Merge branch 'feature/config' of https://git.rz.tu-bs.de/soe.peters/VirtualFluids_dev into feature/config