Add cmake.sh to master
Merge branch 'master' into gui

Conflicts:
	cmake.sh