Changed some custom names/mods; Changed an emoticon's code
Merge remote-tracking branch 'origin/master' into gh-pages