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