fix spacing for indent
Merge pull request #758 from wozz/spacing-fix

fix spacing for indent
simplified dialog for new file name
missing import
always enable qr scanner plugin
wizard restore: abort if wallet is None
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gui/qt/qrtextedit.py