Merge origin/master

Conflicts:
	Clinique/src/metier/Patient.java