Solving merge conflicts
Creating functional test to report comment.
Solving merge issues
Merge remote-tracking branch 'lucas/development' into development

Conflicts:
	features/step_definitions/medic_steps.rb