maj
Merge branch 'master' of https://github.com/Nymphadelle/Phyllali

Conflicts:
	Classes/Troc.php
dernière modif