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

Conflicts:
	PetSay/src/com/petsay/constants/Constants.java
Merge branch 'master' of https://github.com/52pet/Chongwushuo_Android

Conflicts:
	PetSay/AndroidManifest.xml
	PetSay/src/com/petsay/constants/Constants.java