More codes for emoticons
More codes for emoticons
Merge remote-tracking branch 'origin/master' into gh-pages