caracteristiques final
Caracteristiques final
Merge branch 'master' of https://github.com/HarounaMadi/IPEZ_CRM

Conflicts:
	app/Config/database.php