Signed-off-by: medali.bettaieb <medali.bettaieb@esprit.tn>
Merge branch 'master' of ssh://git@github.com/hmaaroufi/neosoft_repo.git

Conflicts:
	tn.com.neosoft.gestion_patient/src/tn/com/neosoft/gestion_patient/domaine/A.java