AutoMapper fix
Merge remote-tracking branch 'origin/S4-blog' into S4-blog

Conflicts:
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/NetPing_modern.csproj.GenerateResource.Cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb