Switch to Servlet/HttpServlet instead of ServletEngine/Servlet
Merge pull request #24 from wagnert/master

Switch to Servlet/HttpServlet instead of ServletEngine/Servlet