Merge remote-tracking branch 'upstream/master'

assets/local/localization_en.json

@@ -493,6 +493,9 @@
     "staff.update":"Update",
 
     "shipment.title":"Shipments",
-    "shipment.add":"New shipment"
+    "shipment.add":"New shipment",
     
+    "pickup.title": "Pickups",
+    "pickup.new": "New Pickup",
+    "pickup.edit.title": "Pickup"
 }

assets/local/localization_mu.json

@@ -526,5 +526,9 @@
     "staff.update":"Update",
 
     "shipment.title":"Shipments",
-    "shipment.add":"New shipment"
+    "shipment.add":"New shipment",
+    
+    "pickup.title": "Pickups",
+    "pickup.new": "New Pickup",
+    "pickup.edit.title": "Pickup"
 }