upgrade to resources plugin 1.2.6
Use springloaded 1.1.5
version 2.3.7
Merge branch '2.3.x'

Conflicts:
	build.gradle
	build.properties
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java