jetty 8
merge
Merge pull request #849 from patriot1burke/master

jetty 8