Merge remote-tracking branch 'origin/master'

# Conflicts:
#	@overflow/target/component/list/list.component.ts

@overflow/infra/component/infra-map.component.ts

@@ -10,8 +10,7 @@ import { Observable, Subscription, of } from 'rxjs';
 import { ProbeHost } from '@overflow/commons-typescript/model/probe';
 import { MenuItem } from 'primeng/primeng';
 import { InfraService } from '../service/infra.service';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import { Infra } from '@overflow/commons-typescript/model/infra';
 
 

@overflow/infra/service/infra.service.ts

@@ -5,8 +5,7 @@ import { RPCService } from '@loafer/ng-rpc';
 
 import { Infra } from '@overflow/commons-typescript/model/infra';
 import { Domain } from '@overflow/commons-typescript/model/domain';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 
 @Injectable()
 export class InfraService {

@overflow/notification/component/badge/badge.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input, EventEmitter, Output, ViewChild, OnInit } from '@angular/core';
 import { Notification } from '@overflow/commons-typescript/model/notification';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import { Paginator } from 'primeng/primeng';
 
 @Component({

@overflow/notification/component/list/list.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input, EventEmitter, Output, ViewChild, OnInit, OnChanges, SimpleChanges } from '@angular/core';
 import { Notification } from '@overflow/commons-typescript/model/notification';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import { Paginator } from 'primeng/primeng';
 
 @Component({

@overflow/notification/container/badge/badge-container.component.ts

@@ -6,8 +6,7 @@ import { Domain, DomainMember } from '@overflow/commons-typescript/model/domain'
 import * as NotificationEntityStore from '../../store/entity/notification';
 import { NotificationEntitySelector } from '../../store/';
 import { AuthSelector } from '@overflow/shared/auth/store';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import { Notification } from '@overflow/commons-typescript/model/notification';
 import { ActivatedRoute } from '@angular/router';
 

@overflow/notification/container/list/list-container.component.ts

@@ -6,8 +6,7 @@ import * as NotificationEntityStore from '../../store/entity/notification';
 import { NotificationEntitySelector } from '../../store/';
 import { AuthSelector } from '@overflow/shared/auth/store';
 import { Member } from '@overflow/commons-typescript/model/member';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import { Notification } from '@overflow/commons-typescript/model/notification';
 import { ActivatedRoute } from '@angular/router';
 import { DomainMember } from '@overflow/commons-typescript/model/domain';

@overflow/notification/service/notification.service.ts

@@ -5,8 +5,7 @@ import { RPCService } from '@loafer/ng-rpc';
 
 import { Notification } from '@overflow/commons-typescript/model/notification';
 import { Member } from '@overflow/commons-typescript/model/member';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 
 @Injectable()
 export class NotificationService {

@overflow/notification/store/entity/notification/notification.action.ts

@@ -1,8 +1,7 @@
 import { Action } from '@ngrx/store';
 import { RPCClientError } from '@loafer/ng-rpc';
 import { Member } from '@overflow/commons-typescript/model/member';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import { Notification } from '@overflow/commons-typescript/model/notification';
 
 export enum ActionType {

@overflow/sensor/component/sensor-list.component.ts

@@ -7,11 +7,10 @@ import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators';
 import { AuthSelector } from '@overflow/shared/auth/store';
 
 import { Sensor } from '@overflow/commons-typescript/model/sensor';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import { Target } from '@overflow/commons-typescript/model/target';
 import { DomainMember } from '@overflow/commons-typescript/model/domain';
 import { SensorService } from '../service/sensor.service';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
 
 @Component({
   selector: 'of-sensor-list',

@overflow/sensor/service/sensor.service.ts

@@ -8,8 +8,7 @@ import { SensorItem } from '@overflow/commons-typescript/model/sensor-item';
 import { Sensor } from '@overflow/commons-typescript/model/sensor';
 import { Domain } from '@overflow/commons-typescript/model/domain';
 import { Target } from '@overflow/commons-typescript/model/target';
-import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
-import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 
 
 @Injectable()

@overflow/target/service/target.service.ts

@@ -5,8 +5,7 @@ import { Observable } from 'rxjs';
 
 import { Target } from '@overflow/commons-typescript/model/target';
 import { Host, Service } from '@overflow/commons-typescript/model/discovery';
-import {PageParams} from '@overflow/commons-typescript/model/commons/PageParams';
-import {Page} from '@overflow/commons-typescript/model/commons/Page';
+import { Page, PageParams } from '@overflow/commons-typescript/core/model';
 import {Notification} from '@overflow/commons-typescript/model/notification';
 
 @Injectable()

package.json

@@ -37,7 +37,7 @@
     "@ngrx/router-store": "^5.2.0",
     "@ngrx/store": "^5.2.0",
     "@ngrx/store-devtools": "^5.2.0",
-    "@overflow/commons-typescript": "^0.0.8",
+    "@overflow/commons-typescript": "^0.0.9",
     "angular-google-recaptcha": "^1.0.3",
     "angular-l10n": "^5.0.0",
     "angularx-qrcode": "^1.1.7",