Merge branch 'master' of newgeom:newgeom

Conflicts:
	CMakeLists.txt
	src/Config/CMakeLists.txt
	src/Config/plugins.xml
	src/PartSet/CMakeLists.txt
	src/SketchPlugin/CMakeLists.txt
	src/SketchPlugin/SketchPlugin_Sketch.cpp
	src/SketchPlugin/SketchPlugin_Sketch.h

diff --cc CMakeLists.txt
index dc4b8fd191e0706ff1d6fbfeffaf69c846558569,9656d18f24fe9f3a9af0574b9448ba2dd52bf9b6..68d5857256d658732db8002c042c5f70db069f85
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,8 -25,7 +25,9 @@@ ADD_SUBDIRECTORY (src/ModelAPI
  ADD_SUBDIRECTORY (src/ModuleBase)
  ADD_SUBDIRECTORY (src/PartSet)
  ADD_SUBDIRECTORY (src/PartSetPlugin)
 +ADD_SUBDIRECTORY (src/ConstructionPlugin)
 +ADD_SUBDIRECTORY (src/SketchPlugin)
+ ADD_SUBDIRECTORY (src/SketchPlugin)
  ADD_SUBDIRECTORY (src/PyConsole)
  ADD_SUBDIRECTORY (src/PyEvent)
  ADD_SUBDIRECTORY (src/PyInterp)