Merge commit 'OpenCFD/master' into olesenm

applications/solvers/multiphase/interDyMFoam/Make/options

applications/solvers/multiphase/interDyMFoam/createFields.H

applications/solvers/multiphase/interDyMFoam/interDyMFoam.C

applications/solvers/multiphase/interFoam/createFields.H

applications/solvers/multiphase/interFoam/interFoam.C

...ons/solvers/multiphase/multiphaseInterFoam/createFields.H

...vers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C

...ons/solvers/multiphase/twoLiquidMixingFoam/createFields.H

...vers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C

etc/apps/cint/bashrc

etc/bashrc

etc/cshrc

src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C

src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H

src/meshTools/indexedOctree/treeDataEdge.C

...ction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C

...aSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C

...oughWallFunction/nutRoughWallFunctionFvPatchScalarField.C