Some TODOS added.
TODO fixes
Remove todo comments that have been fixed, add two or three more comments
fixes
delete flash in layout
TODO fixes
TODO comments removed
fix ordering of categories
Merge branch 'develop' of https://github.com/vinsol/freeka into develop

Conflicts:
	app/models/category.rb
ordering fixes
add key to production --to be removed
change toggle status code
change toggle status code
Merge branch 'develop' into carmen-rails
--working with requestes CRUD
remove admin sign up
Merge branch 'develop' into server_setup
some fixes
Merge branch 'develop' into carmen-rails
--working