new files merged
Revert "new files merged"

This reverts commit 391d76141083586c1dd59b380c495135edbbe568.
Merge branch 'mensa' of https://github.com/fabian-gh/fhdapp into mensa