Fixed build with cognate plugin names
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
weave integration test mixin into integration tests automatically
update to Grails 2.3 RC1
increase memory for test suite
Merge branch 'master' of github.com:grails/grails-core
increase memory for test suite
update to datastore RC1
Merge branch 'master' of github.com:grails/grails-core
set version to 2.2.4
Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-persistence/build.gradle
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
GRAILS-10266 create the history file if it doesn't exist
updated hibernate plugin versions
Merge branch '2.2.x'
update scaffolding plugin to 2.0.0.RC1
replace integration test template with one that doesn't use the unit test mixins
Scaffolding plugin update missed assemble.gradle
Merge pull request #383 from bobbywarner/plugin-update-missed

Scaffolding plugin update missed assemble.gradle
Set version back to 2.3.0.BUILD-SNAPSHOT

This reverts commit 549d7c3bc1e6ea779907bb8c263556a263378168.
Fix for GRAILS-9997: replace generics placeholders with parameter types