<feature/map-tab> map receive location updates #125
<stable/0.1> Merge branch 'feature/map-tab' into stable/0.1