Merge changes from master

diff --cc lib/gui_lite.py
index cd0e6f7,6f3ebce..b8dda84
--- 1/lib/gui_lite.py
--- 2/lib/gui_lite.py
+++ b/lib/gui_lite.py
@@@ -175,7 -175,9 +175,9 @@@ class MiniWindow(QDialog)
          main_layout.addWidget(self.send_button, 2, 1)
  
          menubar = QMenuBar()
 -        electrum_menu = menubar.addMenu(_("&Electrum"))
 +        electrum_menu = menubar.addMenu(_("&Bitcoin"))
+         #electrum_menu.addMenu(_("&Servers"))
+         #electrum_menu.addSeparator()
          electrum_menu.addAction(_("&Quit"))
  
          view_menu = menubar.addMenu(_("&View"))