add workaround for dev
Merge remote-tracking branch 'origin/feature-conversation-refactor' into feature-conversation-refactor

Conflicts:
	test/e2e/route-conversation.spec.js