gazetteer UI
Merge branch 'master' of https://github.com/mapbox/mapbox-studio into gazetteer
resolve merge conflict