2606 - initial commit
2606 added login admin as customer
[IC] working on multi sku optiona
[IC] added login as customer button
addition to last commit
[IC] working on ms options
addition to last commit
addition to last commit
addition to last commit
addition to last commit
addition to last commit
[IC] added pro upsell
[IC] login as customer
[IC] login as customer
Merge remote-tracking branch 'remotes/origin/develop' into D2606
Merge remote-tracking branch 'remotes/origin/D1739' into D1739-2

Conflicts:
	catalog/addons/Loaded_7_Pro/admin/hooks/customers_listing.xml
	catalog/admin/includes/applications/customers/classes/customers.php
	catalog/admin/includes/applications/products/classes/products.php
[IC] merge work
[IC] working on combo options
[IC] working on combo options
[IC] merge work