Spring 4.1 upgrade
Merge pull request #717 from Unicon/spring-41-upgrade

Spring 4.1 upgrade
Merge branch 'master' into spring-webflow-24x

Conflicts:
	pom.xml