Category Model
Commit categories controller
Taxonomy
Fix merge