d
Merge remote-tracking branch 'origin/master'

Conflicts:

	PresentationLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PresentationLayer/obj/Debug/Final1.csproj.FileListAbsolute.txt