fix for recurring
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/view/template/catalog/recurring_list.tpl