Merge branch '2.0release' into develop

trunk/research/api-server/server.py

@@ -622,7 +622,7 @@ class RESTServers(object):
     '''
     get all servers which report to this api-server.
     '''
-    def GET(self):
+    def GET(self, id=None):
         enable_crossdomain()
         
         try:
@@ -632,6 +632,7 @@ class RESTServers(object):
             
             data = []
             for node in self.__nodes:
+                if id == None or node.id == str(id) or node.device_id == str(id):
                     data.append(node.json_dump())
             
             return json.dumps(data)