Merge pull request #359 from patriot1burke/master

fix tomcat7 build