recup de koko
Recup formulaire bonne sidebar + bon css
Mes vues
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement

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