Merge origin/master

Conflicts:
	backend/controllers/PaiementController.php
	backend/views/paiement/annuler.php
	backend/views/paiement/index.php
	backend/views/paiement/succes.php