Conflicts:
	src/OpenFOAM/primitives/triad/triad.C

Conflicts:
	applications/utilities/mesh/advanced/collapseEdges/collapseDict
	src/OpenFOAM/primitives/quaternion/quaternion.C

BUG: static variable initialisation: Cannot rely on other static variables to be initialised when initialising a static variable

for gasThermoType based on type of energy solved

difference between two triads

and instanciating reactionThermos, Reactions, chemistrySolver
solidChemistrySolvers and readers.
chemkinReader uses the sensibleEnthalpy base of thermoType