update build
:q
Merge branch 'master' of github.com:lwgray/NedCal

Conflicts:
	inventory_tools/Inbound_Shipping/build_shipment.py
fix build_shipment