Add Todos
search controller_action CR fix
Merge branch 'develop' into CR-sprint2

Conflicts:
	app/controllers/requirements_controller.rb
CR fixes
Merge branch 'develop' into server_setup