moved @Transaction and @NotTransactional to grails-core jar
Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x
add content type constants to ControllerUnitTestMixin

This prevents unit tests from making references to MimeType which is in a org.codehause.* package.
Merge branch '2.3.x'

Conflicts:
	grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy
move constants which were placed during the last merge