diff --git a/Ionic2/src/app/app.component.ts b/Ionic2/src/app/app.component.ts
index 20f33b0..053e9b1 100644
--- a/Ionic2/src/app/app.component.ts
+++ b/Ionic2/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, provide } from '@angular/core';
+import { Component, ViewChild } from '@angular/core'; //TODO: provide
 import { Platform, MenuController, Nav } from 'ionic-angular';
 import { StatusBar } from 'ionic-native';
 
@@ -19,21 +19,22 @@ import {UserInfoService} from '../services/userInfo.service';
 
 import {Http} from '@angular/http';
 import {AuthHttp, AuthConfig} from 'angular2-jwt';
-import {AuthService} from '../services/auth.service';
+//TODO: import {AuthService} from '../services/auth.service';
 import {Secret} from '../secrets/secret';
 
 @Component({
   templateUrl: `app.html`
 })
 export class MyApp {
-  @ViewChild('nav') nav: Nav;
+  @ViewChild('content') nav: Nav;
   public primaryPages:any[];
   public settingsPages:any[];
   public rootPage:any;
 
   constructor(public platform: Platform, public menu: MenuController,
     public preferencesService: PreferencesService,
-    public auth: AuthService, public userInfoService: UserInfoService) {
+    //TODO: public auth: AuthService,
+    public userInfoService: UserInfoService) {
 
     this.initializeApp();
 
@@ -49,7 +50,7 @@ export class MyApp {
         { title: 'Settings', component: SettingsPage, icon: 'settings' }
     ];
 
-    this.rootPage = LoginPage;
+    this.rootPage = ProfilePage;//LoginPage;
   }
 
   initializeApp() {
@@ -59,7 +60,7 @@ export class MyApp {
       StatusBar.styleDefault();
       this.userInfoService.initialize();
       this.preferencesService.initializePreferences();
-      this.auth.startupTokenRefresh();
+      //TODO: this.auth.startupTokenRefresh();
     });
   }
 
diff --git a/Ionic2/src/app/app.html b/Ionic2/src/app/app.html
index 125126f..1cfde2e 100644
--- a/Ionic2/src/app/app.html
+++ b/Ionic2/src/app/app.html
@@ -1,5 +1,5 @@
 <ion-menu [content]="content" >
-  <ion-toolbar primary>
+  <ion-toolbar color="primary">
     <ion-title >Menu</ion-title>
   </ion-toolbar>
   <ion-content>
diff --git a/Ionic2/src/app/app.module.ts b/Ionic2/src/app/app.module.ts
index 9c1f168..b73553b 100644
--- a/Ionic2/src/app/app.module.ts
+++ b/Ionic2/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import { NgModule, provide } from '@angular/core';
+import { NgModule } from '@angular/core';//TODO: provide
 import { IonicApp, IonicModule } from 'ionic-angular';
 import { MyApp } from './app.component';
 
@@ -20,7 +20,7 @@ import {ProfileHeader} from '../components/profileHeader';
 import {ChatBubble} from '../components/chatBubble/chatBubble';
 
 //services (providers)
-import {AuthService} from '../services/auth.service';
+//TODO: import {AuthService} from '../services/auth.service';
 import {ContactsService} from '../services/contacts.service';
 import {PreferencesService} from '../services/preferences.service';
 import {StorageService} from '../services/storage.service';
@@ -71,13 +71,14 @@ import {AuthHttp, AuthConfig} from 'angular2-jwt';
     PreferencesService,
     StorageService,
     UserInfoService,
-    provide(AuthHttp, {
-      useFactory: (http) => {
-        return new AuthHttp(new AuthConfig({noJwtError: true}), http);
-      },
-      deps: [Http]
-    }),
-    AuthService
+    //TODO:
+    // provide(AuthHttp, {
+    //   useFactory: (http) => {
+    //     return new AuthHttp(new AuthConfig({noJwtError: true}), http);
+    //   },
+    //   deps: [Http]
+    // }),
+    // AuthService
   ]
 })
 export class AppModule {}
