Spring up and running
pom.prop
Merge branch 'master' into spring-setup
Merge to get all java files as well into spring-setup