:gem: Change emoticon logic
:gem: Change emoticon logic
Merge branch 'master' of https://github.com/xpush/messengerX