map geocoder done
Merge branch 'master' of https://github.com/PhoenixRockit/3rd-degree

Conflicts:
	main.js