Merge branch 'dev'

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.conf.json",
-    "build": "ng build --environment prod --build-optimizer=false --base-href=/luna/  --deploy '/luna/'",
+    "build": "ng build --environment prod --base-href=/luna/  --deploy '/luna/'",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"

src/app/elements/iframe/iframe.component.ts

 import {Component, Input, OnInit} from '@angular/core';
 import {DomSanitizer} from '@angular/platform-browser';
 import {NavList} from '../../ControlPage/control/control.component';
+
 import {User} from '../../globals';
 import {HttpService, LogService} from '../../app.service';