fix (or at least work around) #788
Merge branch 'master' of git://github.com/spesmilo/electrum
Add Trezor plugin settings - can now view ID and set device label
Confirmation count included in API command history
Change wording on Trezor pincode request
Add a GUI messagebox when using a Trezor but can't connect to the device.
fix xpub in trezor plugin (fingerprint and child number should be big endian)
bugfix for seed_v7
bip44
save wallet file as json
wallet types
version number
update trezor plugin
account key must be a string (json)
don't store wallet_type in wizard; refactoring
class for xpub wallets
wizard: we still want to store wallet type on creation
wizard: change order
root_name
fix wizard