Added custom module to update "Shipping" to "Delivery" in checkout process.
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

* refs/remotes/origin/dev:
  Data import: Added Color column to Annuals.csv.