minor
Merge branch 'master' of https://github.com/voncount/PSTraining

Conflicts:
	spring01/src/main/webapp/WEB-INF/appConfig.xml
	spring01/target/spring01-1.0-SNAPSHOT/WEB-INF/appConfig.xml