GRAILS-5312 fixed always compile spring/resources.groovy on Windows
upgrade to spring loaded 1.1.3
upgrade to spring loaded 1.1.3
Conflicts:
	build.gradle
fix for GRAILS-10081 "configuration of springloaded appears broken"
Another fix for GRAILS-10081
update version to 2.1.6.BUILD-SNAPSHOT
GRAILS-10183 prepare for Java 7u40 change by adding -Djdk.reflect.allowGetCallerClass=true to agent.string
- move spring-loaded common options to gradle build variable
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	gradle/assemble.gradle
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
Merge branch '2.2.x'

Conflicts:
	build.gradle