Merge branch V7_3_1_BR

diff --cc CMakeLists.txt
index 6e649bc6d8f8309a8aa4d23a5fc5b33d7e758320,77c364227da62f73835d297ff7589bf7f3a23daf..bb1b84bc168e43fa36bbf88decaeec3b2140096b
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,10 -31,10 +31,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
  SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
  SET(${PROJECT_NAME_UC}_VERSION
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 -SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Our own set of macros:
  LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/salome_adm/cmake_files")

diff --cc bin/virtual_salome.py
Simple merge

diff --cc salome_adm/cmake_files/FindSalomeVTK.cmake
Simple merge

diff --cc salome_adm/cmake_files/deprecated/am2cmake.py
Simple merge

diff --cc src/Container/Container_i.cxx
Simple merge

diff --cc src/Container/Container_init_python.cxx
Simple merge

diff --cc src/Container/Container_init_python.hxx
Simple merge

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

diff --cc src/KERNEL_PY/__init__.py
Simple merge

diff --cc src/KERNEL_PY/batchmode_salome.py
Simple merge

diff --cc src/KERNEL_PY/salome_study.py
Simple merge