cleaning up wallet
Merge branch 'master' of https://github.com/goethewins/EzBit-BitCoin-API--Wallet

Conflicts:
	.idea/workspace.xml
...