Update 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentation/Nop.Web/Plugins/DiscountRules.CustomerRoles/Nop.Plugin.DiscountRules.CustomerRoles.dll
	Presentation/Nop.Web/Plugins/DiscountRules.HadSpentAmount/Nop.Plugin.DiscountRules.HadSpentAmount.dll
	Presentation/Nop.Web/Plugins/DiscountRules.HasAllProducts/Nop.Plugin.DiscountRules.HasAllProducts.dll
	Presentation/Nop.Web/Plugins/DiscountRules.HasOneProduct/Nop.Plugin.DiscountRules.HasOneProduct.dll
	Presentation/Nop.Web/Plugins/ExchangeRate.McExchange/Nop.Plugin.ExchangeRate.McExchange.dll
	Presentation/Nop.Web/Plugins/ExternalAuth.Facebook/Nop.Plugin.ExternalAuth.Facebook.dll
	Presentation/Nop.Web/Plugins/ExternalAuth.OpenId/Nop.Plugin.ExternalAuth.OpenId.dll
	Presentation/Nop.Web/Plugins/Feed.Froogle/Nop.Plugin.Feed.Froogle.dll
	Presentation/Nop.Web/Plugins/Misc.FacebookShop/Nop.Plugin.Misc.FacebookShop.dll
	Presentation/Nop.Web/Plugins/Misc.WebServices/Nop.Plugin.Misc.WebServices.dll
	Presentation/Nop.Web/Plugins/Payments.AuthorizeNet/Nop.Plugin.Payments.AuthorizeNet.dll
	Presentation/Nop.Web/Plugins/Payments.CashOnDelivery/Nop.Plugin.Payments.CashOnDelivery.dll
	Presentation/Nop.Web/Plugins/Payments.CheckMoneyOrder/Nop.Plugin.Payments.CheckMoneyOrder.dll
	Presentation/Nop.Web/Plugins/Payments.Manual/Nop.Plugin.Payments.Manual.dll
	Presentation/Nop.Web/Plugins/Payments.PayPalDirect/Nop.Plugin.Payments.PayPalDirect.dll
	Presentation/Nop.Web/Plugins/Payments.PayPalStandard/Nop.Plugin.Payments.PayPalStandard.dll
	Presentation/Nop.Web/Plugins/Payments.PurchaseOrder/Nop.Plugin.Payments.PurchaseOrder.dll
	Presentation/Nop.Web/Plugins/SMS.Verizon/Nop.Plugin.SMS.Verizon.dll
	Presentation/Nop.Web/Plugins/Shipping.AustraliaPost/Nop.Plugin.Shipping.AustraliaPost.dll
	Presentation/Nop.Web/Plugins/Shipping.ByWeight/Nop.Plugin.Shipping.ByWeight.dll
	Presentation/Nop.Web/Plugins/Shipping.CanadaPost/Nop.Plugin.Shipping.CanadaPost.dll
	Presentation/Nop.Web/Plugins/Shipping.Fedex/Nop.Plugin.Shipping.Fedex.dll
	Presentation/Nop.Web/Plugins/Shipping.FixedRateShipping/Nop.Plugin.Shipping.FixedRateShipping.dll
	Presentation/Nop.Web/Plugins/Shipping.UPS/Nop.Plugin.Shipping.UPS.dll
	Presentation/Nop.Web/Plugins/Shipping.USPS/Nop.Plugin.Shipping.USPS.dll
	Presentation/Nop.Web/Plugins/Tax.CountryStateZip/Nop.Plugin.Tax.CountryStateZip.dll
	Presentation/Nop.Web/Plugins/Tax.FixedRate/Nop.Plugin.Tax.FixedRate.dll
	Presentation/Nop.Web/Plugins/Widgets.GoogleAnalytics/Nop.Plugin.Widgets.GoogleAnalytics.dll
	Presentation/Nop.Web/Plugins/Widgets.NivoSlider/Nop.Plugin.Widgets.NivoSlider.dll
	Presentation/Nop.Web/Properties/PublishProfiles/cakematerials.pubxml