more file manager work done
Merge branch 'master' of git://github.com/opencart/opencart.git