Merge "Fixed Logout, Empty White Page, Session Timeout"

diff --cc ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
index 1e447c7,16dc654..994c53a
--- 1/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
--- 2/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
@@@ -38,7 -38,10 +38,8 @@@
  import { Component, OnInit } from '@angular/core';
  import { Router, NavigationEnd } from '@angular/router';
  import { HeaderService } from '../../../shared/services/header/header.service';
 -import { UserService } from 'src/app/shared/services/user/user.service';
 -import { User } from 'src/app/shared/services/user/user';
  import { CookieService } from 'ngx-cookie-service';
+ import { environment } from 'src/environments/environment';
  
  @Component({
      selector: 'app-header',