Updated jQuery plugin to 1.9.1
fix failing tests
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/DynamicFinderOrTests.groovy
	grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/FindByMethodTests.groovy
	grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/SubquerySpec.groovy
Merge branch '2.2.x'
fix failing tests
fix for GRAILS-2730 "Location of stacktrace.log in WAR deployed app on Tomcat 6 running non-root is invalid"
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'
Merge pull request #325 from bobbywarner/master

Updated jQuery plugin to 1.9.1
added serialVersionUID
fix for meta class changes from integration tests leaking into functional tests when running inline
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsRuntimeConfigurator.java
Merge branch '2.2.x'

Conflicts:
	scripts/_GrailsTest.groovy
Merge branch 'master' of github.com:grails/grails-core
fix compilation error
fix for GRAILS-9708 "Grails 2.2.0 fails with Xerces 2.10.0 as a dependency"
Merge branch '2.2.x'