Update docs for tomcat7 maven plugin
Add in parent pom definition
Merge branch 'develop' of github.com:fhanik/login-server into develop
Merge remote-tracking branch 'upstream/develop' into develop