Merge remote-tracking branch 'origin/EDF_IMPROVEMENTS_2020'

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

diff --cc src/ModelAPI/ModelAPI_Tools.cpp
Simple merge

diff --cc src/ModelAPI/ModelAPI_Tools.h
Simple merge

diff --cc src/SHAPERGUI/SHAPERGUI.cpp
Simple merge

diff --cc src/SHAPERGUI/SHAPERGUI.h
Simple merge