Merge branch 'master' into cvm

.gitignore

applications/solvers/incompressible/pisoFoam/pisoFoam.C

applications/solvers/multiphase/cavitatingFoam/pEqn.H

...ations/solvers/multiphase/compressibleInterDyMFoam/UEqn.H

...s/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H

...ations/solvers/multiphase/compressibleInterDyMFoam/pEqn.H

applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H

applications/test/DLList/DLListTest.C

applications/test/Dictionary/DictionaryTest.C

applications/test/ISLList/ISLListTest.C

applications/test/PtrList/Make/files

applications/test/PtrList/Make/options

applications/test/PtrList/PtrListTest.C

applications/test/SLList/SLListTest.C

applications/test/UDictionary/UDictionaryTest.C

applications/test/dictionary/dictionaryTest.C

applications/test/dictionary/testDictRegex

applications/test/fileName/fileNameTest.C

applications/test/getRoots/Make/files

applications/test/getRoots/Make/options