Downgraded to Servlet API 2.5.
First draft of Heroku configuration running Jetty.
Merge branch 'feature/heroku' into develop