Fix #549
 Changed container from jetty to tomcat on request by @jdubois.