Add store feature to categories import
Add color values adding on the fly feature
Merge origin/master