Use Spring 3.2.7.RELEASE
Merge branch '2.3.x'

Conflicts:
	build.gradle