New way to categorize contents
Merge branch 'AI2928-categories' into stable

Conflicts:
	app/controllers/box_organizer_controller.rb