Removed single quote mark from mysqli driver file when setting charset - fix from recent merge. Ref #964
more work on the file manager done
Merge branch 'master' of https://github.com/opencart/opencart
Merge branch 'master' of git://github.com/opencart/opencart.git