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

Conflicts:
admin/api/index.php
admin/ficha-tecnica.php
admin/scripts/updateDBFeature.php
conf
comi