Merge remote-tracking branch 'root/master'

# Conflicts:
#	src/main.cpp
#	src/screen.cpp
#	src/screen.h

src/PowerFSM.cpp

@@ -186,4 +186,4 @@ void PowerFSM_setup()
     // timeout");
 
     powerFSM.run_machine(); // run one interation of the state machine, so we run our on enter tasks for the initial DARK state
-}
+}