categories controller changes
Merging