30
Merge branch 'master' of https://github.com/mmartche/car

Conflicts:
	admin/TODO.txt
	admin/index.php
	admin/scripts/updateDBFeature.php