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
Added formatting to number format in pp express to ensure no comma is added for items over 1000.
Updated changelog.
Update special.php

added line 85 to fix special.tpl when giving error:

The requested URL /cart/Notice: Undefined variable: continue in /var/www/OpenCart/catalog/view/theme/default/template/product/special.tpl on line 105 was not found on this server.
https://github.com/opencart/opencart/issues/2056
Merge branch 'master' of https://github.com/opencart/opencart
Merge pull request #2219 from manakill/patch-1

Update special.php
- adding check that transactionreference is set, was supposed to be a required field but was not always set in the secure trading IPN
- changing confirm function name to addOrderHistory
Merge branch 'master' of https://github.com/opencart/opencart into confirm_bug_branch
Merge pull request #2228 from chris-wm/confirm_bug_branch

Confirm bug branch
https://github.com/opencart/opencart/issues/2214
event system update
https://github.com/opencart/opencart/issues/2227
Merge branch 'master' of https://github.com/opencart/opencart
Merge pull request #4 from opencart/master

合并作者更新