one more daemon thread
Merge branch 'master' of git://github.com/spesmilo/electrum
update merchant script