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
https://github.com/opencart/opencart/issues/2214
event system update
Merge branch 'master' of github.com:opencart/opencart

Conflicts:
	upload/admin/model/openbay/amazon.php