Recup jeudi soir
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:

	Nextwatt/application/views/B2E/Dossier_Archives/Devis/Catalogue_Devis.php
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:

	Nextwatt/application/views/B2E/Dossier_Archives/Devis/Catalogue_Devis.php

	Nextwatt/application/views/B2E/Dossier_Archives/Devis/detail_article.php