Add JSON Codec as a registered Codec
Fix for GRAILS-10830: HalJsonRenderer links don't resolve properly for proxied entities
GRAILS-10973: revert changing default format in Config.groovy (66efffb), add comment to 'all' format
Merge branch 'patch-1' of https://github.com/davydotcom/grails-core into davydotcom-patch-1
fix Unroll label in HTMLEncoderSpec
Fix passing null to Codec . @CompileStatic must have caused this problem. NullObject instances get passed to Codecs when encodeAs* method is called on null. This fixes the problem.
Fix for GRAILS-10980: make encodeAsJSON() and encodeAsXML() work as in older grails versions for other than CharSequence/String and primitive objects
GRAILS-10990: IncludeResponseWrapper doesn't override all methods necessary to wrap response
- code from GRAILS-10990, author Craig Andrews
GRAILS-10933 - Add shouldFail helper methods for convenience when migrating away from GroovyTestCase
Merge pull request #456 from longwa/GRAILS-10933

GRAILS-10933 - Add shouldFail helper methods for convenience when migrat...
update version to 2.3.5
Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x
update hibernate plugin to 3.6.10.7
update tomcat plugin to 7.0.50
2.3.6.BUILD-SNAPSHOT
Merge branch '2.3.x'

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