Signed-off-by: clemenceLO21 <clemence.geffray@gmail.com>
Merge branch 'master' of https://github.com/tudorluchy/NF17-P14

Conflicts:
	classes/RendezVous.class.php
	index.php
	modules/Client/module.php
	modules/Employe/module.php
	modules/Facture/module.php
	modules/Personne/module.php
	modules/Veterinaire/module.php
	modules/default/module.php