Merge branch 'dev' into github_dev

src/app/test-page/test-page.component.ts

 import {Component, OnInit} from '@angular/core';
 import {DataStore} from '../globals';
-import {Config} from '../elements/table/table.component';
-import {DialogService} from '../elements/dialog/dialog.service';
-
-// import {Mats, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
 
 @Component({
   selector: 'app-test-page',
@@ -11,42 +7,12 @@ import {DialogService} from '../elements/dialog/dialog.service';
   styleUrls: ['./test-page.component.scss']
 })
 export class TestPageComponent implements OnInit {
-  rows = [
-    {name: 'Austin', gender: 'Male', company: 'Swimlane'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-    {name: 'Dany', gender: 'Male', company: 'KFC'},
-    {name: 'Molly', gender: 'Female', company: 'Burger King'},
-  ];
-  columns = [
-    {prop: 'name'},
-    {name: 'Gender'},
-    {name: 'Company'}
-  ];
-  config = Config;
 
-  constructor(private _layer: DialogService) {
+  constructor() {
     DataStore.NavShow = false;
-    this.config.search = true;
-    this.config.scrollbarH = true;
   }
 
   ngOnInit() {
   }
 
-  test() {
-    this._layer.alert('sss');
-  }
 }