put extended q-scheme in
Merge branch 'fluidity-core/MultiFluids_Dev' of github.com:FluidityProject/fluidity into fluidity-core/MultiFluids_Dev