Merge branch 'master' into cgt/V240

Conflicts:
	src/GeomAlgoAPI/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge

diff --cc src/ConstructionPlugin/axis_widget.xml
Simple merge

diff --cc src/GeomAlgoAPI/CMakeLists.txt
index 588c885078cf808e1b3ee258f92f96985194a8ae,7d05409ac4146915be14970d60eed8df079296a8..ee42e2a906aef1da311a173475944453dd51c973
--- 1/src/GeomAlgoAPI/CMakeLists.txt
--- 2/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -39,10 -39,8 +39,12 @@@ SET(PROJECT_HEADER
      GeomAlgoAPI_WireBuilder.h
      GeomAlgoAPI_Sewing.h
      GeomAlgoAPI_ShapeBuilder.h
 +    GeomAlgoAPI_DirectAPI.h
 +    GeomAlgoAPI_Exception.h
 +    GeomAlgoAPI_Box.h
 +    GeomAlgoAPI_BoxPoints.h
+     GeomAlgoAPI_XAOExport.h
+     GeomAlgoAPI_XAOImport.h
  )
  
  SET(PROJECT_SOURCES
@@@ -78,10 -76,8 +80,12 @@@
      GeomAlgoAPI_WireBuilder.cpp
      GeomAlgoAPI_Sewing.cpp
      GeomAlgoAPI_ShapeBuilder.cpp
 +    GeomAlgoAPI_DirectAPI.cpp
 +    GeomAlgoAPI_Exception.cpp
 +    GeomAlgoAPI_Box.cpp
 +    GeomAlgoAPI_BoxPoints.cpp
+     GeomAlgoAPI_XAOExport.cpp
+     GeomAlgoAPI_XAOImport.cpp
  )
  
  SET(PROJECT_LIBRARIES