Merge branch 'master' of https://github.com/chiragjain/Emoticons-Keyboard
Merge branch 'master' of https://github.com/chiragjain/Emoticons-Keyboard