Merge branch 'amal' into 'master'

src/app/login/login.page.ts

-import {Component,OnInit, ElementRef, NgZone, ViewChild} from '@angular/core';
+  import {Component,OnInit, ElementRef, NgZone, ViewChild} from '@angular/core';
 import { trigger, transition, animate, style } from '@angular/animations';
 import { Router,ActivatedRoute } from '@angular/router';
 import {Validators, FormBuilder, FormGroup, FormControl } from '@angular/forms';