Merge pull request #7 from jivesoftware/master

Merge in Tomcat Changes to Master
Merge branch '7.0' of github.com:jivesoftware/jive-sdk-java-jersey into 7.0
Merge branch 'master' of github.com:jivesoftware/jive-sdk-java-jersey
Merge branch 'master' of github.com:jivesoftware/jive-sdk-java-jersey
updated