Merge branch 'master' into cgt/devCEA

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

diff --cc src/FeaturesAPI/FeaturesAPI.i
Simple merge

diff --cc src/FeaturesAPI/FeaturesAPI_MultiTranslation.h
Simple merge

diff --cc src/FeaturesAPI/FeaturesAPI_swig.h
Simple merge

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

diff --cc src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.h
Simple merge

diff --cc src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
Simple merge

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

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

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_Cylinder.cpp
Simple merge

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_Cylinder.h
Simple merge

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_Rotation.cpp
Simple merge

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
Simple merge

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
Simple merge

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp
Simple merge

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
Simple merge

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

diff --cc src/PrimitivesAPI/PrimitivesAPI.i
Simple merge

diff --cc src/PrimitivesAPI/PrimitivesAPI_Cylinder.cpp
Simple merge

diff --cc src/PrimitivesAPI/PrimitivesAPI_Cylinder.h
Simple merge

diff --cc src/PrimitivesAPI/PrimitivesAPI_swig.h
Simple merge

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

diff --cc src/PrimitivesPlugin/PrimitivesPlugin_Cylinder.cpp
Simple merge

diff --cc src/PrimitivesPlugin/PrimitivesPlugin_Plugin.cpp
Simple merge

diff --cc src/PrimitivesPlugin/plugin-Primitives.xml
Simple merge