Added forgotten changes to r9018 (Added shipcloud and track & trace from /tags/modified-shop-1.06 to /branches/modified-shop-1.06-SP3)