Merge branch 'master' of https://github.com/geobalas/trafie

Conflicts:
protected/views/home/home.php
fix conflict