Error control improvement, bulk import error fix
Merge branch 'master' of https://github.com/squidfacil/opencart.git