newst
Merge branch 'master' of https://github.com/mato84/LampStore

Conflicts:
	NewVersionLampstore/Controllers/FilterController.cs
	NewVersionLampstore/Views/Product/Index.cshtml
	NewVersionLampstore/bin/NewVersionLampstore.dll
	NewVersionLampstore/bin/NewVersionLampstore.pdb
	NewVersionLampstore/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NewVersionLampstore/obj/Debug/NewVersionLampstore.dll
	NewVersionLampstore/obj/Debug/NewVersionLampstore.pdb
	NewVersionLampstore/obj/Debug/ResolveAssemblyReference.cache
	TestProject1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache