Updated Tomcat 7.0 and added Tomcat 6.0