Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	CMakeLists.txt

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

diff --cc env.bat
Simple merge