Add missing Category model
Merge branch 'dev'