Merge branch 'master' of https://github.com/maubayuelo/Alter-MVC

Conflicts:
	gabarit.projet.php
	js/main.js
	vues/magazine_detail.class.php
	vues/magazine_list.class.php
a