commit
Merge remote-tracking branch 'origin/registration_and_authentification'

Conflicts:
	test/unit/grails/clickstart/EventTests.groovy