beginn with de-/encryption
Merge remote-tracking branch 'origin/feature-conversation-refactor' into feature-conversation-refactor

Conflicts:
	app/comps/conversations/drtv-conversation.js