updated order delete code
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/sale/order.php