CR fix
Remove fixed TODOs
remove debugger
Merge branch 'CR-sprint2' of https://github.com/vinsol/freeka into CR-sprint2

Conflicts:
	app/controllers/welcome_controller.rb
Bug fix
Merge branch 'CR-sprint2' into server_setup