New conflicts theory
Merge branch 'develop' of https://github.com/pidupuis/MedicalCare.git into develop