fixed bug with CV_OTHER_LOC not being defined
Merge branch 'fluidity-core/MultiFluids_Dev' of github.com:jrper/MultiFluidFluidity into fluidity-core/MultiFluids_Dev