Tomcat 7 config added
Merge remote-tracking branch 'origin/master'