no changes
Merge remote-tracking branch 'origin/master'

Conflicts:

	easterStore.Data/obj/Debug/easterStore.Data.csproj.GenerateResource.Cache

	easterStore.Data/obj/Debug/easterStore.Data.csprojResolveAssemblyReference.cache

	easterStore.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	easterStore.Web/obj/Debug/easterStore.Web.csprojResolveAssemblyReference.cache
	easterStore.v12.suo