Update locations
Merge remote-tracking branch 'origin/master' into grantlocal
Edit Locations