Fixed some typos I got wrong inthe merge process
Changed the descriptor of Jetty server in order to let that work in
Eclipse's Debug mode