nearly finished the order editor.
Merge branch 'master' of https://github.com/opencart/opencart