Fixed wrong display of emote menu; Emoticons' conflicts
Merge remote-tracking branch 'origin/master' into gh-pages