more on map
Merge branch 'master' of https://github.com/ilvalle/vtraffic

Conflicts:
	views/default/map.html