编辑嘴型声音
Merge branch 'master' of https://github.com/52pet/Chongwushuo_Android

Conflicts:
	PetSay/res/values/strings.xml