resources directory should be on classpath for forked mode
fix for GRAILS-10037 "grails run-app fails if directory name is < 3 chars"
Merge branch 'master' of github.com:grails/grails-core
fix for GRAILS-7173 "Cannot define schema name for table used in joinTable mapping"
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java
Merge branch '2.2.x'

Conflicts:
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/JoinTable.groovy
	grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateMappingBuilderTests.groovy
update datastore version to 1.1.7 RELEASE
Merge branch '2.1.x' into 2.2.x
Grails batch file fix for windows environemnt.

Signed-off-by: Jeff Brown <jbrown@vmware.com>
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
GRAILS-9895 - improve binding String to collection

When binding a String to a collection of some non String type, the conversion was not happening.

Relevant functional tests:
https://github.com/grails/grails-functional-tests/commit/ea1dc74a1b5d32d41761404de40bc0dd1f993691
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'
GRAILS-8991 - improve binding String to Set<Integer>
whitespace, cleanup
updated tomcat, scaffolding, and hibernate plugins to non-snapshot versions
whitespace
GRAILS-10024 added new ParticipatingInterceptor interface that allows us to reset the participate flag to ensure the session is closed at the end of the request
update version to 2.1.5