修改个人信息部分
Merge branch 'master' of https://github.com/yang-chao/GoCook_Android

Conflicts:
	GoCook/src/com/m6/gocook/base/protocol/Protocol.java