Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
merge work
merge work
merge work
added rec x to remove qpb
Merge remote-tracking branch 'remotes/origin/B3396' into D1965-work

Conflicts:
	catalog/addons/Loaded_7_Pro/admin/applications/categories/classes/categories.php
	catalog/addons/Loaded_7_Pro/admin/applications/products/classes/products.php
	catalog/addons/Loaded_7_Pro/admin/applications/products/classes/rpc.php
	catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/options_subproducts.inc.php
	catalog/addons/Loaded_7_Pro/admin/applications/products/pages/tabs/pricing_qpb.inc.php
	catalog/addons/Loaded_7_Pro/admin/hooks/categories_save.xml
	catalog/addons/Loaded_7_Pro/admin/hooks/product_actions_save.xml
	catalog/addons/Loaded_7_Pro/admin/hooks/product_edit_pricing.xml
	catalog/addons/Loaded_7_Pro/admin/hooks/products_class.xml
	catalog/addons/Loaded_7_Pro/controller.php