Merge branch 'master' into material2

# Conflicts:
#	src/app/transfer-back/transfer-back.component.ts

Author: Gorniv

server.ts

@@ -4,9 +4,9 @@ const path = require('path');
 const template = fs.readFileSync(path.join(__dirname, '.', 'dist', 'index.html')).toString();
 const win = domino.createWindow(template);
 const files = fs.readdirSync(`${process.cwd()}/dist-server`);
-const styleFiles = files.filter(file => file.startsWith('styles'));
-const hashStyle = styleFiles[0].split('.')[1];
-const style = fs.readFileSync(path.join(__dirname, '.', 'dist-server', `styles.${hashStyle}.bundle.css`)).toString();
+// const styleFiles = files.filter(file => file.startsWith('styles'));
+// const hashStyle = styleFiles[0].split('.')[1];
+// const style = fs.readFileSync(path.join(__dirname, '.', 'dist-server', `styles.${hashStyle}.bundle.css`)).toString();
 
 global['window'] = win;
 Object.defineProperty(win.document.body.style, 'transform', {
@@ -18,7 +18,7 @@ Object.defineProperty(win.document.body.style, 'transform', {
   },
 });
 global['document'] = win.document;
-global['CSS'] = style;
+global['CSS'] = null;
 // global['XMLHttpRequest'] = require('xmlhttprequest').XMLHttpRequest;
 global['Prism'] = null;
 

src/app/app.module.ts

@@ -3,19 +3,19 @@ import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { TransferHttpModule } from './../modules/transfer-http/transfer-http.module';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { HttpModule } from '@angular/http';
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { AppComponent } from './app.component';
 import { CookieService } from 'ngx-cookie-service';
+import { HttpClientModule } from '@angular/common/http';
 
 @NgModule({
   declarations: [
     AppComponent,
   ],
   imports: [
     BrowserModule.withServerTransition({ appId: 'my-app' }),
-    HttpModule,
+    HttpClientModule,
     RouterModule,
     AppRoutes,
     TransferHttpModule,

src/app/app.server.module.ts

@@ -3,7 +3,6 @@ import { AppStorage } from './../forStorage/universal.inject';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule, ApplicationRef, APP_BOOTSTRAP_LISTENER } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
-import { HttpModule } from '@angular/http';
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';
 import { BrowserModule } from '@angular/platform-browser';

src/modules/transfer-http/transfer-http.module.ts

@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core';
-import { Http, HttpModule } from '@angular/http';
 import { TransferHttp } from './transfer-http';
 
 @NgModule({