Commit avec le devis (1ere version)
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/CI_catalogue.php
	Nextwatt/application/models/Mappage/article.php
	Nextwatt/application/views/B2E/Dossier_Archives/Devis/devis.php
qsdk
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/CI_catalogue.php
	Nextwatt/application/models/Mappage/article.php