Mensa Änderungen
Merge branch 'daniel16.02' of https://github.com/fabian-gh/fhdapp into daniel16.02
Merge branch 'daniel16.02' of https://github.com/fabian-gh/fhdapp into daniel16.02