_
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/domain/webapp/UserRole.groovy
	test/integration/webapp/UserIntegTests.groovy