add sample servlet and tomcat7
fixed merged