Feature/more generic fluidsystems

Merged Kilian Weishaupt requested to merge feature/more-generic-fluidsystems into master
Edited by Timo Koch

Merge request reports