replace emoticon plugin
Merge pull request #581 from arnaudbey/emoticon

replace emoticon plugin