Migrated to Tomcat 7. Jetty sucks!
Merge remote-tracking branch 'origin/master'