fix grid
Merge branch 'feature/refactoring_#25' into staging

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