Async: Support timeout in waitAll method in PromiseList/PromiseMap
Updated Groovy to 2.1.6
Merge pull request #372 from bobbywarner/groovyupdate

Updated Groovy to 2.1.6
Resolved GRAILS-8496, by adding missing dependencies required for an Ant build
Merge pull request #373 from rimerosolutions/fix/GRAILS-8496

Resolved GRAILS-8496, by adding missing dependencies required for an Ant...
use grails repo for snapshots
fix for GRAILS-5791 "Create a way to easily exclude properties from Serialization when using the XML or JSON converters"
Merge branch 'master' of github.com:grails/grails-core

Conflicts:
	grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy
fix failing tests
update datastore version to snapshot
fix for GRAILS-5531 "Http methods OPTIONS, TRACE, HEAD are not mapped in UrlMappings"
fix for GRAILS-10251 "REST: Index action does not work when extending RestfulController"
GRAILS-10220 - handle XML or JSON body parsing errors

If the parsing error occurs during the automatic data binding that is imposed on command objects, the response status code is set to 400 and the controller action is never actually invoked.  If the parsing error occurs during binding initiated by application code, a binding error is added to the object that data binding is being imposed upon.
GRAILS-10220 - move and rename exception class
GRAILS-10220 - fix javadoc
Merge branch 'master' of github.com:grails/grails-core
GRAILS-10220 - more tests