Merge branch 'develop' of https://git.rbg.informatik.tu-darmstadt.de/kai-abschlussarbeiten-fm into develop
some fixes