fixing copy'n'paste error from GrailsTestCompiler

- it was a method, not a constructor as intended
- detected problem with CodeNarc's MethodName rule
Update to asset-pipeline 1.60 was missed in assemble.gradle
Use asset-pipeline 1.6.1
update version numbers in commented asset plugins
temporarily reinstate commons-collections as a compile time dependency

This reverts part of https://github.com/grails/grails-core/commit/f36a45236caee677bf1c6f93244929e7e4e15929.  I am troubleshooting runtime problems related to LRUMap access.
use jquery plugin version 1.11.0.2
fix broken applicationContext.xml
restore commons-collections as a compile time dependency since Hibernate 3 requires it anyway
Merge branch 'master' of github.com:grails/grails-core

Conflicts:
	grails-web/build.gradle
GRAILS-11134 GRAILS-11145 add an attribute to @Transactional for inheriting setRollbackOnly state from nested TransactionStatus to parent TransactionStatus
- prevents UnexpectedRollbackExceptions when TransactionStatus.setRollbackOnly() is called in nested transaction template callback
Remove properties related to the resources plugin
remove grails.resources.adhoc.excludes
Merge branch '2.3.x'

Conflicts:
	grails-resources/src/grails/grails-app/conf/Config.groovy
groovyVersion = "2.2.2"
Set version to 2.4.0.M1
Revert "Set version to 2.4.0.M1"

This reverts commit 0bee182857fde869483e4bde4c3dc4486e95d4f5.
Revert "Revert "Set version to 2.4.0.M1""

This reverts commit 73fab550382a6aab61b0f4d8ce56c18ed79dc75a.
Use aspectj 1.7.4

https://jira.springsource.org/browse/SPR-11273
https://github.com/spring-projects/spring-framework/commit/d1b1770eba984ff9a9de45dbaa347dac9e1fe4cb
Eliminate dependency on commons-io from everything except fileupload
delete deprecated class