Merge branch 'master' of https://github.com/thingsboard/thingsboard

@@ -32,7 +32,8 @@ import { DashboardService } from '@core/http/dashboard.service';
 import { UserService } from '@core/http/user.service';
 import { UserService } from '@core/http/user.service';
 import { AlarmService } from '@core/http/alarm.service';
 import { AlarmService } from '@core/http/alarm.service';
 import { Router } from '@angular/router';
 import { Router } from '@angular/router';
-import { BroadcastService } from "@core/services/broadcast.service";
+import { BroadcastService } from '@core/services/broadcast.service';
+import { ImportExportService } from '@home/components/import-export/import-export.service';
 
 
 export const ServicesMap = new Map<string, Type<any>>(
 export const ServicesMap = new Map<string, Type<any>>(
   [
   [
@@ -53,6 +54,7 @@ export const ServicesMap = new Map<string, Type<any>>(
    ['utils', UtilsService],
    ['utils', UtilsService],
    ['translate', TranslateService],
    ['translate', TranslateService],
    ['http', HttpClient],
    ['http', HttpClient],
-   ['router', Router]
+   ['router', Router],
+   ['importExport', ImportExportService]
   ]
   ]
 );
 );