Use twitter emoji
Merge branch 'dev' into xmpp-muc