motify
modify
Merge branch 'master' of github.com:momoplan/petandroid1

Conflicts:
	AndroidManifest.xml
	src/petcircle/activity/personalCenter/PeoperInfoTwoActivity.java