minor commit
error commit
Merge branch 'develop' of https://github.com/pidupuis/MedicalCare.git
into develop

Conflicts:
	MedicalCare/src/main/java/ui/dailysheetfilling/FormPanel.java