Merge branch 'dev' of gitlab.memri.io:memri/schema into username

EdgeAndPropertyHierarchy/type/type.json

+{
+  "description": "Used to describe edge types in front end, will be deprecated in the near future.",
+  "type": "string"
+}
\ No newline at end of file

TypeHierarchy/Item/Edge/Edge.json

 {
   "description": "Edge is the Item that stores the specifics of an edge, used by front ends.",
   "properties": [
-    "itemType",
+    "type",
     "targetItemType",
     "targetItemID",
     "sourceItemType",

tools/export_schema_ios_application.js

@@ -98,7 +98,9 @@ function getDataItemClasses() {
             case 'string':
               properties += `    @objc dynamic var ${field}:String? = nil\n`;
               if (field === 'targetItemType') {
-                propertiesDecoder += `            ${field} = try decoder.decodeIfPresent("itemType") ?? ${field}\n`;
+                propertiesDecoder += `            ${field} = try decoder.decodeIfPresent("targetType") ?? ${field}\n`;
+              } else if (field === 'type') {
+                propertiesDecoder += `            ${field} = try decoder.decodeIfPresent("_type") ?? ${field}\n`;
               } else if (field !== 'sourceItemType') {
                 propertiesDecoder += `            ${field} = try decoder.decodeIfPresent("${field}") ?? ${field}\n`;
               }