use resources plugin 1.2.9
use resources plugin 1.2.10
use resources plugin 1.2.11
use resources plugin 1.2.12
use resource plugin 1.2.13-SNAPSHOT
use resources plugin 1.2.13
update hibernate plugin versions
Merge branch '2.3.x'

Conflicts:
	apps/gsp-reload-app/grails-app/conf/BuildConfig.groovy
	apps/html-default-codec/grails-app/conf/BuildConfig.groovy
	apps/hyphenatedurls/grails-app/conf/BuildConfig.groovy
	apps/kitchen_sink_app/grails-app/conf/BuildConfig.groovy
	apps/unit-test-app/grails-app/conf/BuildConfig.groovy
	cli-tests/spock-app/grails-app/conf/BuildConfig.groovy
use tomcat plugin 7.0.55
Merge branch '2.3.x'

Conflicts:
	apps/kitchen_sink_app/grails-app/conf/BuildConfig.groovy
	apps/maven-plugins/grails-app/conf/BuildConfig.groovy