zwischenstand
zwischenstand
zwischenstand
fsdf
hhuhuh
Merged 'dev'.

Conflicts:
	app/comps/conversations/srvc-conversation-model.js
	app/i18n/de_DE.json
	app/i18n/en_US.json
	app/routes/conversation/comps/drtv-security_settings.html
	app/routes/conversation/comps/drtv-security_settings.js
	app/routes/conversation/conversation-ctrl.js
	app/routes/conversation/conversation.html
	app/routes/purl/purl.html
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'
firefox hat json parse error in der purl
fixxed json parse error
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
fixxed i18n at security aspects
pw wird an passphrase per reference übergeben, check entefrnt
fixxed i18n
fixxed i18n / added aspects to purl
fiexed two tests
bug in purl