Fix bug in emoticons
Merge branch 'master' of https://github.com/lelexxx/Social