fixed conflicted tomcat7-maven-plugin
reverted pom.xml build settings