Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/combustion/PDRFoam/Make/files

...RFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C

...tion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C

...bustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C

.../solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C

...s/solvers/combustion/fireFoam/combustionModels/Make/files

...oam/combustionModels/combustionModel/combustionModelNew.C

...ions/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C

...perature/solidWallHeatFluxTemperatureFvPatchScalarField.C

...perature/solidWallHeatFluxTemperatureFvPatchScalarField.H

...jointShapeOptimizationFoam/adjointShapeOptimizationFoam.C

...ations/solvers/multiphase/interPhaseChangeFoam/Make/files

...s/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H

...haseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C

...e/alphaContactAngle/alphaContactAngleFvPatchScalarField.C

...multiphase/twoPhaseEulerFoam/interfacialModels/Make/files

...erFoam/interfacialModels/dragModels/dragModel/dragModel.H

...oam/interfacialModels/dragModels/dragModel/dragModelNew.C

...ltiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files

...onductivityModel/conductivityModel/conductivityModelNew.C