fix #750
wizard: ask for password earlier during restore
Merge branch 'master' of github.com:spesmilo/electrum into clean