upgraded to spring 4, spring security 3.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml