Commit avec le layout mise en place pour la plupart des pages
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/catalogue.php
	Nextwatt/application/controllers/client.php
	Nextwatt/application/controllers/user.php
	Nextwatt/application/views/B2E/Catalogue/Consulter_Catalogue.php
	Nextwatt/application/views/B2E/Client/Add_Client.php
	Nextwatt/application/views/B2E/User/Add_User.php
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/controllers/catalogue.php
	Nextwatt/application/controllers/client.php
	Nextwatt/application/controllers/user.php
	Nextwatt/application/views/B2E/Client/Add_Client.php
	Nextwatt/application/views/B2E/User/Add_User.php