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

diff --combined Extractor/ExtractorScript.py
index 2c965908705c6ce01e97c1a12739009886ffa5c4,1643c43b02ee8e6d758333bc5fd76fe319d785a5..f972b70f78763701106c05be19fd7f7ffd28b5ac
--- 1/Extractor/ExtractorScript.py
--- 2/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@@ -261,6 -261,7 +261,7 @@@ def AnalyzeCapabilities(Temp, appName, 
                        Temp == "capability.switchLevel" or
                        Temp == "capability.illuminanceMeasurement" or
                        Temp == "capability.colorControl" or
+                       Temp == "capability.colorTemperature" or
                        #Motion related
                        Temp == "capability.motionSensor" or
                        Temp == "capability.accelerationSensor" or
@@@ -289,7 -290,7 +290,7 @@@
  def AnalyzePhysicalInteraction(app1Capab, app2Capab):
        #Light
        if ("capability.illuminanceMeasurement" in app1Capab) and ("capability.switch" in app2Capab or 
-                       "capability.switchLevel" in app2Capab or "capability.colorControl" in app2Capab):
+                       "capability.switchLevel" in app2Capab or "capability.colorControl" or "capability.colorTemperature" in app2Capab):
                print ("\nWARNING: Potential PHYSICAL CONFLICT (light) detected between App1 and App2!\n")
        #Motion
        # TODO: Technically this is not entirely precise since we need to be able to detect that the other app creates motion
@@@ -461,7 -462,6 +462,7 @@@ def ExtractEvents(extractedEvents)
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "motion":
 +                        print("HERE????")
                        #Write two events subsequently
                        event = open("eventSimulator/motionActiveEvent.groovy", "r")                    
                        for line in event: