fix routes
Merge branch 'fix_routes' into develop

Conflicts:
	app/views/messages/_dialog.html.haml
	vendor/assets/stylesheets/emoji.css.scss