Merge branch 'dev' into rep-room-acl

# Conflicts:
#	examples/simple_repeater/main.cpp

examples/simple_repeater/main.cpp

@@ -8,10 +8,6 @@
   static UITask ui_task(display);
 #endif
 
-#ifdef WITH_BRIDGE
-AbstractBridge* bridge;
-#endif
-
 StdRNG fast_rng;
 SimpleMeshTables tables;
 
@@ -27,10 +23,6 @@ void setup() {
   Serial.begin(115200);
   delay(1000);
 
-#ifdef WITH_BRIDGE
-  bridge->begin();
-#endif
-
   board.begin();
 
 #ifdef DISPLAY_CLASS