Merge branch 'master' of github.com:openscad/openscad into test3dexport

Conflicts:
	src/CGAL_renderer.h
	src/MainWindow.h
	src/OGL_helper.h
	src/mainwin.cc
	src/openscad.cc
	tests/test_cmdline_tool.py
	tests/test_pretty_print.py
do not run sudo in here, per bug report from several months ago
about a programmer whose system was almost messed up by it.
Merge branch 'test3dexport' of github.com:openscad/openscad into test3dexport

Conflicts:
	src/CGAL_renderer.h
	src/MainWindow.h
	src/OGL_helper.h
	src/openscad.cc
	tests/test_cmdline_tool.py
	tests/test_pretty_print.py
remove setSyntaxHighlighter function