Modification de la navigation dans la site
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin.git into
HEAD

Conflicts:
	MasterCoin/src/main/webapp/marcher/proposerEchange.xhtml
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin.git into HEAD