Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

diff --cc CTestTestfileInstall.cmake.in
index 9282d0a2875ef57192a8524957764cfa0b05fd56,4136a32bc045889d9aad3b012711d4dd47895ce3..254fb82f1e3e0701a287b3998271dfd3eaefcc2d
--- 1/CTestTestfileInstall.cmake.in
--- 2/CTestTestfileInstall.cmake.in
+++ b/CTestTestfileInstall.cmake.in
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake
index bdf4b90b150aaa4dba17b4dff88c73a6af5f3f5d,59600adeda5874302a92342fa95b117f4eedee92..5c90495c81b40fa6c2f462e59413c274bfe6d7d0
--- 1/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake
--- 2/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
index 3c5391727772a2a2ea1c9d4eb0ec51b718cf085d,f38992b786cc5e6427fe5ad4e20e5f189957c2e4..eb69a0d20f42eb7fc1edc6c6832d2a4b965622ea
--- 1/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
--- 2/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake
index 366f022dbaa4d7a0b5f2c7a2558a49cbcb14051b,9e5b9d2574b2033669b48436ad66dc4465373e16..c8cbb1e245dfb76199ccb9a7f20b39585b7b3a2a
--- 1/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake
--- 2/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc bin/runTests.py
Simple merge

diff --cc idl/SALOME_Launcher.idl
Simple merge

diff --cc salome_adm/cmake_files/CMakeLists.txt
index ed3f36a3dcab52d7fb72324cace00bb946ec87ca,f6114021a6acd079126ee8fdb419bb50661b457e..9411a537a0415277ced0751a444879a1f7f25638
--- 1/salome_adm/cmake_files/CMakeLists.txt
--- 2/salome_adm/cmake_files/CMakeLists.txt
+++ b/salome_adm/cmake_files/CMakeLists.txt
@@@ -45,7 -45,10 +45,9 @@@ SET(DAT
    FindSalomeOmniORB.cmake
    FindSalomeOmniORBPy.cmake
    FindSalomePThread.cmake
-   FindSalomePython.cmake
 -#  FindSalomePython.cmake
+   FindSalomePythonLibs.cmake
+   FindSalomePythonInterp.cmake
+   FindSalomeNumPySciPy.cmake
    FindSalomeSphinx.cmake
    FindSalomeSWIG.cmake
    FindSphinx.cmake

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

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

diff --cc src/AppQuickStart/app-template/CMakeLists.txt
Simple merge

diff --cc src/AppQuickStart/app-template/src/resources/CMakeLists.txt
Simple merge

diff --cc src/Basics/Basics_Utils.hxx
Simple merge

diff --cc src/KernelHelpers/Test/CTestTestfileInstall.cmake
index 9ba6010ee3a4e442bf6f6b0a8ac7307de2a202d9,183b9f343eec2b957b92ca42f11e86caf1bf96ed..eac9713a33e934a1f7a91ce7e9cfc9cd4b748ccc
--- 1/src/KernelHelpers/Test/CTestTestfileInstall.cmake
--- 2/src/KernelHelpers/Test/CTestTestfileInstall.cmake
+++ b/src/KernelHelpers/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

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

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

diff --cc src/Launcher/Test/CTestTestfileInstall.cmake
index e3db2b18b60f56712c5d678d1ac7943329914d4c,76cc5b15946b4c6f505e116652edecbb586f4771..664c74c99ca0edfa285954595fb3b5a947cbcfa3
--- 1/src/Launcher/Test/CTestTestfileInstall.cmake
--- 2/src/Launcher/Test/CTestTestfileInstall.cmake
+++ b/src/Launcher/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake
index 85a2fd7eb316346a451fc141a76f84ffd4ccc9e4,606a7a1e2ba46455c2623e12505decc37f210567..21f3217c02d076b0e1a03cce8997538e916e15d8
--- 1/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake
--- 2/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake
+++ b/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake
index 1e7257473236da1bd2871b586e44338c82494362,76cc5b15946b4c6f505e116652edecbb586f4771..ae7164a4e4ec2c57d4dc8eb1ac7d6d1b67fdda92
--- 1/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake
--- 2/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake
+++ b/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/NamingService/Test/CTestTestfileInstall.cmake
index 7ffe57fea07f06e5148e514ce8c9a64ca86b474a,35c2060cba628c06ecb58d27b08fae27c478285a..c72dfabf1d9cc21f82a31334ecd6a9d7f9734def
--- 1/src/NamingService/Test/CTestTestfileInstall.cmake
--- 2/src/NamingService/Test/CTestTestfileInstall.cmake
+++ b/src/NamingService/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

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

diff --cc src/SALOMEDS/Test/CTestTestfileInstall.cmake
index 0b249dfe746ab743bfb23c16d85e71a3f33ede56,bb4a3b00c5fbe50722677e73bd221cdde0c6e64a..941b3e081188e7f2c7e0fdabf64a6daf4a8c0994
--- 1/src/SALOMEDS/Test/CTestTestfileInstall.cmake
--- 2/src/SALOMEDS/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMEDS/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
Simple merge

diff --cc src/SALOMEDS/Test/SALOMEDSTest_SObject.cxx
Simple merge

diff --cc src/SALOMEDS/Test/SALOMEDSTest_Study.cxx
Simple merge

diff --cc src/SALOMEDS/Test/SALOMEDSTest_StudyManager.cxx
Simple merge

diff --cc src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake
index 11c94b898aea0eb424111398b5864860011bf49b,19861572680ed93f924fdb29520e40d550f5ef36..231c53fe2556ea8532324127986751da34454ec1
--- 1/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake
--- 2/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake
index 074b9b881e0f1a65944558ae4b0659236c289245,160b61620abfe1cdaa6964e18972f2d46e610355..a8397a8750254aa02de88348b78a1e74531295b3
--- 1/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake
--- 2/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/SALOMESDS/CTestTestfileInstall.cmake
index ee7dc3714107975e7e78bf4cf3aab79cd38c1ec4,491de34ede18b2dc696d90d22cda1fbdef422714..555b36acadb27be222aeabf7ac62180621794873
--- 1/src/SALOMESDS/CTestTestfileInstall.cmake
--- 2/src/SALOMESDS/CTestTestfileInstall.cmake
+++ b/src/SALOMESDS/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake
index 7ee19bca3f5bac4f4f0cf34d52339dfa29f6e227,7c3c591bcd3e4c148f6a72c843d1d80d40216ea7..4a58cb20991f8341fe736efc501ec9886f6d93c9
--- 1/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake
--- 2/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/UnitTests/CTestTestfileInstall.cmake
index 3674efa58d71707f8c688f2e379f935fd41bb926,d4813863dd7830ae8e3176deeba64d39eecdb56c..a9747536b0daf4d8a5183146bb83b086fa5e96b6
--- 1/src/UnitTests/CTestTestfileInstall.cmake
--- 2/src/UnitTests/CTestTestfileInstall.cmake
+++ b/src/UnitTests/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc src/Utils/Test/CTestTestfileInstall.cmake
index 7027a54519bfcce1bc2641a0871e8a95dfc5ab11,c33e109d5747e21534b5828ee766ec1befcffa35..b6301285d29a7c31aeb59727d701a47f565b2436
--- 1/src/Utils/Test/CTestTestfileInstall.cmake
--- 2/src/Utils/Test/CTestTestfileInstall.cmake
+++ b/src/Utils/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2015, 2016  CEA/DEN, EDF R&D
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public