This version integrates the capillarity and new features as nodal terms (e.g. for the contact problems).