diff --git a/Ionic2/src/assets/img/hugh.png b/Ionic2/src/assets/img/hugh.png
new file mode 100644
index 0000000..94c0857
Binary files /dev/null and b/Ionic2/src/assets/img/hugh.png differ
diff --git a/Ionic2/src/components/profileHeader.ts b/Ionic2/src/components/profileHeader.ts
index aa0f024..c692672 100644
--- a/Ionic2/src/components/profileHeader.ts
+++ b/Ionic2/src/components/profileHeader.ts
@@ -17,7 +17,7 @@ export class ProfileHeader {
 
   constructor() {
     this.fullName = 'Dr. House';
-    this.profileImage = 'build/img/hugh.png';
+    this.profileImage = 'assets/img/hugh.png';
   }
 
   public setFullName(fullName){
diff --git a/Ionic2/src/pages/chatPage/chatPage.ts b/Ionic2/src/pages/chatPage/chatPage.ts
index 987ce2c..aa2a5fa 100644
--- a/Ionic2/src/pages/chatPage/chatPage.ts
+++ b/Ionic2/src/pages/chatPage/chatPage.ts
@@ -16,63 +16,63 @@ export class ChatPage {
 
     this.messages = [
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'left',
         content: 'Hello from the other side.',
         senderName: 'Gregory',
         time: '28-Jun-2016 21:53'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'right',
         content: 'Hi! How are?',
         senderName: 'Me',
         time: '28-Jun-2016 21:55'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'left',
         content: "This is some really long test that I'm writing here. Let's see how it wraps.",
         senderName: 'Gregory',
         time: '28-Jun-2016 21:57'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'right',
         content: 'Hi! How are?',
         senderName: 'Me',
         time: '28-Jun-2016 21:55'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'left',
         content: "This is some really long test that I'm writing here. Let's see how it wraps.",
         senderName: 'Gregory',
         time: '28-Jun-2016 21:57'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'right',
         content: 'Hi! How are?',
         senderName: 'Me',
         time: '28-Jun-2016 21:55'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'left',
         content: "This is some really long test that I'm writing here. Let's see how it wraps.",
         senderName: 'Gregory',
         time: '28-Jun-2016 21:57'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'right',
         content: 'Hi! How are?',
         senderName: 'Me',
         time: '28-Jun-2016 21:55'
       },
       {
-        img: 'build/img/hugh.png',
+        img: 'assets/img/hugh.png',
         position: 'left',
         content: "This is some really long test that I'm writing here. Let's see how it wraps.",
         senderName: 'Gregory',
@@ -89,7 +89,7 @@ export class ChatPage {
     this.txtChat.setFocus();
 
     this.messages.push({
-      img: 'build/img/hugh.png',
+      img: 'assets/img/hugh.png',
       position: 'right',
       content: this.txtChat.content,
       senderName: 'Me',
diff --git a/Ionic2/src/pages/contactPage/contactPage.html b/Ionic2/src/pages/contactPage/contactPage.html
index 78cfec1..57eeebd 100644
--- a/Ionic2/src/pages/contactPage/contactPage.html
+++ b/Ionic2/src/pages/contactPage/contactPage.html
@@ -36,7 +36,10 @@
     </ion-item>
   </ion-list>
 
-  <button ion-button icon-only fab fab-bottom fab-right secondary (click)='openChat()'>
-    <ion-icon name="chatboxes"></ion-icon>
-  </button>
+  <ion-fab bottom right>
+    <button ion-fab color="secondary" (click)='openChat()'>
+      <ion-icon name="chatboxes"></ion-icon>
+    </button>
+  </ion-fab>
+
 </ion-content>
diff --git a/Ionic2/src/pages/discoverUsersPage/discoverUsersPage.html b/Ionic2/src/pages/discoverUsersPage/discoverUsersPage.html
index 8cfd971..ec36867 100644
--- a/Ionic2/src/pages/discoverUsersPage/discoverUsersPage.html
+++ b/Ionic2/src/pages/discoverUsersPage/discoverUsersPage.html
@@ -46,14 +46,16 @@
     </ion-slide>
   </ion-slides>
 
-  <button ion-button icon-only #btnDismiss fab fab-bottom fab-right secondary style="margin-bottom:75px; z-index: 100;"
-    (click)="onBtnDismissClicked()"
-    @fabState="btnState">
-    <ion-icon name="close"></ion-icon>
-  </button>
-  <button  ion-button icon-only #btnAccept fab fab-bottom fab-right secondary style="z-index: 100;"
-    (click)="onBtnAcceptClicked()"
-    @fabState="btnState">
-    <ion-icon name="checkmark"></ion-icon>
-  </button>
+  <ion-fab bottom right>
+    <button ion-fab #btnDismiss color="secondary" style="margin-bottom:10px; z-index: 100;"
+      (click)="onBtnDismissClicked()"
+      [@fabState]="btnState">
+      <ion-icon name="close"></ion-icon>
+    </button>
+    <button ion-fab #btnAccept color="secondary" style="z-index: 100;"
+      (click)="onBtnAcceptClicked()"
+      [@fabState]="btnState">
+      <ion-icon name="checkmark"></ion-icon>
+    </button>
+  </ion-fab>
 </ion-content>
diff --git a/Ionic2/src/pages/loginPage/loginPage.html b/Ionic2/src/pages/loginPage/loginPage.html
index 3293184..a952f75 100644
--- a/Ionic2/src/pages/loginPage/loginPage.html
+++ b/Ionic2/src/pages/loginPage/loginPage.html
@@ -12,7 +12,7 @@
   <div class="Aligner-item">
     <h4 text-center style="margin-bottom:15vh;">Welcome to Ionic</h4><!--separation is 15% of the viewport's height -->
     <p text-center secondary-text *ngIf="showLoginButton!=true">Please wait while we try to sign you in...</p>
-    <button  ion-button icon-only color="primary" full (click)="login()" *ngIf="showLoginButton==true">Sign in or register</button>
+    <button ion-button color="primary" full (click)="login()" *ngIf="showLoginButton==true">Sign in or register</button>
   </div>
 </div>
 
diff --git a/Ionic2/src/pages/loginPage/loginPage.ts b/Ionic2/src/pages/loginPage/loginPage.ts
index 2b70b02..3078834 100644
--- a/Ionic2/src/pages/loginPage/loginPage.ts
+++ b/Ionic2/src/pages/loginPage/loginPage.ts
@@ -1,7 +1,7 @@
-import {Component, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
 import {NavController} from 'ionic-angular';
 import {ProfilePage} from '../profilePage/profilePage';
-import {AuthService} from '../../services/auth.service';
+//TODO: import {AuthService} from '../../services/auth.service';
 import {UserInfoService} from '../../services/userInfo.service';
 
 
@@ -13,33 +13,39 @@ export class LoginPage {
   public nextPage:any;
   public showLoginButton:boolean;
 
-  constructor(public nav: NavController, public auth: AuthService, public userInfoService: UserInfoService) {
+  constructor(public nav: NavController,
+      //TODO: public auth: AuthService,
+      public userInfoService: UserInfoService) {
     this.nextPage = ProfilePage;
-    this.showLoginButton = false;
+    this.showLoginButton = !false;
   }
 
   public ionViewWillEnter(){
-    this.showLoginButton = false;
+    this.showLoginButton = !false;
   }
 
   public ionViewDidEnter(){
-    if(this.auth.authenticated()){
-      //give some time for local storage to initialize
-      setTimeout(() => {
-        this.nav.setRoot(ProfilePage);
-      }, 1000)
-    }else{
-      this.showLoginButton = true;
-    }
+      this.nav.setRoot(ProfilePage);
+     //TODO:
+    // if(this.auth.authenticated()){
+    //   //give some time for local storage to initialize
+    //   setTimeout(() => {
+    //     this.nav.setRoot(ProfilePage);
+    //   }, 1000)
+    // }else{
+    //   this.showLoginButton = true;
+    // }
   }
 
   public login(){
-    this.auth.login(() =>
-      setTimeout(() => {
-        this.nav.setRoot(ProfilePage)
-      }, 1000)//I need this delay because otherwise the navigation occurs
-              //before the InAppBrowser closes, and the content ends up under
-              //the top bar.
-    );
+       this.nav.setRoot(ProfilePage);
+      //TODO:
+    // this.auth.login(() =>
+    //   setTimeout(() => {
+    //     this.nav.setRoot(ProfilePage)
+    //   }, 1000)//I need this delay because otherwise the navigation occurs
+    //           //before the InAppBrowser closes, and the content ends up under
+    //           //the top bar.
+    // );
   }
 }
diff --git a/Ionic2/src/pages/pendingInvitesPage/pendingInvitesPage.html b/Ionic2/src/pages/pendingInvitesPage/pendingInvitesPage.html
index 6c92d68..dd5380e 100644
--- a/Ionic2/src/pages/pendingInvitesPage/pendingInvitesPage.html
+++ b/Ionic2/src/pages/pendingInvitesPage/pendingInvitesPage.html
@@ -21,7 +21,7 @@
       </ion-item>
 
       <ion-item-options side="left">
-        <button ion-button favorite (click)="acceptInvite(cnt)">Accept</button>
+        <button ion-button color="favorite" (click)="acceptInvite(cnt)">Accept</button>
       </ion-item-options>
 
       <ion-item-options side="right">
diff --git a/Ionic2/src/pages/profilePage/profilePage.html b/Ionic2/src/pages/profilePage/profilePage.html
index d914586..1db26a6 100644
--- a/Ionic2/src/pages/profilePage/profilePage.html
+++ b/Ionic2/src/pages/profilePage/profilePage.html
@@ -46,8 +46,11 @@
       [disabled]="!isEditMode"></ion-textarea>
   </ion-item>
 
-  <button  ion-button icon-only fab fab-bottom fab-right color="secondary" (click)="edit()" style="position:fixed;">
-    <ion-icon *ngIf="isEditMode" name="checkmark"></ion-icon>
-    <ion-icon *ngIf="!isEditMode" name="create"></ion-icon>
-  </button>
+  <ion-fab bottom right>
+    <button ion-fab color="secondary" (click)="edit()">
+      <ion-icon *ngIf="isEditMode" name="checkmark"></ion-icon>
+      <ion-icon *ngIf="!isEditMode" name="create"></ion-icon>
+    </button>
+  </ion-fab>
+
 </ion-content>
diff --git a/Ionic2/src/pages/settingsPage/settingsPage.html b/Ionic2/src/pages/settingsPage/settingsPage.html
index 88668d5..d5cf786 100644
--- a/Ionic2/src/pages/settingsPage/settingsPage.html
+++ b/Ionic2/src/pages/settingsPage/settingsPage.html
@@ -32,7 +32,7 @@
         [ngModel]='preferences[PREF_NOTIFY_INVITES]'
         (ionChange)='changePreference($event, PREF_NOTIFY_INVITES)'></ion-toggle>
     </ion-item>
-    <ion-list-header color="secondary">
+    <ion-list-header>
        Account
     </ion-list-header>
     <button ion-item (click)="logout()">
diff --git a/Ionic2/src/pages/settingsPage/settingsPage.ts b/Ionic2/src/pages/settingsPage/settingsPage.ts
index 049f0f8..81ecd19 100644
--- a/Ionic2/src/pages/settingsPage/settingsPage.ts
+++ b/Ionic2/src/pages/settingsPage/settingsPage.ts
@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 import {NavController} from 'ionic-angular';
 import {PreferencesService} from '../../services/preferences.service';
-import {AuthService} from '../../services/auth.service';
+//TODO: import {AuthService} from '../../services/auth.service';
 import {LoginPage} from '../loginPage/loginPage';
 
 
@@ -15,7 +15,9 @@ export class SettingsPage {
   public PREF_NOTIFY_MESSAGES:string;
   public PREF_NOTIFY_INVITES:string;
 
-  constructor(public nav: NavController, public preferencesService:PreferencesService, public auth:AuthService) {
+  constructor(public nav: NavController, public preferencesService:PreferencesService,
+     //TODO:  public auth:AuthService
+    ) {
     this.preferences = {};
 
     this.PREF_DISCOVERABLE = PreferencesService.PREF_DISCOVERABLE;
@@ -37,6 +39,6 @@ export class SettingsPage {
   }
 
   public logout(){
-    this.auth.logout(() => this.nav.setRoot(LoginPage));
+    //TODO: this.auth.logout(() => this.nav.setRoot(LoginPage));
   }
 }
diff --git a/Ionic2/src/services/auth.service.ts b/Ionic2/src/services/auth.service.ts
index 0861b02..02b758d 100644
--- a/Ionic2/src/services/auth.service.ts
+++ b/Ionic2/src/services/auth.service.ts
@@ -1,180 +1,180 @@
-import {Storage} from '@ionic/storage';
-import {AuthHttp, JwtHelper, tokenNotExpired} from 'angular2-jwt';
-import {Injectable, NgZone} from '@angular/core';
-import {Observable} from 'rxjs/Rx';
-import {Secret} from '../secrets/secret';
-import {UserInfoService} from './userInfo.service';
-
-@Injectable()
-export class AuthService {
-    public jwtHelper:JwtHelper;
-    public auth0:any;
-    public lock:any;
-    public local:Storage;
-    public zoneImpl:NgZone;
-
-  constructor(public authHttp: AuthHttp, public zone:NgZone, public userInfoService: UserInfoService) {
-    this.jwtHelper = new JwtHelper();
-    this.auth0 = new Auth0({clientID: Secret.AUTH0_CLIENT_ID, domain: Secret.AUTH0_DOMAIN});
-    this.lock = new Auth0Lock(Secret.AUTH0_CLIENT_ID, Secret.AUTH0_DOMAIN, {
-      auth: {
-        redirect: false,
-        params: {
-          scope: 'openid offline_access',
-        }
-      }
-    });
-    this.local = new Storage(LocalStorage);
-    this.refreshSubscription = undefined;
-    this.user = {};
-
-    this.userInfoService = userInfoService;
-    this.zoneImpl = zone;
-    // Check if there is a profile saved in local storage
-    this.local.get('profile').then(profile => {
-      this.user = JSON.parse(profile);
-    }).catch(error => {
-      console.log(error);
-    });
-
-    this.lock.on('authenticated', authResult => {
-      this.local.set('id_token', authResult.idToken);
-
-      // Fetch profile information
-      this.lock.getProfile(authResult.idToken, (error, profile) => {
-        if (error) {
-          // Handle error
-          alert(error);
-          return;
-        }
-
-        console.log(profile);
-
-        profile.user_metadata = profile.user_metadata || {};
-
-        if(this.userInfoService.getUserInfo(UserInfoService.PREF_USER_NAME) === ''){
-          //there is no user information stored, store the new info obtained from auth0
-          this.userInfoService.setUserInfo(UserInfoService.PREF_USER_NAME, profile.name);
-          this.userInfoService.setUserInfo(UserInfoService.PREF_USER_EMAIL, profile.email);
-          this.userInfoService.setUserInfo(UserInfoService.PREF_USER_AUTH_ID, profile.user_id);
-          this.userInfoService.setUserInfo(UserInfoService.PREF_USER_PICTURE_URL, profile.picture);
-        }
-
-        this.local.set('profile', JSON.stringify(profile));
-        this.user = profile;
-      });
-
-      this.lock.hide();
-
-      this.local.set('refresh_token', authResult.refreshToken);
-      this.zoneImpl.run(() => this.user = authResult.profile);
-
-      if(this.onAuthenticatedCallback != null){
-        this.onAuthenticatedCallback();
-      }
-    });
-
-  }
-
-  authenticated() {
-    // Check if there's an unexpired JWT
-    return tokenNotExpired();
-  }
-
-  login(onAuthenticatedCallback) {
-    // Show the Auth0 Lock widget
-    this.lock.show();
-    this.onAuthenticatedCallback = onAuthenticatedCallback;
-  }
-
-  logout(onLogOutCallback) {
-    this.onLogOutCallback = onLogOutCallback;
-    this.local.remove('profile');
-    this.local.remove('id_token');
-    this.local.remove('refresh_token');
-    this.userInfoService.setUserInfo(UserInfoService.PREF_USER_NAME, '');
-    this.userInfoService.setUserInfo(UserInfoService.PREF_USER_EMAIL, '');
-    this.userInfoService.setUserInfo(UserInfoService.PREF_USER_AUTH_ID, '');
-    this.userInfoService.setUserInfo(UserInfoService.PREF_USER_PICTURE_URL, '');
-    this.zoneImpl.run(() => this.user = null);
-    // Unschedule the token refresh
-    this.unscheduleRefresh();
-    if(this.onLogOutCallback != null){
-      this.onLogOutCallback();
-    }
-  }
-
-  scheduleRefresh() {
-    // If the user is authenticated, use the token stream
-    // provided by angular2-jwt and flatMap the token
-    let source = this.authHttp.tokenStream.flatMap(
-      token => {
-        // The delay to generate in this case is the difference
-        // between the expiry time and the issued at time
-        let jwtIat = this.jwtHelper.decodeToken(token).iat;
-        let jwtExp = this.jwtHelper.decodeToken(token).exp;
-        let iat = new Date(0);
-        let exp = new Date(0);
-
-        let delay = (exp.setUTCSeconds(jwtExp) - iat.setUTCSeconds(jwtIat));
-
-        return Observable.interval(delay);
-      });
-
-    this.refreshSubscription = source.subscribe(() => {
-      this.getNewJwt();
-    });
-  }
-
-startupTokenRefresh() {
-  // If the user is authenticated, use the token stream
-  // provided by angular2-jwt and flatMap the token
-  if (this.authenticated()) {
-    let source = this.authHttp.tokenStream.flatMap(
-      token => {
-        // Get the expiry time to generate
-        // a delay in milliseconds
-        let now = new Date().valueOf();
-        let jwtExp = this.jwtHelper.decodeToken(token).exp;
-        let exp = new Date(0);
-        exp.setUTCSeconds(jwtExp);
-        let delay = exp.valueOf() - now;
-
-        // Use the delay in a timer to
-        // run the refresh at the proper time
-        return Observable.timer(delay);
-      });
-
-      // Once the delay time from above is
-      // reached, get a new JWT and schedule
-      // additional refreshes
-      source.subscribe(() => {
-        this.getNewJwt();
-        this.scheduleRefresh();
-      });
-  }
-}
-
-unscheduleRefresh() {
-  // Unsubscribe fromt the refresh
-  if (this.refreshSubscription) {
-    console.log(this.refreshSubscription);
-    this.refreshSubscription.unsubscribe();
-  }
-}
-
-getNewJwt() {
-  // Get a new JWT from Auth0 using the refresh token saved
-  // in local storage
-  this.local.get('refresh_token').then(token => {
-    this.auth0.refreshToken(token, (err, delegationRequest) => {
-      if (err) {
-        alert(err);
-      }
-      this.local.set('id_token', delegationRequest.id_token);
-    });
-  }).catch(error => {
-    console.log(error);
-  });
- }
-}
+//TODO: import {Storage} from '@ionic/storage';
+// import {AuthHttp, JwtHelper, tokenNotExpired} from 'angular2-jwt';
+// import {Injectable, NgZone} from '@angular/core';
+// import {Observable} from 'rxjs/Rx';
+// import {Secret} from '../secrets/secret';
+// import {UserInfoService} from './userInfo.service';
+//
+// @Injectable()
+// export class AuthService {
+//     public jwtHelper:JwtHelper;
+//     public auth0:any;
+//     public lock:any;
+//     public local:Storage;
+//     public zoneImpl:NgZone;
+//
+//   constructor(public authHttp: AuthHttp, public zone:NgZone, public userInfoService: UserInfoService) {
+//     this.jwtHelper = new JwtHelper();
+//     this.auth0 = new Auth0({clientID: Secret.AUTH0_CLIENT_ID, domain: Secret.AUTH0_DOMAIN});
+//     this.lock = new Auth0Lock(Secret.AUTH0_CLIENT_ID, Secret.AUTH0_DOMAIN, {
+//       auth: {
+//         redirect: false,
+//         params: {
+//           scope: 'openid offline_access',
+//         }
+//       }
+//     });
+//     this.local = new Storage(LocalStorage);
+//     this.refreshSubscription = undefined;
+//     this.user = {};
+//
+//     this.userInfoService = userInfoService;
+//     this.zoneImpl = zone;
+//     // Check if there is a profile saved in local storage
+//     this.local.get('profile').then(profile => {
+//       this.user = JSON.parse(profile);
+//     }).catch(error => {
+//       console.log(error);
+//     });
+//
+//     this.lock.on('authenticated', authResult => {
+//       this.local.set('id_token', authResult.idToken);
+//
+//       // Fetch profile information
+//       this.lock.getProfile(authResult.idToken, (error, profile) => {
+//         if (error) {
+//           // Handle error
+//           alert(error);
+//           return;
+//         }
+//
+//         console.log(profile);
+//
+//         profile.user_metadata = profile.user_metadata || {};
+//
+//         if(this.userInfoService.getUserInfo(UserInfoService.PREF_USER_NAME) === ''){
+//           //there is no user information stored, store the new info obtained from auth0
+//           this.userInfoService.setUserInfo(UserInfoService.PREF_USER_NAME, profile.name);
+//           this.userInfoService.setUserInfo(UserInfoService.PREF_USER_EMAIL, profile.email);
+//           this.userInfoService.setUserInfo(UserInfoService.PREF_USER_AUTH_ID, profile.user_id);
+//           this.userInfoService.setUserInfo(UserInfoService.PREF_USER_PICTURE_URL, profile.picture);
+//         }
+//
+//         this.local.set('profile', JSON.stringify(profile));
+//         this.user = profile;
+//       });
+//
+//       this.lock.hide();
+//
+//       this.local.set('refresh_token', authResult.refreshToken);
+//       this.zoneImpl.run(() => this.user = authResult.profile);
+//
+//       if(this.onAuthenticatedCallback != null){
+//         this.onAuthenticatedCallback();
+//       }
+//     });
+//
+//   }
+//
+//   authenticated() {
+//     // Check if there's an unexpired JWT
+//     return tokenNotExpired();
+//   }
+//
+//   login(onAuthenticatedCallback) {
+//     // Show the Auth0 Lock widget
+//     this.lock.show();
+//     this.onAuthenticatedCallback = onAuthenticatedCallback;
+//   }
+//
+//   logout(onLogOutCallback) {
+//     this.onLogOutCallback = onLogOutCallback;
+//     this.local.remove('profile');
+//     this.local.remove('id_token');
+//     this.local.remove('refresh_token');
+//     this.userInfoService.setUserInfo(UserInfoService.PREF_USER_NAME, '');
+//     this.userInfoService.setUserInfo(UserInfoService.PREF_USER_EMAIL, '');
+//     this.userInfoService.setUserInfo(UserInfoService.PREF_USER_AUTH_ID, '');
+//     this.userInfoService.setUserInfo(UserInfoService.PREF_USER_PICTURE_URL, '');
+//     this.zoneImpl.run(() => this.user = null);
+//     // Unschedule the token refresh
+//     this.unscheduleRefresh();
+//     if(this.onLogOutCallback != null){
+//       this.onLogOutCallback();
+//     }
+//   }
+//
+//   scheduleRefresh() {
+//     // If the user is authenticated, use the token stream
+//     // provided by angular2-jwt and flatMap the token
+//     let source = this.authHttp.tokenStream.flatMap(
+//       token => {
+//         // The delay to generate in this case is the difference
+//         // between the expiry time and the issued at time
+//         let jwtIat = this.jwtHelper.decodeToken(token).iat;
+//         let jwtExp = this.jwtHelper.decodeToken(token).exp;
+//         let iat = new Date(0);
+//         let exp = new Date(0);
+//
+//         let delay = (exp.setUTCSeconds(jwtExp) - iat.setUTCSeconds(jwtIat));
+//
+//         return Observable.interval(delay);
+//       });
+//
+//     this.refreshSubscription = source.subscribe(() => {
+//       this.getNewJwt();
+//     });
+//   }
+//
+// startupTokenRefresh() {
+//   // If the user is authenticated, use the token stream
+//   // provided by angular2-jwt and flatMap the token
+//   if (this.authenticated()) {
+//     let source = this.authHttp.tokenStream.flatMap(
+//       token => {
+//         // Get the expiry time to generate
+//         // a delay in milliseconds
+//         let now = new Date().valueOf();
+//         let jwtExp = this.jwtHelper.decodeToken(token).exp;
+//         let exp = new Date(0);
+//         exp.setUTCSeconds(jwtExp);
+//         let delay = exp.valueOf() - now;
+//
+//         // Use the delay in a timer to
+//         // run the refresh at the proper time
+//         return Observable.timer(delay);
+//       });
+//
+//       // Once the delay time from above is
+//       // reached, get a new JWT and schedule
+//       // additional refreshes
+//       source.subscribe(() => {
+//         this.getNewJwt();
+//         this.scheduleRefresh();
+//       });
+//   }
+// }
+//
+// unscheduleRefresh() {
+//   // Unsubscribe fromt the refresh
+//   if (this.refreshSubscription) {
+//     console.log(this.refreshSubscription);
+//     this.refreshSubscription.unsubscribe();
+//   }
+// }
+//
+// getNewJwt() {
+//   // Get a new JWT from Auth0 using the refresh token saved
+//   // in local storage
+//   this.local.get('refresh_token').then(token => {
+//     this.auth0.refreshToken(token, (err, delegationRequest) => {
+//       if (err) {
+//         alert(err);
+//       }
+//       this.local.set('id_token', delegationRequest.id_token);
+//     });
+//   }).catch(error => {
+//     console.log(error);
+//   });
+//  }
+// }
diff --git a/Ionic2/src/services/contacts.service.ts b/Ionic2/src/services/contacts.service.ts
index 028b262..e42cabb 100644
--- a/Ionic2/src/services/contacts.service.ts
+++ b/Ionic2/src/services/contacts.service.ts
@@ -10,13 +10,13 @@ export class ContactsService {
     this.contacts = [];
 
     let cnt = new ContactModel('#1 Gregory', 'House', 'Head of Diagnostic @ PPT Hospital', 'Attended Hopkins University 1979-1984');
-    cnt.profileImage = 'build/img/hugh.png'
+    cnt.profileImage = 'assets/img/hugh.png'
     let cnt2 = new ContactModel('#2 Hugh', 'Laurie', 'Actor, Writer, Director, Author, etc.', 'Attended Selwyn College, Cambridge 1978 - 1984');
-    cnt2.profileImage = 'build/img/hugh.png'
+    cnt2.profileImage = 'assets/img/hugh.png'
     let cnt3 = new ContactModel('#3 Gregory', 'House', 'Head of Diagnostic @ PPT Hospital', 'Attended Hopkins University 1979-1984');
-    cnt3.profileImage = 'build/img/hugh.png'
+    cnt3.profileImage = 'assets/img/hugh.png'
     let cnt4 = new ContactModel('#4 Hugh', 'Laurie', 'Actor, Writer, Director, Author, etc.', 'Attended Selwyn College, Cambridge 1978 - 1984');
-    cnt4.profileImage = 'build/img/hugh.png'
+    cnt4.profileImage = 'assets/img/hugh.png'
 
     this.contacts.push(cnt);
     this.contacts.push(cnt2);