Merge remote-tracking branch 'origin/master'

Conflicts:
	intellSetup.bat
Merge remote-tracking branch 'origin/master'