Merge remote-tracking branch 'origin/Base' into Sven
Merge branch 'Sven' of https://github.com/ninox92/StudyMap into Sven