Updated to tomcat 7