Add NTP to VS project files
Merge branch 'develop' into custom

Conflicts:
	Net/testsuite/TestSuite_x64_vs100.vcxproj