LocationManager conflict
Merge branch 'master' of https://github.com/lukasstoecklein/SWEN301GroupProject.git
Conflict