bug fix
my watcher version
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle
	build.properties
	grails-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java
	grails-core/build.gradle
	grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/DirectoryWatcher.java