moep semicolin
Merge remote-tracking branch 'origin/feature-conversation-refactor' into feature-conversation-refactor
init verschoben
Merge remote-tracking branch 'origin/feature-conversation-refactor' into feature-conversation-refactor
small upated
fix not encrypted conversation
Merge remote-tracking branch 'origin/feature-conversation-refactor' into feature-conversation-refactor

Conflicts:
	app/comps/ui/drtv-avatar.js