Assets 2

This is the last version running off tomcat. All future versions will be using standalone (#1)