TODOS added
TODO merge
TODO fix all
fix eager loading of sub categories
update rails version
Remove todo comments that have been fixed, add two more todos.
change routes as member
Fix TODO partial name + merge pull commit
Merge branch 'develop' of https://github.com/vinsol/freeka into develop

Conflicts:
	config/routes.rb
Merge branch 'develop' into server_setup