1212
Merge branch 'master' of https://github.com/Foboy/Ecommerce

Conflicts:
	RuiCui/NopCommerce.v12.suo
	RuiCui/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/obj/Debug/Nop.Plugin.DiscountRules.CustomerRoles.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/obj/Debug/Nop.Plugin.DiscountRules.CustomerRoles.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/obj/Debug/Nop.Plugin.DiscountRules.CustomerRoles.pdb
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HadSpentAmount/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HadSpentAmount/obj/Debug/Nop.Plugin.DiscountRules.HadSpentAmount.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HadSpentAmount/obj/Debug/Nop.Plugin.DiscountRules.HadSpentAmount.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HadSpentAmount/obj/Debug/Nop.Plugin.DiscountRules.HadSpentAmount.pdb
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasAllProducts/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasAllProducts/obj/Debug/Nop.Plugin.DiscountRules.HasAllProducts.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasAllProducts/obj/Debug/Nop.Plugin.DiscountRules.HasAllProducts.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasAllProducts/obj/Debug/Nop.Plugin.DiscountRules.HasAllProducts.pdb
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasOneProduct/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasOneProduct/obj/Debug/Nop.Plugin.DiscountRules.HasOneProduct.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasOneProduct/obj/Debug/Nop.Plugin.DiscountRules.HasOneProduct.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasOneProduct/obj/Debug/Nop.Plugin.DiscountRules.HasOneProduct.pdb
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/Nop.Plugin.ExchangeRate.McExchange.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/Nop.Plugin.ExchangeRate.McExchange.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/Nop.Plugin.ExchangeRate.McExchange.dll
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/Nop.Plugin.ExchangeRate.McExchange.pdb
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/Nop.Plugin.ExternalAuth.Facebook.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/Nop.Plugin.ExternalAuth.Facebook.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/Nop.Plugin.ExternalAuth.Facebook.dll
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/Nop.Plugin.ExternalAuth.Facebook.pdb
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/Nop.Plugin.ExternalAuth.OpenId.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/Nop.Plugin.ExternalAuth.OpenId.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/Nop.Plugin.ExternalAuth.OpenId.dll
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/Nop.Plugin.ExternalAuth.OpenId.pdb
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/Nop.Plugin.Feed.Froogle.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/Nop.Plugin.Feed.Froogle.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/Nop.Plugin.Feed.Froogle.dll
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/Nop.Plugin.Feed.Froogle.pdb
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/Nop.Plugin.Misc.FacebookShop.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/Nop.Plugin.Misc.FacebookShop.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/Nop.Plugin.Misc.FacebookShop.dll
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/Nop.Plugin.Misc.FacebookShop.pdb
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/Nop.Plugin.Misc.WebServices.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/Nop.Plugin.Misc.WebServices.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/Nop.Plugin.Misc.WebServices.dll
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/Nop.Plugin.Misc.WebServices.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/Nop.Plugin.Payments.AuthorizeNet.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/Nop.Plugin.Payments.AuthorizeNet.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/Nop.Plugin.Payments.AuthorizeNet.dll
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/Nop.Plugin.Payments.AuthorizeNet.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.CashOnDelivery/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.CashOnDelivery/obj/Debug/Nop.Plugin.Payments.CashOnDelivery.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.CashOnDelivery/obj/Debug/Nop.Plugin.Payments.CashOnDelivery.dll
	RuiCui/Plugins/Nop.Plugin.Payments.CashOnDelivery/obj/Debug/Nop.Plugin.Payments.CashOnDelivery.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/Nop.Plugin.Payments.CheckMoneyOrder.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/Nop.Plugin.Payments.CheckMoneyOrder.dll
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/Nop.Plugin.Payments.CheckMoneyOrder.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/Nop.Plugin.Payments.Manual.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/Nop.Plugin.Payments.Manual.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/Nop.Plugin.Payments.Manual.dll
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/Nop.Plugin.Payments.Manual.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalDirect/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalDirect/obj/Debug/Nop.Plugin.Payments.PayPalDirect.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalDirect/obj/Debug/Nop.Plugin.Payments.PayPalDirect.dll
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalDirect/obj/Debug/Nop.Plugin.Payments.PayPalDirect.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/Nop.Plugin.Payments.PayPalStandard.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/Nop.Plugin.Payments.PayPalStandard.dll
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/Nop.Plugin.Payments.PayPalStandard.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.PurchaseOrder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.PurchaseOrder/obj/Debug/Nop.Plugin.Payments.PurchaseOrder.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.PurchaseOrder/obj/Debug/Nop.Plugin.Payments.PurchaseOrder.dll
	RuiCui/Plugins/Nop.Plugin.Payments.PurchaseOrder/obj/Debug/Nop.Plugin.Payments.PurchaseOrder.pdb
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/Nop.Plugin.SMS.Verizon.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/Nop.Plugin.SMS.Verizon.dll
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/Nop.Plugin.SMS.Verizon.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/Nop.Plugin.Shipping.AustraliaPost.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/Nop.Plugin.Shipping.AustraliaPost.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/Nop.Plugin.Shipping.AustraliaPost.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/Nop.Plugin.Shipping.AustraliaPost.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.ByWeight/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.ByWeight/obj/Debug/Nop.Plugin.Shipping.ByWeight.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.ByWeight/obj/Debug/Nop.Plugin.Shipping.ByWeight.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.ByWeight/obj/Debug/Nop.Plugin.Shipping.ByWeight.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.CanadaPost/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.CanadaPost/obj/Debug/Nop.Plugin.Shipping.CanadaPost.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.CanadaPost/obj/Debug/Nop.Plugin.Shipping.CanadaPost.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.CanadaPost/obj/Debug/Nop.Plugin.Shipping.CanadaPost.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/Nop.Plugin.Shipping.Fedex.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/Nop.Plugin.Shipping.Fedex.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/Nop.Plugin.Shipping.Fedex.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/Nop.Plugin.Shipping.Fedex.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/Nop.Plugin.Shipping.FixedRateShipping.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/Nop.Plugin.Shipping.FixedRateShipping.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/Nop.Plugin.Shipping.FixedRateShipping.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/Nop.Plugin.Shipping.FixedRateShipping.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/Nop.Plugin.Shipping.UPS.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/Nop.Plugin.Shipping.UPS.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/Nop.Plugin.Shipping.UPS.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/Nop.Plugin.Shipping.UPS.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.USPS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.USPS/obj/Debug/Nop.Plugin.Shipping.USPS.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.USPS/obj/Debug/Nop.Plugin.Shipping.USPS.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.USPS/obj/Debug/Nop.Plugin.Shipping.USPS.pdb
	RuiCui/Plugins/Nop.Plugin.Tax.CountryStateZip/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Tax.CountryStateZip/obj/Debug/Nop.Plugin.Tax.CountryStateZip.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Tax.CountryStateZip/obj/Debug/Nop.Plugin.Tax.CountryStateZip.dll
	RuiCui/Plugins/Nop.Plugin.Tax.CountryStateZip/obj/Debug/Nop.Plugin.Tax.CountryStateZip.pdb
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/Nop.Plugin.Tax.FixedRate.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/Nop.Plugin.Tax.FixedRate.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/Nop.Plugin.Tax.FixedRate.dll
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/Nop.Plugin.Tax.FixedRate.pdb
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/Nop.Plugin.Widgets.GoogleAnalytics.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/Nop.Plugin.Widgets.GoogleAnalytics.dll
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/Nop.Plugin.Widgets.GoogleAnalytics.pdb
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.dll
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.pdb
	RuiCui/Presentation/Nop.Web/Administration/sitemap.config
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.CustomerRoles/Nop.Plugin.DiscountRules.CustomerRoles.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.CustomerRoles/Nop.Plugin.DiscountRules.CustomerRoles.pdb
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HadSpentAmount/Nop.Plugin.DiscountRules.HadSpentAmount.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HadSpentAmount/Nop.Plugin.DiscountRules.HadSpentAmount.pdb
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasAllProducts/Nop.Plugin.DiscountRules.HasAllProducts.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasAllProducts/Nop.Plugin.DiscountRules.HasAllProducts.pdb
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasOneProduct/Nop.Plugin.DiscountRules.HasOneProduct.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasOneProduct/Nop.Plugin.DiscountRules.HasOneProduct.pdb
	RuiCui/Presentation/Nop.Web/Plugins/ExchangeRate.McExchange/Nop.Plugin.ExchangeRate.McExchange.dll
	RuiCui/Presentation/Nop.Web/Plugins/ExchangeRate.McExchange/Nop.Plugin.ExchangeRate.McExchange.pdb
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.Facebook/Nop.Plugin.ExternalAuth.Facebook.dll
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.Facebook/Nop.Plugin.ExternalAuth.Facebook.pdb
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.OpenId/Nop.Plugin.ExternalAuth.OpenId.dll
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.OpenId/Nop.Plugin.ExternalAuth.OpenId.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Feed.Froogle/Nop.Plugin.Feed.Froogle.dll
	RuiCui/Presentation/Nop.Web/Plugins/Feed.Froogle/Nop.Plugin.Feed.Froogle.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Misc.FacebookShop/Nop.Plugin.Misc.FacebookShop.dll
	RuiCui/Presentation/Nop.Web/Plugins/Misc.FacebookShop/Nop.Plugin.Misc.FacebookShop.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Misc.WebServices/Nop.Plugin.Misc.WebServices.dll
	RuiCui/Presentation/Nop.Web/Plugins/Misc.WebServices/Nop.Plugin.Misc.WebServices.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.AuthorizeNet/Nop.Plugin.Payments.AuthorizeNet.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.AuthorizeNet/Nop.Plugin.Payments.AuthorizeNet.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CashOnDelivery/Nop.Plugin.Payments.CashOnDelivery.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CashOnDelivery/Nop.Plugin.Payments.CashOnDelivery.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CheckMoneyOrder/Nop.Plugin.Payments.CheckMoneyOrder.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CheckMoneyOrder/Nop.Plugin.Payments.CheckMoneyOrder.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.Manual/Nop.Plugin.Payments.Manual.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.Manual/Nop.Plugin.Payments.Manual.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalDirect/Nop.Plugin.Payments.PayPalDirect.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalDirect/Nop.Plugin.Payments.PayPalDirect.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalStandard/Nop.Plugin.Payments.PayPalStandard.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalStandard/Nop.Plugin.Payments.PayPalStandard.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PurchaseOrder/Nop.Plugin.Payments.PurchaseOrder.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PurchaseOrder/Nop.Plugin.Payments.PurchaseOrder.pdb
	RuiCui/Presentation/Nop.Web/Plugins/SMS.Verizon/Nop.Plugin.SMS.Verizon.dll
	RuiCui/Presentation/Nop.Web/Plugins/SMS.Verizon/Nop.Plugin.SMS.Verizon.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.AustraliaPost/Nop.Plugin.Shipping.AustraliaPost.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.AustraliaPost/Nop.Plugin.Shipping.AustraliaPost.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.ByWeight/Nop.Plugin.Shipping.ByWeight.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.ByWeight/Nop.Plugin.Shipping.ByWeight.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.CanadaPost/Nop.Plugin.Shipping.CanadaPost.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.CanadaPost/Nop.Plugin.Shipping.CanadaPost.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.Fedex/Nop.Plugin.Shipping.Fedex.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.Fedex/Nop.Plugin.Shipping.Fedex.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.FixedRateShipping/Nop.Plugin.Shipping.FixedRateShipping.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.FixedRateShipping/Nop.Plugin.Shipping.FixedRateShipping.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.UPS/Nop.Plugin.Shipping.UPS.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.UPS/Nop.Plugin.Shipping.UPS.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.USPS/Nop.Plugin.Shipping.USPS.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.USPS/Nop.Plugin.Shipping.USPS.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Tax.CountryStateZip/Nop.Plugin.Tax.CountryStateZip.dll
	RuiCui/Presentation/Nop.Web/Plugins/Tax.CountryStateZip/Nop.Plugin.Tax.CountryStateZip.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Tax.FixedRate/Nop.Plugin.Tax.FixedRate.dll
	RuiCui/Presentation/Nop.Web/Plugins/Tax.FixedRate/Nop.Plugin.Tax.FixedRate.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.GoogleAnalytics/Nop.Plugin.Widgets.GoogleAnalytics.dll
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.GoogleAnalytics/Nop.Plugin.Widgets.GoogleAnalytics.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.NivoSlider/Nop.Plugin.Widgets.NivoSlider.dll
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.NivoSlider/Nop.Plugin.Widgets.NivoSlider.pdb
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.Tests.dll
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.Tests.pdb
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.dll
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.pdb
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Tests.pdb
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/Nop.Core.Tests.csproj.FileListAbsolute.txt
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/Nop.Core.Tests.csprojResolveAssemblyReference.cache
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/Nop.Core.Tests.dll
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/Nop.Core.Tests.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Core.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Core.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Data.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Data.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.Tests.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.Tests.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Tests.pdb
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/Nop.Services.Tests.csproj.FileListAbsolute.txt
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/Nop.Services.Tests.csprojResolveAssemblyReference.cache
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/Nop.Services.Tests.dll
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/Nop.Services.Tests.pdb
	RuiCui/Tests/Nop.Tests/bin/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Tests/bin/Debug/Nop.Tests.pdb
	RuiCui/Tests/Nop.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Tests/Nop.Tests/obj/Debug/Nop.Tests.csproj.FileListAbsolute.txt
	RuiCui/Tests/Nop.Tests/obj/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Tests/obj/Debug/Nop.Tests.pdb
