solid-fluid coupling
Merge branch 'fluidity-core/MultiFluids_Dev' of github.com:FluidityProject/fluidity into fluidity-core/MultiFluids_Dev

Conflicts:
	spatialindex-1.8.0/make.log
updated manual