Daily commit
Merge branch 'master' of https://github.com/Kooboo/Ecommerce

Conflicts:
	src/Kooboo.Commerce.Web/Kooboo.Commerce.Web.csproj