180514-0752
Merge branch 'master' of github.com:Amr1977/I4VDeploy

Conflicts:
	ChangeLog.txt
	TestRun.cmd
	run.cmd
	test.jar