fixed tests
Merge remote-tracking branch 'origin/feature-e2e-tests-conversation' into feature-e2e-tests-conversation

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