Merge pull request #11 from wagnert/master

Refactor servlet engine/web container integration