made updates to the current locations js file
Merge remote-tracking branch 'origin/master'
made updates to the current locations js file
made updates to the current locations js file