reggeli
Merge branch 'master' of https://github.com/akosputz/HappyTraffic

Conflicts:
	web/client/views/home/home.html
	web/happytraffic.js