fix
moep
Merged 'dev'.

Conflicts:
	app/shared/core/pack-files.js
finish registrierung mit guest
Merge branch 'origin/dev'
Merged 'dev'.
Finish without e2e-test