Merge pull request #1724 from steven-wm/master

Fixes custom fields language error.
https://github.com/opencart/opencart/issues/1235
Merge branch 'master' of https://github.com/opencart/opencart
https://github.com/opencart/opencart/issues/1235
removed ckeditor to be replaced with summernote
OC-1815 - Fixing mandatory fields bug when empty. Added PayPal and cheque fields to be mandatory if selected.
Fixing tabs > spaces
Merge branch 'master' of https://github.com/david-wm/opencart into OC-1815
add the some js to auto display errors in ajax forms.
custom field fix
Merge pull request #1729 from david-wm/master

OC-1815 - Fixing mandatory fields bug when empty.
https://github.com/opencart/opencart/issues/1685
Merge branch 'master' of https://github.com/opencart/opencart
OC-1800 - Fix for ups when no rates available
alerted the upload buttons so it uses the load message instead of spinning icon
fixing the text for upload buttons
Merge pull request #1731 from david-wm/OC-1800v2

OC-1800 - Fix for ups when no rates available
finished adding the loading text to all upload buttons
Merge branch 'master' of https://github.com/opencart/opencart
Coding standards fixes for CBA admin controller and view