fix bugs
Merge branch 'master' of github.com:antme/x-e-commerce
fix bugs
add field userLocation for user table
Merge branch 'master' of github.com:antme/x-e-commerce

Conflicts:
	ecommerce/ecservice/doc/db/db-beta2-modify.sql
	ecommerce/ecservice/src/main/webapp/pages/admin/user/manage.jsp