map.js timer reference fixed
Merge remote-tracking branch 'origin/master'
timer
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/map.js