Début du rajout "Proposer une offre"
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin into HEAD
Ajout d'un bouton (travail en cours)
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin into HEAD
MAJ
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin into HEAD
Modifs
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin into HEAD

Conflicts:
	MasterCoin/src/main/java/fr/ufrima/m2pgi/ecom/model/EchangeOffre.java
	MasterCoin/src/main/webapp/offre.xhtml