B1803 Product Additional Image - Unable to see from catalog
Merge remote-tracking branch 'remotes/origin/B1803' into develop
[IC] added pro addon
B1803 Product Additional Image - Unable to see from catalog
B1803 Product Additional Image - Unable to see from catalog
B1803 Product Additional Image - Unable to see from catalog => CSS FIX for page shifts right when the modal opens up
[B1941] Manufacturers image folder
Delete .htaccess
[B1941]
Merge branch 'B1941' of github.com:loadedcommerce/loaded7 into B1941

Conflicts:
	catalog/images/manufacturers/.htaccess
[B1944] CKeditor changes
[D1930] Order ID removed from success.
[D1930]
Update general.js.php
[IC] updated set permissions logic
[IC] updated set permissions logic
[IC] updated set permissions logic
[IC] updated set permissions logic
[IC] updated set permissions logic
[IC] updated set permissions logic