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

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

Use the proper system path, rather than the dirname(__FILE__)
Update cache.php

Use the proper system path, rather than the dirname(__FILE__)
Merge pull request #1767 from JAY6390/patch-3

Update cache.php
Merge pull request #1766 from JAY6390/patch-2

Update db.php
replacing the wysiwyg
undefined method Response::setContentType?

Please verify...
anyway, it would be nice to have an hash array for the headers property of Response.
keys would be the header names and values the header values (either scalar or array) 
In that case we could have a 
setHeader($name, $value) method
addHeader($name, $value) for multiple values headers
setContentType($contentType) calling setHeader('Content-type', $contentType)
getHeaderLine($name) whose output will be used with php header() method
Merge pull request #1770 from pine3ree/patch-18

undefined method Response::setContentType?
Updated remaining method names from profile to recurring

Close: #1773
Merge branch 'master' of https://github.com/opencart/opencart