zwischenstand
zwischenstand
zwischenstand
Merged 'dev'.

Conflicts:
	app/i18n/en_US.json
	app/routes/conversation/comps/drtv-security_settings.html
language file angepasst
zwischenstand
Merge branch 'origin/feature-new-security-aspects'
Merge branch 'origin/feature-conversation-settings-renew'

Conflicts:
	app/i18n/en_US.json
	app/routes/conversation/comps/drtv-security_settings.html
Merge branch 'origin/feature-conversation-settings-renew'

Conflicts:
	app/i18n/en_US.json