Use g-d-m 3.1.3.BUILD-SNAPSHOT
use org.grails:grails-datastore-test-support:1.0.2-grails-2.3
Merge branch '2.3.x' into 2.4.x

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