Fix wrong emoticon's code "[:o)2pkm]"
Merge remote-tracking branch 'origin/master' into gh-pages