Commit boulot de Shany
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement
Commit boulot de Shany
Commit vendredi matin
Commit vendredi matin
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement

Conflicts:
	Nextwatt/.idea/workspace.xml
	Nextwatt/application/controllers/CI_catalogue.php

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