修改emotion
修复继承bug
Merge remote-tracking branch 'origin/master'