removed heatmap.js folder
.
zoom
layer order
zoom nonsense
var
load heatmap.js
Merge branch 'develop'

Conflicts:
	LabImport/dev/maps.js