edit profile change
Change some front end!
Merge branch 'master' of github.com:gjq1218/ducking-octo-bugfixes

Conflicts:
	WebRoot/Adminvieworder.jsp
	WebRoot/Adminviewreservation.jsp
	WebRoot/continueshopping.jsp
	src/struts.xml