后台修改
111
11
忽略OBJ DEBUG
11
Merge branch 'master' of https://github.com/Foboy/Ecommerce

Conflicts:
	.gitignore
	RuiCui/NopCommerce.v12.suo
	RuiCui/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/obj/Debug/Nop.Plugin.DiscountRules.CustomerRoles.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.CustomerRoles/obj/Debug/Nop.Plugin.DiscountRules.CustomerRoles.pdb
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HadSpentAmount/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HadSpentAmount/obj/Debug/Nop.Plugin.DiscountRules.HadSpentAmount.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HadSpentAmount/obj/Debug/Nop.Plugin.DiscountRules.HadSpentAmount.pdb
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasAllProducts/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasAllProducts/obj/Debug/Nop.Plugin.DiscountRules.HasAllProducts.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasAllProducts/obj/Debug/Nop.Plugin.DiscountRules.HasAllProducts.pdb
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasOneProduct/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasOneProduct/obj/Debug/Nop.Plugin.DiscountRules.HasOneProduct.dll
	RuiCui/Plugins/Nop.Plugin.DiscountRules.HasOneProduct/obj/Debug/Nop.Plugin.DiscountRules.HasOneProduct.pdb
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/Nop.Plugin.ExchangeRate.McExchange.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/Nop.Plugin.ExchangeRate.McExchange.dll
	RuiCui/Plugins/Nop.Plugin.ExchangeRate.McExchange/obj/Debug/Nop.Plugin.ExchangeRate.McExchange.pdb
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/Nop.Plugin.ExternalAuth.Facebook.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/Nop.Plugin.ExternalAuth.Facebook.dll
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.Facebook/obj/Debug/Nop.Plugin.ExternalAuth.Facebook.pdb
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/Nop.Plugin.ExternalAuth.OpenId.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/Nop.Plugin.ExternalAuth.OpenId.dll
	RuiCui/Plugins/Nop.Plugin.ExternalAuth.OpenId/obj/Debug/Nop.Plugin.ExternalAuth.OpenId.pdb
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/Nop.Plugin.Feed.Froogle.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/Nop.Plugin.Feed.Froogle.dll
	RuiCui/Plugins/Nop.Plugin.Feed.Froogle/obj/Debug/Nop.Plugin.Feed.Froogle.pdb
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/Nop.Plugin.Misc.FacebookShop.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/Nop.Plugin.Misc.FacebookShop.dll
	RuiCui/Plugins/Nop.Plugin.Misc.FacebookShop/obj/Debug/Nop.Plugin.Misc.FacebookShop.pdb
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/Nop.Plugin.Misc.WebServices.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/Nop.Plugin.Misc.WebServices.dll
	RuiCui/Plugins/Nop.Plugin.Misc.WebServices/obj/Debug/Nop.Plugin.Misc.WebServices.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/Nop.Plugin.Payments.AuthorizeNet.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/Nop.Plugin.Payments.AuthorizeNet.dll
	RuiCui/Plugins/Nop.Plugin.Payments.AuthorizeNet/obj/Debug/Nop.Plugin.Payments.AuthorizeNet.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.CashOnDelivery/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.CashOnDelivery/obj/Debug/Nop.Plugin.Payments.CashOnDelivery.dll
	RuiCui/Plugins/Nop.Plugin.Payments.CashOnDelivery/obj/Debug/Nop.Plugin.Payments.CashOnDelivery.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/Nop.Plugin.Payments.CheckMoneyOrder.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/Nop.Plugin.Payments.CheckMoneyOrder.dll
	RuiCui/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/obj/Debug/Nop.Plugin.Payments.CheckMoneyOrder.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/Nop.Plugin.Payments.Manual.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/Nop.Plugin.Payments.Manual.dll
	RuiCui/Plugins/Nop.Plugin.Payments.Manual/obj/Debug/Nop.Plugin.Payments.Manual.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalDirect/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalDirect/obj/Debug/Nop.Plugin.Payments.PayPalDirect.dll
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalDirect/obj/Debug/Nop.Plugin.Payments.PayPalDirect.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/Nop.Plugin.Payments.PayPalStandard.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/Nop.Plugin.Payments.PayPalStandard.dll
	RuiCui/Plugins/Nop.Plugin.Payments.PayPalStandard/obj/Debug/Nop.Plugin.Payments.PayPalStandard.pdb
	RuiCui/Plugins/Nop.Plugin.Payments.PurchaseOrder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Payments.PurchaseOrder/obj/Debug/Nop.Plugin.Payments.PurchaseOrder.dll
	RuiCui/Plugins/Nop.Plugin.Payments.PurchaseOrder/obj/Debug/Nop.Plugin.Payments.PurchaseOrder.pdb
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/Nop.Plugin.SMS.Verizon.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/Nop.Plugin.SMS.Verizon.dll
	RuiCui/Plugins/Nop.Plugin.SMS.Verizon/obj/Debug/Nop.Plugin.SMS.Verizon.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/Nop.Plugin.Shipping.AustraliaPost.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/Nop.Plugin.Shipping.AustraliaPost.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.AustraliaPost/obj/Debug/Nop.Plugin.Shipping.AustraliaPost.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.ByWeight/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.ByWeight/obj/Debug/Nop.Plugin.Shipping.ByWeight.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.ByWeight/obj/Debug/Nop.Plugin.Shipping.ByWeight.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.CanadaPost/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.CanadaPost/obj/Debug/Nop.Plugin.Shipping.CanadaPost.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.CanadaPost/obj/Debug/Nop.Plugin.Shipping.CanadaPost.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/Nop.Plugin.Shipping.Fedex.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/Nop.Plugin.Shipping.Fedex.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.Fedex/obj/Debug/Nop.Plugin.Shipping.Fedex.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/Nop.Plugin.Shipping.FixedRateShipping.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/Nop.Plugin.Shipping.FixedRateShipping.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.FixedRateShipping/obj/Debug/Nop.Plugin.Shipping.FixedRateShipping.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/Nop.Plugin.Shipping.UPS.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.UPS/obj/Debug/Nop.Plugin.Shipping.UPS.pdb
	RuiCui/Plugins/Nop.Plugin.Shipping.USPS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Shipping.USPS/obj/Debug/Nop.Plugin.Shipping.USPS.dll
	RuiCui/Plugins/Nop.Plugin.Shipping.USPS/obj/Debug/Nop.Plugin.Shipping.USPS.pdb
	RuiCui/Plugins/Nop.Plugin.Tax.CountryStateZip/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Tax.CountryStateZip/obj/Debug/Nop.Plugin.Tax.CountryStateZip.dll
	RuiCui/Plugins/Nop.Plugin.Tax.CountryStateZip/obj/Debug/Nop.Plugin.Tax.CountryStateZip.pdb
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/Nop.Plugin.Tax.FixedRate.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/Nop.Plugin.Tax.FixedRate.dll
	RuiCui/Plugins/Nop.Plugin.Tax.FixedRate/obj/Debug/Nop.Plugin.Tax.FixedRate.pdb
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/Nop.Plugin.Widgets.GoogleAnalytics.csproj.FileListAbsolute.txt
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/Nop.Plugin.Widgets.GoogleAnalytics.dll
	RuiCui/Plugins/Nop.Plugin.Widgets.GoogleAnalytics/obj/Debug/Nop.Plugin.Widgets.GoogleAnalytics.pdb
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.csprojResolveAssemblyReference.cache
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.dll
	RuiCui/Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.pdb
	RuiCui/Presentation/Nop.Web/Administration/Bin/Nop.Core.dll
	RuiCui/Presentation/Nop.Web/Administration/Bin/Nop.Data.dll
	RuiCui/Presentation/Nop.Web/Administration/Bin/Nop.Services.dll
	RuiCui/Presentation/Nop.Web/Administration/Bin/Nop.Web.Framework.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.CustomerRoles/Nop.Plugin.DiscountRules.CustomerRoles.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.CustomerRoles/Nop.Plugin.DiscountRules.CustomerRoles.pdb
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HadSpentAmount/Nop.Plugin.DiscountRules.HadSpentAmount.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HadSpentAmount/Nop.Plugin.DiscountRules.HadSpentAmount.pdb
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasAllProducts/Nop.Plugin.DiscountRules.HasAllProducts.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasAllProducts/Nop.Plugin.DiscountRules.HasAllProducts.pdb
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasOneProduct/Nop.Plugin.DiscountRules.HasOneProduct.dll
	RuiCui/Presentation/Nop.Web/Plugins/DiscountRules.HasOneProduct/Nop.Plugin.DiscountRules.HasOneProduct.pdb
	RuiCui/Presentation/Nop.Web/Plugins/ExchangeRate.McExchange/Nop.Plugin.ExchangeRate.McExchange.dll
	RuiCui/Presentation/Nop.Web/Plugins/ExchangeRate.McExchange/Nop.Plugin.ExchangeRate.McExchange.pdb
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.Facebook/Nop.Plugin.ExternalAuth.Facebook.dll
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.Facebook/Nop.Plugin.ExternalAuth.Facebook.pdb
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.OpenId/Nop.Plugin.ExternalAuth.OpenId.dll
	RuiCui/Presentation/Nop.Web/Plugins/ExternalAuth.OpenId/Nop.Plugin.ExternalAuth.OpenId.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Feed.Froogle/Nop.Plugin.Feed.Froogle.dll
	RuiCui/Presentation/Nop.Web/Plugins/Feed.Froogle/Nop.Plugin.Feed.Froogle.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Misc.FacebookShop/Nop.Plugin.Misc.FacebookShop.dll
	RuiCui/Presentation/Nop.Web/Plugins/Misc.FacebookShop/Nop.Plugin.Misc.FacebookShop.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Misc.WebServices/Nop.Plugin.Misc.WebServices.dll
	RuiCui/Presentation/Nop.Web/Plugins/Misc.WebServices/Nop.Plugin.Misc.WebServices.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.AuthorizeNet/Nop.Plugin.Payments.AuthorizeNet.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.AuthorizeNet/Nop.Plugin.Payments.AuthorizeNet.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CashOnDelivery/Nop.Plugin.Payments.CashOnDelivery.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CashOnDelivery/Nop.Plugin.Payments.CashOnDelivery.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CheckMoneyOrder/Nop.Plugin.Payments.CheckMoneyOrder.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.CheckMoneyOrder/Nop.Plugin.Payments.CheckMoneyOrder.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.Manual/Nop.Plugin.Payments.Manual.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.Manual/Nop.Plugin.Payments.Manual.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalDirect/Nop.Plugin.Payments.PayPalDirect.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalDirect/Nop.Plugin.Payments.PayPalDirect.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalStandard/Nop.Plugin.Payments.PayPalStandard.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PayPalStandard/Nop.Plugin.Payments.PayPalStandard.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PurchaseOrder/Nop.Plugin.Payments.PurchaseOrder.dll
	RuiCui/Presentation/Nop.Web/Plugins/Payments.PurchaseOrder/Nop.Plugin.Payments.PurchaseOrder.pdb
	RuiCui/Presentation/Nop.Web/Plugins/SMS.Verizon/Nop.Plugin.SMS.Verizon.dll
	RuiCui/Presentation/Nop.Web/Plugins/SMS.Verizon/Nop.Plugin.SMS.Verizon.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.AustraliaPost/Nop.Plugin.Shipping.AustraliaPost.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.AustraliaPost/Nop.Plugin.Shipping.AustraliaPost.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.ByWeight/Nop.Plugin.Shipping.ByWeight.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.ByWeight/Nop.Plugin.Shipping.ByWeight.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.CanadaPost/Nop.Plugin.Shipping.CanadaPost.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.CanadaPost/Nop.Plugin.Shipping.CanadaPost.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.Fedex/Nop.Plugin.Shipping.Fedex.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.Fedex/Nop.Plugin.Shipping.Fedex.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.FixedRateShipping/Nop.Plugin.Shipping.FixedRateShipping.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.FixedRateShipping/Nop.Plugin.Shipping.FixedRateShipping.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.UPS/Nop.Plugin.Shipping.UPS.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.UPS/Nop.Plugin.Shipping.UPS.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.USPS/Nop.Plugin.Shipping.USPS.dll
	RuiCui/Presentation/Nop.Web/Plugins/Shipping.USPS/Nop.Plugin.Shipping.USPS.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Tax.CountryStateZip/Nop.Plugin.Tax.CountryStateZip.dll
	RuiCui/Presentation/Nop.Web/Plugins/Tax.CountryStateZip/Nop.Plugin.Tax.CountryStateZip.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Tax.FixedRate/Nop.Plugin.Tax.FixedRate.dll
	RuiCui/Presentation/Nop.Web/Plugins/Tax.FixedRate/Nop.Plugin.Tax.FixedRate.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.GoogleAnalytics/Nop.Plugin.Widgets.GoogleAnalytics.dll
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.GoogleAnalytics/Nop.Plugin.Widgets.GoogleAnalytics.pdb
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.NivoSlider/Nop.Plugin.Widgets.NivoSlider.dll
	RuiCui/Presentation/Nop.Web/Plugins/Widgets.NivoSlider/Nop.Plugin.Widgets.NivoSlider.pdb
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000014_5-virtual-gift-card.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000014_5-virtual-gift-card_125.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000014_5-virtual-gift-card_300.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000014_5-virtual-gift-card_70.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000014_5-virtual-gift-card_75.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000015_25-virtual-gift-card.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000015_25-virtual-gift-card_125.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000015_25-virtual-gift-card_300.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000015_25-virtual-gift-card_32.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000015_25-virtual-gift-card_70.jpeg
	RuiCui/Presentation/Nop.Web/Themes/DefaultTheme/Content/Images/Thumbs/0000015_25-virtual-gift-card_75.jpeg
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.Tests.dll
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.Tests.pdb
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.dll
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Core.pdb
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Core.Tests/bin/Debug/Nop.Tests.pdb
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/Nop.Core.Tests.csprojResolveAssemblyReference.cache
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/Nop.Core.Tests.dll
	RuiCui/Tests/Nop.Core.Tests/obj/Debug/Nop.Core.Tests.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Core.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Core.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Data.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Data.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.Tests.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.Tests.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Services.pdb
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Services.Tests/bin/Debug/Nop.Tests.pdb
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/Nop.Services.Tests.csprojResolveAssemblyReference.cache
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/Nop.Services.Tests.dll
	RuiCui/Tests/Nop.Services.Tests/obj/Debug/Nop.Services.Tests.pdb
	RuiCui/Tests/Nop.Tests/bin/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Tests/bin/Debug/Nop.Tests.pdb
	RuiCui/Tests/Nop.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RuiCui/Tests/Nop.Tests/obj/Debug/Nop.Tests.csproj.FileListAbsolute.txt
	RuiCui/Tests/Nop.Tests/obj/Debug/Nop.Tests.dll
	RuiCui/Tests/Nop.Tests/obj/Debug/Nop.Tests.pdb
	www/index.htm
	www/js/base.min.js
Merge branch 'master' of https://github.com/Foboy/Ecommerce

Conflicts:
	www/css/base.min.css