Emoticon change and input animation add
Merge remote-tracking branch 'origin/master'