commit avant merge
Merge branch 'master' of https://github.com/MartinLG/PeopleAreTravelling

Conflicts:
	composer.lock
Merge branch 'master' of https://github.com/MartinLG/PeopleAreTravelling
Lien d'upload d'image depuis la view article