Create new maven-simple-webapp
Merge remote-tracking branch 'origin/master'