Change to master branche for building documentation
Refactor for usage with servlet engine
Merge pull request #23 from wagnert/master

Refactor for usage with servlet engine
Switch to Servlet/HttpServlet instead of ServletEngine/Servlet
Merge pull request #24 from wagnert/master

Switch to Servlet/HttpServlet instead of ServletEngine/Servlet
mergin upstream