fix emojify
delete conflict

Conflicts:
	app/assets/javascripts/messages.js
	app/views/layouts/_index.html.haml