temp fix
Merge branch 'Base' of https://github.com/ninox92/StudyMap into Base