Cleaning it up a bit
Merge branch 'master' into gui/qt

Conflicts:
	Clean.bat
	Clean.sh
	GenerateProjects.sh
whoops, args wrong way
Merge branch 'master' into gui/qt