.
Merge branch 'master' of https://github.com/anewkirk-/NotFamousNuRetail

Conflicts:
	NuRetail_NotFamous/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NuRetail_NotFamous/obj/Debug/NuRetail_NotFamous_MarkupCompile.i.cache