commit
zzz
another commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	easterStore.Data/bin/Debug/easterStore.Data.dll
	easterStore.Data/bin/Debug/easterStore.Data.pdb
	easterStore.Data/obj/Debug/easterStore.Data.csproj.FileListAbsolute.txt

	easterStore.Data/obj/Debug/easterStore.Data.csproj.GenerateResource.Cache
	easterStore.Data/obj/Debug/easterStore.Data.dll
	easterStore.Data/obj/Debug/easterStore.Data.pdb
	easterStore.Web/bin/easterStore.Data.dll
	easterStore.Web/bin/easterStore.Data.pdb
	easterStore.Web/bin/easterStore.Web.dll
	easterStore.Web/bin/easterStore.Web.pdb

	easterStore.Web/obj/Debug/easterStore.Web.csprojResolveAssemblyReference.cache
	easterStore.Web/obj/Debug/easterStore.Web.dll
	easterStore.Web/obj/Debug/easterStore.Web.pdb