Fixing views
Merge branch 'master' of https://github.com/florianb/patient-situation

Conflicts:
	app/views/medical_cases/show.html.erb