work on local api
Merge branch 'master' of https://github.com/Kooboo/Ecommerce

Conflicts:
	src/Kooboo.Commerce.API.LocalProvider/Kooboo.Commerce.API.LocalProvider.csproj
	src/Kooboo.Commerce.API/Kooboo.Commerce.API.csproj
	src/Kooboo.Commerce.Web/Areas/Commerce/Controllers/BrandController.cs