changing the order editor to use stages.
Merge branch 'master' of https://github.com/opencart/opencart