Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --combined SmokeDetector/SmokeDetectors.groovy
index 768f53acb1ed9e1e7c77ba67b2022bc00339c9e6,1bcb95a62415b7dc1b737ab284d6e69795e5ff1b..2c09a20b43326b9a933dacf4634601733bd742f3
--- 1/SmokeDetector/SmokeDetectors.groovy
--- 2/SmokeDetector/SmokeDetectors.groovy
+++ b/SmokeDetector/SmokeDetectors.groovy
@@@ -21,6 -21,7 +21,7 @@@ public class SmokeDetectors 
        private String currentCarbonMonoxideValue = "clear"
        private String carbonMonoxideLatestValue = "clear"
        private int battery = 50
+         private int batteryValue = 50
        private int batteryLatestValue = 50
  
                
@@@ -53,7 -54,7 +54,7 @@@
                        this.carbonMonoxideLatestValue = "tested"               
                }
                }*/
 -              smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue, this.carbonMonoxideValue, this.batteryValue))
 +              smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue, this.carbonMonoxide, this.carbonMonoxideLatestValue, this.battery))
        }
  
        //By Model Checker