Fix cart cleanup and cart unlock
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.