update
Merge branch 'master' of https://github.com/antme/x-e-commerce

Conflicts:
	ecommerce/ui/web/index.jsp