GRAILS-10335 - Override Grails mappings for collections when property is mapped with a custom Hibernate UserType
GRAILS-9899: Update Protobuf
Merge pull request #391 from bobbywarner/2.2.x

GRAILS-9899: Update Protobuf
GRAILS-9811: Binary plugin i18n problem
+ Fix location of default messages file inside the jar so that it includes the name of the plugin, which is how it is packaged
GRAILS-9811: Binary plugin i18n problem
+ Fix location of default messages file inside the jar so that it includes the name of the plugin, which is how it is packaged
Merge pull request #392 from geedubya/master

GRAILS-9811: Binary plugin i18n problem
fix for GRAILS-10406 "Incorrect Content Type in response when Accept Header is missing for Restful Controllers"
fix for GRAILS-10414 "Map-based syntax for dependency doesn't work"
fix for GRAILS-10415 "legacyResolve doesn't resolve dependencies within in-place plugins"
Couple of bug fixes for Maven support
Improvement  for GRAILS-10419
fix for GRAILS-10308 "joinTable: with name: now not working after 2.1.5 upgrade to 2.2.4"
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java
fix for GRAILS-10308 "joinTable: with name: now not working after 2.1.5 upgrade to 2.2.4"
AspectJ Update
Merge pull request #393 from bobbywarner/aspectj

AspectJ Update
Revert "AspectJ Update"

This reverts commit b98fb5390dc090339daef042ac5ce4e1379eed1f.
use tomcat 7.0.42
update version to 2.3.0
upgrade to datastore GA jars