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

...tions/solvers/combustion/chemFoam/readInitialConditions.H

applications/test/vectorTools/Test-vectorTools.C

...2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H

...es/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C

applications/utilities/mesh/generation/cvMesh/Make/options

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

...ion/cellSizeCalculationType/fieldFromFile/fieldFromFile.C

...surfaceCellSizeFunction/nonUniformField/nonUniformField.C

...unction/surfaceCellSizeFunction/surfaceCellSizeFunction.C

...faces/surfaceCellSizeFunction/uniformValue/uniformValue.H

...alVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C

...alVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H

...h/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C

...nformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C

...lVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H

...ation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C

...ation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H

...tion/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H

...eration/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

...extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C