searchbar
Merge remote-tracking branch 'origin/Thomas'
Merge branch 'master' of https://github.com/ninox92/StudyMapV2