Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	Mist/assets/qml/wallet.qml

Mist/assets/qml/views/wallet.qml

@@ -9,7 +9,7 @@ import Ethereum 1.0
 Rectangle {
 	id: root
 	property var title: "Wallet"
-	property var iconSource: "../wallet.png"
+	property var iconSource: "../facet.png"
 	property var menuItem
 
 	objectName: "walletView"

Mist/assets/qml/wallet.qml

@@ -101,16 +101,16 @@ ApplicationWindow {
 		}
 	}
 
-	menuBar: MenuBar {
+    menuBar: MenuBar {
-		Menu {
+        Menu {
-			title: "File"
+            title: "File"
-			MenuItem {
+            MenuItem {
-				text: "Import App"
+                text: "Import App"
-				shortcut: "Ctrl+o"
+                shortcut: "Ctrl+o"
-				onTriggered: {
+                onTriggered: {
-					generalFileDialog.show(true, importApp)
+                    generalFileDialog.show(true, importApp)
-				}
+                }
-			}
+            }
 
 			/*
 			MenuItem {

javascript/types.go

@@ -88,6 +88,10 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value {
 	return self.toVal(&JSStateObject{ethpipe.NewJSObject(self.JSPipe.World().SafeGet(ethutil.Hex2Bytes(addr))), self})
 }
 
+func (self *JSEthereum) Peers() otto.Value {
+	return self.toVal(self.JSPipe.Peers())
+}
+
 func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
 	r, err := self.JSPipe.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
 	if err != nil {