Merge pull request #952 from rustyswayne/1.5.0

Patches back office issue when shipment status was not being set correctly in Angular models