color markers
Merge branch 'gh-pages' of https://github.com/data4society/Closed-Society into gh-pages

Conflicts:
	core/map.js