Merge branch 'master' of newgeom:newgeom

diff --cc CMakeLists.txt
index 89da6f7270803a7c9e4ec24819432133448ad19e,607249a9e2e1a6c0b548753df1594ae264565a66..4ffaeb0c88dd92e235b307433b0f5527b1013ea6
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -4,10 -4,7 +4,10 @@@ PROJECT (NewGEOM
  
  SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
  
 -ADD_SUBDIRECTORY (src/ModelAPI)
 -ADD_SUBDIRECTORY (src/Model)
 +INCLUDE(Common)
 +INCLUDE(FindQt5)
 +
 +#ADD_SUBDIRECTORY (src/ModelAPI)
 +#ADD_SUBDIRECTORY (src/Model)
  ADD_SUBDIRECTORY (src/XGUI)
- ADD_SUBDIRECTORY (src/GeomModule)
 -#ADD_SUBDIRECTORY (src/GeomModule)
++#ADD_SUBDIRECTORY (src/GeomModule)

diff --cc env.bat
Simple merge