more custom field updates
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/catalog/model/tool/upload.php