end of input fix
Merge branch 'develop' into server_setup
Merge branch 'develop' into server_setup

Conflicts:
	app/models/concerns/requirement_asm.rb
Merge branch 'develop' into server_setup
Add more TODOs
CR fixes
CR fixes
Bug fix
Merge branch 'develop' into server_setup
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
name not callable on nil class Fix
QA bug fixes