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