Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

applications/test/vectorTools/Make/files

applications/test/vectorTools/Make/options

applications/test/vectorTools/Test-vectorTools.C

...es/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files

.../mesh/generation/cvMesh/conformalVoronoiMesh/Make/options

...oronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H

...alVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C

...alVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H

...h/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C

...nformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C

...noiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C

.../conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C

...lVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H

...VoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C

...h/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H

.../conformalVoronoiMesh/conformalVoronoiMesh/indexedCellI.H

...conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H

...onformalVoronoiMesh/conformalVoronoiMesh/indexedVertexI.H

...VoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H

...alVoronoiMesh/conformationSurfaces/conformationSurfaces.C