Upgrade Spring and Spring Security Versions
Conflicts:
	pom.xml