Fix map loading bug on first launch
Remove useless comments
Merge branch 'master' of https://github.com/Hivemapper/Android