修改聊天/评论界面 加入EMOJI
Merge branch 'master' of https://github.com/logosmjt/PetBao.git

Conflicts:
	AndroidManifest.xml