Closed #166
Closed #165
Merge branch 'master' of https://github.com/TCA-Team/TumCampusApp