must commit: locationsearch stuff (not finished)
Merge branch 'master' of https://github.com/ThomasBB/Joinster.git
finished locationsearches @ camera