fix ordering of categories
Merge branch 'develop' of https://github.com/vinsol/freeka into develop

Conflicts:
	app/models/category.rb