more admin template work done

also changed custom_field to customfield in the controllers to stick to jenkins coding rules
Merge branch 'master' of https://github.com/opencart/opencart