changed the directory image/data to image/catalog
more admin update done
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/view/template/common/header.tpl