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

Conflicts:
admin/scripts/updateDBFeature.php
admin/upload.php
a
d