changes to support testnet
testnet bip32 changes
change filenames for testnet
change default ports for testnet
raise
Merge branch 'master' of github.com:spesmilo/electrum into testnet
Merge branch 'master' of https://github.com/spesmilo/electrum into testnet
rewrite WaiingDialog as child class of QThread
Merge branch 'qthread_test' of https://github.com/spesmilo/electrum into testnet

Conflicts:
	gui/qt/main_window.py
	gui/qt/util.py
Merge branch 'qthread_test' of https://github.com/spesmilo/electrum into testnet
Merge branch 'master' of https://github.com/spesmilo/electrum into testnet
Merge branch 'master' of https://github.com/spesmilo/electrum into testnet
Merge branch 'master' of https://github.com/spesmilo/electrum into testnet
test data is wrong for testnet
Merge branch 'testnet' of git://github.com/wozz/electrum into testnet