Fixed simple compilation error in xfem code. Also applied uncrustify
Changed a few surface/edge calls to the general "boundary" term in the FM module.