Merge branch 'master' into develop

Tool.py

@@ -0,0 +1,9 @@
+class Tool:
+    id = 0
+    name = ""
+    typeid = 0
+
+    def __init__(self, id, name, typeid):
+        self.id = id
+        self.name = name
+        self.typeid = typeid