because we have a triple nested loop for some reason!?
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/basicmap.js