Merge pull request #1093 from inthause/APIWeb

Fix cart cleanup and cart unlock
Load canonical URLs for products in order process.
Better handling of variant products in product added to cart popin.
If there is only one return mode, select it automatically and hide the section.
Fix short cart.
Merge pull request #1092 from intportg/APIWeb

Enchancements in catalog
Enhance product detail block and directives.
Merge pull request #1094 from intportg/APIWeb

Enhance product detail block and directives.
Add User Web API