Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Work on partial shipments issue
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Added discounts to invoice totals
Merge remote-tracking branch 'cssquirrel/1.4.0' into 1.4.0
Merge pull request #869 from cssquirrel/1.4.0

Fixed Customer Address Edit issue
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Patches issue on PutProduct not synching variants
Merge pull request #870 from rustyswayne/1.4.0

Adds consideration for discounts in invoice total and patches issue in ProductApi controller not properly synching variants with options in some cases.
Small style patch.