Merge branch 'BR_EDF_2018_Lot1'

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

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

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

diff --cc src/GeomValidators/GeomValidators_Plugin.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_ParamSpinBox.cpp
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge