Migrated to Java7 & Tomcat8
Merge pull request #1 from Nugs/master

Migrated to Java7 & Tomcat8