fix for add this issue. also some backend work done
Merge branch 'master' of https://github.com/opencart/opencart