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