Merge branch 'master' of newgeom:newgeom.git

diff --cc src/XGUI/CMakeLists.txt
index 078e6aa4f5ac1f0e4bfddfeb7d33242a464eb0a3,e740fea8ddc96246d45fcbcf96821c24fd81a3dc..e1993f5d903cb6d10d726b6ff526509a80d02660
--- 1/src/XGUI/CMakeLists.txt
--- 2/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@@ -60,10 -60,10 +60,11 @@@ SET(PROJECT_LIBRARIE
        opengl32
      Event
      Config
 -      ${Qt5Widgets_LIBRARIES}
 +      ${QT_LIBRARIES}
 +      ${QT_QTMAIN_LIBRARY}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
+     ${CAS_OCAF}
        PyConsole
        PyInterp
        PyEvent