Eliminate dependency on commons-io from everything except fileupload
delete deprecated class
move BootStrap handling to grails-web since it is servlet specific
upgrade to resources plugin 1.2.6
Use springloaded 1.1.5
GRAILS-10744 - remove upgrade script
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
Updated resources plugin version to 1.2.7
Updated asset-pipeline examples
use aspectj 1.7.4
Revert "Updated resources plugin version to 1.2.7"

This reverts commit 3d406a1803ee57cf3236fbed5e39ec0a96acd6bf.
move CLI Apis out of grails-core into grails-project-api subproject (work in progress)
fix for GRAILS-11126 "grails-plugin-rest fails to find container renderer based on compontent type's interfaces"
fix for GRAILS-11149 "Integration tests for controllers using the Respond method fail after Unit tests"
fix for GRAILS-11166 "Messages.properties are not loaded when using Grails run-war"
update tomcat and resources plugin versions to latest versions (7.0.52 and 1.2.7)
Merge branch '2.3.x'

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
use jquery 1.11.0.2
Merge branch '2.3.x'

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy