update plugin versions
Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x
Merge branch '2.3.x'

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