https://github.com/opencart/opencart/issues/2176
https://github.com/opencart/opencart/issues/2192
Pass shipping information to PayPal if the cart contains normal (shipped) products.

REF: #2027
Bug fix: customer no approved can now be approved from customer list
https://github.com/opencart/opencart/issues/2204
Merge pull request #2207 from makeen/patch-2

Bug fix: customer no approved can now be approved from customer list
modification update
Merge branch 'master' of https://github.com/opencart/opencart
removed testing code
Merge remote-tracking branch 'upstream/master'