Merge branch 'master' into tiles

Conflicts:
	src/js/main.js
	src/js/views/map.js
Merge branch 'tiles' of https://github.com/LocalData/localdata-dashboard into tiles

Conflicts:
	src/js/views/map.js
Use the relative, proxied tile endpoint
Reflect the resolution of our UTF grid