Merge pull request #766 from koswesley/ManualOrders-1.3.0

Manual orders 1.3.0
Merge remote-tracking branch 'merchello/master' into 1.3.0
Clear
Merge branch '1.3.0' of https://github.com/rustyswayne/Merchello into 1.3.0
#M-328 Fixed
Bumped Merchello development version to 1.2.17
Merge pull request #772 from rustyswayne/1.3.0

Patches issues associated with deserializing shipments from extended data