Showing related categories
small design refactorings
Merge branch '714-fix_category_allocation' into develop

Conflicts:
	app/views/categories/index.html.haml