Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/ts/meta/api/model/MetaCrawler.ts
#	src/ts/meta/api/model/MetaCrawlerInputItem.ts
#	src/ts/meta/api/model/MetaInfraType.ts
#	src/ts/meta/api/model/MetaInfraVendor.ts
#	src/ts/meta/api/model/MetaInputType.ts
#	src/ts/meta/api/model/MetaMemberStatus.ts
#	src/ts/meta/api/model/MetaNoAuthProbeStatus.ts
#	src/ts/meta/api/model/MetaNotification.ts
#	src/ts/meta/api/model/MetaProbeArchitecture.ts
#	src/ts/meta/api/model/MetaProbePackage.ts
#	src/ts/meta/api/model/MetaVendorCrawlerSensorItem.ts

src/ts/apikey/api/model/ApiKey.ts

@@ -2,9 +2,9 @@
 import Domain from 'domain/api/model/Domain';
 
 export interface ApiKey {
-    id: number;
+    id?: number;
     apiKey: string;
-    createDate: Date;
+    createDate?: Date;
     domain: Domain;
 }
 

src/ts/discovery/api/model/Host.ts

@@ -1,14 +1,14 @@
 import Port from './Port';
 
 interface Host {
-    id: number;
+    id?: number;
     ip: number;
     mac: number;
-    createDate: Date;
+    createDate?: Date;
     updateDate: Date;
     os: string;
     target: boolean;
-    ports: Port[];
+    ports?: Port[];
 }
 
 export default Host;

src/ts/discovery/api/model/Port.ts

@@ -3,12 +3,12 @@ import Service from './Service';
 import PortType from './PortType';
 
 interface Port {
-    id: number;
+    id?: number;
     host: Host;
     portType: PortType;
     portNumber: number;
-    services: Service[];
-    createDate: Date;
+    services?: Service[];
+    createDate?: Date;
     updateDate: Date;
 }