tt
Merge branch 'master' of https://github.com/Kureb/Marathon

Conflicts:
	panierController.php