Upgrade to spring 4
Merge branch 'master' of https://github.com/orachid/school.git

Conflicts:
	school-web-rebirth/pom.xml