paiement
Merge branch 'master' of https://github.com/Wilfrite/ProjetPOEC

Conflicts:
	app/controllers/PagesController.php