Merged in dev (pull request #63)

Dev

src/app/ControlPage/cleftbar/dialog.html

@@ -5,7 +5,7 @@
               [compareWith]="compareFn"
               [formControl]="UserSelectControl"
               placeholder="{{'Choose a User'|trans}}" required>
-    <mat-option *ngFor="let u of data.users" value="{{u.id}}">{{u.username}}</mat-option>
+    <mat-option *ngFor="let u of data.users" value="{{u.id}}">{{u.name}}</mat-option>
   </mat-select>
   <mat-error *ngIf="UserSelectControl.hasError('required')">{{"Please choose a User"|trans}}</mat-error>
 

src/sass/style.scss

@@ -19,14 +19,12 @@ $roboto-font-path: "~roboto-fontface/fonts";
 $asset-path: '../static/imgs/inspinia';
 @import "../assets/inspinia/style";
 
-@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
-
 @import '~@swimlane/ngx-datatable/release/index.css';
 @import '~@swimlane/ngx-datatable/release/themes/material.css';
 @import '~@swimlane/ngx-datatable/release/assets/icons.css';
 
 
-
+@import './material.css';
 $material-design-icons-font-path: '~/material-design-icons/iconfont/';
 //@import "~material-design-icons/iconfont/material-icons";
 @font-face {