Improvements in capillary pressure plus other minor changes.
Merge branch 'fluidity-core/MultiFluids_Dev' of github.com:FluidityProject/fluidity into fluidity-core/MultiFluids_Dev