add current_location option to get_location_marker for querying nearby locations
Merge branch 'datatojs'
Merging Cheri's js changes with new nearby-location feature