- updated gitignore
- added tomcat7 maven plugin
Merge remote-tracking branch 'origin/master'