Redesign project fix_2
Merge branch 'S4-other' of https://github.com/chipsergik/Netping_modern into chipsergik-S4-other

Conflicts:
	NetPing_modern.v12.suo
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb
Merge branch 'chipsergik-S4-other' into S4-other