fixes
Merge branch 'master' of https://github.com/metadiel/cargo

Conflicts:
	application/views/client-catalog_main.php