*fixed error about inhomogenous slip bnd
Merge remote-tracking branch 'contactangle/contactangle' into contactangle