return locations with coordinates as well as bare locations
Merge remote branch 'origin/master'