Merge remote-tracking branch 'remotes/origin/master' into SketchSolver

Conflicts:
	src/GeomAlgoAPI/CMakeLists.txt

diff --cc src/GeomAlgoAPI/CMakeLists.txt
index 548f7002f059005ef606fec6c162634eac72afb6,181bf09de2c37299ac71e89a35429ae18e2794a9..5822d61fb15faafa03f551fd693e723608ea1b04
--- 1/src/GeomAlgoAPI/CMakeLists.txt
--- 2/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -9,14 -8,14 +8,16 @@@ SET(PROJECT_HEADER
      GeomAlgoAPI_CompoundBuilder.h
      GeomAlgoAPI_FaceBuilder.h
      GeomAlgoAPI_EdgeBuilder.h
+     GeomAlgoAPI_PointBuilder.h
 +    GeomAlgoAPI_SketchBuilder.h
  )
  
  SET(PROJECT_SOURCES
      GeomAlgoAPI_CompoundBuilder.cpp
      GeomAlgoAPI_FaceBuilder.cpp
      GeomAlgoAPI_EdgeBuilder.cpp
+     GeomAlgoAPI_PointBuilder.cpp
 +    GeomAlgoAPI_SketchBuilder.cpp
  )
  
  ADD_DEFINITIONS(-DGEOMALGOAPI_EXPORTS ${CAS_DEFINITIONS})

diff --cc src/SketchPlugin/SketchPlugin_Sketch.cpp
Simple merge