Merge pull request #326 from wagnert/master

Refactor README.md for new servlet manager configuration in context.xml