Tomcat deployable WAR
Merge branch 'develop' of https://github.com/fau-amos-2014-team-2/root into develop