https://github.com/opencart/opencart/issues/2273
shows the custom fields in t eh admin order also fix for address and edit custom fields
Merge remote-tracking branch 'upstream/master'