more work on the image file manager done
fixed an issue with options in the admin.
updated mysql to just trigger an error. before it triggered an error and exited
Merge branch 'master' of git@github.com:opencart/opencart.git