Merge branch 'master' into genAPI

Common/gmsh.cpp

Common/gmsh.h

Geo/GModel.h

Geo/GModelIO_MSH.cpp

Geo/GModelIO_MSH2.cpp

Geo/GeomMeshMatcher.cpp

Geo/MElement.h

Geo/MHexahedron.cpp

Geo/MPrism.cpp

Geo/MPyramid.cpp

Geo/MQuadrangle.cpp

Geo/MVertex.h

Geo/discreteEdge.cpp

Mesh/HighOrder.cpp

Mesh/meshGEdge.cpp

Mesh/meshGFace.cpp

Mesh/meshGRegionBoundaryRecovery.cpp

Mesh/qualityMeasuresJacobian.cpp

Numeric/ElementType.cpp

Numeric/ElementType.h