upgraded tomcat, static assets for tomcat (WIP), cleanup