testing with Spring 3.1.4.BUILD-SNAPSHOT
Upgrade to Spring 3.1.4
Merge branch '2.0.x' into 2.1.x

Conflicts:
	build.gradle
	build.properties
	dependencies.txt
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsWebApplicationContext.java
Merge branch '2.1.x' into 2.2.x

Conflicts:
	dependencies.txt