套餐以及其他修改
Merge branch 'master' of https://github.com/Foboy/Ecommerce

Conflicts:
	RuiCui/Presentation/Nop.Web/Administration/Nop.Admin.csproj
	RuiCui/Presentation/Nop.Web/Administration/Views/Product/List.cshtml
	RuiCui/Presentation/Nop.Web/Nop.Web.csproj