Updated and modularised map loading
Merge branch 'master' of https://github.com/hacktm/Smart-City-Projects-NewHaircut

Conflicts:
	public/media/js/mobile/heat.map.js