my profile update
Merge branch 'master' of https://github.com/liyang2/foodiePharosWeb

Conflicts:
	WebContent/myprofile.jsp