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

Conflicts:
	PetSay/src/com/petsay/activity/ReleaseActivity.java
分享
Merge branch 'master' of https://github.com/52pet/Chongwushuo_Android

Conflicts:
	PetSay/src/com/petsay/activity/MainActivity.java
分享
Merge branch 'master' of https://github.com/52pet/Chongwushuo_Android
修改宠物信息