fix TxStorage
Merge branch 'master' of git://github.com/chromaway/cc-wallet-core

Conflicts:
	src/tx/TxStorage.js
init electrum websocket
add electrum websocket
Merge branch 'master' of https://github.com/fanatid/cc-wallet-core