Merge pull request #46 from hazendaz/master

Lots of version updates
Merge pull request #47 from hazendaz/master

Updated tomcat.