Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/engine/BL_Job.cxx
Simple merge

diff --cc src/engine/BL_Job.hxx
Simple merge

diff --cc src/engine/BL_SALOMEServices.cxx
Simple merge

diff --cc src/genericgui/BL_CreateJobWizard.cxx
Simple merge

diff --cc src/genericgui/BL_CreateJobWizard.hxx
Simple merge

diff --cc src/genericgui/BL_JobsManager_QT.cxx
Simple merge

diff --cc src/genericgui/BL_JobsTable.cxx
Simple merge

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

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