Merge remote-tracking branch 'origin/master' into dev

gazebo/flix.h

@@ -45,7 +45,7 @@ void testMotor(int, float);
 void print(const char* format, ...);
 void pause(float duration);
 void doCommand(String str, bool echo);
-void handleInput();
+void handleConsole();
 void setupRC();
 void normalizeRC();
 void calibrateRC();

gazebo/simulator.cpp

@@ -84,7 +84,7 @@ public:
 		attitude.setYaw(this->model->WorldPose().Yaw());
 
 		control();
-		handleInput();
+		handleConsole();
 		processMavlink();
 
 		applyMotorForces();