use g-d-m 3.1.3.RELEASE version
use hibernate 3.6.10.18
Merge branch '2.3.x' into 2.4.x

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
use hibernate4 plugin 4.3.6.1