update Spring version
Merge branch '2.3.x' into 2.4.x

Conflicts:
	build.gradle