sample
Merge branch 'master' of https://github.com/blackzky/Traffix
must change algo for cronjob
Merge branch 'master' of https://github.com/blackzky/Traffix
INTENSITY: Add official and SQL table for official votes
Merge branch 'master' of https://github.com/blackzky/Traffix

Conflicts:
	public/javascripts/map-page.js
	public/javascripts/script.js
	views/map.ejs
saa
Merge branch 'master' of https://github.com/blackzky/Traffix

Conflicts:
	public/javascripts/map-page.js
	public/javascripts/script.js
ss
Merge branch 'master' of https://github.com/blackzky/Traffix

Conflicts:
	public/javascripts/map-page.js
	views/index.ejs
Bug fix zoom
Merge branch 'master' of https://github.com/blackzky/Traffix

Conflicts:
	public/javascripts/map-page.js