Merge branch 'master' of newgeom:newgeom.git

diff --combined src/PartSetPlugin/CMakeLists.txt
index 0d2a88d312f55c2e8dfba63139bfd95ab869ba5c,3cad36fe02fefebb1ab4037b20d369f0e20bab6e..e115ab9db5433d23f261f48b55a0d7a0b81badbe
--- 1/src/PartSetPlugin/CMakeLists.txt
--- 2/src/PartSetPlugin/CMakeLists.txt
+++ b/src/PartSetPlugin/CMakeLists.txt
@@@ -15,12 -15,13 +15,13 @@@ SET(PROJECT_SOURCE
      PartSetPlugin_Remove.cpp
  )
  
 -ADD_DEFINITIONS(-DPARTSETPLUGIN_EXPORTS ${BOOST_DEFINITIONS})
 +ADD_DEFINITIONS(-DPARTSETPLUGIN_EXPORTS)
  ADD_LIBRARY(PartSetPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS})
  TARGET_LINK_LIBRARIES(PartSetPlugin ${PROJECT_LIBRARIES} ModelAPI)
  
  INCLUDE_DIRECTORIES(
    ../ModelAPI
+   ../GeomAPI
  )
  
  SET(XML_RESOURCES