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
GRAILS-10183 GRAILS-10081 fixes for ForkedGrailsProcess
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
update to resources 1.2
ignore sources and javadocs when generating wrapper
ignore springloaded javadoc jar file (if it exists) when generating wrapper
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
version 2.1.6
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
Merge branch '2.2.x'
fix compilation error
Merge branch 'master' of github.com:grails/grails-core