tytyj
Merge branch 'master' of https://github.com/senbeiwabaka/NOP

Conflicts:
	Libraries/Nop.Core/bin/Debug/Nop.Core.dll
	Libraries/Nop.Core/bin/Debug/Nop.Core.pdb
	Libraries/Nop.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Libraries/Nop.Core/obj/Debug/Nop.Core.dll
	Libraries/Nop.Core/obj/Debug/Nop.Core.pdb
	Libraries/Nop.Data/bin/Debug/Nop.Core.dll
	Libraries/Nop.Data/bin/Debug/Nop.Core.pdb
	Libraries/Nop.Data/bin/Debug/Nop.Data.dll
	Libraries/Nop.Data/bin/Debug/Nop.Data.pdb
	Libraries/Nop.Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Libraries/Nop.Data/obj/Debug/Nop.Data.csprojResolveAssemblyReference.cache
	Libraries/Nop.Data/obj/Debug/Nop.Data.dll
	Libraries/Nop.Data/obj/Debug/Nop.Data.pdb
	Libraries/Nop.Services/bin/Debug/Nop.Core.dll
	Libraries/Nop.Services/bin/Debug/Nop.Core.pdb
	Libraries/Nop.Services/bin/Debug/Nop.Data.dll
	Libraries/Nop.Services/bin/Debug/Nop.Data.pdb
	Libraries/Nop.Services/bin/Debug/Nop.Services.dll
	Libraries/Nop.Services/bin/Debug/Nop.Services.pdb
	Libraries/Nop.Services/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Libraries/Nop.Services/obj/Debug/Nop.Services.csprojResolveAssemblyReference.cache
	Libraries/Nop.Services/obj/Debug/Nop.Services.dll
	Libraries/Nop.Services/obj/Debug/Nop.Services.pdb
	NopCommerce.v11.suo
	Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.csproj.FileListAbsolute.txt
	Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.csprojResolveAssemblyReference.cache
	Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.dll
	Plugins/Nop.Plugin.Widgets.NivoSlider/obj/Debug/Nop.Plugin.Widgets.NivoSlider.pdb
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Core.dll
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Core.pdb
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Data.dll
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Data.pdb
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Services.dll
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Services.pdb
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Web.Framework.dll
	Presentation/Nop.Web.Framework/bin/Debug/Nop.Web.Framework.pdb
	Presentation/Nop.Web.Framework/obj/Debug/Nop.Web.Framework.csprojResolveAssemblyReference.cache
	Presentation/Nop.Web.Framework/obj/Debug/Nop.Web.Framework.dll
	Presentation/Nop.Web.Framework/obj/Debug/Nop.Web.Framework.pdb
	Presentation/Nop.Web/App_Data/Settings.txt
	Presentation/Nop.Web/Plugins/Widgets.NivoSlider/Nop.Plugin.Widgets.NivoSlider.dll
	Presentation/Nop.Web/Plugins/Widgets.NivoSlider/Nop.Plugin.Widgets.NivoSlider.pdb
	Presentation/Nop.Web/bin/Nop.Core.dll
	Presentation/Nop.Web/bin/Nop.Core.pdb
	Presentation/Nop.Web/bin/Nop.Data.dll
	Presentation/Nop.Web/bin/Nop.Data.pdb
	Presentation/Nop.Web/bin/Nop.Services.dll
	Presentation/Nop.Web/bin/Nop.Services.pdb
	Presentation/Nop.Web/bin/Nop.Web.Framework.dll
	Presentation/Nop.Web/bin/Nop.Web.Framework.pdb
	Presentation/Nop.Web/bin/Nop.Web.dll
	Presentation/Nop.Web/bin/Nop.Web.pdb
	Presentation/Nop.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Presentation/Nop.Web/obj/Debug/Nop.Web.csprojResolveAssemblyReference.cache
	Presentation/Nop.Web/obj/Debug/Nop.Web.dll
	Presentation/Nop.Web/obj/Debug/Nop.Web.pdb
	Tests/Nop.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache