MAP: testing
Intensity: change the time algo and display the traffic intensity in the map
Merge branch 'master' and intensity view

Conflicts:
	views/index.ejs
Intensity: Display one way icon and get data every 1 min