Add support to run the application via Maven using embedded Tomcat 7.
Merge origin/master