more file manager work done
Code change as suggested in issue 898. Close #898
file manager update
Merge branch 'master' of https://github.com/opencart/opencart
more filemanager work done
Removed check for user to accept GNU GPL license during install. Close #919
more file manager update
Merge branch 'master' of https://github.com/opencart/opencart
custom field work done
repeated line

repeated $this->data['text_discount'] = $this->language->get('text_discount');
update to the custom fields
Fixed error with missing payment method on manual order. Ref #931
Merge branch 'master' of https://github.com/opencart/opencart
Update tracking.tpl
updated the list page to have a popup confirm for deleting products
Merge branch 'master' of https://github.com/opencart/opencart
updated the system to use bootstrap and fill out the widths if one of the columns is missing.
more custom field work done
more custom field work done
more work done on the custom fields