use :hibernate:3.6.10.15
Use :tomcat:7.0.53
Merge branch '2.3.x' into 2.4.x

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy