Java version check on installing M4L components
Merge remote-tracking branch 'origin/master'

Conflicts:
	Setup Script/Output/setup.exe