Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
bug fix
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
update to datastore RC1
Merge branch 'master' of github.com:grails/grails-core