modify
Merge branch 'master' of https://github.com/youjiaqi/HealthClub.git

Conflicts:
	WebContent/member/PersonalCenterActivity.jsp
modify