Merge pull request 'feature/unify_basic' (#15) from peters/VirtualFluids_dev:feature/unify_basic into develop