Add emoticon "[pokerface]"
Merge remote-tracking branch 'origin/master' into gh-pages