a static candidate method must not be a instance candidate method at the same time
update version for 2.3.2 release
update hibernate version
2.3.3.BUILD-SNAPSHOT
Merge branch '2.3.x'

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
resolve merge conflicts