Merge branch 'V9_8_BR'

diff --cc CMakeLists.txt
index 0b93f3b04a05d8afdb80ec4b3253ce21f299d4da,c9579f425f8d7afd16cbd8e9d249e7a88d2cc9bf..f9f60ac1ecc76919d4b4ffbe7c60b48886c730ee
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -50,7 -50,7 +50,7 @@@ ENDIF(
  
  # Versioning
  # ===========
- SALOME_SETUP_VERSION(9.7.0 DEVELOPMENT)
 -SALOME_SETUP_VERSION(9.8.0)
++SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
  MESSAGE(STATUS "Building ${PROJECT_NAME} ${${PROJECT_NAME}_VERSION} from \"${${PROJECT_NAME}_GIT_SHA1}\"")
  SET(COMPONENT_NAME SHAPER)
  

diff --cc src/ExchangePlugin/Test/TestImportImage_1.py
Simple merge

diff --cc src/ExchangePlugin/Test/TestImportImage_2.py
Simple merge

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

diff --cc src/PartSet/PartSet_Module.cpp
Simple merge