Merge branch 'olesenm'

bin/foamEtcFile

bin/tools/pre-commit-hook

src/finiteVolume/cfdTools/general/porousMedia/porousZone.C

src/finiteVolume/cfdTools/general/porousMedia/porousZone.H

...Volume/cfdTools/general/porousMedia/porousZoneTemplates.C

...s/atomizationModel/atomizationModel/newAtomizationModel.C

.../Kinematic/CollisionModel/CollisionModel/CollisionModel.C

.../Kinematic/CollisionModel/CollisionModel/CollisionModel.H

...nematic/CollisionModel/CollisionModel/CollisionModelNew.C

...lisionModel/PairCollision/PairModel/PairModel/PairModel.C

...lisionModel/PairCollision/PairModel/PairModel/PairModel.H

...ionModel/PairCollision/PairModel/PairModel/PairModelNew.C

...lisionModel/PairCollision/WallModel/WallModel/WallModel.C

...lisionModel/PairCollision/WallModel/WallModel/WallModel.H

...ionModel/PairCollision/WallModel/WallModel/WallModelNew.C

src/meshTools/coordinateSystems/coordinateSystem.C

src/meshTools/coordinateSystems/coordinateSystem.H

src/meshTools/coordinateSystems/coordinateSystems.C

src/meshTools/coordinateSystems/coordinateSystems.H

src/thermophysicalModels/basicSolidThermo/Make/files