fix for failing functional tests
partial fix for GRAILS-9273 "DirectoryWatcher: files are incorrectly considered "new" if their extension wasn't watched for that directory"
upgrade to Groovy 1.8.9
fix for GRAILS-5921 "Enhance withForm to allow for forms on multiple tabs"
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/GrailsProjectWatcher.java
Merge branch '2.2.x'
Upgrade to Tomcat 7.0.37
fix for StringIndexOutOfBoundsException
Merge pull request #332 from bobbywarner/tomcatUpgrade

Upgrade to Tomcat 7.0.37
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'
Merge branch 'master' of github.com:grails/grails-core