Ajout d'un bouton/Changement des boutons échanges et offre/
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin into HEAD

Conflicts:
	MasterCoin/src/main/resources/com/languages/text_en.properties
	MasterCoin/src/main/webapp/WEB-INF/templates/header.xhtml
	MasterCoin/src/main/webapp/echange.xhtml
gv