Merge branch 'omu/SalomeLauncher'

diff --cc idl/SALOME_Launcher.idl
Simple merge

diff --cc idl/SALOME_ResourcesManager.idl
Simple merge

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

diff --cc src/Launcher/Launcher.cxx
Simple merge

diff --cc src/Launcher/Launcher.hxx
Simple merge

diff --cc src/Launcher/Launcher_Job.cxx
Simple merge

diff --cc src/Launcher/SALOME_Launcher.cxx
Simple merge

diff --cc src/Launcher/SALOME_Launcher.hxx
Simple merge