Branch merge + conflict resolution

applications/test/tokenizeTest/tokenizeTest.C

...ations/utilities/mesh/generation/blockMesh/blockMeshApp.C

...ities/mesh/manipulation/transformPoints/transformPoints.C

...stProcessing/dataConversion/foamToEnsight/foamToEnsight.C

...ng/dataConversion/foamToEnsightParts/foamToEnsightParts.C

...ities/postProcessing/dataConversion/foamToVTK/foamToVTK.C

applications/utilities/surface/README

...ies/surface/surfaceFeatureConvert/surfaceFeatureConvert.C

...ies/surface/surfaceFeatureExtract/surfaceFeatureExtract.C

...s/surface/surfaceTransformPoints/surfaceTransformPoints.C

src/Allwmake

src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H

src/OpenFOAM/db/IOstreams/Sstreams/ISstreamI.H

src/OpenFOAM/global/argList/argList.C

src/OpenFOAM/global/argList/argList.H

src/edgeMesh/Make/files

src/edgeMesh/edgeFormats/edgeFormatsCore.C

src/edgeMesh/edgeFormats/edgeFormatsCore.H

src/edgeMesh/edgeFormats/emesh/EMESHedgeFormat.C

src/edgeMesh/edgeFormats/emesh/EMESHedgeFormat.H