Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java

libraries/Bridge/Bridge.cpp

@@ -42,9 +42,7 @@ void BridgeClass::begin() {
   delay(500);
   // Wait for OpenWRT message
   // "Press enter to activate console"
-  print(F("\ncd /usr/lib/python2.7/bridge\n"));
-  delay(100);
-  print(F("python -B bridge.py\n"));
+  print(F("run-bridge\n"));
   delay(1000);
   dropAll();