manufacturers
Merge branch 'master' into products
typo
fix manufacturer tests
products
categories
category admin features
dashboard for admin
fix broken test
test for default roles
hook up foundation and base style settings
option types
manage option types
basic option integration
change in default value