* film could compile a mpi version
Merge remote branch 'origin/contactangle' into contactangle