change to spring 3
Merge branch 'master' of https://github.com/widewing/tourismapp.git

Conflicts:
	src/main/resources/back-end.properties
	src/main/resources/log4j.properties