Merge remote-tracking branch 'origin/CEA_2019'

# Conflicts:
#	src/GeomAlgoAPI/CMakeLists.txt

diff --cc src/FeaturesPlugin/CMakeLists.txt
Simple merge

diff --cc src/FeaturesPlugin/plugin-Features.xml
Simple merge

diff --cc src/GeomAlgoAPI/CMakeLists.txt
index e80d9cf2928f39abc3ec85bded664a2426df79d1,460aebe7e4b16a1a9794b0e7b4361c752e4fc617..235851975d320db4ffd4596b5215e1af2ee011b9
--- 1/src/GeomAlgoAPI/CMakeLists.txt
--- 2/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -142,7 -142,7 +142,8 @@@ SET(PROJECT_SOURCE
      GeomAlgoAPI_Offset.cpp
      GeomAlgoAPI_SolidClassifier.cpp
      GeomAlgoAPI_MapShapesAndAncestors.cpp
+     GeomAlgoAPI_Projection.cpp
 +    GeomAlgoAPI_Chamfer.cpp
  )
  
  SET(PROJECT_LIBRARIES