kurz vor finish
Merged 'dev'.
Finish login-registration-gui