juste pour verifier
Merge branch 'master' into Paypal

Conflicts:
	src/public/index.php
dbhdrgherth