debut echange
Merge branch 'HEAD' of https://github.com/courbije/MasterCoin.git into
HEAD

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