Setup the new categorization and create a separate controller for it (CategoriesController)
Merge branch 'master' into change-seed-for-categories