Merge branch 'contactangle', remote-tracking branch 'origin' into contactangle
implement a new term in B for XFEM introduced by slip boundary conditions