Merge branch 'master' of github:/szmoore/MCTX3420

diff --cc server/actuator.c
Simple merge

diff --cc server/sensor.c
index 28c3f5e,e429958..98896e8
--- 1/server/sensor.c
--- 2/server/sensor.c
+++ b/server/sensor.c
@@@ -138,8 -144,9 +144,9 @@@ void Sensor_CheckData(SensorId id, doub
  {
        if( value > thresholds[id].max_error || value < thresholds[id].min_error)
        {
 -              Log(LOGERR, "Sensor %s is above or below its safety value of %f or %f\n", g_sensor_names[id],thresholds[id].max_error, thresholds[id].min_error);
 +              Log(LOGERR, "Sensor %s at %f is above or below its safety value of %f or %f\n", value, g_sensor_names[id],thresholds[id].max_error, thresholds[id].min_error);
                //new function that stops actuators?
+               //Control_SetMode(CONTROL_EMERGENCY, NULL)
        }
        else if( value > thresholds[id].max_warn || value < thresholds[id].min_warn)
        {