Better performance finding location on map (iOS)
Merge branch 'master' into game