Conflicts:
	tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes

    The standard/previous general symmetry type is now named symmetry
    both in class and lookup name for consistency.  The rigorous
    symmetryPlane type is needed for moving-mesh cases in which the
    motion it constrained by one or two planes.

different groups. This is used in 3D baffle where the generated patches are not
coupled.
     The tutorial circuitBoardCooling has been updated.

    Initialize faceAgglom list to identity when a patch is not agglomerated in faceAgglomerate.C
    Restrict agglomeration through edges with more than two faces attached in pairPatchAgglomeration.C

Conflicts:
	doc/Doxygen/css/doxygen.css