Merge branch 'staging' into 'coldfix-cart'

# Conflicts:
#   lib/Pages/Cart/cart.dart
#   lib/Pages/Product/detail_product.dart