增加个人信息界面
Merge branch 'master' of github.com:52pet/Chongwushuo_Android

Conflicts:
	PetSay/AndroidManifest.xml