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

diff --combined Runner.py
index 70bdf3efa135406fbc3261b702a586063e615553,8e2db793888869dbbfceb0df17383282fb43caf2..4c02586146cf200d3df9067041407962f613fae4
--- 1/Runner.py
--- 2/Runner.py
+++ b/Runner.py
@@@ -31,6 -31,8 +31,8 @@@ sendNotification = open("Methods/"+"sen
  canSchedule = open("Methods/"+"canSchedule.groovy", "r")
  createAccessToken = open("Methods/"+"createAccessToken.groovy", "r")
  runOnce = open("Methods/"+"runOnce.groovy", "r")
+ parseJson = open("Methods/"+"parseJson.groovy", "r")
+ unsubscribe = open("Methods/"+"unsubscribe.groovy", "r")
  App1 = open("Extractor/"+"App1/App1.groovy", "r")
  extractedObjectsApp1 = open("Extractor/"+"App1/extractedObjectsApp1.groovy", "r")
  extractedObjectsConstructorApp1 = open("Extractor/"+"App1/extractedObjectsConstructorApp1.groovy", "r")
@@@ -110,6 -112,10 +112,10 @@@ Out.write("import Valve.Valve\n"
  Out.write("import Valve.Valves\n")
  Out.write("import MobilePresence.MobilePresence\n")
  Out.write("import MobilePresence.MobilePresences\n")
+ Out.write("import ColorTemperature.ColorTemperature\n")
+ Out.write("import ColorTemperature.ColorTemperatures\n")
+ Out.write("import Button.Button\n")
+ Out.write("import Button.Buttons\n")
  Out.write("import Event.Event\n")
  Out.write("import Timer.SimulatedTimer\n")
  Out.write("\n")
@@@ -186,6 -192,10 +192,10 @@@ for line in createAccessToken
        Out.write("\t"+line)
  for line in runOnce:
        Out.write("\t"+line)
+ for line in parseJson:
+       Out.write("\t"+line)
+ for line in unsubscribe:
+       Out.write("\t"+line)
  Out.write("\n")
  Start = 0
  for line in App1:
@@@ -219,6 -229,8 +229,8 @@@ sendNotification = open("Methods/"+"sen
  canSchedule = open("Methods/"+"canSchedule.groovy", "r")
  createAccessToken = open("Methods/"+"createAccessToken.groovy", "r")
  runOnce = open("Methods/"+"runOnce.groovy", "r")
+ parseJson = open("Methods/"+"parseJson.groovy", "r")
+ unsubscribe = open("Methods/"+"unsubscribe.groovy", "r")
  App2 = open("Extractor/"+"App2/App2.groovy", "r")
  extractedObjectsApp2 = open("Extractor/"+"App2/extractedObjectsApp2.groovy", "r")
  extractedObjectsConstructorApp2 = open("Extractor/"+"App2/extractedObjectsConstructorApp2.groovy", "r")
@@@ -286,6 -298,10 +298,10 @@@ for line in createAccessToken
        Out.write("\t"+line)
  for line in runOnce:
        Out.write("\t"+line)
+ for line in parseJson:
+       Out.write("\t"+line)
+ for line in unsubscribe:
+       Out.write("\t"+line)
  Out.write("\n")
  Start = 0
  for line in App2:
@@@ -297,22 -313,22 +313,22 @@@ Out.write("}\n"
  Out.write("\n")
  Out.write("@Field def app1\n")
  Out.write("@Field def app2\n")
 -Out.write("def initOrder = Verify.getBoolean()\n")
 -Out.write("if (initOrder) {\n")
 +Out.write("//def initOrder = Verify.getBoolean()\n")
 +Out.write("//if (initOrder) {\n")
  Out.write("\tapp1 = new App1(this)\n")
  Out.write("\tapp2 = new App2(this)\n")
 -Out.write("} else {\n")
 -Out.write("\tapp2 = new App2(this)\n")
 -Out.write("\tapp1 = new App1(this)\n")
 -Out.write("}\n\n")
 -Out.write("def installOrder = Verify.getBoolean()\n")
 -Out.write("if (installOrder) {\n")
 +Out.write("//} else {\n")
 +Out.write("\t//app2 = new App2(this)\n")
 +Out.write("\t//app1 = new App1(this)\n")
 +Out.write("//}\n\n")
 +Out.write("//def installOrder = Verify.getBoolean()\n")
 +Out.write("//if (installOrder) {\n")
  Out.write("\tapp1.installed()\n")
  Out.write("\tapp2.installed()\n")
 -Out.write("} else {\n")
 -Out.write("\tapp2.installed()\n")
 -Out.write("\tapp1.installed()\n")
 -Out.write("}\n\n")
 +Out.write("//} else {\n")
 +Out.write("\t//app2.installed()\n")
 +Out.write("\t//app1.installed()\n")
 +Out.write("//}\n\n")
  for line in eventSimulator:
        Out.write(line)
  Out.close()