merge
Merge branch 'documentation' of github.com:jasonray/jersey-starterkit into documentation