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

Conflicts:
	ecommerce/ecservice/src/main/webapp/resources/js/public_css.js