edit User finished
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	WebContent/WEB-INF/web.xml