Make new REST APIs honour the 'grails.scaffolding.templates.domainSuffix' setting
Forked Mode: fixed deeply nested class loaders
fix for GRAILS-3929 "Configuration file not found in grails-app/conf when executing "grails run-app" (directory not added to classpath?)"
Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
	grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/io/support/UrlResource.java
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-core/src/main/groovy/org/codehaus/groovy/grails/project/packaging/GrailsProjectPackager.groovy
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
	grails-web/src/main/groovy/grails/gsp/PageRenderer.groovy
Merge pull request #362 from nobeans/fix/slow-forked-test

Forked Mode: fixed the problem of becoming slow gradually for test execution
Addresses javadoc/groovydoc vulnerability http://www.oracle.com/technetwork/topics/security/javacpujun2013-1899847.html
Merge branch '2.2.x'
Merge branch 'master' of github.com:grails/grails-core
ignore springloaded javadoc jar file (if it exists) when generating wrapper
Merge branch '2.2.x'

Conflicts:
	scripts/Wrapper.groovy
ignore springloaded javadoc jar file (if it exists) when generating wrapper
REST: take into account @Resource annotation when calculating response formats
Merge branch 'master' of github.com:grails/grails-core
fix typo
move some tests to g-t-s-u

This is steering around an issue with the Eclipse compiler that prevents transformations written in Groovy from being used in the same project which defines the transformation.
ignore test for now
move some tests to g-t-s-u

This is steering around an issue with the Eclipse compiler that prevents transformations written in Groovy from being used in the same project which defines the transformation.
isolate rest renderer specs
GRAILS-5312 fixed always compile spring/resources.groovy on Windows
upgrade to spring loaded 1.1.3