Merge
merge
Merge branch 'master' of github.com:sregoui/GestionMedical

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml