Merge branch 'master' into visitortests

Conflicts:
	tests/CMakeLists.txt
	tests/echotest.cc

doc/TODO.txt

@@ -116,6 +116,7 @@ o Misc
     (e.g Preview, Render)
   - If trying to export STL/DXF but source is newer than the CGAL rendering, ask
     for confirmation.
+  - Go through keyboard shortcuts and make them more conformant to platform standards
 o Cmd-line
   - Add verbose option (PRINT command from mainwin.cc and progress output)
 

tests/CMakeLists.txt

@@ -194,6 +194,12 @@ target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
 add_executable(echotest echotest.cc ${CORE_SOURCES})
 target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
 
+#
+# echotest
+#
+add_executable(echotest echotest.cc ${CORE_SOURCES})
+target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
+
 #
 # Offscreen OpenGL context source code
 #