Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/ModelAPI/CMakeLists.txt

diff --cc src/ModelAPI/CMakeLists.txt
index 0013e1b6aaeff539ceea822fb3f5f7d3788edd26,950cbc530eec3bfc6efbc4f0dfe0fd9aa2d33164..47f665e5375c07044d0c9bc72f0345571953cd92
--- 1/src/ModelAPI/CMakeLists.txt
--- 2/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@@ -1,8 -1,9 +1,7 @@@
  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
  
 -INCLUDE(Common)
  FIND_PACKAGE(SWIG REQUIRED)
  INCLUDE(${SWIG_USE_FILE})
- INCLUDE(FindBoost)
 -INCLUDE(FindPython)
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
  
  SET(PROJECT_HEADERS