Merge remote-tracking branch 'origin/feature-cam-473-trust-own-keys' into feature-e2e-tests-conversation

Conflicts:
	app/routes/conversation/conversation.html
fixxed header
Merge remote-tracking branch 'origin/feature-e2e-tests-conversation' into feature-e2e-tests-conversation
fixxed purl header??
Merge remote-tracking branch 'origin/feature-e2e-tests-conversation' into feature-e2e-tests-conversation