Create integration test to medics controllers
Merge branch 'branch_merge' into development

Conflicts:
	app/controllers/medics_controller.rb