Fix: uc_attribute_option_desc is module, not theme
Merge branch 'dev'