Merge pull request #1014 from rustyswayne/1.6.1

Starts work on adding edit shipment dialog.