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

...ations/utilities/mesh/generation/foamyQuadMesh/Make/files

...ions/utilities/mesh/generation/foamyQuadMesh/Make/options

...eneration/foamyQuadMesh/conformalVoronoi2DMesh/Make/files

...eration/foamyQuadMesh/conformalVoronoi2DMesh/Make/options

etc/config/CGAL.csh

etc/config/CGAL.sh

etc/config/settings.csh

etc/config/settings.sh

...tion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8

.../fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault

...ustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2

...ustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2

...bustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T

...bustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U

.../fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault

...Foam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf

...Foam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf

.../les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf

...bustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k

...ion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs