Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

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

diff --cc src/PVGUI/PVGUI_Module.cxx
Simple merge

diff --cc src/PVGUI/PVGUI_Module.h
Simple merge

diff --cc src/PV_SWIG/presentations.py
Simple merge

diff --cc src/Plugins/ArrayRenamer/CMakeLists.txt
Simple merge

diff --cc src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx
Simple merge

diff --cc src/Plugins/JSONReader/ParaViewPlugin/CMakeLists.txt
Simple merge

diff --cc src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.hxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/vtkExtractCellType.cxx
Simple merge

diff --cc src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt
Simple merge

diff --cc src/Plugins/MEDReader/ParaViewPlugin/VectBoolSpreadSheet.cxx
Simple merge

diff --cc src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderFieldsWidget.cxx
Simple merge

diff --cc src/Plugins/MEDReader/Test/CTestTestfileInstall.cmake
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader0.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader1.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader10.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader11.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader13.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader14.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader15.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader16.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader17.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader2.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader4.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader5.py
Simple merge

diff --cc src/Plugins/MEDReader/Test/testMEDReader6.py
Simple merge

diff --cc src/Plugins/TableReader/ParaViewPlugin/CMakeLists.txt
Simple merge

diff --cc src/Plugins/View/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/2D_viewer/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/3D_viewer/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/Animation/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/CutLines/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/CutLines/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/CutPlanes/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/CutPlanes/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/DeformedShape/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/DeformedShape/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/GaussPoints/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/GaussPoints/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/ImportMedField/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/ImportMedField/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/IsoSurfaces/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/MeshPresentation/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/MeshPresentation/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/Plot3D/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/Plot3D/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/SWIG_scripts/A5.py
Simple merge

diff --cc test/VisuPrs/SWIG_scripts/A9.py
Simple merge

diff --cc test/VisuPrs/SWIG_scripts/B6.py
Simple merge

diff --cc test/VisuPrs/SWIG_scripts/B7.py
Simple merge

diff --cc test/VisuPrs/SWIG_scripts/C6.py
Simple merge

diff --cc test/VisuPrs/SWIG_scripts/C7.py
Simple merge

diff --cc test/VisuPrs/SWIG_scripts/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/ScalarMap/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/ScalarMap/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/ScalarMap/G2.py
Simple merge

diff --cc test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/ScalarMap_On_DeformedShape/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/StreamLines/B3.py
Simple merge

diff --cc test/VisuPrs/StreamLines/B4.py
Simple merge

diff --cc test/VisuPrs/StreamLines/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/StreamLines/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/StreamLines/F9.py
Simple merge

diff --cc test/VisuPrs/StreamLines/G0.py
Simple merge

diff --cc test/VisuPrs/Tables/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/Util/paravistest.py
Simple merge

diff --cc test/VisuPrs/Vectors/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/Vectors/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/bugs/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/bugs/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/bugs/D1.py
Simple merge

diff --cc test/VisuPrs/bugs/D5.py
Simple merge

diff --cc test/VisuPrs/dump_study/A0.py
Simple merge

diff --cc test/VisuPrs/dump_study/A1.py
Simple merge

diff --cc test/VisuPrs/dump_study/A2.py
Simple merge

diff --cc test/VisuPrs/dump_study/A3.py
Simple merge

diff --cc test/VisuPrs/dump_study/A4.py
Simple merge

diff --cc test/VisuPrs/dump_study/A5.py
Simple merge

diff --cc test/VisuPrs/dump_study/A6.py
Simple merge

diff --cc test/VisuPrs/dump_study/A7.py
Simple merge

diff --cc test/VisuPrs/dump_study/A8.py
Simple merge

diff --cc test/VisuPrs/dump_study/A9.py
Simple merge

diff --cc test/VisuPrs/dump_study/B0.py
Simple merge

diff --cc test/VisuPrs/dump_study/B3.py
Simple merge

diff --cc test/VisuPrs/dump_study/B4.py
Simple merge

diff --cc test/VisuPrs/dump_study/CMakeLists.txt
Simple merge

diff --cc test/VisuPrs/dump_study/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/imps/A1.py
Simple merge

diff --cc test/VisuPrs/imps/CTestTestfileInstall.cmake
Simple merge

diff --cc test/VisuPrs/united/CTestTestfileInstall.cmake
Simple merge

diff --cc test/standalone/CMakeLists.txt
Simple merge

diff --cc test/standalone/gui/CMakeLists.txt
Simple merge