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

diff --combined Extractor/ExtractorScript.py
index d495d0fa6b23ffbcd7d163a6fff57a870b44e103,d04a9dc55b1c4cb2dbfa2fdf23db1b5082b81269..bf8471f1a41935fa0191f93f558dc31b5679966d
--- 1/Extractor/ExtractorScript.py
--- 2/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@@ -290,8 -290,10 +290,8 @@@ def ExtractEvents(extractedEvents)
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "unlock":
 -                      event = open("eventSimulator/unlockEvent.groovy", "r")
 -                      for line in event:
 -                              extractedEvents.write(line)
 -                      event.close()
 +                        #Don't do anything for this case
 +                        counter = counter - 1
                elif eventList[i] == "contact.open":
                        event = open("eventSimulator/contactOpenEvent.groovy", "r")
                        for line in event:
@@@ -924,6 -926,8 +924,8 @@@
                                event = open("eventSimulator/musicPlayerLevelEvent.groovy", "r")
                        elif capability == "capability.switchLevel":
                                event = open("eventSimulator/switchLevelEvent.groovy", "r")
+                       elif capability == "capability.colorControl":
+                               event = open("eventSimulator/colorLevelChangeEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()