[B1941]
Merge branch 'B1941' of github.com:loadedcommerce/loaded7 into B1941

Conflicts:
	catalog/images/manufacturers/.htaccess