undo
Merge branch 'master' of https://github.com/ilvalle/vtraffic
Merge branch 'master' of https://github.com/ilvalle/vtraffic

Conflicts:
	models/db.py
Merge branch 'master' of https://github.com/ilvalle/vtraffic
Merge branch 'master' of https://github.com/ilvalle/vtraffic
Merge branch 'master' of https://github.com/ilvalle/vtraffic
Merge branch 'master' of https://github.com/ilvalle/vtraffic
Merge branch 'master' of https://github.com/ilvalle/vtraffic
Merge branch 'master' of https://github.com/ilvalle/vtraffic
Merge branch 'master' of https://github.com/ilvalle/vtraffic
fix syntax