updated user location script
Merge branch 'maps-api'