Fixed build with cognate plugin names
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
GRAILS-10299 - Add controller action exception handling support
GRAILS-9997: Additional changes: don't add duplicate methods
GRAILS-10303 - restore BindDynamicMethod
GRAILS-10301 - improve the handling of service bean aliases
GRAILS-10301 - was aliasing the wrong bean
GRAILS-10301 - fix failing functional test
GRAILS-10132 - fix command line handling of blanks in windows

This is still pending testing.
2.2.5.BUILD-SNAPSHOT
Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
GRAILS-10132 - fix command line handling of blanks in windows

This is still pending testing.
Merge branch '2.2.x'
Revert "GRAILS-10132 - fix command line handling of blanks in windows"

This reverts commit de110b271546754a9a8e500c94797bba58b1bd37.
Merge branch '2.2.x'