delete commentaire
Merge remote-tracking branch 'origin/master'

Conflicts:
	vendor/friendsofsymfony/user-bundle/FOS/UserBundle