Merge branch 'master' into 2.0release

@@ -528,6 +528,7 @@ class ArmServer:
         self.ip = None
         self.ip = None
         self.device_id = None
         self.device_id = None
         self.summaries = None
         self.summaries = None
+        self.devices = None
         
         
         self.public_ip = cherrypy.request.remote.ip
         self.public_ip = cherrypy.request.remote.ip
         self.heartbeat = time.time()
         self.heartbeat = time.time()
@@ -546,6 +547,7 @@ class ArmServer:
         data["ip"] = self.ip
         data["ip"] = self.ip
         data["device_id"] = self.device_id
         data["device_id"] = self.device_id
         data["summaries"] = self.summaries
         data["summaries"] = self.summaries
+        data["devices"] = self.devices
         data["public_ip"] = self.public_ip
         data["public_ip"] = self.public_ip
         data["heartbeat"] = self.heartbeat
         data["heartbeat"] = self.heartbeat
         data["heartbeat_h"] = time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(self.heartbeat))
         data["heartbeat_h"] = time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(self.heartbeat))
@@ -610,6 +612,8 @@ class RESTServers(object):
             node.ip = json_req["ip"]
             node.ip = json_req["ip"]
             if "summaries" in json_req:
             if "summaries" in json_req:
                 node.summaries = json_req["summaries"]
                 node.summaries = json_req["summaries"]
+            if "devices" in json_req:
+                node.devices = json_req["devices"]
             node.device_id = device_id
             node.device_id = device_id
             node.public_ip = cherrypy.request.remote.ip
             node.public_ip = cherrypy.request.remote.ip
             node.heartbeat = time.time()
             node.heartbeat = time.time()