Merge branch 'startup-gui-option' into merged

diff --cc lib/gui_qt.py
index 93809a0,47e419c..972b28c
--- 1/lib/gui_qt.py
--- 2/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@@ -37,8 -37,8 +37,9 @@@ except
      sys.exit("Error: Could not import icons_rc.py, please generate it with: 'pyrcc4 icons.qrc -o lib/icons_rc.py'")
  
  from wallet import format_satoshis
 +from simple_config import SimpleConfig
  import bmp, mnemonic, pyqrnative, qrscanner
+ from simple_config import SimpleConfig
  
  from decimal import Decimal