Markers
Merge branch 'master' of https://github.com/GrayOverride/OpenDataDAy

Conflicts:
	app/assets/javascripts/dammNiceScript.js