Merge pull request #853 from rustyswayne/1.4.0

Updated JSON object property names to match the lang file
Merge pull request #854 from rustyswayne/1.4.0

Refactored PaymentApiController to return PaymentResultDisplay rather than PaymentDisplay when processing payments
Refactored PaymentApiController to return PaymentResultDisplay
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0