Improved Servlet integration
Merge branch 'master' of github.com:avityuk/ginger