Merge branch 'master' into MeshGridTemplateSpecialisation

BaseLib/CMakeLists.txt

BaseLib/RapidXML/rapidxml_print.hpp

BaseLib/logog/CMakeLists.txt

BaseLib/logog/src/target.cpp

CMakeLists.txt

FemLib/ProcessInfo.h

FileIO/ImportFileTypes.h

FileIO/Legacy/MeshIO.cpp

FileIO/Legacy/OGSIOVer4.cpp

FileIO/MeshIO/GMSHInterface.cpp

FileIO/MeshIO/GMSHInterface.h

FileIO/XmlIO/RapidXMLInterface.cpp

FileIO/XmlIO/RapidXMLInterface.h

FileIO/XmlIO/VTKInterface.cpp

FileIO/XmlIO/VTKInterface.h

Gui/DataExplorer.cmake

Gui/DataView/DataView.cpp

Gui/DataView/DataView.h

Gui/DataView/DirectConditionGenerator.cpp

Gui/DataView/MshEdit.ui