Autocomplete smilies
Merge remote-tracking branch 'upstream/master' into autocomplete
Merge pull request #751 from pafcu/autocomplete

Autocomplete smilies