2528 repaired issue with subproducts broken image
2528 repaired issue with subproducts broken image
2528 - use transparent image for missing subproducts image
2528 - use transparent image for missing subproducts image
[IC] setup for 2468
2468 - working on shopping cart qty update
[IC] updated cart page
[IC] update cart page
[IC] repair cart empty redirect
[IC] fixing last commit
[IC] merge work
[IC] merge work
[IC] merge work
[IC] merge work
[IC] merge work
Merge remote-tracking branch 'remotes/origin/B2528' into D2468

Conflicts:
	catalog/addons/Loaded_7_Pro/controller.php
[IC] updated version
Merge remote-tracking branch 'remotes/origin/develop' into D2468
updated bootstrap to 3.1.1
Merge remote-tracking branch 'remotes/origin/D2651' into D2468