Added missing language string.

Close #1752
Renamed method to correct name. in admin/model/catalog/product.php

Close #1760
Standards improved (white space, indents)
Merge branch 'master' of https://github.com/opencart/opencart
updated order delete code
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/sale/order.php
Merge branch 'master' of git@github.com:opencart/opencart.git
Fixed Order status on dashbord report