ffz
modif
Merge remote-tracking branch 'origin/ModifOffre' into ModifOffre

Conflicts:
	upload/offre/OFFRE_4.pdf
	views/offre/afficheroffre_v.php