merge with new commit
add tomcat7 plugin to automate testing and deployment