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

Conflicts:
	ecommerce/ecservice/src/main/java/com/ecom/controller/ServiceProviderController.java