Texte sangepasst, 1. Version Registrieren Form, String Konstanten umgestellt
Merge branch 'master' into dev

Conflicts:
	conf/messages
	conf/messages.en
Merge branch 'dev'