DDBEXTRA-185-ugo
Merge branch 'DDBEXTRA-185-ugo' into develop

Conflicts:
	grails-app/controllers/de/ddb/registration/IndexController.groovy
	grails-app/controllers/de/ddb/registration/UserController.groovy