Merge pull request #193 from chris18890/dev

 bugfix for saving edit in paypal & update amazon_payment for edit op #98