Locations map powered by mml
Merge branch 'master' of https://github.com/fakeplasticpaul/locationsmap

Conflicts:
	.gitignore