[fix] live updates might work
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/map.ejs