Empty dirs
force folder to be created
force folders to be created
Merge remote-tracking branch 'origin/master'

Conflicts:
	brokenwindows/grails-app/views/crime/search.gsp
	brokenwindows/src/groovy/brokenwindows/CrimeQuery.groovy
	brokenwindows/target-eclipse/classes/.gitignore