committed by PS
Merge branch 'master' of https://github.com/pgemeo/WZNT

Conflicts:
	Services/bin/Debug/Services.dll
	Services/bin/Debug/Services.pdb
	Services/obj/Debug/Services.dll
	Services/obj/Debug/Services.pdb
	UI/bin/Debug/Services.dll
	UI/bin/Debug/Services.pdb
	UI/bin/Debug/UI.exe
	UI/bin/Debug/UI.pdb
	UI/obj/Debug/UI.csprojResolveAssemblyReference.cache
	UI/obj/Debug/UI.exe
	UI/obj/Debug/UI.pdb
	UnitTests/bin/Debug/Services.dll
	UnitTests/bin/Debug/Services.pdb
	UnitTests/bin/Debug/UnitTests.dll
	UnitTests/bin/Debug/UnitTests.pdb
	UnitTests/obj/Debug/UnitTests.csprojResolveAssemblyReference.cache
	UnitTests/obj/Debug/UnitTests.dll
	UnitTests/obj/Debug/UnitTests.pdb