Service REST OK
Merge branch 'master' of https://github.com/koehrlenguillaume/webProjet

Conflicts:
	Controller/controller_Panier.php