echangetest passe
Merge branch 'master' of github.com:bitcoinerie/bitcoinWeb3

Conflicts:
	derby.log