bouton favori
charlotte
:Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	bin/doctrine
	bin/doctrine.php