commit before merge
add back tomcat7 plugin