Changed jetty to Tomcat
Changes