Categories cleanup
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev

Conflicts:
	app/views/application/_top_navigation.html.erb