CRU des sous types OK !
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/views/B2E/Catalogue/Consulter_Soustype.php
Merge branch 'Developpement' of https://github.com/Projet-Nextwatt/B2E into Developpement

Conflicts:
	Nextwatt/application/models/Mappage/user.php