fixing double uc_option_image module
Merge branch 'f-dev' into dev
Merge branch 'dev'