分享
Merge branch 'master' of https://github.com/52pet/Chongwushuo_Android

Conflicts:
	PetSay/AndroidManifest.xml