From 2a8fb745eaa8206c277e1216ce06d38cd2ca47b5 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 2 Oct 2017 12:44:34 +0800
Subject: [PATCH 01/23] Move assessment and submission [ISDK-75]

---
 src/services/assessment.service.ts | 160 ++++++++++++++++++++++++++---
 src/services/submission.service.ts |   3 +-
 2 files changed, 149 insertions(+), 14 deletions(-)

diff --git a/src/services/assessment.service.ts b/src/services/assessment.service.ts
index a8f7900c..859e35dd 100755
--- a/src/services/assessment.service.ts
+++ b/src/services/assessment.service.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
 import { RequestService } from '../shared/request/request.service';
-
+import { Http, Headers } from '@angular/http';
 import * as _ from 'lodash';
-
+// services
+import { CacheService } from '../shared/cache/cache.service';
 class Assessment {
   id: number;
   context_id: number;
@@ -15,6 +16,15 @@ class Answer {
   choices?: Array<any>;
 }
 
+export class questionsResult {
+  required: Boolean;
+  answer: any;
+  reviewerAnswer: {
+    answer: any;
+    comment: any;
+  };
+}
+
 export class ChoiceBase<T> {
   id: number;
   value?: number; // or choice id, usually same as "id" above
@@ -32,11 +42,12 @@ export class QuestionBase<T> {
   assessment_id: number;
   name: string;
   type: string;
-  file_type?: string;
-  audience: Array<any>;
+  description: string;
+  required: boolean;
+  audience: string | Array<any>;
+  file_type?: string | any;
   choices?: ChoiceBase<any>[];
   answer?: any;
-  required?: boolean;
   order?: string | number;
 
   constructor(id, assessment_id, name, type) {
@@ -55,8 +66,12 @@ export class Submission {
 
 @Injectable()
 export class AssessmentService {
-  constructor(private request: RequestService) {}
-
+  constructor(private cacheService: CacheService,
+              private request: RequestService,
+              private http: Http) {}
+  private prefixUrl: any = this.request.getPrefixUrl();
+  private appkey = this.request.getAppkey();
+  private assessment_url = 'api/assessments.json';
   /**
    * @description check feedback can show
    * @type {boolen}
@@ -268,9 +283,10 @@ export class AssessmentService {
    */
   public normaliseGroup(group) {
     // let result = group;
-    let thisQuestions = group.AssessmentGroupQuestion;
-    thisQuestions = thisQuestions.map(question => {
-      return this.normaliseQuestion(question);
+    let questions = group.AssessmentGroupQuestion;
+    let thisQuestions = [];
+    questions.forEach(question => {
+      thisQuestions.push(this.normaliseQuestion(question));
     });
 
     return {
@@ -283,6 +299,27 @@ export class AssessmentService {
     }
   }
 
+  /**
+   * filter submission by:
+   * - "submitter" as audience
+   * - "submitter" as audience && status as "published"
+   * @name isAccessible
+   * @param {object} question Single normalised assessment
+   *                            object from this.normalise above
+   */
+  public isAccessible(question, status) {
+    let result = true;
+    if (question.audience.indexOf('submitter') === -1) {
+      result = false;
+    }
+
+    if (result && status === 'published') {
+      result = false;
+    }
+
+    return result;
+  }
+
   /*
     turn "AssessmentGroupQuestion" array format from:
     {
@@ -326,18 +363,19 @@ export class AssessmentService {
     });
 
     return {
-      id: question.id,
+      id: question.id, // unknown purpose (be careful with this id)
       assessment_id: question.assessment_question_id,
-      question_id: question.assessment_question_id,
+      question_id: question.assessment_question_id, // use this to indicate question
       group_id: question.assessment_group_id,
       name: thisQuestion.name,
       type: thisQuestion.question_type,
       audience: thisQuestion.audience,
+      description: thisQuestion.description,
       file_type: thisQuestion.file_type,
       required: thisQuestion.is_required,
       choices: choices,
       order: question.order,
-      answer: thisQuestion.answer
+      answer: thisQuestion.answer,
     };
   }
 
@@ -379,4 +417,100 @@ export class AssessmentService {
       weight: choice.weight
     };
   }
+
+  /**
+   * hardcode communication to different server
+   * @param {[type]} assessment_id [description]
+   */
+  public getPostProgramAssessment(assessment_id) {
+    // let url = `${this.prefixUrl}api/assessments.json?assessment_id=${assessment_id}&structured=true`;
+    // let headers = new Headers();
+    // headers.append('appkey', this.appkey);
+    // headers.append('apikey', this.cacheService.getLocalObject('apikey'));
+    // headers.append('timelineID', this.cacheService.getLocalObject('timelineID'));
+    return this.request.get(`api/assessments.json?assessment_id=${assessment_id}&structured=true`);
+  }
+
+  // helpers
+  public getStatus(questionsResult, submissionResult): string {
+    let questionsStatus = [];
+    _.forEach(questionsResult, q => {
+      if (q.required && q.answer !== null) {
+        if (
+          q.reviewerAnswer !== null &&
+          submissionResult.status !== 'pending approval' &&
+          (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
+        ) {
+          questionsStatus.push('reviewed');
+        } else {
+          questionsStatus.push('completed');
+        }
+      }
+
+      if (!q.required && q.answer !== null) {
+        if (
+          q.reviewerAnswer !== null &&
+          submissionResult.status !== 'pending approval' &&
+          (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
+        ) {
+          questionsStatus.push('reviewed');
+        } else {
+          questionsStatus.push('completed');
+        }
+      }
+
+      if (q.answer === null) {
+        questionsStatus.push('incomplete');
+      }
+    });
+
+    // get final status by checking all questions' statuses
+    let status = 'incomplete';
+    if (_.every(questionsStatus, (v) => {
+      return (v === 'completed');
+    })) {
+      status = 'completed';
+    }
+    if (_.includes(questionsStatus, 'reviewed')) {
+      status = 'reviewed';
+    }
+
+    return status;
+  }
+
+  public getSummaries(questionsResult: Array<questionsResult>) {
+    let totalRequiredQuestions = 0;
+    let answeredQuestions = 0;
+    let reviewerFeedback = 0;
+
+    _.forEach(questionsResult, (q) => {
+      // get total number of questions
+      if (q.required) {
+        totalRequiredQuestions += 1;
+      }
+
+      // get total number of answered questions
+      if (q.required && q.answer && q.answer !== null) {
+        answeredQuestions += 1;
+      }
+
+      // get total number of feedback
+      // If API response, the reviewer's answer and comment are empty,
+      // front-end don't consider it as a feedback
+      if (
+        q.reviewerAnswer &&
+        q.reviewerAnswer !== null &&
+        !_.isEmpty(q.reviewerAnswer.answer) &&
+        !_.isEmpty(q.reviewerAnswer.comment)
+      ) {
+        reviewerFeedback += 1;
+      }
+    });
+
+    return {
+      totalRequiredQuestions,
+      answeredQuestions,
+      reviewerFeedback
+    };
+  }
 }
diff --git a/src/services/submission.service.ts b/src/services/submission.service.ts
index 9371f079..47574abb 100755
--- a/src/services/submission.service.ts
+++ b/src/services/submission.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { RequestService } from '../shared/request/request.service';
+import { Observable } from 'rxjs/Observable';
 
 import * as _ from 'lodash';
 import * as moment from 'moment';
@@ -211,7 +212,7 @@ export class SubmissionService {
    * extract reference IDs and prepare Observables to retrieve submissions
    * @param {array} references References array responded with get_activities() api
    */
-  public getSubmissionsByReferences(references) {
+  public getSubmissionsByReferences(references: Array<{context_id : Number}>): Array<Observable<any>> {
     let tasks = []; // multiple API requests
 
     // get_submissions API to retrieve submitted answer

From e4a11c033d220d8b2846e35dc800e211915f1b96 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 2 Oct 2017 16:53:48 +0800
Subject: [PATCH 02/23] Fix render error problem [ISDK-75]

---
 .../assessments/group/assessments-group.html  |  21 +-
 .../group/assessments-group.page.ts           | 227 ++++++++----------
 2 files changed, 108 insertions(+), 140 deletions(-)

diff --git a/src/pages/assessments/group/assessments-group.html b/src/pages/assessments/group/assessments-group.html
index 43f8bcd9..dc0b3ad5 100644
--- a/src/pages/assessments/group/assessments-group.html
+++ b/src/pages/assessments/group/assessments-group.html
@@ -16,12 +16,13 @@
     </ion-list-header>
   </ion-list>
 
-  <ion-list text-wrap *ngIf="assessmentGroup">
+  <ion-list text-wrap *ngIf="assessmentGroup" class="assessments-group-text">
     <h6 class="strong center">{{assessmentGroup.name}}</h6>
-    <p [innerHTML]="assessment.description"></p>
+    <div [innerHTML]="assessmentGroup.description| keepHtml"></div>
   </ion-list>
 
   <div *ngFor="let question of questions; let i = index;"
+    class="assessments-group-text"
     [ngSwitch]="question.type"
     [ngClass]="{'hr': (i > 0 && i < questions.length)}">
 
@@ -30,43 +31,39 @@ <h6 class="strong center">{{assessmentGroup.name}}</h6>
       <span *ngIf="question.required" class="red">*</span>
     </ion-list>
 
-    <ion-item text-wrap *ngIf="question.description">
+    <ion-item text-wrap *ngIf="question.description" class="description">
       <p [innerHtml]="question.description"></p>
     </ion-item>
 
-    <div *ngFor="let submission of submissions">
-      <pre>{{ submission | json }}</pre>
-    </div>
-
     <!-- type: oneOf -->
     <oneof-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'oneof'"></oneof-question>
 
     <!-- type: oneOf -->
     <multiple-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'multiple'"></multiple-question>
 
     <!-- type: file -->
     <file-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'file'"></file-question>
 
     <!-- type: text -->
     <text-question
       [question]="question"
-      [form]="formGroup[question.id]"
+      [form]="formGroup[question.question_id]"
       [disabled]="!canUpdateInput"
       *ngSwitchCase="'text'"></text-question>
 
     <!-- Reviewer's answer and comment -->
-    <feedback [question]="question" *ngIf="question.review_answer"></feedback>
+    <feedback [question]="question" *ngIf="question.review_answer" class="feedback"></feedback>
   </div>
 </ion-content>
diff --git a/src/pages/assessments/group/assessments-group.page.ts b/src/pages/assessments/group/assessments-group.page.ts
index 7f434f9f..d868be9d 100644
--- a/src/pages/assessments/group/assessments-group.page.ts
+++ b/src/pages/assessments/group/assessments-group.page.ts
@@ -1,16 +1,15 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { NavParams, NavController, AlertController, LoadingController, Events } from 'ionic-angular';
 import { FormBuilder, Validators, FormGroup, FormControl, FormArray } from '@angular/forms';
 import { CacheService } from '../../../shared/cache/cache.service';
 import { ChoiceBase, QuestionBase, Submission, AssessmentService } from '../../../services/assessment.service';
 
 import * as _ from 'lodash';
-
 @Component({
   selector: 'assessments-group-page',
   templateUrl: './assessments-group.html',
 })
-export class AssessmentsGroupPage {
+export class AssessmentsGroupPage implements OnInit {
   questions = [];
   formGroup;
 
@@ -40,7 +39,7 @@ export class AssessmentsGroupPage {
     public events: Events
   ) {}
 
-  ionViewDidEnter() {
+  ngOnInit() {
     // navigate from activity page
     this.activity = this.navParams.get('activity') || {};
 
@@ -49,15 +48,15 @@ export class AssessmentsGroupPage {
     if (!_.isEmpty(this.event)) {
       this.activity = this.event;
     }
+  }
 
-    this.assessment = this.activity.assessment; // required for context_id
-    this.cacheKey = `assessment.group.${this.assessment.context_id}`;
+  ionViewDidEnter() {
+    // use assessment object from activity (required for extracting context_id)
+    this.assessment = this.activity.assessment;
 
+    this.cacheKey = `assessment.group.${this.assessment.context_id}`;
     this.assessmentGroup = this.navParams.get('assessmentGroup') || {};
     this.submission = this.navParams.get('submission') || {};
-
-    console.log('this.assessmentGroup', this.assessmentGroup);
-
     // preset key used for caching later (locally and remote data)
     this.canUpdateInput = this.isInputEditable(this.submission);
     // this.published = this.assessmentService.isPublished(this.submissions);
@@ -69,6 +68,10 @@ export class AssessmentsGroupPage {
     );
   }
 
+  /**
+   * @name updateSubmission
+   * @description trace changes of input for assessment (to avoid extra checking logics)
+   */
   updateSubmission() {
     this.events.publish('assessment:changes', {
       changed: true
@@ -86,22 +89,6 @@ export class AssessmentsGroupPage {
        return true;
      }
      return false;
-    //  let editable = false;
-    //  _.forEach(this.submissions, (submission) => {
-    //    if (_.isEmpty(submission)) {
-    //      editable = true;
-    //    } else {
-    //      _.forEach(submission, (subm) => {
-    //        if (
-    //          subm.AssessmentSubmission &&
-    //          subm.AssessmentSubmission.status === 'in progress'
-    //        ) {
-    //          editable = true;
-    //        }
-    //      });
-    //    }
-    //  });
-    //  return editable;
    }
 
   /**
@@ -116,24 +103,32 @@ export class AssessmentsGroupPage {
     }
 
     _.forEach(submission.review, (review) => {
+
       _.forEach(questions, (question, idx) => {
-        if (review.assessment_question_id === question.id) {
-          // text type
+        if (review.assessment_question_id === question.question_id) {
+          // text type (no merging, text question displayed in plain text)
           if (question.type === 'text') {
             questions[idx].review_answer = review;
           }
 
           // oneof type
+          // combine question, when answered by both reviewer and submitter
           if (question.type === 'oneof') {
             questions[idx].review_answer = review;
+            let submitterAnswer = question.answer;
+
             _.forEach(question.choices, (choice, key) => {
-              if (choice.id == review.answer && choice.id == question.answer.answer) {
-                questions[idx].choices[key].name = choice.name + ' (you and reviewer)';
-              }
-              if (choice.id != review.answer && choice.id == question.answer.answer) {
-                questions[idx].choices[key].name = choice.name + ' (you)';
-              }
-              if (choice.id == review.answer && choice.id != question.answer.answer) {
+              if (!_.isEmpty(submitterAnswer)) {
+                if (choice.id == review.answer && choice.id == submitterAnswer.answer) {
+                  questions[idx].choices[key].name = choice.name + ' (you and reviewer)';
+                }
+                else if (choice.id != review.answer && choice.id == submitterAnswer.answer) {
+                  questions[idx].choices[key].name = choice.name + ' (you)';
+                }
+                else if (choice.id == review.answer && choice.id != submitterAnswer.answer) {
+                  questions[idx].choices[key].name = choice.name + ' (reviewer)';
+                }
+              } else if (choice.id == review.answer) { // display reviewer answer
                 questions[idx].choices[key].name = choice.name + ' (reviewer)';
               }
             });
@@ -142,39 +137,6 @@ export class AssessmentsGroupPage {
       });
     });
 
-    // _.forEach(submissions, (submission) => {
-    //   _.forEach(submission, (subm) => {
-    //
-    //     _.forEach(subm.AssessmentReviewAnswer, (reviewAnswer) => {
-    //       _.forEach(questions, (question, idx) => {
-    //
-    //         if (reviewAnswer.assessment_question_id === question.id) {
-    //           // text type
-    //           if (question.type === 'text') {
-    //             questions[idx].review_answer = reviewAnswer;
-    //           }
-    //
-    //           // oneof type
-    //           if (question.type === 'oneof') {
-    //             questions[idx].review_answer = reviewAnswer;
-    //             _.forEach(question.choices, (choice, key) => {
-    //               if (choice.id == reviewAnswer.answer && choice.id == question.answer.answer) {
-    //                 questions[idx].choices[key].name = choice.name + ' (you and reviewer)';
-    //               }
-    //               if (choice.id != reviewAnswer.answer && choice.id == question.answer.answer) {
-    //                 questions[idx].choices[key].name = choice.name + ' (you)';
-    //               }
-    //               if (choice.id == reviewAnswer.answer && choice.id != question.answer.answer) {
-    //                 questions[idx].choices[key].name = choice.name + ' (reviewer)';
-    //               }
-    //             });
-    //           }
-    //         }
-    //
-    //       });
-    //     });
-    //   });
-    // });
     return questions;
   }
 
@@ -236,7 +198,14 @@ export class AssessmentsGroupPage {
         group['choices'] = new FormGroup(choices);
       }
 
-      result[question.id] = new FormGroup(group);
+      /**
+       * id and question_id are different id
+       * - id =  has no obvious purpose
+       * - question_id must be used as id for submission
+       *
+       * but for case like this just for index id
+       */
+      result[question.question_id] = new FormGroup(group);
     });
 
     return result;
@@ -262,22 +231,31 @@ export class AssessmentsGroupPage {
 
     return {
       Assessment: {
-          id: submission.assessment_id,
-          context_id: this.getSubmissionContext()
+        id: submission.assessment_id,
+        context_id: this.getSubmissionContext()
       },
       AssessmentSubmissionAnswer: answers
     };
   }
 
   /**
-   * @description store assessment answer/progress locally
+   * @name storeProgress
+   * @description store assessment answer/progress locally (offline)
+   * @example format for cached submission
+   *          {
+   *            Assessment: {
+   *                id: 1,
+   *                context_id: 2
+   *            },
+   *            AssessmentSubmissionAnswer: Array<Submission>
+   *          }
    */
   storeProgress = () => {
     let answers = {};
-    _.forEach(this.formGroup, (question, id) => {
+    _.forEach(this.formGroup, (question, question_id) => {
       let values = question.getRawValue(),
           answer = {
-            assessment_question_id: id,
+            assessment_question_id: question_id,
             answer: values.answer || values.comment,
 
             // store it if choice answer is available or skip
@@ -286,7 +264,7 @@ export class AssessmentsGroupPage {
 
       // set empty string to remove answer
       answer.answer = (answer.answer) ? answer.answer : '';
-      answers[id] = answer;
+      answers[question_id] = answer;
     });
 
     // final step - store submission locally
@@ -308,18 +286,17 @@ export class AssessmentsGroupPage {
    * @description retrieve saved progress from localStorage
    */
   retrieveProgress = (questions: Array<any>, answers?) => {
-    let cachedProgress = answers || {}; //this.cache.getLocalObject(this.cacheKey);
-
-    let newQuestions = questions;
-    let savedProgress = cachedProgress.AssessmentSubmissionAnswer;
+    let cachedProgress = answers || {},
+        newQuestions = questions,
+        savedProgress = cachedProgress.AssessmentSubmissionAnswer;
 
     if (!_.isEmpty(savedProgress)) {
 
-      // index "id" is set as question.id in @Function buildFormGroup above
-      _.forEach(newQuestions, (question, id) => {
+      // index "id" is set as question.question_id in @Function buildFormGroup above
+      _.forEach(newQuestions, (question, question_id) => {
         // check integrity of saved answer (question might get updated)
-        if (savedProgress[id] && savedProgress[id].assessment_question_id == id) {
-          newQuestions[id] = this.setValueWith(question, savedProgress[id]);
+        if (savedProgress[question_id] && savedProgress[question_id].assessment_question_id == question_id) {
+          newQuestions[question_id] = this.setValueWith(question, savedProgress[question_id]);
         }
       });
     }
@@ -347,58 +324,52 @@ export class AssessmentsGroupPage {
   }
 
   /**
-   * @description initiate save progress and return to previous page/navigation stack
+   * @name save
+   * @description save input (partially post submission) and
+   *              return to previous navigation stack
    */
   save() {
     let self = this,
-    loading = this.loadingCtrl.create({
-      content: 'Loading...'
-    }),
-    // to provide a more descriptive error message (if available)
-    failAlert = this.alertCtrl.create({
-      title: 'Fail to submit.'
-    });
-
-    let saveProgress = () => {
-      this.updateSubmission();
-
-      loading.present().then(() => {
-        self.assessmentService.save(self.storeProgress()).subscribe(
-          response => {
-            loading.dismiss().then(() => {
-              self.navCtrl.pop();
-            });
-          },
-          reject => {
-            loading.dismiss().then(() => {
-              failAlert.data.title = reject.msg || failAlert.data.title;
-              failAlert.present().then(() => {
-                console.log('Unable to save', reject);
+      loading = this.loadingCtrl.create({
+        content: 'Loading...'
+      }),
+      // to provide a more descriptive error message (if available)
+      failAlert = this.alertCtrl.create({
+        title: 'Fail to submit.'
+      }),
+      saveProgress = () => {
+        this.updateSubmission();
+
+        loading.present().then(() => {
+          self.assessmentService.save(self.storeProgress()).subscribe(
+            response => {
+              loading.dismiss().then(() => {
+                self.navCtrl.pop();
               });
-            });
-          }
-        );
+            },
+            reject => {
+              loading.dismiss().then(() => {
+                failAlert.data.title = reject.msg || failAlert.data.title;
+                failAlert.present().then(() => {
+                  console.log('Unable to save', reject);
+                });
+              });
+            }
+          );
+        });
+      },
+      confirmBox = this.alertCtrl.create({
+        message: 'You have not completed all required questions. Do you still wish to Save?',
+        buttons: [
+          {
+            text: 'Yes',
+            handler: saveProgress
+          },
+          'No'
+        ]
       });
-    };
-
-    let confirmBox = this.alertCtrl.create({
-      message: 'You have not completed all required questions. Do you still wish to Save?',
-      buttons: [
-        {
-          text: 'Yes',
-          handler: () => {
-            saveProgress();
-          }
-        },
-        {
-          text: 'No',
-          handler: () => {
-            //return false;
-          }
-        }
-      ]
-    });
 
+    // has all compulsory questions answered?
     if (!this.isAllQuestionsAnswered()) {
       confirmBox.present();
     } else {

From 4d80266904c7f6acb897dd148e0ab33b457d3609 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 2 Oct 2017 17:04:59 +0800
Subject: [PATCH 03/23] Fix problem unable to submit [ISDK-75]

---
 src/pages/assessments/assessments.html    |  10 +-
 src/pages/assessments/assessments.page.ts | 503 ++++++++++------------
 2 files changed, 234 insertions(+), 279 deletions(-)

diff --git a/src/pages/assessments/assessments.html b/src/pages/assessments/assessments.html
index 02d56f6b..bb0fe09f 100644
--- a/src/pages/assessments/assessments.html
+++ b/src/pages/assessments/assessments.html
@@ -1,7 +1,6 @@
 <ion-header>
   <ion-navbar>
     <ion-title></ion-title>
-
     <ion-buttons end>
       <button ion-button (click)="clickSubmit()" class="btn-submit" *ngIf="allowSubmit">
         {{ 'GENERAL.SUBMIT' | translate }}
@@ -9,18 +8,15 @@
     </ion-buttons>
   </ion-navbar>
 </ion-header>
-<ion-content class="assessments-list">
-
+<ion-content>
   <div *ngFor="let assessmentGroup of assessmentGroups; let i = index">
     <div *ngFor="let assessment of assessmentGroup; let j = index">
-
       <ion-card *ngIf="assessment.description" class="no-box-shadow">
         <ion-card-content>
-          <h2 class="text-center">{{ assessment.name }}</h2>
-          <div [innerHTML]="assessment.description"></div>
+          <h2 class="text-center assessment-title">{{ assessment.name }}</h2>
+          <p [innerHTML]="assessment.description" class="assessment-description"></p>
         </ion-card-content>
       </ion-card>
-
       <questionGroup
         *ngFor="let group of assessment.AssessmentGroup; let q = index"
         [group]="group"
diff --git a/src/pages/assessments/assessments.page.ts b/src/pages/assessments/assessments.page.ts
index 0e93a8ae..12e34d29 100644
--- a/src/pages/assessments/assessments.page.ts
+++ b/src/pages/assessments/assessments.page.ts
@@ -14,7 +14,6 @@ import { Observable } from 'rxjs/Observable';
 //services
 import { AssessmentService } from '../../services/assessment.service';
 import { CacheService } from '../../shared/cache/cache.service';
-import { CharacterService } from '../../services/character.service';
 import { GameService } from '../../services/game.service';
 import { SubmissionService } from '../../services/submission.service';
 import { TranslationService } from '../../shared/translation/translation.service';
@@ -64,7 +63,6 @@ export class AssessmentsPage {
     private loadingCtrl: LoadingController,
     public modalCtrl: ModalController,
     private assessmentService: AssessmentService,
-    private characterService: CharacterService,
     private cacheService: CacheService,
     private gameService: GameService,
     private submissionService: SubmissionService,
@@ -75,21 +73,15 @@ export class AssessmentsPage {
     if (!this.activity) {
       throw "Fatal Error: Activity not available";
     }
-
-    console.log('this.activity', this.activity);
   }
 
   ionViewWillEnter() {
-
     let loader = this.loadingCtrl.create();
     loader.present().then(() => {
       this.loadQuestions()
       .then(() => {
         loader.dismiss();
-      }, err => {
-        console.log('log::', err);
-      })
-      .catch((err) => {
+      }).catch(err => {
         console.log(err);
         loader.dismiss();
       });
@@ -109,138 +101,97 @@ export class AssessmentsPage {
    * @description mapping assessments and submissions
    * @param {Object} submissions submissions
    * @param {Object} assessments assessments
+   * @returns {Array} objects of compiled assessment + submissions
    */
-  mapSubmissionsToAssessment(submissions, assessments) {
-    _.forEach(assessments, (group, i) => {
-      _.forEach(group, (assessment, j) => {
-
-        // normalise
-        assessments[i][j] = assessment = this.assessmentService.normalise(assessment);
-        console.log('assessment', assessment);
-
-        _.forEach(assessment.AssessmentGroup, (assessmentGroup, k) => {
-          _.forEach(assessmentGroup.questions, (question, l) => {
-            // Inject empty answer fields
-            // We will know thare are no submission when it is null
-            assessments[i][j].AssessmentGroup[k].questions[l].answer = null;
-            assessments[i][j].AssessmentGroup[k].questions[l].reviewerAnswer = null;
+  mapSubmissionsToAssessment(submissions, assessmentsBatch) {
+    let result = [];
+
+    _.forEach(assessmentsBatch, (batch, i) => {
+
+      let assessmentResult = [];
+      _.forEach(batch, (assessment, j) => {
+        // normalised
+        let normalised = this.assessmentService.normalise(assessment);
+
+        // groups
+        let assessmentGroupResult = [];
+        _.forEach(normalised.AssessmentGroup, assessmentGroup => {
+          // questions
+          let questionsResult = [];
+          let submissionResult : any = {};
+          _.forEach(assessmentGroup.questions, question => {
+            // force answers as null by default (for checkings)
+            let questionResult : any = {
+              answer: null,
+              reviewerAnswer: null
+            };
 
             // find submission
             _.forEach(submissions, (submission) => {
               // attach existing submission to assessment group it belongs to
-              let group = this.assessmentGroups[i][j].AssessmentGroup[k];
-              if (group.assessment_id === submission.assessment_id) {
-                this.assessmentGroups[i][j].AssessmentGroup[k].submission = submission;
+              if (assessmentGroup.assessment_id === submission.assessment_id) {
+                submissionResult = submission;
               }
 
               // find user answer
               _.forEach(submission.answer, (answer) => {
-                if (answer.assessment_question_id === question.id) {
-                  assessments[i][j].AssessmentGroup[k].questions[l].answer = answer;
+                if (answer.assessment_question_id === question.question_id) {
+                  questionResult.answer = answer;
                 }
               });
 
               // find reviewer feedback
               _.forEach(submission.review, (reviewerAnswer) => {
-                if (reviewerAnswer.assessment_question_id === question.id) {
-                  assessments[i][j].AssessmentGroup[k].questions[l].reviewerAnswer = reviewerAnswer;
+                if (reviewerAnswer.assessment_question_id === question.question_id) {
+                  questionResult.reviewerAnswer = reviewerAnswer;
                 }
               });
             });
 
-          });
-
-          // Summarise basic answer information
-          // get total number of questions
-          assessments[i][j].AssessmentGroup[k].totalRequiredQuestions = 0;
-          _.forEach(assessmentGroup.questions, (q) => {
-            if (q.required) {
-              assessments[i][j].AssessmentGroup[k].totalRequiredQuestions += 1;
+            // set assessmentGroup as accessible (submitter has no permission to view)
+            if (this.isAccessibleBySubmitter(question, submissionResult.status)) {
+              assessmentGroup.accessible = true;
+              questionsResult.push(Object.assign(question, questionResult));
             }
           });
 
-          // get total number of answered questions
-          assessments[i][j].AssessmentGroup[k].answeredQuestions = 0;
-          _.forEach(assessmentGroup.questions, (q) => {
-            if (q.required && q.answer && q.answer !== null) {
-              assessments[i][j].AssessmentGroup[k].answeredQuestions += 1;
-            }
-          });
-
-          // get total number of feedback
-          assessments[i][j].AssessmentGroup[k].reviewerFeedback = 0;
-          _.forEach(assessmentGroup.questions, (q) => {
-            // If API response, the reviewer's answer and comment are empty,
-            // front-end don't consider it as a feedback
-            if (
-              q.reviewerAnswer &&
-              q.reviewerAnswer !== null &&
-              !_.isEmpty(q.reviewerAnswer.answer) &&
-              !_.isEmpty(q.reviewerAnswer.comment)
-            ) {
-              assessments[i][j].AssessmentGroup[k].reviewerFeedback += 1;
-            }
-          });
-
-          // Set status
-          // let status = assessments[i][j].AssessmentGroup[k].status = 'incomplete';
-          let questionsStatus = [];
-          _.forEach(assessmentGroup.questions, (q) => {
-            if (q.required && q.answer !== null) {
-              if (
-                q.reviewerAnswer !== null &&
-                assessmentGroup.submission.status !== 'pending approval' &&
-                (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
-              ) {
-                questionsStatus.push('reviewed');
-              } else {
-                questionsStatus.push('completed');
-              }
-            }
+          let summaries = this.assessmentService.getSummaries(questionsResult);
+          if (assessmentGroup.accessible) {
+            assessmentGroupResult.push(Object.assign(assessmentGroup, {
+              questions: questionsResult,
+              submission: submissionResult,
+              totalRequiredQuestions: summaries.totalRequiredQuestions,
+              answeredQuestions: summaries.answeredQuestions,
+              reviewerFeedback: summaries.reviewerFeedback,
+              status: this.assessmentService.getStatus(questionsResult, submissionResult)
+            }));
+          }
+        });
 
-            if (!q.required && q.answer !== null) {
-              if (
-                q.reviewerAnswer !== null &&
-                assessmentGroup.submission.status !== 'pending approval' &&
-                (q.reviewerAnswer.answer || q.reviewerAnswer.comment)
-              ) {
-                questionsStatus.push('reviewed');
-              } else {
-                questionsStatus.push('completed');
-              }
-            }
+        normalised.AssessmentGroup = assessmentGroupResult;
+        assessmentResult.push(normalised);
+      });
 
-            if (q.answer === null) {
-              questionsStatus.push('incomplete');
-            }
+      result.push(assessmentResult);
+    });
 
-            // if (q.required && q.answer === null) {
-            //   questionsStatus.push('incomplete');
-            // }
-            //
-            // if (!q.required && q.answer === null) {
-            //   questionsStatus.push('completed');
-            // }
-          });
+    return result;
+  }
 
-          console.log('questionsStatus', questionsStatus);
+  // filter question by condition (submitter cannot view reviewer question before it is published/reviewed)
+  isAccessibleBySubmitter(question, submissionStatus: string) {
+    let accessible = true;
+    let submitterAllowed = false;
 
-          assessments[i][j].AssessmentGroup[k].status = 'incomplete';
-          if (_.every(questionsStatus, (v) => {
-            return (v === 'completed');
-          })) {
-            assessments[i][j].AssessmentGroup[k].status = 'completed';
-          }
-          if (_.includes(questionsStatus, 'reviewed')) {
-            assessments[i][j].AssessmentGroup[k].status = 'reviewed';
-          }
-        });
+    if (question.audience.indexOf('submitter') !== -1) {
+      submitterAllowed = true;
+    }
 
-        console.log('assessment 2', assessment);
-      });
-    });
+    if (!submitterAllowed && submissionStatus !== 'published') {
+      accessible = false;
+    }
 
-    return assessments;
+    return accessible;
   }
 
   /**
@@ -258,49 +209,29 @@ export class AssessmentsPage {
           this.activity.References
         ))
         .subscribe(allSubmissions => {
-          // allSubmissions - response format: [ // context_ids
-          //   [ // assessment group 1
-          //     assessment1,
-          //     assessment2,
-          //     ...
-          //   ],
-          //   [ // assessment group 2
-          //     assessment1,
-          //     assessment2,
-          //     ...
-          //   ],
-          //   ...
-          // ]
+          /** allSubmissions - response format:
+           *  [ // context_ids
+           *    [ // assessment group 1
+           *      assessment1,
+           *      assessment2,
+           *      ...
+           *    ],
+           *    [ // assessment group 2
+           *      assessment1,
+           *      assessment2,
+           *      ...
+           *    ],
+           *    ...
+           *  ]
+           */
           let submissions = [];
           _.forEach(allSubmissions, group => {
-            _.forEach(group, (submission) => {
+            _.forEach(group, submission => {
                 submissions.push(this.submissionService.normalise(submission));
             });
           });
 
-          // check if a submission is specified
-          let currentSubmission = this.navParams.get('currentSubmission');
-          let filteredSubmissions = [];
-
-          submissions.forEach(subm => {
-            if (currentSubmission && currentSubmission.id === subm.id) {
-              filteredSubmissions.push(subm);
-            }
-          });
-          let hasInProgress = _.find(submissions, {status: 'in progress'}); // "in progress" never > 1
-          let isNew = (!currentSubmission && (filteredSubmissions.length === 0 || !_.isEmpty(hasInProgress)));
-
-          if (isNew) { // new submission
-            this.submissions = !_.isEmpty(hasInProgress) ? [hasInProgress] : [];
-          } else if (!isNew && hasInProgress) { // resume "in progress"
-            filteredSubmissions.push(hasInProgress);
-            this.submissions = filteredSubmissions;
-          } else if (currentSubmission) { // display current submission
-            filteredSubmissions.push(currentSubmission);
-            this.submissions = filteredSubmissions;
-          }
-
-          console.log('this.submissions', this.submissions);
+          this.submissions = this.filterSubmissions(submissions);
           resolve(submissions);
         }, err => {
           console.log('err', err);
@@ -309,39 +240,84 @@ export class AssessmentsPage {
     });
   }
 
-  loadQuestions(): Promise<any> {
-    return new Promise((resolve, reject) => {
+  private filterSubmissions(submissions) {
+    let results = []; // filtered submissions
 
-      // get_assessments request with "assessment_id" & "structured"
-      let getAssessment = (assessmentId) => {
-        return this.assessmentService.getAll({
-          search: {
-            assessment_id: assessmentId,
-            structured: true
-          }
-        });
-      };
+    // check if a submission is specified (from previous page, from NavParams)
+    let currentSubmission = this.navParams.get('currentSubmission');
 
-      // Congregation of assessment ids to fulfill get_assessments API's param requirement
-      let tasks = [];
-      _.forEach(this.activity.References, (reference) => {
-        if (
-          reference.Assessment &&
-          reference.Assessment.id
-        ) {
-          return tasks.push(getAssessment(reference.Assessment.id));
+    // filteredSubmission: store only submissions related to
+    // currentSubmission (if currentSubmission above exist)
+    let filteredSubmissions = [];
+    submissions.forEach(submission => {
+      if (currentSubmission && currentSubmission.id === submission.id) {
+        filteredSubmissions.push(submission);
+      }
+    });
+
+    // prepare statuses of submissions for different condition filtering (activity & event)
+    // Statuses: `in progress`, `done`
+
+    // "in progress" never > 1 (cuz "_.find" return only 1 found value)
+    let hasInProgress = _.find(submissions, {status: 'in progress'});
+    let isNew = (!currentSubmission && (filteredSubmissions.length === 0 || !_.isEmpty(hasInProgress)));
+    let isDone = _.find(submissions, {status: 'done'}); // "done" for view checkin
+    let isCheckin = (this.navParams.get('event') && isDone);
+
+
+    if (isCheckin) { // on event's view checkin, no status filtering required
+      results = submissions;
+    } else if (isNew) { // on new submission
+      results = !_.isEmpty(hasInProgress) ? [hasInProgress] : [];
+    } else if (!isNew && hasInProgress) { // on resume "in progress"
+      filteredSubmissions.push(hasInProgress);
+      results = filteredSubmissions;
+    } else if (currentSubmission) { // display current submission
+      filteredSubmissions.push(currentSubmission);
+      results = filteredSubmissions;
+    }
+
+    return results;
+  }
+
+  /**
+   * @name preStackTasks
+   * @description stack of tasks prepared to handle multiple activity references (ids)
+   */
+  preStackTasks() {
+    // get_assessments request with "assessment_id" & "structured"
+    let getAssessment = (assessmentId) => {
+      // @TODO: we might need to pass in submission id (if available) to get properly filtered assessmnet questions
+      return this.assessmentService.getAll({
+        search: {
+          assessment_id: assessmentId,
+          structured: true
         }
       });
+    };
+
+    let tasks: Array<any> = [];
+    // Congregate assessment ids for rxjs forkJoin (batch API requests)
+    _.forEach(this.activity.References, ref => {
+      if (ref.Assessment && ref.Assessment.id) {
+        tasks.push(getAssessment(ref.Assessment.id));
+      }
+    });
+
+    return tasks;
+  }
 
+  loadQuestions(): Promise<any> {
+    return new Promise((resolve, reject) => {
       /**
        * merging submission into question inside of assessment array objects
        * - set question statuses (quantity of total answered)
        * - set submission button status
        */
-      let preprocessAssessmentSubmission = () => {
+      let preprocessAssessmentSubmission = (assessments) => {
         this.assessmentGroups = this.mapSubmissionsToAssessment(
           this.submissions,
-          this.assessmentGroups
+          assessments
         );
 
         // Only allow submit when all required question have answered.
@@ -349,13 +325,10 @@ export class AssessmentsPage {
           _.forEach(groups, assessment => {
             let groupWithAnswers = 0;
             _.forEach(assessment.AssessmentGroup, group => {
-              // console.log('group.answeredQuestions', group.answeredQuestions);
-              // console.log('group.totalRequiredQuestions', group.totalRequiredQuestions);
               if (group.answeredQuestions >= group.totalRequiredQuestions) {
                 groupWithAnswers += 1;
               }
             });
-            // console.log('groupWithAnswers', groupWithAnswers, _.size(assessment.AssessmentGroup));
             if (groupWithAnswers >= _.size(assessment.AssessmentGroup)) {
               this.allowSubmit = true;
             }
@@ -379,37 +352,33 @@ export class AssessmentsPage {
         });
       };
 
-      // first batch API requests (get_assessments)
-      Observable.forkJoin(tasks)
-        .subscribe(
-          (assessments: any) => {
-            this.assessmentGroups = assessments;
-            this.submissions = this.navParams.get('submissions');
-
-            // check if this is from single submission view
-            let currentSubmission = this.navParams.get('currentSubmission');
-            if (currentSubmission) {
-              this.submissions = [currentSubmission];
-              console.log(this.navParams.get('currentSubmission'), this.submissions);
-            }
+      let setSubmissionAndAssessment = (assessments) => {
+        this.submissions = this.navParams.get('submissions');
 
-            // pull new when submission is updated or currentSubmission is empty
-            if (this.submissionUpdated || !currentSubmission) {
-              this.pullSubmissions().then(res => {
-                preprocessAssessmentSubmission();
-              }, err => {
-                reject(err);
-              });
-              this.submissionUpdated = false;
-            } else {
-              preprocessAssessmentSubmission();
-            }
-          },
-          (err) => {
-            console.log('err', err);
+        // check if this is from single submission view
+        let currentSubmission = this.navParams.get('currentSubmission');
+        if (currentSubmission) {
+          this.submissions = [currentSubmission];
+        }
+
+        // pull new when submission is updated or currentSubmission is empty
+        if (this.submissionUpdated || !currentSubmission) {
+          this.pullSubmissions().then(res => {
+            preprocessAssessmentSubmission(assessments);
+          }, err => {
             reject(err);
-          }
-        );
+          });
+          this.submissionUpdated = false;
+        } else {
+          preprocessAssessmentSubmission(assessments);
+        }
+      };
+
+      // first batch API requests (get_assessments)
+      Observable.forkJoin(this.preStackTasks())
+        .subscribe(setSubmissionAndAssessment, err => {
+          reject(err);
+        });
     });
   }
 
@@ -425,8 +394,8 @@ export class AssessmentsPage {
     loading.present().then(() => {
       let tasks = [];
       _.forEach(this.submissions, (submission) => {
-        console.log('submission', submission);
 
+          // @TODO: investigate what causes absent of assessment_id/id/context_id
           if (
             submission &&
             submission.assessment_id &&
@@ -475,7 +444,7 @@ export class AssessmentsPage {
 
   clickSubmit() {
     const confirm = this.alertCtrl.create({
-      title: 'Submit evidence',
+      title: 'Confirm Submission',
       message: this.submitConfirmMessage,
       buttons: [
         {
@@ -496,7 +465,7 @@ export class AssessmentsPage {
   }
 
   // items popup
-  popupAfterSubmit(){
+  popupAfterSubmit() {
     const loading = this.loadingCtrl.create({
       content: this.loadingMessages
     });
@@ -506,94 +475,84 @@ export class AssessmentsPage {
         {
           text: 'OK',
           handler: () => {
-            this.navCtrl.setRoot(ActivitiesListPage); // dashboard page
+            // Move to dashboard
+            this.navCtrl.parent.select(0);
+            // this.navCtrl.setRoot(ActivitiesListPage); // dashboard page
           }
         }
       ]
     });
 
     // get initial items
-    console.log('Inital Items: ', this.getInitialItems);
     _.forEach(this.getInitialItems, element => {
       let id = element.id;
-      console.log("id value: ", id);
       if(!this.initialItemsCount[id]){
         this.initialItemsCount[id] = 0;
       }
       this.initialItemsCount[id]++;
     });
-    console.log("Count for initial Items: ", this.initialItemsCount);
     // get latest updated items data api call
     loading.present();
 
     this.gameService.getItems({
       character_id: this.getCharacterID
-    })
-    .subscribe(
-      data => {
-        console.log("Items: ", data.Items);
-        this.newItemsData = data.Items;
-        _.forEach(data.Items, (element, index) => {
-          let id = element.id;
-          console.log("id value: ", id);
-          if(!this.newItemsCount[id]){
-            this.newItemsCount[id] = 0;
-          }
-          this.newItemsCount[id]++;
-        });
-        console.log("Count for final Items: ", this.newItemsCount);
-        // compare with previous get_characters() results and generate final index value array result
-        _.forEach(this.newItemsCount, (element, id) => {
-          if(!this.initialItemsCount[id]){
-            this.totalItems.push({ "count": element, "id": id });
-          }else {
-            let diffCountVal = element - this.initialItemsCount[id];
-            if(diffCountVal > 0){
-              this.totalItems.push({ "count": diffCountVal, "id": id });
+    }).subscribe(
+          data => {
+            this.newItemsData = data.Items;
+            _.forEach(data.Items, (element, index) => {
+              let id = element.id;
+              if(!this.newItemsCount[id]){
+                this.newItemsCount[id] = 0;
+              }
+              this.newItemsCount[id]++;
+            });
+            // compare with previous get_characters() results and generate final index value array result
+            _.forEach(this.newItemsCount, (element, id) => {
+              if(!this.initialItemsCount[id]){
+                this.totalItems.push({ "count": element, "id": id });
+              }else {
+                let diffCountVal = element - this.initialItemsCount[id];
+                if(diffCountVal > 0){
+                  this.totalItems.push({ "count": diffCountVal, "id": id });
+                }
+              }
+            });
+            _.forEach(this.totalItems, (element, index) => {
+              element.id = parseInt(element.id);
+            });
+            this.allItemsData = _.intersectionBy(this.newItemsData, this.totalItems, 'id');
+            // get the final object with item occurance count value
+            let groupData = _.groupBy(this.totalItems, 'id');
+            if(this.allItemsData.length === 0){
+              this.gotNewItems = false;
+              this.cacheService.setLocal('gotNewItems', this.gotNewItems);
+              loading.onDidDismiss(() => {
+                alert.present(); // redirect to dashboard page
+              });
+              loading.dismiss();
+            } else {
+              _.map(this.allItemsData, (ele) => {
+                this.combinedItems.push(_.extend({count: groupData[ele.id] || []}, ele))
+              });
+              // display items on dashboard page
+              this.gotNewItems = true;
+              this.cacheService.setLocal('gotNewItems', this.gotNewItems);
+              this.cacheService.setLocalObject('allNewItems', this.combinedItems);
+              loading.onDidDismiss(() => {
+                this.navCtrl.setRoot(ActivitiesListPage);
+              });
+              loading.dismiss();
             }
+          },
+          err => {
+            loading.dismiss().then(() => {
+              console.log("Err: ", err);
+            });
           }
-        });
-        console.log("New compared items: ", this.newItemsData);
-        _.forEach(this.totalItems, (element, index) => {
-          element.id = parseInt(element.id);
-        });
-        console.log("Count for new total Items: ", this.totalItems);
-        this.allItemsData = _.intersectionBy(this.newItemsData, this.totalItems, 'id');
-        console.log("Final items object data: ", this.allItemsData);
-        // get the final object with item occurance count value
-        let groupData = _.groupBy(this.totalItems, 'id');
-        console.log("Group?? ", groupData);
-        if(this.allItemsData.length === 0){
-          this.gotNewItems = false;
-          this.cacheService.setLocal('gotNewItems', this.gotNewItems);
-          loading.onDidDismiss(() => {
-            alert.present(); // redirect to dashboard page
-          });
-          loading.dismiss();
-        } else {
-          _.map(this.allItemsData, (ele) => {
-            this.combinedItems.push(_.extend({count: groupData[ele.id] || []}, ele))
-            console.log("Final Combined results: ", this.combinedItems);
-          });
-          // display items on dashboard page
-          this.gotNewItems = true;
-          this.cacheService.setLocal('gotNewItems', this.gotNewItems);
-          this.cacheService.setLocalObject('allNewItems', this.combinedItems);
-          loading.onDidDismiss(() => {
-            this.navCtrl.setRoot(ActivitiesListPage);
-          });
-          loading.dismiss();
-        }
-      },
-      err => {
-        loading.dismiss().then(() => {
-          console.log("Err: ", err);
-        });
-      }
-    );
+        );
   }
+
   gotoAssessment(assessmentGroup, activity) {
-    console.log('activity', activity);
     this.navCtrl.push(AssessmentsGroupPage, {
       assessmentGroup,
       activity,

From 435a0a51bd5b0d78abec668fe390f8f0c42e0440 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 2 Oct 2017 17:09:14 +0800
Subject: [PATCH 04/23] Changing declared classes (WIP) [ISDK-75]

---
 src/pages/assessments/assessments.page.ts             | 4 ++--
 src/pages/assessments/group/assessments-group.page.ts | 3 +--
 src/pages/assessments/popup/items-popup.page.ts       | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/pages/assessments/assessments.page.ts b/src/pages/assessments/assessments.page.ts
index 12e34d29..c208143a 100644
--- a/src/pages/assessments/assessments.page.ts
+++ b/src/pages/assessments/assessments.page.ts
@@ -61,13 +61,13 @@ export class AssessmentsPage {
     private alertCtrl: AlertController,
     private navCtrl: NavController,
     private loadingCtrl: LoadingController,
-    public modalCtrl: ModalController,
+    private modalCtrl: ModalController,
     private assessmentService: AssessmentService,
     private cacheService: CacheService,
     private gameService: GameService,
     private submissionService: SubmissionService,
     private translationService: TranslationService,
-    public events: Events
+    private events: Events
   ) {
     this.activity = this.navParams.get('activity');
     if (!this.activity) {
diff --git a/src/pages/assessments/group/assessments-group.page.ts b/src/pages/assessments/group/assessments-group.page.ts
index d868be9d..1a0f36c9 100644
--- a/src/pages/assessments/group/assessments-group.page.ts
+++ b/src/pages/assessments/group/assessments-group.page.ts
@@ -16,7 +16,6 @@ export class AssessmentsGroupPage implements OnInit {
   // used when navigate from event view page
   event: any;
 
-  //@TODO: decide which one to use
   activity: any;
   submission: Submission;
   assessment: any;
@@ -36,7 +35,7 @@ export class AssessmentsGroupPage implements OnInit {
     private assessmentService: AssessmentService,
     private alertCtrl: AlertController,
     private loadingCtrl: LoadingController,
-    public events: Events
+    private events: Events
   ) {}
 
   ngOnInit() {
diff --git a/src/pages/assessments/popup/items-popup.page.ts b/src/pages/assessments/popup/items-popup.page.ts
index a3a800d1..9d9857a0 100644
--- a/src/pages/assessments/popup/items-popup.page.ts
+++ b/src/pages/assessments/popup/items-popup.page.ts
@@ -7,7 +7,7 @@ import * as _ from 'lodash';
 // services
 import { CacheService } from '../../../shared/cache/cache.service';
 import { TranslateService } from '@ngx-translate/core';
-// pages 
+// pages
 import { TabsPage } from '../../../pages/tabs/tabs.page';
 @Injectable()
 @Component({
@@ -24,8 +24,8 @@ export class ItemsPopupPage {
     private navCtrl: NavController,
     private navParams: NavParams,
     private loadingCtrl: LoadingController,
-    public cacheService: CacheService,
-    public translationService: TranslateService
+    private cacheService: CacheService,
+    private translationService: TranslateService
   ) {}
   ionViewWillEnter(){
     // if (this.cacheService.getLocal('isEventSubmission') == 'true') {

From 681bc28e9294a61f726c9922b4b5bc1a0fa31253 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 2 Oct 2017 17:34:45 +0800
Subject: [PATCH 05/23] Update code standard (WIP) [ISDK-75]

---
 .../view/achievements-view.page.ts            |  5 +-
 .../list/activities-classic-list.page.ts      | 18 +++---
 src/pages/activities/list/list.page.ts        | 58 +++++++++----------
 src/pages/activities/list/popup.ts            | 22 +++----
 src/pages/assessments/assessments.page.ts     | 10 ++--
 .../assessments/popup/items-popup.page.ts     |  8 +--
 .../events/checkin/event-checkin.page.ts      | 18 +++---
 src/pages/events/list/list.page.ts            | 31 +++++-----
 8 files changed, 91 insertions(+), 79 deletions(-)

diff --git a/src/pages/achievements/view/achievements-view.page.ts b/src/pages/achievements/view/achievements-view.page.ts
index 451808e4..31f12cb2 100755
--- a/src/pages/achievements/view/achievements-view.page.ts
+++ b/src/pages/achievements/view/achievements-view.page.ts
@@ -20,11 +20,12 @@ let _mock = {
   templateUrl: './achievements-view.html'
 })
 export class AchievementsViewPage {
-  public achievement: any;
+
+  achievement: any;
 
   constructor(
     private params: NavParams,
-    public translationService: TranslationService
+    private translationService: TranslationService
   ) {
     this.achievement = {};
   }
diff --git a/src/pages/activities-classic/list/activities-classic-list.page.ts b/src/pages/activities-classic/list/activities-classic-list.page.ts
index 9a5d9f0f..425ce3fa 100644
--- a/src/pages/activities-classic/list/activities-classic-list.page.ts
+++ b/src/pages/activities-classic/list/activities-classic-list.page.ts
@@ -1,3 +1,6 @@
+/**
+ * @TODO: I believe we can delete this now
+ */
 import { Component } from '@angular/core';
 import { NavController, ToastController, LoadingController } from 'ionic-angular';
 
@@ -10,7 +13,8 @@ declare var _: any;
   templateUrl: './list.html'
 })
 export class ActivitiesClassicListPage {
-  private activities: Array<any> = [];
+
+  activities: Array<any> = [];
 
   constructor(
     private navCtrl: NavController,
@@ -38,7 +42,7 @@ export class ActivitiesClassicListPage {
   /**
    * normalise activities
    */
-  private normaliseActivities(activities): Array<any> {
+   normaliseActivities(activities): Array<any> {
     let result = [];
 
     activities.forEach((act, index) => {
@@ -78,7 +82,7 @@ export class ActivitiesClassicListPage {
       });
   }
 
-  public doRefresh(refresher) {
+  doRefresh(refresher) {
     this._pullData(this.activities, () => {
       if (refresher) {
         refresher.complete();
@@ -103,19 +107,19 @@ export class ActivitiesClassicListPage {
     });
   }
 
-  public hasReservation(activity) {
+  hasReservation(activity) {
     return false;
   }
 
-  public viewTicket(activity) {
+  viewTicket(activity) {
 
   }
 
-  public book(activity) {
+  book(activity) {
 
   }
 
-  public gotoActivity(activity) {
+  gotoActivity(activity) {
     console.log(activity);
     this.navCtrl.push(ActivitiesViewPage, {activity});
   }
diff --git a/src/pages/activities/list/list.page.ts b/src/pages/activities/list/list.page.ts
index 11ee9a88..3cd14f93 100755
--- a/src/pages/activities/list/list.page.ts
+++ b/src/pages/activities/list/list.page.ts
@@ -35,24 +35,24 @@ import { TruncatePipe } from '../../../pipes/truncate.pipe';
   templateUrl: 'list.html'
 })
 export class ActivitiesListPage implements OnInit {
-  public anyNewItems: any = this.cacheService.getLocal('gotNewItems');
-  public newItemsData: any = [];
-  public activities: any = [];
-  public initialItems: any = [];
-  public totalAchievements: any = [];
-  public currentPoints: number = 0;
-  public maxPoints: number = 0;
-  public currentPercentage: any = '0';
-  public filteredSubmissions: any = [];
-  public characterData: any = [];
-  public submissionData: any = [];
-  public characterCurrentExperience: number = 0;
-  public percentageValue: number = 0;
-  public submissionPoints: number = 0;
-  public returnError: boolean = false;
+  private anyNewItems: any = this.cacheService.getLocal('gotNewItems');
+  private newItemsData: any = [];
+  private activities: any = [];
+  private initialItems: any = [];
+  private totalAchievements: any = [];
+  private currentPoints: number = 0;
+  private maxPoints: number = 0;
+  private currentPercentage: any = '0';
+  private filteredSubmissions: any = [];
+  private characterData: any = [];
+  private submissionData: any = [];
+  private characterCurrentExperience: number = 0;
+  private percentageValue: number = 0;
+  private submissionPoints: number = 0;
+  private returnError: boolean = false;
   // loading & err message variables
-  public activitiesLoadingErr: any = errMessages.General.loading.load;
-  public activitiesEmptyDataErr: any = errMessages.Activities.activities.empty;
+  private activitiesLoadingErr: any = errMessages.General.loading.load;
+  private activitiesEmptyDataErr: any = errMessages.Activities.activities.empty;
   // Achievements
   private achievements = {
     maxPoint: {},
@@ -60,18 +60,18 @@ export class ActivitiesListPage implements OnInit {
     available: []
   };
   constructor(
-    public navCtrl: NavController,
-    public http: Http,
-    public activityService: ActivityService,
-    public achievementService: AchievementService,
-    public cacheService: CacheService,
-    public characterService: CharacterService,
-    public gameService: GameService,
-    public submissionService: SubmissionService,
-    public toastCtrl: ToastController,
-    public loadingCtrl: LoadingController,
-    public modalCtrl: ModalController,
-    public translationService: TranslationService
+    private navCtrl: NavController,
+    private http: Http,
+    private activityService: ActivityService,
+    private achievementService: AchievementService,
+    private cacheService: CacheService,
+    private characterService: CharacterService,
+    private gameService: GameService,
+    private submissionService: SubmissionService,
+    private toastCtrl: ToastController,
+    private loadingCtrl: LoadingController,
+    private modalCtrl: ModalController,
+    private translationService: TranslationService
   ) {
     this.anyNewItems = this.cacheService.getLocal('gotNewItems');
     this.newItemsData = this.cacheService.getLocalObject('allNewItems');
diff --git a/src/pages/activities/list/popup.ts b/src/pages/activities/list/popup.ts
index 52ae0be4..b01b4cc4 100644
--- a/src/pages/activities/list/popup.ts
+++ b/src/pages/activities/list/popup.ts
@@ -11,16 +11,16 @@ import { AchievementService } from '../../../services/achievement.service';
   templateUrl: 'popup.html'
 })
 export class ActivityListPopupPage {
-  public unlock_id: any;
-  public achievementData: any = null;
-  public badgeUrl: string;
-  public description: string;
-  public points: string;
-  public achievementName: string;
-  public enableData: boolean = null;
-  public loadingMessage: any = loadingMessages.LoadingSpinner.loading;
-  public achievementsLoadingErr: any = errMessages.General.loading.load;
-  public achievementsEmptyDataErr: any = errMessages.Activities.achievements.empty;
+  private unlock_id: any;
+  private achievementData: any = null;
+  private badgeUrl: string;
+  private description: string;
+  private points: string;
+  private achievementName: string;
+  private enableData: boolean = null;
+  private loadingMessage: any = loadingMessages.LoadingSpinner.loading;
+  private achievementsLoadingErr: any = errMessages.General.loading.load;
+  private achievementsEmptyDataErr: any = errMessages.Activities.achievements.empty;
 
   constructor(
     private viewCtrl: ViewController,
@@ -28,7 +28,7 @@ export class ActivityListPopupPage {
     private toastCtrl: ToastController,
     private loadingCtrl: LoadingController,
     private achievementService: AchievementService,
-    public translationService: TranslateService
+    private translationService: TranslateService
   ) {
     this.unlock_id = this.navParams.get('unlock_id');
     // console.log('Unlock id value: ', this.unlock_id);
diff --git a/src/pages/assessments/assessments.page.ts b/src/pages/assessments/assessments.page.ts
index c208143a..53eb350f 100644
--- a/src/pages/assessments/assessments.page.ts
+++ b/src/pages/assessments/assessments.page.ts
@@ -32,7 +32,6 @@ export class AssessmentsPage {
 
   activity: any = {};
   answers: any = {};
-
   assessment: any = {};
   assessmentGroups: any = [];
   assessmentQuestions: any = [];
@@ -50,11 +49,12 @@ export class AssessmentsPage {
   combinedItems: any = [];
   noItems: boolean = null;
   outputData: any = [];
-  public loadingMessages: any = loadingMessages.LoadingSpinner.loading;
   submissionUpdated: boolean = false; // event listener flag
-  // confirm message variables
-  private discardConfirmMessage = confirmMessages.Assessments.DiscardChanges.discard;
-  private submitConfirmMessage = confirmMessages.Assessments.SubmitConfirmation.confirm;
+
+  // messages variables
+  loadingMessages: any = loadingMessages.LoadingSpinner.loading;
+  discardConfirmMessage = confirmMessages.Assessments.DiscardChanges.discard;
+  submitConfirmMessage = confirmMessages.Assessments.SubmitConfirmation.confirm;
 
   constructor(
     private navParams: NavParams,
diff --git a/src/pages/assessments/popup/items-popup.page.ts b/src/pages/assessments/popup/items-popup.page.ts
index 9d9857a0..56a08c02 100644
--- a/src/pages/assessments/popup/items-popup.page.ts
+++ b/src/pages/assessments/popup/items-popup.page.ts
@@ -15,10 +15,10 @@ import { TabsPage } from '../../../pages/tabs/tabs.page';
   templateUrl: 'items-popup.html'
 })
 export class ItemsPopupPage {
-  public combinedData: any = [];
-  // public pageTitle: string = '';
-  // public noData: boolean = null;
-  public loadingMessage: any = loadingMessages.LoadingSpinner.loading;
+
+  combinedData: any = [];
+  loadingMessage: any = loadingMessages.LoadingSpinner.loading;
+
   constructor(
     private viewCtrl: ViewController,
     private navCtrl: NavController,
diff --git a/src/pages/events/checkin/event-checkin.page.ts b/src/pages/events/checkin/event-checkin.page.ts
index beb35d3b..79fa581d 100644
--- a/src/pages/events/checkin/event-checkin.page.ts
+++ b/src/pages/events/checkin/event-checkin.page.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { NavParams, NavController, LoadingController } from 'ionic-angular';
+
 // services
 import { CacheService } from '../../../shared/cache/cache.service';
 import { EventService } from '../../../services/event.service';
@@ -12,12 +13,12 @@ import * as moment from 'moment';
   templateUrl: './event-checkin.html',
 })
 export class EventCheckinPage {
-  public event: any;
-  public submissions: any;
-  public assessment;
-  public assessmentGroup;
-  private user: any = {};
-  public checkin: any = {};
+  event: any;
+  submissions: any;
+  assessment: any;
+  assessmentGroup: any;
+  user: any = {};
+  checkin: any = {};
 
   constructor(
     private navParams: NavParams,
@@ -34,13 +35,14 @@ export class EventCheckinPage {
   }
 
   ionViewDidEnter() {
-    this.checkin = this.getCheckinAnswer(this.submissions[0]); // event checkin has just single submission
+    // We assume event checkin has just single submission
+    this.checkin = this.getCheckinAnswer(this.submissions[0]);
     this.assessment = this.assessmentService.normaliseGroup(this.assessmentGroup);
     this.user = this.cache.getLocalObject('user');
   }
 
   // Only checkin/file upload answer is displayed in check-in view
-  private getCheckinAnswer(submission) {
+  getCheckinAnswer(submission) {
     let result = {};
     submission.answer.forEach(ans => {
       if (typeof ans.answer === 'object') {
diff --git a/src/pages/events/list/list.page.ts b/src/pages/events/list/list.page.ts
index 6a4de2a3..8b2e5521 100644
--- a/src/pages/events/list/list.page.ts
+++ b/src/pages/events/list/list.page.ts
@@ -13,23 +13,28 @@ import { EventsViewPage } from '../view/events-view.page';
   templateUrl: 'list.html'
 })
 export class EventsListPage {
+
+
+
+
+  activities: any = {};
+  loadedEvents: any = []; // Further processed events array, for private use
+  events: any = []; // ordered events array in filterEvents and to be access through template
+  noEvents: boolean = false;
+  filter = 'browses';
+
   // loading & error message variables
-  private emptyFilterErrMessage = errMessages.Events.filter.empty;
-  private noBookingsFilterErrMessage = errMessages.Events.filter.noBookings;
-  private noAttendedFilterErrMessage = errMessages.Events.filter.noAttended;
+  emptyFilterErrMessage = errMessages.Events.filter.empty;
+  noBookingsFilterErrMessage = errMessages.Events.filter.noBookings;
+  noAttendedFilterErrMessage = errMessages.Events.filter.noAttended;
+
   constructor(
-    public navCtrl: NavController,
-    public eventService: EventService,
-    public activityService: ActivityService,
-    public loadingCtrl: LoadingController,
+    private navCtrl: NavController,
+    private eventService: EventService,
+    private activityService: ActivityService,
+    private loadingCtrl: LoadingController,
   ) {}
 
-  activities = {};
-  private loadedEvents = []; // Further processed events array, for private use
-  events = []; // ordered events array in filterEvents and to be access through template
-  noEvents = false;
-  filter = 'browses';
-
   /**
    * @name filterEvents
    * @description filter and group events into 3 catergories (attended, my-bookings, browses)

From 8cf28acb4dbd2072892dc755a009365361997ff0 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 2 Oct 2017 21:29:46 +0800
Subject: [PATCH 06/23] Update to standard code [ISDK-75]

---
 src/pages/events/view/events-view.page.ts     | 26 ++++----
 src/pages/forget-password/forget-password.ts  | 33 +++++-----
 src/pages/gallery/gallery.ts                  | 16 +++--
 src/pages/levels/list/list.ts                 | 18 +++---
 src/pages/login/login.ts                      | 32 ++++++----
 src/pages/magic-link/magic-link.ts            | 18 +++---
 src/pages/rankings/list/rankings.page.ts      | 17 +++--
 src/pages/rankings/view/ranking-badges.ts     | 24 +++----
 .../rankings/view/ranking-details.page.ts     | 19 +++---
 src/pages/registration/register.page.ts       | 63 +++++++++++--------
 src/pages/registration/registration.page.ts   | 16 +++--
 src/pages/reset-password/reset-password.ts    | 55 +++++++++-------
 .../leaderboard/leaderboard-settings.page.ts  | 11 ++--
 src/pages/settings/settings.page.ts           | 25 +++++---
 src/pages/settings/tutorial/tutorial.page.ts  |  8 +--
 src/pages/tabs/tabs.page.ts                   |  2 +-
 src/pages/team/team.ts                        | 15 +++--
 .../term-condition/term-condition.page.ts     | 30 ++++++---
 18 files changed, 241 insertions(+), 187 deletions(-)

diff --git a/src/pages/events/view/events-view.page.ts b/src/pages/events/view/events-view.page.ts
index efdd438e..96b17502 100755
--- a/src/pages/events/view/events-view.page.ts
+++ b/src/pages/events/view/events-view.page.ts
@@ -1,5 +1,6 @@
 import { Component, Output, EventEmitter } from '@angular/core';
 import { Tabs, NavParams, NavController, AlertController, LoadingController, ActionSheetController, ToastController } from 'ionic-angular';
+
 import { loadingMessages, errMessages } from '../../../app/messages';
 import { TranslationService } from '../../../shared/translation/translation.service';
 // services
@@ -17,7 +18,6 @@ import { EventCheckinPage } from '../checkin/event-checkin.page';
 
 // We no need custom page for checkin anymore
 // import { EventCheckinPage } from '../checkin/event-checkin.page';
-
 import * as moment from 'moment';
 
 const terms = {
@@ -27,24 +27,24 @@ const terms = {
   templateUrl: './events-view.html'
 })
 export class EventsViewPage {
-  public loadings = {
+  loadings: any = {
     checkin: true
   };
-  public event: any = {};
-  public bookingStatus: string = '';
-  public justBooked: boolean = false;
-  public booked_text: string = 'Booked';
-  public bookEventErrMessage: any = errMessages.Events.bookEvents.book;
-  public cancelBookingErrMessage: any = errMessages.Events.cancelBooking.cancel;
-  public completedSubmissions: boolean = false;
-  private submissions: Array<any> = [];
+  event: any = {};
+  bookingStatus: string = '';
+  justBooked: boolean = false;
+  booked_text: string = 'Booked';
+  bookEventErrMessage: any = errMessages.Events.bookEvents.book;
+  cancelBookingErrMessage: any = errMessages.Events.cancelBooking.cancel;
+  completedSubmissions: boolean = false;
+  submissions: Array<any> = [];
 
   constructor(
     private navParams: NavParams,
     private navCtrl: NavController,
     private cache: CacheService,
     private eventService: EventService,
-    public translationService: TranslationService,
+    private translationService: TranslationService,
     private alertCtrl: AlertController,
     private loadingCtrl: LoadingController,
     private actionSheetCtrl: ActionSheetController,
@@ -55,7 +55,7 @@ export class EventsViewPage {
     this.event = navParams.get('event');
   }
 
-  private availability(event): string {
+  availability(event): string {
     return (event.isBooked)? terms.booked : event.remaining_capacity + ' of ' + event.capacity + ' seats available';
   }
 
@@ -99,7 +99,7 @@ export class EventsViewPage {
    * @description each event has only one assessment
    * @param {Array} references References array response from get_activity API
    */
-  private extractAssessment(references: Array<any>) {
+  extractAssessment(references: Array<any>) {
     let ref = references[0];
     ref.Assessment.context_id = ref.context_id;
 
diff --git a/src/pages/forget-password/forget-password.ts b/src/pages/forget-password/forget-password.ts
index 91e5f21c..51a6c8c9 100644
--- a/src/pages/forget-password/forget-password.ts
+++ b/src/pages/forget-password/forget-password.ts
@@ -5,10 +5,12 @@ import { NavController,
          AlertController,
          ToastController } from 'ionic-angular';
 import { FormBuilder, Validators } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
+
 import 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages'; 
+import { loadingMessages, errMessages } from '../../app/messages';
 // services
 import { AuthService } from '../../services/auth.service';
 // directives
@@ -21,27 +23,29 @@ export class ForgetPasswordPage {
   email: string;
   forgotPwdFormGroup: any;
   // loading & error message variables
-  private sendingEmailLoadingMessage = loadingMessages.SendingEmail.send;
-  private sentEmailMessagePartOne = loadingMessages.SentMessage.partOne;
-  private sentEmailMessagePartTwo = loadingMessages.SentMessage.partTwo;
+  sendingEmailLoadingMessage = loadingMessages.SendingEmail.send;
+  sentEmailMessagePartOne = loadingMessages.SentMessage.partOne;
+  sentEmailMessagePartTwo = loadingMessages.SentMessage.partTwo;
   constructor(
     private navCtrl: NavController,
     private navParams: NavParams,
     private loadingCtrl: LoadingController,
     private alertCtrl: AlertController,
-    public translationService: TranslationService,
+    private translationService: TranslationService,
     private authService: AuthService,
     private toastCtrl: ToastController,
-    private formBuilder: FormBuilder) {
+    private formBuilder: FormBuilder
+  ) {
       this.forgotPwdFormGroup = formBuilder.group({
         email: ['', [FormValidator.isValidEmail,
                     Validators.required]],
       });
-    }
+  }
+
   ionViewDidLoad() {
-    console.log('ionViewDidLoad ForgetPasswordPage');
   }
-  userForgotPassword(){
+
+  userForgotPassword() {
     const loading = this.loadingCtrl.create({
       dismissOnPageChange: true,
       content: this.sendingEmailLoadingMessage
@@ -73,13 +77,4 @@ export class ForgetPasswordPage {
         }
      );
   }
-  // logError(error) {
-  //   const alert = this.alertCtrl.create({
-  //     title: 'Email sent failed ..',
-  //     message: error,
-  //     buttons: ['Close']
-  //   });
-  //   alert.present();
-  //   // handle API calling errors display with alert controller
-  // }
 }
diff --git a/src/pages/gallery/gallery.ts b/src/pages/gallery/gallery.ts
index 69ac727a..9d350659 100644
--- a/src/pages/gallery/gallery.ts
+++ b/src/pages/gallery/gallery.ts
@@ -1,10 +1,8 @@
 import { Component } from '@angular/core';
-
 import { NavController, ToastController } from 'ionic-angular';
 
 import * as _ from 'lodash';
 import * as moment from 'moment';
-
 import { AssessmentService } from '../../services/assessment.service';
 import { SubmissionService } from '../../services/submission.service';
 
@@ -45,13 +43,13 @@ export class GalleryPage {
     ]
   }
 
-  private refresher = null;
+  refresher = null;
 
   constructor(
-    public navCtrl: NavController,
-    public toastCtrl: ToastController,
-    public assessmentService: AssessmentService,
-    public submissionService: SubmissionService
+    private navCtrl: NavController,
+    private toastCtrl: ToastController,
+    private assessmentService: AssessmentService,
+    private submissionService: SubmissionService
   ) {}
 
   // @TODO: Move to shared function later...
@@ -70,7 +68,7 @@ export class GalleryPage {
     toast.present();
   }
 
-  private _pullData() {
+  _pullData() {
     this.assessmentService.getAll().toPromise()
     .then((result) => {
       this.assessments = result;
@@ -111,7 +109,7 @@ export class GalleryPage {
     });
   }
 
-  public doRefresh(refresher) {
+  doRefresh(refresher) {
     this.refresher = refresher;
     this._pullData();
 
diff --git a/src/pages/levels/list/list.ts b/src/pages/levels/list/list.ts
index e8973583..f24639ea 100644
--- a/src/pages/levels/list/list.ts
+++ b/src/pages/levels/list/list.ts
@@ -11,15 +11,15 @@ import { LevelService } from '../../../services/level.service';
 export class LevelsListPage {
 
   constructor(
-    public navCtrl: NavController,
-    public platform: Platform,
-    public toastCtrl: ToastController,
-    public levelService: LevelService,
+    private navCtrl: NavController,
+    private platform: Platform,
+    private toastCtrl: ToastController,
+    private levelService: LevelService,
   ) {
       platform.ready().then(() => {});
   }
 
-  private _mock = [
+  _mock = [
     {
       id: 1,
       name: 'Rookie'
@@ -30,10 +30,10 @@ export class LevelsListPage {
     }
   ];
 
-  public levels = [];
+  levels = [];
 
   // @TODO: Move to shared function later...
-  private _error(err) {
+  _error(err) {
     let toast = this.toastCtrl.create({
       message: err,
       duration: 5000,
@@ -48,7 +48,7 @@ export class LevelsListPage {
     toast.present();
   }
 
-  private _pullData(refresher = null) {
+  _pullData(refresher = null) {
     return this.levelService.getLevels()
       .then((levels: any) => {
         this.levels = levels;
@@ -65,7 +65,7 @@ export class LevelsListPage {
       });
   }
 
-  public doRefresh(refresher) {
+  doRefresh(refresher) {
     this._pullData(refresher);
     // @TODO Remove it when API work
     this.levels = this._mock;
diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts
index ef16f8db..6c360ac2 100644
--- a/src/pages/login/login.ts
+++ b/src/pages/login/login.ts
@@ -8,6 +8,7 @@ import { NavController,
 import { FormBuilder, Validators } from '@angular/forms';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
+
 import * as _ from 'lodash';
 import { TranslationService } from '../../shared/translation/translation.service';
 import { loadingMessages, errMessages } from '../../app/messages';
@@ -28,16 +29,17 @@ import { ForgetPasswordPage } from '../../pages/forget-password/forget-password'
   templateUrl: 'login.html'
 })
 export class LoginPage {
-  public email: string;
-  public password: any;
-  public userName: string;
-  public userImage: string;
-  public API_KEY: string;
-  public milestone_id: string;
-  public loginFormGroup: any;
-  public forgetpasswordPage = ForgetPasswordPage;
-  public loginLoadingMessages: any = loadingMessages.Login.login;
-  public invalidLoginMessage: any = errMessages.Login.login;
+  email: string;
+  password: any;
+  userName: string;
+  userImage: string;
+  API_KEY: string;
+  milestone_id: string;
+  loginFormGroup: any;
+  forgetpasswordPage = ForgetPasswordPage;
+  loginLoadingMessages: any = loadingMessages.Login.login;
+  invalidLoginMessage: any = errMessages.Login.login;
+
   constructor(
     private navCtrl: NavController,
     private navParams: NavParams,
@@ -47,7 +49,7 @@ export class LoginPage {
     private viewCtrl: ViewController,
     private authService: AuthService,
     private gameService: GameService,
-    public translationService: TranslationService,
+    private translationService: TranslationService,
     private config: RequestServiceConfig,
     private formBuilder: FormBuilder,
     private milestoneService: MilestoneService,
@@ -60,6 +62,7 @@ export class LoginPage {
       password: ['', [Validators.required, Validators.minLength(8)]],
     });
   }
+
   ionViewCanLeave(): boolean {
     // user is authorized
     console.log('authorized');
@@ -70,6 +73,7 @@ export class LoginPage {
       return false;
     }
   }
+
   /**
    * user login function to authenticate user with email and password
    */
@@ -93,7 +97,7 @@ export class LoginPage {
               self.cacheService.setLocalObject('timelineID', data.Timelines[0].Timeline.id);
               self.cacheService.setLocalObject('teams', data.Teams);
               self.cacheService.setLocal('gotNewItems', false);
-              // get game_id data after login 
+              // get game_id data after login
               this.gameService.getGames()
                   .subscribe(
                     data => {
@@ -161,6 +165,7 @@ export class LoginPage {
       });
     });
   }
+
   /**
    * Insert post_auth() api result into localStorage
    * @param {object} data result from API request
@@ -180,6 +185,7 @@ export class LoginPage {
     console.log("cache data: " + cacheProcesses);
     return Observable.from(cacheProcesses);
   }
+
   /**
    * Insert get_user() api result into localStorage
    * @param {object} user result from API request
@@ -196,6 +202,7 @@ export class LoginPage {
     // to get API KEY and timeline_id and stored in localStorage
     // then other API calls can directly use (API KEY and timeline_id)
   }
+
   /**
    * @TODO we'll come back to this logging workflow later in this development
    *
@@ -211,6 +218,7 @@ export class LoginPage {
     alert.present();
     // handle API calling errors display with alert controller
   }
+
   /**
    * forget password page link function
    */
diff --git a/src/pages/magic-link/magic-link.ts b/src/pages/magic-link/magic-link.ts
index c20621fb..aea61089 100644
--- a/src/pages/magic-link/magic-link.ts
+++ b/src/pages/magic-link/magic-link.ts
@@ -4,8 +4,9 @@ import { NavController,
          LoadingController,
          AlertController } from 'ionic-angular';
 import 'rxjs/Rx';
+
 import * as _ from 'lodash';
-import { loadingMessages, errMessages } from '../../app/messages'; 
+import { loadingMessages, errMessages } from '../../app/messages';
 // services
 import { AuthService } from '../../services/auth.service';
 import { CacheService } from '../../shared/cache/cache.service';
@@ -19,12 +20,13 @@ import { LoginPage } from '../login/login';
   templateUrl: 'magic-link.html'
 })
 export class MagicLinkPage {
-  private verifySuccess = null;
-  private auth_token: string;
-  public milestone_id: string;
+  verifySuccess = null;
+  auth_token: string;
+  milestone_id: string;
   // loading & error messages variables
-  private loginLoadingMessage: any = loadingMessages.Login.login;
-  private misMatchTokenErrMessage: any = errMessages.DirectLink.mismatch;
+  loginLoadingMessage: any = loadingMessages.Login.login;
+  misMatchTokenErrMessage: any = errMessages.DirectLink.mismatch;
+
   constructor(
     private navCtrl: NavController,
     private navParams: NavParams,
@@ -40,9 +42,11 @@ export class MagicLinkPage {
     console.log('ionViewDidLoad MagiclinkPage');
     this.auth_token = this.navParams.get('auth_token');
   }
+
   ionViewWillEnter(){
     this.magicLinkAccess();
   }
+
   magicLinkAccess(){
     let observable = this.authService.magicLinkLogin(this.auth_token);
     const loading = this.loadingCtrl.create({
@@ -58,7 +62,7 @@ export class MagicLinkPage {
       this.cacheService.setLocalObject('apikey', data.apikey);
       this.cacheService.setLocalObject('timelineID', data.Timelines[0].Timeline.id);
       this.cacheService.setLocalObject('teams', data.Teams);
-      // get game_id data after login 
+      // get game_id data after login
       this.gameService.getGames()
           .subscribe(
             data => {
diff --git a/src/pages/rankings/list/rankings.page.ts b/src/pages/rankings/list/rankings.page.ts
index 84157d30..c9b9e7f5 100644
--- a/src/pages/rankings/list/rankings.page.ts
+++ b/src/pages/rankings/list/rankings.page.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, NavParams, LoadingController, AlertController } from 'ionic-angular';
+
 import { TranslationService } from '../../../shared/translation/translation.service';
 import { loadingMessages, errMessages } from '../../../app/messages';
 import * as _ from 'lodash';
@@ -13,20 +14,23 @@ import { RankingDetailsPage } from '../view/ranking-details.page';
   templateUrl: 'rankings.html'
 })
 export class RankingsPage {
-  public totalData: any = [];
-  public rankingData: any = [];
-  public myRankingData: any = [];
-  public listRankingData: any = [];
-  public loadingMessages: any = loadingMessages.LoadingSpinner.loading;
-  public emptyErrorMessage: any = errMessages.General.loading.load;
+  totalData: any = [];
+  rankingData: any = [];
+  myRankingData: any = [];
+  listRankingData: any = [];
+  loadingMessages: any = loadingMessages.LoadingSpinner.loading;
+  emptyErrorMessage: any = errMessages.General.loading.load;
+
   constructor(private navCtrl: NavController,
               private loadingCtrl: LoadingController,
               private alertCtrl: AlertController,
               private gameService: GameService,
               private cacheService: CacheService){}
+
   ionViewWillEnter(){
     this.RankingData();
   }
+
   RankingData(){
     const loading = this.loadingCtrl.create({
       content: this.loadingMessages
@@ -73,6 +77,7 @@ export class RankingsPage {
         });
       });
   }
+
   goRankingDetail(myRanking){
     this.navCtrl.push(RankingDetailsPage, {
       myRanking: myRanking
diff --git a/src/pages/rankings/view/ranking-badges.ts b/src/pages/rankings/view/ranking-badges.ts
index 226173b1..8cf193f5 100644
--- a/src/pages/rankings/view/ranking-badges.ts
+++ b/src/pages/rankings/view/ranking-badges.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ViewController, ToastController, LoadingController, NavParams } from 'ionic-angular';
 import { TranslationService } from '../../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../../app/messages'; 
+import { loadingMessages, errMessages } from '../../../app/messages';
 import * as _ from 'lodash';
 // services
 import { AchievementService } from '../../../services/achievement.service';
@@ -12,25 +12,27 @@ import { RankingDetailsPage } from '../view/ranking-details.page';
   templateUrl: 'ranking-badges.html'
 })
 export class RankingBadgesPage {
-  public currentAchievement: any = null;
-  public badgeUrl: string = '../assets/img/default/default-badge.png';
-  public description: string = "No Description Yet ..";
-  public points: number = 0;
-  public achievementName: string = "Achievement";
-  public loadingMessage: any = loadingMessages.LoadingSpinner.loading;
-  public achievementsLoadingErr: any = errMessages.General.loading.load;
-  public achievementsEmptyDataErr: any = errMessages.Activities.achievements.empty;
+  currentAchievement: any = null;
+  badgeUrl: string = '../assets/img/default/default-badge.png';
+  description: string = "No Description Yet ..";
+  points: number = 0;
+  achievementName: string = "Achievement";
+  loadingMessage: any = loadingMessages.LoadingSpinner.loading;
+  achievementsLoadingErr: any = errMessages.General.loading.load;
+  achievementsEmptyDataErr: any = errMessages.Activities.achievements.empty;
+
   constructor(private viewCtrl: ViewController,
               private navParams: NavParams,
               private toastCtrl: ToastController,
               private loadingCtrl: LoadingController,
               private achievementService: AchievementService,
-              public translationService: TranslationService){
+              private translationService: TranslationService){
                 this.currentAchievement = this.navParams.get('achievement');
                 console.log("currentAchievement: ", this.currentAchievement);
               }
+
   // close disbaled activity popup
   closeModal() {
     this.viewCtrl.dismiss();
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/rankings/view/ranking-details.page.ts b/src/pages/rankings/view/ranking-details.page.ts
index d6ee9f8b..e3b0c04b 100644
--- a/src/pages/rankings/view/ranking-details.page.ts
+++ b/src/pages/rankings/view/ranking-details.page.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, NavParams, LoadingController, AlertController, ModalController } from 'ionic-angular';
+
 import { TranslationService } from '../../../shared/translation/translation.service';
 import { loadingMessages, errMessages } from '../../../app/messages';
 import * as _ from 'lodash';
@@ -13,15 +14,15 @@ import { RankingBadgesPage } from './ranking-badges';
   templateUrl: 'ranking-details.html'
 })
 export class RankingDetailsPage {
-  public userAchievementsData: any = [];
-  public achievementBadgeImage = '../assets/img/default/default-badge.png';
-  public achievementName = 'Achievement';
-  public totalPoints = 0;
-  public myRank: any= {};
+  userAchievementsData: any = [];
+  achievementBadgeImage = '../assets/img/default/default-badge.png';
+  achievementName = 'Achievement';
+  totalPoints = 0;
+  myRank: any= {};
+  emptyAchievementMessage = errMessages.Activities.achievements.empty;
+  loadingMessages: any = loadingMessages.LoadingSpinner.loading;
+  emptyErrorMessage: any = errMessages.General.loading.load;
 
-  public emptyAchievementMessage = errMessages.Activities.achievements.empty;
-  public loadingMessages: any = loadingMessages.LoadingSpinner.loading;
-  public emptyErrorMessage: any = errMessages.General.loading.load;
   constructor(private navCtrl: NavController,
               private loadingCtrl: LoadingController,
               private alertCtrl: AlertController,
@@ -44,6 +45,7 @@ export class RankingDetailsPage {
     });
 
   }
+
   userAchievements(): Promise<any> {
     return new Promise((resolve, reject) => {
       this.achievementService.getAchievements()
@@ -67,6 +69,7 @@ export class RankingDetailsPage {
         );
     });
   }
+
   goToBadgeDetailsPage(achievementData){
     let goRankingBadgesPopup = this.modalCtrl.create(RankingBadgesPage, { achievement: achievementData });
     goRankingBadgesPopup.present();
diff --git a/src/pages/registration/register.page.ts b/src/pages/registration/register.page.ts
index 1bb9842c..9292efe3 100644
--- a/src/pages/registration/register.page.ts
+++ b/src/pages/registration/register.page.ts
@@ -1,8 +1,8 @@
-import { Component, ViewChild, OnInit, Inject } from '@angular/core'; 
+import { Component, ViewChild, OnInit, Inject } from '@angular/core';
 import { NgForm, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NavController, ViewController, AlertController, LoadingController, NavParams } from 'ionic-angular';
 import { Observable } from 'rxjs/Observable';
-import { loadingMessages, errMessages, generalVariableMessages } from '../../app/messages'; 
+import { loadingMessages, errMessages, generalVariableMessages } from '../../app/messages';
 // services
 import { AuthService } from '../../services/auth.service';
 import { CacheService } from '../../shared/cache/cache.service';
@@ -33,31 +33,32 @@ export class RegisterPage implements OnInit {
     verify_password: ''
   };
   submitted: boolean = false;
-  private regForm: any;
-  private pwdMacthBool: boolean = false;
-  private verifyPwd: boolean = false;
-  private verifySuccess: boolean = null;
-  private isPwdMatch: boolean = false;
-  private changeContent: boolean = false;
-  private minLengthCheck: boolean = true;
-  private clickSuspended: boolean = false;
-  private milestone_id: string;
-  private password: string;
-  private verify_password: string;
+  regForm: any;
+  pwdMacthBool: boolean = false;
+  verifyPwd: boolean = false;
+  verifySuccess: boolean = null;
+  isPwdMatch: boolean = false;
+  changeContent: boolean = false;
+  minLengthCheck: boolean = true;
+  clickSuspended: boolean = false;
+  milestone_id: string;
+  password: string;
+  verify_password: string;
   // loading & error messages variables
-  private verifyFailedErrMessage = errMessages.Registration.verifyFailed.verifyfailed;
-  private successRegistrationLoading: any = loadingMessages.SuccessRegistration.successRegistration;
-  private passwordMismatchErrMessage: any = errMessages.Registration.mismatch.mismatch;
-  private registrationErrMessage: any = errMessages.Registration.error.error;
-  private invalidUserErrMessage: any = errMessages.Registration.invalidUser.account;
-  private noPasswordErrMessage: any = errMessages.Registration.noPassword.password;
-  private registeredErrMessage: any = errMessages.Registration.alreadyRegistered.registered;
-  private passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
-  private passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
+  verifyFailedErrMessage = errMessages.Registration.verifyFailed.verifyfailed;
+  successRegistrationLoading: any = loadingMessages.SuccessRegistration.successRegistration;
+  passwordMismatchErrMessage: any = errMessages.Registration.mismatch.mismatch;
+  registrationErrMessage: any = errMessages.Registration.error.error;
+  invalidUserErrMessage: any = errMessages.Registration.invalidUser.account;
+  noPasswordErrMessage: any = errMessages.Registration.noPassword.password;
+  registeredErrMessage: any = errMessages.Registration.alreadyRegistered.registered;
+  passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
+  passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
+
   constructor(
     @Inject(FormBuilder) fb: FormBuilder,
-    public navCtrl: NavController,
-    public alertCtrl: AlertController,
+    private navCtrl: NavController,
+    private alertCtrl: AlertController,
     private viewCtrl: ViewController,
     private notificationService: NotificationService,
     private navParams: NavParams,
@@ -65,7 +66,7 @@ export class RegisterPage implements OnInit {
     private authService: AuthService,
     private cache: CacheService,
     private gameService: GameService,
-    public translationService: TranslationService,
+    private translationService: TranslationService,
     private milestone: MilestoneService,
   ) {
     // validation for both password values: required & minlength is 8
@@ -74,15 +75,18 @@ export class RegisterPage implements OnInit {
       verify_password: ['', [Validators.minLength(8), Validators.required]],
     });
   }
+
   ngOnInit() {
   }
-  public displayAlert(message) {
+
+  displayAlert(message) {
     return this.alertCtrl.create({
       title: 'Test',
       message: message,
       buttons: ['OK']
     });
   }
+
   onSubmit(form: NgForm):void {
     let self = this;
     self.submitted = true;
@@ -141,7 +145,7 @@ export class RegisterPage implements OnInit {
           this.authService.loginAuth(this.cache.getLocal('user.email'), this.regForm.get('password').value)
               .subscribe(
                 data => {
-                  // get game_id data after login 
+                  // get game_id data after login
                   this.gameService.getGames()
                       .subscribe(
                         data => {
@@ -193,6 +197,7 @@ export class RegisterPage implements OnInit {
       });
     }
   }
+
   setRegistrationData(data) {
     let cacheProcesses = [];
     _.forEach(data, (datum, key) => {
@@ -202,19 +207,23 @@ export class RegisterPage implements OnInit {
     this.cache.setLocal('timelineID', data.Timeline.id);
     return Observable.from(cacheProcesses);
   }
+
   goToLogin() {
     this.cache.clear().then(() => {
       this.navCtrl.push(LoginPage);
     });
   }
+
   // check password minmimum length
   checkMinLength(){
     return (this.password.length < 8 || this.verify_password.length < 8) ? this.minLengthCheck = true : this.minLengthCheck = false;
   }
+
   // check password mismacth issue
   verifyPwdKeyUp() {
     return this.verifyPwd = true;
   }
+
   pwdMatchCheck() {
     return this.password != this.verify_password ? this.isPwdMatch = true : this.isPwdMatch = false;
   }
diff --git a/src/pages/registration/registration.page.ts b/src/pages/registration/registration.page.ts
index 65f1f0c3..0d46f6bf 100644
--- a/src/pages/registration/registration.page.ts
+++ b/src/pages/registration/registration.page.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit } from '@angular/core';
+
 import { CacheService } from '../../shared/cache/cache.service';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { NavController, NavParams, AlertController } from 'ionic-angular';
 import { Observable } from 'rxjs';
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages'; 
+import { loadingMessages, errMessages } from '../../app/messages';
 // services
 import { AuthService } from '../../services/auth.service';
 import { RequestService } from '../../shared/request/request.service';
@@ -21,19 +22,21 @@ export class RegistrationPage implements OnInit {
   };
   term: String;
   content: SafeResourceUrl;
-  private prefixUrl: any = this.request.getPrefixUrl();
+  prefixUrl: any = this.request.getPrefixUrl();
   // loadinbg & error message variables
-  private verifyFailedErrMessage = errMessages.Registration.verifyFailed.verifyfailed;
+  verifyFailedErrMessage = errMessages.Registration.verifyFailed.verifyfailed;
+
   constructor(
-    public nav: NavController,
+    private nav: NavController,
     private params: NavParams,
     private authService: AuthService,
     private sanitizer: DomSanitizer,
     private notification: NotificationService,
-    public translationService: TranslationService,
+    private translationService: TranslationService,
     private alertCtrl: AlertController,
     private cache: CacheService,
     private request: RequestService) {}
+
   displayError(errorMessage?: any): void {
     let alert = this.alertCtrl.create({
       title: 'Invalid registration code',
@@ -52,6 +55,7 @@ export class RegistrationPage implements OnInit {
     });
     alert.present();
   }
+
   ngOnInit() {
     // check if email and activation_code are provided in the url/params
     if (!decodeURIComponent(this.params.get('email')) || !this.params.get('key')) {
@@ -83,6 +87,7 @@ export class RegistrationPage implements OnInit {
       });
     }
   }
+
   ionViewDidEnter(): void {
     this.authService.getTerms().subscribe(res => {
       console.log("terms data: ", res);
@@ -91,6 +96,7 @@ export class RegistrationPage implements OnInit {
     });
     this.params.get('test');
   }
+
   ionViewDidLoad(): void {
     let category = [];
     /*if (document.URL.indexOf("?") !== -1) {
diff --git a/src/pages/reset-password/reset-password.ts b/src/pages/reset-password/reset-password.ts
index bf5f7a0e..8fa659d0 100644
--- a/src/pages/reset-password/reset-password.ts
+++ b/src/pages/reset-password/reset-password.ts
@@ -5,9 +5,10 @@ import { NavController,
          LoadingController,
          AlertController,
          ModalController } from 'ionic-angular';
-import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages'; 
 import { FormBuilder, Validators } from '@angular/forms';
+
+import { TranslationService } from '../../shared/translation/translation.service';
+import { loadingMessages, errMessages } from '../../app/messages';
 import * as _ from 'lodash';
 // services
 import { AuthService } from '../../services/auth.service';
@@ -26,25 +27,26 @@ import { ResetpasswordModelPage } from '../../pages/resetpassword-model/resetpas
   templateUrl: 'reset-password.html'
 })
 export class ResetPasswordPage implements OnInit {
-  public keyVal: string;
-  public emailVal: string;
-  private windowHeight: number = window.innerHeight / 3;
-  private isLandscaped: boolean = false;
-  public password: string;
-  public verify_password: string;
-  private verifySuccess: boolean = null;
-  private resetPwdFormGroup: any;
-  private verifyPwd: boolean = false;
-  private minLengthCheck: boolean = true;
-  public milestone_id: string;
-  private isPwdMatch: boolean = false;
+  keyVal: string;
+  emailVal: string;
+  windowHeight: number = window.innerHeight / 3;
+  isLandscaped: boolean = false;
+  password: string;
+  verify_password: string;
+  verifySuccess: boolean = null;
+  resetPwdFormGroup: any;
+  verifyPwd: boolean = false;
+  minLengthCheck: boolean = true;
+  milestone_id: string;
+  isPwdMatch: boolean = false;
   // loading & error message variables
-  private invalidLinkErrMessage = errMessages.ResetPassword.invalidLink.invalid;
-  private verifyUserMessage = loadingMessages.VerifyUser.verify;
-  private successResetPasswordMessage: any = loadingMessages.SuccessResetPassword.successResetPassword;
-  private resetPasswordLoginFailedMessage: any = errMessages.ResetPassword.resetLoginFailed.failed;
-  private passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
-  private passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
+  invalidLinkErrMessage = errMessages.ResetPassword.invalidLink.invalid;
+  verifyUserMessage = loadingMessages.VerifyUser.verify;
+  successResetPasswordMessage: any = loadingMessages.SuccessResetPassword.successResetPassword;
+  resetPasswordLoginFailedMessage: any = errMessages.ResetPassword.resetLoginFailed.failed;
+  passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
+  passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
+
   constructor(private navCtrl: NavController,
     private navParams: NavParams,
     private alertCtrl: AlertController,
@@ -55,13 +57,14 @@ export class ResetPasswordPage implements OnInit {
     private milestoneService: MilestoneService,
     private cacheService: CacheService,
     private gameService: GameService,
-    public translationService: TranslationService) {
+    private translationService: TranslationService) {
       // validation for both password values: required & minlength is 8
       this.resetPwdFormGroup = formBuilder.group({
           password: ['', [Validators.minLength(8), Validators.required]],
           verify_password: ['', [Validators.minLength(8), Validators.required]],
       })
     }
+
   /**
    * Detect user device type (mobile or desktop) on initial page load
    * Purpose: Initially page loaded, this peice code will detect user screen
@@ -73,12 +76,15 @@ export class ResetPasswordPage implements OnInit {
   */
   ngOnInit() {
   }
+
   ionViewDidLoad() {
     console.log('ionViewDidLoad ResetpasswordPage');
   }
+
   ionViewWillEnter() {
     this.verifyKeyEmail();
   }
+
   /**
    * to verify user is whether typed or clicked the email link
    * Purpose: if user is typed the email link key and email, user is not allowed
@@ -115,6 +121,7 @@ export class ResetPasswordPage implements OnInit {
         }, 5000);
       });
   }
+
   /**
    * to update password in db
    * Purpose: store new password for user
@@ -140,7 +147,7 @@ export class ResetPasswordPage implements OnInit {
               this.cacheService.setLocalObject('timelineID', data.Timelines[0].Timeline.id);
               this.cacheService.setLocalObject('teams', data.Teams);
               this.cacheService.setLocal('gotNewItems', false);
-              // get game_id data after login 
+              // get game_id data after login
               this.gameService.getGames()
                   .subscribe(
                     data => {
@@ -207,6 +214,7 @@ export class ResetPasswordPage implements OnInit {
       });
     });
   }
+
   // after password set, auto login error alertbox
   loginError(error) {
     const alertLogin = this.alertCtrl.create({
@@ -216,14 +224,17 @@ export class ResetPasswordPage implements OnInit {
     });
     alertLogin.present();
   }
+
   // check password minmimum length
   checkMinLength(){
     return (this.password.length < 8 || this.verify_password.length < 8) ? this.minLengthCheck = true : this.minLengthCheck = false;
   }
+
   // check password mismacth issue
   verifyPwdKeyUp() {
     return this.verifyPwd = true;
   }
+
   pwdMatchCheck() {
     return this.password != this.verify_password ? this.isPwdMatch = true : this.isPwdMatch = false;
   }
diff --git a/src/pages/settings/leaderboard/leaderboard-settings.page.ts b/src/pages/settings/leaderboard/leaderboard-settings.page.ts
index 1cc215b2..f122170c 100644
--- a/src/pages/settings/leaderboard/leaderboard-settings.page.ts
+++ b/src/pages/settings/leaderboard/leaderboard-settings.page.ts
@@ -6,10 +6,9 @@ import { CacheService } from '../../../shared/cache/cache.service';
   templateUrl: 'leaderboard-settings.html'
 })
 export class LeaderboardSettingsPage {
-  public username: string = this.cacheService.getLocalObject('name') || '';
-  public useremail: string = this.cacheService.getLocalObject('email') || '';
-  public isHide: boolean = false;
-  constructor(private cacheService: CacheService){
+  username: string = this.cacheService.getLocalObject('name') || '';
+  useremail: string = this.cacheService.getLocalObject('email') || '';
+  isHide: boolean = false;
 
-  }
-}
\ No newline at end of file
+  constructor(private cacheService: CacheService){}
+}
diff --git a/src/pages/settings/settings.page.ts b/src/pages/settings/settings.page.ts
index 6025e83d..fd9cee51 100644
--- a/src/pages/settings/settings.page.ts
+++ b/src/pages/settings/settings.page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { App, NavController, MenuController, LoadingController } from 'ionic-angular';
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages'; 
+import { loadingMessages, errMessages } from '../../app/messages';
 // services
 import { CacheService } from '../../shared/cache/cache.service';
 // pages
@@ -14,30 +14,35 @@ import { TermConditionPage } from '../term-condition/term-condition.page';
   templateUrl: 'settings.html'
 })
 export class SettingsPage {
-  public helpline = "help@practera.com";
-  public logoutMessage: any = loadingMessages.Logout.logout;
+  helpline = "help@practera.com";
+  logoutMessage: any = loadingMessages.Logout.logout;
+  settings = [];
   constructor(
     private cache: CacheService,
     private navCtrl: NavController,
     private menuCtrl: MenuController,
     private loadingCtrl: LoadingController,
-    public translationService: TranslationService,
+    private translationService: TranslationService,
     private appCtrl: App
   ) {}
-  public settings = [];
-  public getUserEmail() {
+
+  getUserEmail() {
     return this.cache.getLocalObject('email') || '';
   }
-  public goLeaderBoardSettings(){
+
+  goLeaderBoardSettings(){
     this.navCtrl.push(LeaderboardSettingsPage);
   }
-  public goToTutorial() {
+
+  goToTutorial() {
     this.navCtrl.push(TutorialPage);
   }
-  public goToTermConditions() {
+
+  goToTermConditions() {
     this.navCtrl.push(TermConditionPage);
   }
-  public logout() {
+
+  logout() {
     let loader = this.loadingCtrl.create({
       spinner: 'hide',
       content: this.logoutMessage
diff --git a/src/pages/settings/tutorial/tutorial.page.ts b/src/pages/settings/tutorial/tutorial.page.ts
index 861861e0..f1537f4c 100644
--- a/src/pages/settings/tutorial/tutorial.page.ts
+++ b/src/pages/settings/tutorial/tutorial.page.ts
@@ -8,9 +8,9 @@ import { ActivitiesListPage } from '../../activities/list/list.page';
 })
 export class TutorialPage {
   @ViewChild(Slides) slides: Slides;
-  public indexCounter: number = 0; 
-  public hideNextButton: boolean = false;
-  constructor(public navCtrl: NavController){}
+  indexCounter: number = 0;
+  hideNextButton: boolean = false;
+  constructor(private navCtrl: NavController){}
   goDashbaord() {
     this.navCtrl.setRoot(ActivitiesListPage);
   }
@@ -23,4 +23,4 @@ export class TutorialPage {
     this.slides.isEnd() == true ? this.hideNextButton = true : this.hideNextButton = false;
     // console.log(this.hideNextButton);
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/tabs/tabs.page.ts b/src/pages/tabs/tabs.page.ts
index 888aeb1b..7f50eef1 100644
--- a/src/pages/tabs/tabs.page.ts
+++ b/src/pages/tabs/tabs.page.ts
@@ -17,5 +17,5 @@ export class TabsPage {
   dashboard: any = ActivitiesListPage;
   settings: any = SettingsPage;
   events: any = EventsListPage;
-  constructor(public translationService: TranslationService) {}
+  constructor(private translationService: TranslationService) {}
 }
diff --git a/src/pages/team/team.ts b/src/pages/team/team.ts
index f3295427..fcdd0f19 100644
--- a/src/pages/team/team.ts
+++ b/src/pages/team/team.ts
@@ -10,18 +10,17 @@ import * as _ from 'lodash';
   templateUrl: 'team.html'
 })
 export class TeamPage {
+  team = {};
+  members = [];
 
   constructor(
-    public navCtrl: NavController,
-    public toastCtrl: ToastController,
-    public teamService: TeamService
+    private navCtrl: NavController,
+    private toastCtrl: ToastController,
+    private teamService: TeamService
   ) {}
 
-  public team = {};
-  public members = [];
-
   // @TODO: Move to shared function later...
-  private _error(err) {
+  _error(err) {
     let toast = this.toastCtrl.create({
       message: err,
       duration: 5000,
@@ -55,7 +54,7 @@ export class TeamPage {
     });
   }
 
-  public doRefresh(refresher) {
+  doRefresh(refresher) {
     this._pullData(refresher);
   }
 
diff --git a/src/pages/term-condition/term-condition.page.ts b/src/pages/term-condition/term-condition.page.ts
index 24918c2a..eff230c2 100644
--- a/src/pages/term-condition/term-condition.page.ts
+++ b/src/pages/term-condition/term-condition.page.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { SafeResourceUrl } from '@angular/platform-browser';
 import { NavController, AlertController } from 'ionic-angular';
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages, generalVariableMessages } from '../../app/messages'; 
+import { loadingMessages, errMessages, generalVariableMessages } from '../../app/messages';
 // services
 import { AuthService } from '../../services/auth.service';
 import { NotificationService } from '../../shared/notification/notification.service';
@@ -16,23 +16,27 @@ import { TabsPage } from '../tabs/tabs.page';
 export class TermConditionPage {
   @Input('content') content?: SafeResourceUrl;
   @Input('user') user: any;
+
   agreed:boolean = false;
-  private checkAccessMethod: boolean = false;
+  checkAccessMethod: boolean = false;
   // loading & error message variables
-  private helpEmailMessage = generalVariableMessages.helpMail.email;
-  private disagreeErrMessage = errMessages.TermConditions.disagreement.noAccepted;
-  private verifyFailedErrMessage = errMessages.TermConditions.verifyFailed.verifyfailed;
+  helpEmailMessage = generalVariableMessages.helpMail.email;
+  disagreeErrMessage = errMessages.TermConditions.disagreement.noAccepted;
+  verifyFailedErrMessage = errMessages.TermConditions.verifyFailed.verifyfailed;
+
   constructor(
-    public nav: NavController,
+    private nav: NavController,
     private alertCtrl: AlertController,
     private authService: AuthService,
     private notificationService: NotificationService,
-    public translationService: TranslationService,
+    private translationService: TranslationService,
   ) {}
-  private accessMethod(){
+
+  accessMethod(){
     return (window.location.href.indexOf('?do=') > -1) ? this.checkAccessMethod = true : this.checkAccessMethod = false
   }
-  private displayError(errorMessage?: any): void {
+
+  displayError(errorMessage?: any): void {
     let alert = this.alertCtrl.create({
       title: 'Invalid registration code',
       subTitle: errorMessage,
@@ -42,12 +46,15 @@ export class TermConditionPage {
     });
     alert.present();
   }
-  private backToSAccountPage() {
+
+  backToSAccountPage() {
     this.nav.popToRoot();
   }
+
   ionViewDidEnter() {
     console.log(this.user);
   }
+
   agree(user): void {
     if (this.agreed === true) {
       this.nav.push(RegisterPage, user);
@@ -80,11 +87,13 @@ export class TermConditionPage {
   toggleAgree(): void {
     this.agreed = !this.agreed;
   }
+
   navToRegister(): void {
     if (this.agreed === true) {
       console.log(this.nav.getViews());
     }
   }
+
   onTermError(err): void {
     const supportEmail = this.helpEmailMessage;
     if ((err.data || {}).msg) {
@@ -102,6 +111,7 @@ export class TermConditionPage {
       });
     }
   }
+
   // temporary fix for direct signin
   signIn(): void {
     this.nav.push(TabsPage);

From a5fda7d5f29b9db99e97d1781b6cc0dae66bcfca Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Tue, 3 Oct 2017 11:46:41 +0800
Subject: [PATCH 07/23] Update assessment code [ISDK-75]

---
 src/pages/assessments/assessments.page.ts     | 48 +++++++++++++------
 .../group/assessments-group.page.ts           | 18 +++----
 .../assessments/popup/items-popup.page.ts     | 14 ++----
 3 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/pages/assessments/assessments.page.ts b/src/pages/assessments/assessments.page.ts
index 53eb350f..cdc39126 100644
--- a/src/pages/assessments/assessments.page.ts
+++ b/src/pages/assessments/assessments.page.ts
@@ -31,30 +31,28 @@ export class AssessmentsPage {
   @ViewChild(Navbar) navbar: Navbar;
 
   activity: any = {};
+  allItemsData: any = [];
+  allowSubmit: boolean = false;
   answers: any = {};
   assessment: any = {};
   assessmentGroups: any = [];
   assessmentQuestions: any = [];
-  allowSubmit: boolean = false;
-  submissions: any = [];
+  combinedItems: any = [];
+  discardConfirmMessage = confirmMessages.Assessments.DiscardChanges.discard;
   getInitialItems: any = this.cacheService.getLocalObject('initialItems');
   getCharacterID: any = this.cacheService.getLocal('character_id');
   gotNewItems: boolean = false;
   isEventSubmission: boolean = false;
   initialItemsCount: any = {};
+  loadingMessages: any = loadingMessages.LoadingSpinner.loading;
   newItemsCount: any = {};
   newItemsData: any = [];
-  totalItems: any = [];
-  allItemsData: any = [];
-  combinedItems: any = [];
   noItems: boolean = null;
   outputData: any = [];
+  submissions: any = [];
   submissionUpdated: boolean = false; // event listener flag
-
-  // messages variables
-  loadingMessages: any = loadingMessages.LoadingSpinner.loading;
-  discardConfirmMessage = confirmMessages.Assessments.DiscardChanges.discard;
   submitConfirmMessage = confirmMessages.Assessments.SubmitConfirmation.confirm;
+  totalItems: any = [];
 
   constructor(
     private navParams: NavParams,
@@ -178,7 +176,12 @@ export class AssessmentsPage {
     return result;
   }
 
-  // filter question by condition (submitter cannot view reviewer question before it is published/reviewed)
+  /**
+   * @description filter question by condition (submitter cannot view reviewer
+   *              question before it is published/reviewed)
+   * @param {object} question
+   * @param {string} status
+   */
   isAccessibleBySubmitter(question, submissionStatus: string) {
     let accessible = true;
     let submitterAllowed = false;
@@ -201,7 +204,7 @@ export class AssessmentsPage {
    *
    * @return {Promise<any>}
    */
-  private pullSubmissions(): Promise<any> {
+   pullSubmissions(): Promise<any> {
     return new Promise((resolve, reject) => {
       // 2nd batch API requests (get_submissions)
       Observable.forkJoin(
@@ -240,7 +243,11 @@ export class AssessmentsPage {
     });
   }
 
-  private filterSubmissions(submissions) {
+  /**
+   * @description filter submissions data
+   * @param {Array} submissions
+   */
+  filterSubmissions(submissions) {
     let results = []; // filtered submissions
 
     // check if a submission is specified (from previous page, from NavParams)
@@ -307,6 +314,9 @@ export class AssessmentsPage {
     return tasks;
   }
 
+  /**
+   * @description loading question from API
+   */
   loadQuestions(): Promise<any> {
     return new Promise((resolve, reject) => {
       /**
@@ -384,7 +394,7 @@ export class AssessmentsPage {
 
 
   /**
-   * submit answer and change submission status to done
+   * @description submit answer and change submission status to done
    */
   doSubmit() {
     let loading = this.loadingCtrl.create({
@@ -442,6 +452,9 @@ export class AssessmentsPage {
     });
   }
 
+  /**
+   * @description Submit anwsers
+   */
   clickSubmit() {
     const confirm = this.alertCtrl.create({
       title: 'Confirm Submission',
@@ -464,7 +477,9 @@ export class AssessmentsPage {
     confirm.present();
   }
 
-  // items popup
+  /**
+   * @description  items popup
+   */
   popupAfterSubmit() {
     const loading = this.loadingCtrl.create({
       content: this.loadingMessages
@@ -552,6 +567,11 @@ export class AssessmentsPage {
         );
   }
 
+  /**
+   * @description Move to assessment group page
+   * @param {Object} assessment group
+   * @param {Object} activity
+   */
   gotoAssessment(assessmentGroup, activity) {
     this.navCtrl.push(AssessmentsGroupPage, {
       assessmentGroup,
diff --git a/src/pages/assessments/group/assessments-group.page.ts b/src/pages/assessments/group/assessments-group.page.ts
index 1a0f36c9..cddc00f4 100644
--- a/src/pages/assessments/group/assessments-group.page.ts
+++ b/src/pages/assessments/group/assessments-group.page.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { NavParams, NavController, AlertController, LoadingController, Events } from 'ionic-angular';
 import { FormBuilder, Validators, FormGroup, FormControl, FormArray } from '@angular/forms';
+
 import { CacheService } from '../../../shared/cache/cache.service';
 import { ChoiceBase, QuestionBase, Submission, AssessmentService } from '../../../services/assessment.service';
 
@@ -10,22 +11,19 @@ import * as _ from 'lodash';
   templateUrl: './assessments-group.html',
 })
 export class AssessmentsGroupPage implements OnInit {
-  questions = [];
-  formGroup;
-
-  // used when navigate from event view page
-  event: any;
 
   activity: any;
-  submission: Submission;
+  answers: any; // to render & display submitted answers
   assessment: any;
   assessmentGroup: any;
   cacheKey: any; // to render & display stored
-
   canUpdateInput: boolean = false;
-  published: boolean = false;
-  answers: any; // to render & display submitted answers
+  event: any;
+  formGroup: any;
   inProgress: boolean | any;
+  published: boolean = false;
+  questions = [];
+  submission: Submission;
 
   constructor(
     private navParams: NavParams,
@@ -283,6 +281,8 @@ export class AssessmentsGroupPage implements OnInit {
 
   /**
    * @description retrieve saved progress from localStorage
+   * @param {Array} questions
+   * @param {Object} answers
    */
   retrieveProgress = (questions: Array<any>, answers?) => {
     let cachedProgress = answers || {},
diff --git a/src/pages/assessments/popup/items-popup.page.ts b/src/pages/assessments/popup/items-popup.page.ts
index 56a08c02..583048d1 100644
--- a/src/pages/assessments/popup/items-popup.page.ts
+++ b/src/pages/assessments/popup/items-popup.page.ts
@@ -27,18 +27,14 @@ export class ItemsPopupPage {
     private cacheService: CacheService,
     private translationService: TranslateService
   ) {}
+
   ionViewWillEnter(){
-    // if (this.cacheService.getLocal('isEventSubmission') == 'true') {
-    //   this.pageTitle = 'Checkin Successful!';
-    // }else {
-    //   this.pageTitle = 'Submit Success!';
-    // }
-    // this.combinedData = this.navParams.get('combined');
     this.combinedData = this.cacheService.getLocalObject('allNewItems');
-    console.log("Final final popup combined data: ", this.combinedData);
-    // return this.combinedData.length == 0 ? this.noData = true : this.noData = false
   }
-  // close disbaled activity popup
+
+  /**
+   * @description close disbaled activity popup
+   */
   closeModal() {
     this.viewCtrl.dismiss();
     this.navCtrl.setRoot(TabsPage);

From 1abfd530f9be055c6fa6f296f217a8a5fbe6b8ca Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 23 Oct 2017 11:13:06 +0800
Subject: [PATCH 08/23] Initial app-config module [ISDK-80]

---
 src/app/app.module.ts                       |  2 +
 src/pages/tabs/tabs.page.ts                 | 12 +++++-
 src/shared/app-config/app-config.module.ts  |  6 +++
 src/shared/app-config/app-config.service.ts | 48 +++++++++++++++++++++
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/shared/app-config/app-config.module.ts
 create mode 100644 src/shared/app-config/app-config.service.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4fdb7336..3bf96547 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -14,6 +14,7 @@ import { HttpModule, Http } from '@angular/http';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { TranslateHttpLoader } from "@ngx-translate/http-loader";
 import { i18nData } from './assets/i18n-en';
+import { AppConfigModule } from '../shared/app-config/app-config.module';
 import { TranslationModule } from '../shared/translation/translation.module';
 import { MomentModule } from 'angular2-moment';
 
@@ -156,6 +157,7 @@ export function HttpLoaderFactory(http: Http) {
     EscapeHtmlPipe,
   ],
   imports: [
+    AppConfigModule,
     BrowserModule,
     CacheModule,
     FormsModule,
diff --git a/src/pages/tabs/tabs.page.ts b/src/pages/tabs/tabs.page.ts
index c0339b8b..02b49839 100644
--- a/src/pages/tabs/tabs.page.ts
+++ b/src/pages/tabs/tabs.page.ts
@@ -4,9 +4,10 @@ import { Component } from '@angular/core';
 import { ActivitiesListPage } from '../activities/list/list.page';
 import { RankingsPage } from '../rankings/list/rankings.page';
 import { SettingsPage } from '../settings/settings.page';
-import { TestPage } from './test.page';
+// import { TestPage } from './test.page';
 import { EventsListPage } from '../events/list/list.page';
 // Others
+import { AppConfigService } from '../../shared/app-config/app-config.service';
 import { TranslationService } from '../../shared/translation/translation.service';
 
 @Component({
@@ -22,7 +23,16 @@ export class TabsPage {
   settings: any = SettingsPage;
   events: any = EventsListPage;
 
+  tabs: any = [];
+
   constructor(
+    public appConfig: AppConfigService,
     public translationService: TranslationService
   ) {}
+
+  ionViewWillEnter() {
+    this.appConfig.getModule().then(modules => {
+      this.tabs = modules;
+    });
+  }
 }
diff --git a/src/shared/app-config/app-config.module.ts b/src/shared/app-config/app-config.module.ts
new file mode 100644
index 00000000..58769a6f
--- /dev/null
+++ b/src/shared/app-config/app-config.module.ts
@@ -0,0 +1,6 @@
+import { NgModule } from '@angular/core';
+import { AppConfigService } from './app-config.service';
+@NgModule({
+  providers: [ AppConfigService ]
+})
+export class AppConfigModule {}
diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
new file mode 100644
index 00000000..98664323
--- /dev/null
+++ b/src/shared/app-config/app-config.service.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@angular/core';
+
+// Others
+import * as _ from 'lodash';
+
+@Injectable()
+export class AppConfigService {
+
+  appConfigContent: any = {
+    app: {
+      name: 'ISDK'
+    },
+    modules: {
+      activities: {
+        title: 'Dashboard',
+        visible: true,
+        order: 0
+      },
+      events: {
+        title: 'Events',
+        visible: true,
+        order: 1
+      },
+      rankings: {
+        title: 'Rankings',
+        visible: true,
+        order: 2
+      },
+      settings: {
+        title: 'Settings',
+        visible: true,
+        order: 3
+      }
+    }
+  };
+
+  get(): Promise<any> {
+    return new Promise((resolve, reject) => {
+      resolve(this.appConfigContent);
+    });
+  }
+
+  getModule(): Promise<any> {
+    return this.get().then((data: any) => {
+      return _.sortBy(data.modules, [(o) => o.order]);
+    });
+  }
+}

From 3779d1b02df17fda753448e622a816f050379f26 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 23 Oct 2017 12:45:54 +0800
Subject: [PATCH 09/23] Assign page to tab automatically [ISDK-80]

---
 src/pages/tabs/tabs.html                    |  7 +----
 src/pages/tabs/tabs.page.ts                 |  8 ------
 src/shared/app-config/app-config.service.ts | 29 +++++++++++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/pages/tabs/tabs.html b/src/pages/tabs/tabs.html
index c45f2d85..a32f5ba4 100755
--- a/src/pages/tabs/tabs.html
+++ b/src/pages/tabs/tabs.html
@@ -1,9 +1,4 @@
 <ion-tabs>
   <ion-tab tabsHideOnSubPages="true" [root]="dashboard" tabTitle=" {{ 'TABS.DASHBOARD' | translate }}" tabIcon="md-list-box"></ion-tab>
-  <ion-tab tabsHideOnSubPages="true" [root]="events" tabTitle=" {{ 'TABS.EVENTS' | translate }}" tabIcon="md-calendar"></ion-tab>
-  <ion-tab tabsHideOnSubPages="true" [root]="ranking" tabTitle=" {{ 'TABS.RANKING' | translate }}" tabIcon="md-medal"></ion-tab>
-  <ion-tab tabsHideOnSubPages="true" [root]="settings" tabTitle=" {{ 'TABS.ACCOUNT' | translate }}" tabIcon="md-person"></ion-tab>
+  <ion-tab *ngFor="let tab of tabs" tabsHideOnSubPages="true" [root]="tab.root" tabTitle=" {{ tab.title | translate }}" tabIcon="{{tab.icon}}"></ion-tab>
 </ion-tabs>
-
-
-
diff --git a/src/pages/tabs/tabs.page.ts b/src/pages/tabs/tabs.page.ts
index 02b49839..745c47a9 100644
--- a/src/pages/tabs/tabs.page.ts
+++ b/src/pages/tabs/tabs.page.ts
@@ -2,10 +2,6 @@ import { Component } from '@angular/core';
 
 // Pages
 import { ActivitiesListPage } from '../activities/list/list.page';
-import { RankingsPage } from '../rankings/list/rankings.page';
-import { SettingsPage } from '../settings/settings.page';
-// import { TestPage } from './test.page';
-import { EventsListPage } from '../events/list/list.page';
 // Others
 import { AppConfigService } from '../../shared/app-config/app-config.service';
 import { TranslationService } from '../../shared/translation/translation.service';
@@ -17,11 +13,7 @@ import { TranslationService } from '../../shared/translation/translation.service
 export class TabsPage {
   // this tells the tabs component which Pages
   // should be each tab's root Page
-  ranking: any = RankingsPage;
-  // ranking: any = TestPage;
   dashboard: any = ActivitiesListPage;
-  settings: any = SettingsPage;
-  events: any = EventsListPage;
 
   tabs: any = [];
 
diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
index 98664323..e62cdcb6 100644
--- a/src/shared/app-config/app-config.service.ts
+++ b/src/shared/app-config/app-config.service.ts
@@ -1,34 +1,42 @@
 import { Injectable } from '@angular/core';
 
+// Pages
+import { EventsListPage } from '../../pages/events/list/list.page';
+import { RankingsPage } from '../../pages/rankings/list/rankings.page';
+import { SettingsPage } from '../../pages/settings/settings.page';
+
 // Others
 import * as _ from 'lodash';
 
 @Injectable()
 export class AppConfigService {
+  pagesMap: any = {
+    events: EventsListPage,
+    rankings: RankingsPage,
+    settings: SettingsPage
+  }
 
   appConfigContent: any = {
     app: {
       name: 'ISDK'
     },
     modules: {
-      activities: {
-        title: 'Dashboard',
-        visible: true,
-        order: 0
-      },
       events: {
+        name: 'events',
         title: 'Events',
-        visible: true,
+        icon: 'md-calendar',
         order: 1
       },
       rankings: {
+        name: 'rankings',
         title: 'Rankings',
-        visible: true,
+        icon: 'md-medal',
         order: 2
       },
       settings: {
+        name: 'settings',
         title: 'Settings',
-        visible: true,
+        icon: 'md-person',
         order: 3
       }
     }
@@ -43,6 +51,11 @@ export class AppConfigService {
   getModule(): Promise<any> {
     return this.get().then((data: any) => {
       return _.sortBy(data.modules, [(o) => o.order]);
+    }).then((data: any) => {
+      return _.map(data, (o) => {
+        o.root = this.pagesMap[o.name];
+        return o;
+      });
     });
   }
 }

From b46086eb2b0a1f6c1dfd025e6664db3740fdf8d9 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 23 Oct 2017 16:46:30 +0800
Subject: [PATCH 10/23] Add more page map [ISDK-80]

---
 src/shared/app-config/app-config.service.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
index e62cdcb6..bd4ba894 100644
--- a/src/shared/app-config/app-config.service.ts
+++ b/src/shared/app-config/app-config.service.ts
@@ -2,8 +2,11 @@ import { Injectable } from '@angular/core';
 
 // Pages
 import { EventsListPage } from '../../pages/events/list/list.page';
+import { GalleryPage } from '../../pages/gallery/gallery.page';
+import { LevelsPage } from '../../pages/levels/list/list.page';
 import { RankingsPage } from '../../pages/rankings/list/rankings.page';
 import { SettingsPage } from '../../pages/settings/settings.page';
+import { TeamPage } from '../../pages/team/team.page';
 
 // Others
 import * as _ from 'lodash';
@@ -13,9 +16,12 @@ export class AppConfigService {
   pagesMap: any = {
     events: EventsListPage,
     rankings: RankingsPage,
-    settings: SettingsPage
+    settings: SettingsPage,
+    gallery: GalleryPage,
+    team: TeamPage
   }
 
+  // JSON format sent back from server
   appConfigContent: any = {
     app: {
       name: 'ISDK'

From 2c47fbeea4712c34fc508a318777597e02c05075 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Tue, 24 Oct 2017 09:39:47 +0800
Subject: [PATCH 11/23] Update code style [ISDK-80]

---
 src/app/app.module.ts                                | 4 ++--
 src/pages/gallery/{gallery.ts => gallery.page.ts}    | 0
 src/pages/spinwheel/celebration.html                 | 3 ---
 src/pages/spinwheel/celebration.page.ts              | 8 --------
 src/pages/tabs/tabs.page.ts                          | 2 +-
 src/pages/team/{team.ts => team.page.ts}             | 0
 src/shared/app-config/app-config.service.ts          | 6 +++---
 src/shared/testModules/pages/test/test-start.page.ts | 9 ++-------
 8 files changed, 8 insertions(+), 24 deletions(-)
 rename src/pages/gallery/{gallery.ts => gallery.page.ts} (100%)
 delete mode 100644 src/pages/spinwheel/celebration.html
 delete mode 100644 src/pages/spinwheel/celebration.page.ts
 rename src/pages/team/{team.ts => team.page.ts} (100%)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3bf96547..e948617f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -68,7 +68,7 @@ import { EventsListPage } from '../pages/events/list/list.page';
 import { EventsPreviewPage } from '../pages/events/download/events-preview.page';
 import { EventsViewPage } from '../pages/events/view/events-view.page';
 import { ForgetPasswordPage } from '../pages/forget-password/forget-password';
-import { GalleryPage } from '../pages/gallery/gallery';
+import { GalleryPage } from '../pages/gallery/gallery.page';
 import { ItemsPopupPage } from '../pages/assessments/popup/items-popup.page';
 import { LeaderboardSettingsPage } from '../pages/settings/leaderboard/leaderboard-settings.page';
 import { LevelsListPage } from '../pages/levels/list/list';
@@ -83,7 +83,7 @@ import { ResetPasswordPage } from '../pages/reset-password/reset-password';
 import { SettingsPage } from '../pages/settings/settings.page';
 import { SidenavPage } from '../pages/sidenav/sidenav';
 import { TabsPage } from '../pages/tabs/tabs.page';
-import { TeamPage } from '../pages/team/team';
+import { TeamPage } from '../pages/team/team.page';
 import { TermConditionPage } from '../pages/term-condition/term-condition.page';
 import { TestPage } from '../pages/tabs/test.page';
 import { TutorialPage } from '../pages/settings/tutorial/tutorial.page';
diff --git a/src/pages/gallery/gallery.ts b/src/pages/gallery/gallery.page.ts
similarity index 100%
rename from src/pages/gallery/gallery.ts
rename to src/pages/gallery/gallery.page.ts
diff --git a/src/pages/spinwheel/celebration.html b/src/pages/spinwheel/celebration.html
deleted file mode 100644
index f736105a..00000000
--- a/src/pages/spinwheel/celebration.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ion-content>
-  Test
-</ion-content>
diff --git a/src/pages/spinwheel/celebration.page.ts b/src/pages/spinwheel/celebration.page.ts
deleted file mode 100644
index 5bf0adbe..00000000
--- a/src/pages/spinwheel/celebration.page.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  templateUrl: './celebration.html'
-})
-export class CelebrationPage {
-
-}
diff --git a/src/pages/tabs/tabs.page.ts b/src/pages/tabs/tabs.page.ts
index 745c47a9..27ae955a 100644
--- a/src/pages/tabs/tabs.page.ts
+++ b/src/pages/tabs/tabs.page.ts
@@ -23,7 +23,7 @@ export class TabsPage {
   ) {}
 
   ionViewWillEnter() {
-    this.appConfig.getModule().then(modules => {
+    this.appConfig.getTabs().then(modules => {
       this.tabs = modules;
     });
   }
diff --git a/src/pages/team/team.ts b/src/pages/team/team.page.ts
similarity index 100%
rename from src/pages/team/team.ts
rename to src/pages/team/team.page.ts
diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
index bd4ba894..4a982253 100644
--- a/src/shared/app-config/app-config.service.ts
+++ b/src/shared/app-config/app-config.service.ts
@@ -26,7 +26,7 @@ export class AppConfigService {
     app: {
       name: 'ISDK'
     },
-    modules: {
+    tabs: {
       events: {
         name: 'events',
         title: 'Events',
@@ -54,9 +54,9 @@ export class AppConfigService {
     });
   }
 
-  getModule(): Promise<any> {
+  getTabs(): Promise<any> {
     return this.get().then((data: any) => {
-      return _.sortBy(data.modules, [(o) => o.order]);
+      return _.sortBy(data.tabs, [(o) => o.order]);
     }).then((data: any) => {
       return _.map(data, (o) => {
         o.root = this.pagesMap[o.name];
diff --git a/src/shared/testModules/pages/test/test-start.page.ts b/src/shared/testModules/pages/test/test-start.page.ts
index 861ca6bd..b4d7fa5e 100755
--- a/src/shared/testModules/pages/test/test-start.page.ts
+++ b/src/shared/testModules/pages/test/test-start.page.ts
@@ -7,20 +7,15 @@ import { AssessmentsGroupPage } from '../../../../pages/assessments/group/assess
 import { ActivitiesClassicListPage } from '../../../../pages/activities-classic/list/activities-classic-list.page';
 import { EventsListPage } from '../../../../pages/events/list/list.page';
 import { EventsDownloadPage } from '../../../../pages/events/download/events-download.page';
-import { GalleryPage } from '../../../../pages/gallery/gallery';
+import { GalleryPage } from '../../../../pages/gallery/gallery.page';
 import { LevelsListPage } from '../../../../pages/levels/list/list';
 import { LoginPage } from '../../../../pages/login/login';
 import { RegistrationPage } from '../../../../pages/registration/registration.page';
 import { SettingsPage } from '../../../../pages/settings/settings.page';
 import { EventCheckinPage } from '../../../../pages/events/checkin/event-checkin.page';
-import { TeamPage } from '../../../../pages/team/team';
-import { CelebrationPage } from '../../../../pages/spinwheel/celebration.page';
+import { TeamPage } from '../../../../pages/team/team.page';
 
 const PAGES = [
-  {
-    name: 'celebration',
-    page: CelebrationPage
-  },
   {
     name: 'Check-in',
     page: EventCheckinPage,

From 02b1c1048e9f012a06841626af021d8de006c544 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Tue, 24 Oct 2017 09:56:05 +0800
Subject: [PATCH 12/23] Add comment for code [ISDK-80]

---
 src/pages/tabs/tabs.page.ts                 | 4 +++-
 src/shared/app-config/app-config.service.ts | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/tabs/tabs.page.ts b/src/pages/tabs/tabs.page.ts
index 27ae955a..dd6f6c46 100644
--- a/src/pages/tabs/tabs.page.ts
+++ b/src/pages/tabs/tabs.page.ts
@@ -13,8 +13,10 @@ import { TranslationService } from '../../shared/translation/translation.service
 export class TabsPage {
   // this tells the tabs component which Pages
   // should be each tab's root Page
-  dashboard: any = ActivitiesListPage;
 
+  // We need hardcode at least one tab menu,
+  // otherwise any misconfigure will break
+  dashboard: any = ActivitiesListPage;
   tabs: any = [];
 
   constructor(
diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
index 4a982253..35f07bd5 100644
--- a/src/shared/app-config/app-config.service.ts
+++ b/src/shared/app-config/app-config.service.ts
@@ -13,6 +13,8 @@ import * as _ from 'lodash';
 
 @Injectable()
 export class AppConfigService {
+  // Mapping page to name,
+  // use for changing page in tab menu
   pagesMap: any = {
     events: EventsListPage,
     rankings: RankingsPage,
@@ -48,12 +50,18 @@ export class AppConfigService {
     }
   };
 
+  /**
+   * @description Get raw configure data from server
+   */
   get(): Promise<any> {
     return new Promise((resolve, reject) => {
       resolve(this.appConfigContent);
     });
   }
 
+  /**
+   * @description Get only configure for tabs
+   */
   getTabs(): Promise<any> {
     return this.get().then((data: any) => {
       return _.sortBy(data.tabs, [(o) => o.order]);

From 03700d33843471dbca5dbda19f51193bf44dec60 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Thu, 26 Oct 2017 11:13:08 +0800
Subject: [PATCH 13/23] Update code style [ISDK-80]

---
 src/pages/gallery/gallery.page.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/gallery/gallery.page.ts b/src/pages/gallery/gallery.page.ts
index da647457..4426a930 100644
--- a/src/pages/gallery/gallery.page.ts
+++ b/src/pages/gallery/gallery.page.ts
@@ -45,10 +45,10 @@ export class GalleryPage {
   refresher = null;
 
   constructor(
-    private navCtrl: NavController,
-    private toastCtrl: ToastController,
-    private assessmentService: AssessmentService,
-    private submissionService: SubmissionService
+    public navCtrl: NavController,
+    public toastCtrl: ToastController,
+    public assessmentService: AssessmentService,
+    public submissionService: SubmissionService
   ) {}
 
   // @TODO: Move to shared function later...

From 9fb2782957c09959a2c9b3594e682afb2c5ee06d Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 30 Oct 2017 12:21:30 +0800
Subject: [PATCH 14/23] Add "hide name" to settings page [ISDK-84]

---
 src/pages/settings/settings.html | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html
index 5b516ab6..2f571164 100644
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -8,12 +8,13 @@
     <ion-list-header>
       {{ 'SETTINGS.PROFILE' | translate }} <span *ngIf="getUserEmail()">({{ getUserEmail() }})</span>
     </ion-list-header>
-    <button ion-item (click)="goToTutorial()">
-      <ion-icon name="medkit" item-left></ion-icon> {{ 'SETTINGS.TUTORIAL' | translate }}
-    </button>
-    <button ion-item (click)="goToTermConditions()">
-      <ion-icon name="clipboard" item-left></ion-icon> {{ 'SETTINGS.TERMS' | translate }}
-    </button>
+
+    <ion-item>
+      <ion-toggle checked="false"></ion-toggle>
+      <ion-label>
+        Hide name in rankings
+      </ion-label>
+    </ion-item>
     <!-- <button ion-item (click)="goLeaderBoardSettings()">
       <ion-icon name="swap" item-left></ion-icon> {{ 'SETTINGS.LEADERBOARD' | translate }}
     </button> -->
@@ -22,9 +23,17 @@
     <ion-list-header>
       {{ 'SETTINGS.SUPPORT' | translate }}
     </ion-list-header>
+    <button ion-item (click)="goToTutorial()">
+      <ion-icon name="medkit" item-left></ion-icon> {{ 'SETTINGS.TUTORIAL' | translate }}
+    </button>
+    <button ion-item (click)="goToTermConditions()">
+      <ion-icon name="clipboard" item-left></ion-icon> {{ 'SETTINGS.TERMS' | translate }}
+    </button>
     <a ion-item href="mailto:{{helpline}}?Subject=Tech%20Support%20Request" target="_blank">
       <ion-icon name="mail" item-left></ion-icon> {{ 'SETTINGS.HELP' | translate }}
     </a>
+  </ion-list>
+  <ion-list no-lines>
     <button ion-item (click)="logout()">
       <ion-icon name="exit" item-left></ion-icon> {{ 'SETTINGS.LOGOUT' | translate }}
     </button>

From ae838eea0eaf17ff66b32db81933ede3207cd14d Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 30 Oct 2017 14:15:31 +0800
Subject: [PATCH 15/23] Allow trigger hide name in setting [ISDK-84]

---
 src/pages/settings/settings.html    |  5 +-
 src/pages/settings/settings.page.ts | 87 +++++++++++++++++++++++++----
 2 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html
index 2f571164..799dc693 100644
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -10,14 +10,11 @@
     </ion-list-header>
 
     <ion-item>
-      <ion-toggle checked="false"></ion-toggle>
+      <ion-toggle [(ngModel)]="hideName" (ionChange)="triggerHideName()"></ion-toggle>
       <ion-label>
         Hide name in rankings
       </ion-label>
     </ion-item>
-    <!-- <button ion-item (click)="goLeaderBoardSettings()">
-      <ion-icon name="swap" item-left></ion-icon> {{ 'SETTINGS.LEADERBOARD' | translate }}
-    </button> -->
   </ion-list>
   <ion-list no-lines>
     <ion-list-header>
diff --git a/src/pages/settings/settings.page.ts b/src/pages/settings/settings.page.ts
index c859ab29..98706c10 100644
--- a/src/pages/settings/settings.page.ts
+++ b/src/pages/settings/settings.page.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
-import { App, NavController, MenuController, LoadingController } from 'ionic-angular';
+import { App, NavController, MenuController, LoadingController, AlertController } from 'ionic-angular';
 
 // services
 import { CacheService } from '../../shared/cache/cache.service';
+import { GameService } from '../../services/game.service';
 // pages
 import { LeaderboardSettingsPage } from '../settings/leaderboard/leaderboard-settings.page';
 import { LoginPage } from '../../pages/login/login';
@@ -10,7 +11,7 @@ import { TutorialPage } from '../settings/tutorial/tutorial.page';
 import { TermConditionPage } from '../term-condition/term-condition.page';
 // Others
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages';
+import { loadingMessages } from '../../app/messages';
 
 @Component({
   selector: 'settings-page',
@@ -18,24 +19,90 @@ import { loadingMessages, errMessages } from '../../app/messages';
 })
 export class SettingsPage {
   helpline: string = "help@practera.com";
+  hideName: boolean = false;
   logoutMessage: any = loadingMessages.Logout.logout;
   settings: any = [];
 
   constructor(
-    public cache: CacheService,
+    public appCtrl: App,
+    public alertCtrl: AlertController,
+    public cacheService: CacheService,
+    public gameService: GameService,
+    public loadingCtrl: LoadingController,
     public menuCtrl: MenuController,
     public navCtrl: NavController,
-    public loadingCtrl: LoadingController,
     public translationService: TranslationService,
-    public appCtrl: App
   ) {}
 
-  getUserEmail() {
-    return this.cache.getLocalObject('email') || '';
+  ionViewWillEnter(){
+    this.preload();
+  }
+
+  preload() {
+    const loading = this.loadingCtrl.create({
+      content: 'Loading'
+    });
+    loading.present();
+
+    let gameId = this.cacheService.getLocalObject('game_id');
+    this.gameService.getCharacters(gameId)
+      .subscribe((characters) => {
+        let me = characters.Characters[0];
+        if(me.meta == null) {
+          this.hideName = false;
+        }
+        if(me.meta != null){
+          if (me.meta.private === 0) {
+            this.hideName = false;
+          } else {
+            this.hideName = true;
+          }
+        }
+        loading.dismiss();
+      }, (err) => {
+        loading.dismiss();
+      });
+  }
+
+  triggerHideName() {
+    const showAlert = (msg) => {
+      let alert = this.alertCtrl.create({
+        subTitle: msg,
+        buttons: ['OK']
+      });
+      alert.present();
+    }
+
+    const loader = this.loadingCtrl.create({
+      content: 'Updating'
+    });
+
+    loader.present().then(() => {
+      this.gameService.postCharacter({
+        Character: {
+          id: this.cacheService.getLocalObject('character_id'),
+          meta: {
+            private: (this.hideName) ? 1 : 0
+          }
+        }
+      })
+      .subscribe((result) => {
+        loader.dismiss();
+        let msg = 'You name will now be hidden if in the ranking';
+        if (!this.hideName) {
+          msg = 'Your name will now be displayed if in the ranking';
+        }
+        showAlert(msg);
+      }, (err) => {
+        this.hideName = !this.hideName;
+        showAlert('Unabled to change your privacy setting.');
+        loader.dismiss();
+      });
+    });
   }
 
-  goLeaderBoardSettings(){
-    this.navCtrl.push(LeaderboardSettingsPage);
+  getUserEmail() {
+    return this.cacheService.getLocalObject('email') || '';
   }
 
   goToTutorial() {
@@ -52,7 +119,7 @@ export class SettingsPage {
       content: this.logoutMessage
     });
     loader.present().then(() => {
-      this.cache.clear().then(() => {
+      this.cacheService.clear().then(() => {
         localStorage.clear();
         window.location.reload(); // the reason of doing this is because of we need to refresh page content instead of API data cache issue occurs
         loader.dismiss();

From f8c6baa419e8bf7a0e90f4702e0d8ecd4d5f14ea Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 30 Oct 2017 14:17:59 +0800
Subject: [PATCH 16/23] Remove unused import [ISDK-84]

---
 src/pages/settings/settings.page.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/settings.page.ts b/src/pages/settings/settings.page.ts
index 98706c10..d5887e4b 100644
--- a/src/pages/settings/settings.page.ts
+++ b/src/pages/settings/settings.page.ts
@@ -5,7 +5,6 @@ import { App, NavController, MenuController, LoadingController, AlertController
 import { CacheService } from '../../shared/cache/cache.service';
 import { GameService } from '../../services/game.service';
 // pages
-import { LeaderboardSettingsPage } from '../settings/leaderboard/leaderboard-settings.page';
 import { LoginPage } from '../../pages/login/login';
 import { TutorialPage } from '../settings/tutorial/tutorial.page';
 import { TermConditionPage } from '../term-condition/term-condition.page';

From 550c5c64bd133412c7c939f065fbdb62d629801a Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Wed, 1 Nov 2017 09:41:01 +0800
Subject: [PATCH 17/23] Remove useless setting for ranking [ISDK-84]

---
 src/app/app.module.ts                          |  3 ---
 .../leaderboard/leaderboard-settings.html      | 16 ----------------
 .../leaderboard/leaderboard-settings.page.ts   | 18 ------------------
 src/theme/main.styles.theme.scss               |  1 -
 src/theme/pages/settings/leaderboard.scss      | 15 ---------------
 5 files changed, 53 deletions(-)
 delete mode 100644 src/pages/settings/leaderboard/leaderboard-settings.html
 delete mode 100644 src/pages/settings/leaderboard/leaderboard-settings.page.ts
 delete mode 100644 src/theme/pages/settings/leaderboard.scss

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e948617f..4c7db13b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -70,7 +70,6 @@ import { EventsViewPage } from '../pages/events/view/events-view.page';
 import { ForgetPasswordPage } from '../pages/forget-password/forget-password';
 import { GalleryPage } from '../pages/gallery/gallery.page';
 import { ItemsPopupPage } from '../pages/assessments/popup/items-popup.page';
-import { LeaderboardSettingsPage } from '../pages/settings/leaderboard/leaderboard-settings.page';
 import { LevelsListPage } from '../pages/levels/list/list';
 import { LoginPage } from '../pages/login/login';
 import { MagicLinkPage } from '../pages/magic-link/magic-link';
@@ -122,7 +121,6 @@ export function HttpLoaderFactory(http: Http) {
     ForgetPasswordPage,
     GalleryPage,
     ItemsPopupPage,
-    LeaderboardSettingsPage,
     LevelComponent,
     LevelsListPage,
     LoadingMarkerComponent,
@@ -237,7 +235,6 @@ export function HttpLoaderFactory(http: Http) {
     ForgetPasswordPage,
     ItemsPopupPage,
     GalleryPage,
-    LeaderboardSettingsPage,
     LevelComponent,
     LevelsListPage,
     LoadingMarkerComponent,
diff --git a/src/pages/settings/leaderboard/leaderboard-settings.html b/src/pages/settings/leaderboard/leaderboard-settings.html
deleted file mode 100644
index 6ce93c66..00000000
--- a/src/pages/settings/leaderboard/leaderboard-settings.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<ion-header>
-  <ion-navbar>
-    <ion-title>{{ 'SETTINGS.LEADERBOARD' | translate }}</ion-title>
-  </ion-navbar>
-</ion-header>
-<ion-content class="leaderboard-settings">
-  <ion-list>
-    <ion-col>
-      <p col-12>Hi {{ username }} ({{ useremail }}), </p>
-    </ion-col>
-    <ion-col class="flex-display">
-      <p col-10 class="hide-settings">Hide name in leaderboard?</p>
-      <ion-toggle [(ngModel)]="isHide"></ion-toggle>
-    </ion-col>
-  </ion-list>
-</ion-content>
\ No newline at end of file
diff --git a/src/pages/settings/leaderboard/leaderboard-settings.page.ts b/src/pages/settings/leaderboard/leaderboard-settings.page.ts
deleted file mode 100644
index 69798990..00000000
--- a/src/pages/settings/leaderboard/leaderboard-settings.page.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Component } from '@angular/core';
-
-// services
-import { CacheService } from '../../../shared/cache/cache.service';
-
-@Component({
-  selector: 'leaderboard-settings-page',
-  templateUrl: 'leaderboard-settings.html'
-})
-export class LeaderboardSettingsPage {
-  isHide: boolean = false;
-  useremail: string = this.cacheService.getLocalObject('email') || '';
-  username: string = this.cacheService.getLocalObject('name') || '';
-
-  constructor(
-    public cacheService: CacheService
-  ) {}
-}
diff --git a/src/theme/main.styles.theme.scss b/src/theme/main.styles.theme.scss
index e3706265..1e65b890 100755
--- a/src/theme/main.styles.theme.scss
+++ b/src/theme/main.styles.theme.scss
@@ -30,7 +30,6 @@
 @import "./pages/rankings/view-ranking-details";
 
 // Settings
-@import "./pages/settings/leaderboard";
 @import "./pages/settings/tutorial";
 @import "./pages/settings/settings";
 
diff --git a/src/theme/pages/settings/leaderboard.scss b/src/theme/pages/settings/leaderboard.scss
deleted file mode 100644
index 3f4261df..00000000
--- a/src/theme/pages/settings/leaderboard.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @description
- *  - leaderboard settings page styling
- * @page
- *  - pages/settings/leaderboard/leaderboard-settings.html
- */
-
-.leaderboard-settings {
-  .hide-settings {
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-  }
-}

From f9a451a49bbff9fe91a6ea585696e1774c94770e Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Thu, 2 Nov 2017 11:20:23 +0800
Subject: [PATCH 18/23] Remove ranking setting page [ISDK-84]

---
 src/pages/settings/leaderboard/leaderboard-settings.page.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/pages/settings/leaderboard/leaderboard-settings.page.ts

diff --git a/src/pages/settings/leaderboard/leaderboard-settings.page.ts b/src/pages/settings/leaderboard/leaderboard-settings.page.ts
deleted file mode 100644
index e69de29b..00000000

From 168a933835b311b5a17e7c20fa28fc1f00eef9d3 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Mon, 6 Nov 2017 16:28:15 +0800
Subject: [PATCH 19/23] Support load tabs from remote config [ISDK-80]

---
 src/pages/login/login.ts                    |  2 +-
 src/pages/tabs/tabs.page.ts                 |  4 +--
 src/shared/app-config/app-config.service.ts | 31 ++++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts
index ec5a4783..301c3ff2 100644
--- a/src/pages/login/login.ts
+++ b/src/pages/login/login.ts
@@ -90,10 +90,10 @@ export class LoginPage {
         this.authService.loginAuth(this.email, this.password)
             .subscribe(data => {
               self.cacheService.setLocal('apikey', data.apikey);
-              // saved for 3 types of timeline id in order for later use
               self.cacheService.setLocal('timelineID', data.Timelines[0].Timeline.id);
               self.cacheService.setLocal('teams', data.Teams);
               self.cacheService.setLocal('gotNewItems', false);
+              self.cacheService.setLocal('appConfig', data.Experience.config || {});
               // get game_id data after login
               this.gameService.getGames()
                   .subscribe(data => {
diff --git a/src/pages/tabs/tabs.page.ts b/src/pages/tabs/tabs.page.ts
index dd6f6c46..847afcbc 100644
--- a/src/pages/tabs/tabs.page.ts
+++ b/src/pages/tabs/tabs.page.ts
@@ -25,8 +25,6 @@ export class TabsPage {
   ) {}
 
   ionViewWillEnter() {
-    this.appConfig.getTabs().then(modules => {
-      this.tabs = modules;
-    });
+    this.tabs = this.appConfig.getTabs();
   }
 }
diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
index 35f07bd5..10262164 100644
--- a/src/shared/app-config/app-config.service.ts
+++ b/src/shared/app-config/app-config.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { CacheService } from '../cache/cache.service';
 
 // Pages
 import { EventsListPage } from '../../pages/events/list/list.page';
@@ -50,26 +51,30 @@ export class AppConfigService {
     }
   };
 
+  constructor (
+    private cacheService: CacheService
+  ) {}
+
   /**
-   * @description Get raw configure data from server
+   * @description Get full configure data
    */
-  get(): Promise<any> {
-    return new Promise((resolve, reject) => {
-      resolve(this.appConfigContent);
-    });
+  get(): any {
+    return this.cacheService.getLocal('appConfig');
   }
 
   /**
    * @description Get only configure for tabs
    */
-  getTabs(): Promise<any> {
-    return this.get().then((data: any) => {
-      return _.sortBy(data.tabs, [(o) => o.order]);
-    }).then((data: any) => {
-      return _.map(data, (o) => {
-        o.root = this.pagesMap[o.name];
-        return o;
-      });
+  getTabs(): any {
+    let appConfig: any = this.cacheService.getLocal('appConfig');
+    if (!appConfig.tabs) {
+      return appConfig.tabs;
+    }
+
+    let modules = _.sortBy(appConfig.tabs, [(o) => o.order]);
+    return _.map(modules, (o) => {
+      o.root = this.pagesMap[o.name];
+      return o;
     });
   }
 }

From 403ece91c399ff28476e03c9bc732826a4be30e2 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Tue, 7 Nov 2017 11:45:38 +0800
Subject: [PATCH 20/23] Merge branch 'develop' into
 feature/ISDK-84/ranking-service

# Conflicts:
#	src/app/app.module.ts
#	src/pages/forget-password/forget-password.ts
#	src/pages/login/login.ts
#	src/pages/registration/register.page.ts
#	src/pages/registration/registration.page.ts
#	src/pages/reset-password/reset-password.ts
#	src/pages/term-condition/term-condition.page.ts
---
 package-lock.json                             | 2403 ++++++++++++-----
 package.json                                  |    8 +-
 src/app/app.component.ts                      |    5 +-
 src/app/app.module.ts                         |   39 +-
 src/app/messages.ts                           |   11 +-
 src/assets/i18n-en.json                       |    7 +-
 src/configs/config.ts.default                 |    9 -
 .../forget-password/forget-password.html      |   12 +-
 src/pages/forget-password/forget-password.ts  |   82 +-
 src/pages/login/login.html                    |   15 +-
 src/pages/login/login.ts                      |   75 +-
 src/pages/magic-link/magic-link.ts            |   33 +-
 src/pages/registration/register.html          |   62 +-
 src/pages/registration/register.page.ts       |  234 +-
 .../terms-conditions/terms-conditions.html    |   55 +
 .../terms-conditions/terms-conditions.page.ts |   17 +
 src/pages/reset-password/reset-password.html  |   33 +-
 src/pages/reset-password/reset-password.ts    |  128 +-
 src/pages/settings/settings.page.ts           |    8 +-
 src/pages/settings/tutorial/tutorial.html     |    8 +-
 src/pages/term-condition/term-condition.html  |   32 -
 src/pages/term-condition/term-condition.scss  |   27 -
 .../term-condition/term-content.component.ts  |  104 -
 src/services/auth.service.spec.ts             |  121 +
 src/services/auth.service.ts                  |   15 -
 src/shared/cache/cache.component.ts           |   22 +
 src/shared/cache/cache.module.spec.ts         |   52 +-
 src/shared/request/request.service.ts         |    2 +-
 .../testModules/pages/test/test-start.page.ts |    4 +-
 .../default-center-container.scss             |    7 +-
 .../pages/authenticate/login-container.scss   |   11 -
 .../pages/authenticate/login-module.scss      |   39 +-
 test-config/karma.conf.js                     |    5 +-
 yarn.lock                                     |  243 +-
 34 files changed, 2676 insertions(+), 1252 deletions(-)
 delete mode 100644 src/configs/config.ts.default
 create mode 100644 src/pages/registration/terms-conditions/terms-conditions.html
 create mode 100644 src/pages/registration/terms-conditions/terms-conditions.page.ts
 delete mode 100644 src/pages/term-condition/term-condition.html
 delete mode 100644 src/pages/term-condition/term-condition.scss
 delete mode 100755 src/pages/term-condition/term-content.component.ts
 create mode 100644 src/services/auth.service.spec.ts
 create mode 100644 src/shared/cache/cache.component.ts
 mode change 100755 => 100644 src/shared/cache/cache.module.spec.ts

diff --git a/package-lock.json b/package-lock.json
index 4bade911..0e090944 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -160,7 +160,7 @@
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
+            "supports-color": "4.5.0"
           }
         },
         "component-emitter": {
@@ -277,9 +277,9 @@
       }
     },
     "@ngx-translate/core": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-7.0.0.tgz",
-      "integrity": "sha1-W29jvUBCFk1EzYX2hwOvluk5Ln0="
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-7.2.2.tgz",
+      "integrity": "sha1-5wBp1e+Og36jNuaJB3N4b177XeU="
     },
     "@ngx-translate/http-loader": {
       "version": "0.1.0",
@@ -287,9 +287,9 @@
       "integrity": "sha1-YCkyVWHXho/jJaQZ3idw6Y/xUC4="
     },
     "@types/jasmine": {
-      "version": "2.5.53",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.53.tgz",
-      "integrity": "sha512-2YNL0jXYuN7w07mb1sMZQ6T6zOvGi83v8UbjhBZ8mhvI1VkQ2STU9XOrTFyvWswMyh5rW1evS+e7qltYJvTqPA==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.2.tgz",
+      "integrity": "sha512-MycZLb931+dfAUzz27JeIOrvKjqyWUk27PhJzYWpIJ9nEyPi2bb1AOc/X9bvmvYnekpNrGNqYXwvoXMmpaeoCw==",
       "dev": true
     },
     "@types/localforage": {
@@ -298,9 +298,9 @@
       "integrity": "sha1-PWCmv23aOOP4pGlhFZg3nx9klQk="
     },
     "@types/node": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.39.tgz",
-      "integrity": "sha512-KQHAZeVsk4UIT9XaR6cn4WpHZzimK6UBD1UomQKfQQFmTlUHaNBzeuov+TM4+kigLO0IJt4I5OOsshcCyA9gSA==",
+      "version": "8.0.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.47.tgz",
+      "integrity": "sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ==",
       "dev": true
     },
     "@types/q": {
@@ -316,9 +316,10 @@
       "dev": true
     },
     "abbrev": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
     },
     "abstract-leveldown": {
       "version": "0.12.4",
@@ -338,12 +339,12 @@
       }
     },
     "accepts": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.15",
+        "mime-types": "2.1.17",
         "negotiator": "0.6.1"
       }
     },
@@ -370,9 +371,9 @@
       }
     },
     "adm-zip": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
-      "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz",
+      "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=",
       "dev": true
     },
     "after": {
@@ -400,12 +401,14 @@
       }
     },
     "ajv": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz",
+      "integrity": "sha1-Pa+ai2ciEpn9ro2C0RftjmyAJEs=",
       "dev": true,
       "requires": {
         "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "json-schema-traverse": "0.3.1",
         "json-stable-stringify": "1.0.1"
       }
     },
@@ -441,7 +444,7 @@
       "resolved": "https://registry.npmjs.org/angular2-moment/-/angular2-moment-1.4.0.tgz",
       "integrity": "sha1-PVnB68KJNPz+m4iKtGHiYXJJh+g=",
       "requires": {
-        "moment": "2.18.1"
+        "moment": "2.19.1"
       }
     },
     "angular2-template-loader": {
@@ -459,7 +462,7 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "3.1.3",
+            "big.js": "3.2.0",
             "emojis-list": "2.1.0",
             "json5": "0.5.1",
             "object-assign": "4.1.1"
@@ -470,7 +473,8 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.0",
@@ -482,19 +486,29 @@
       }
     },
     "anymatch": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-      "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
-        "arrify": "1.0.1",
-        "micromatch": "2.3.11"
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "append-transform": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
+      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "1.0.0"
       }
     },
     "aproba": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-      "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
     },
     "archiver-utils": {
       "version": "1.3.0",
@@ -546,6 +560,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
       "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "dev": true,
       "requires": {
         "delegates": "1.0.0",
         "readable-stream": "2.3.3"
@@ -554,12 +569,14 @@
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
           "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+          "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
@@ -574,12 +591,22 @@
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
           "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "dev": true,
           "requires": {
             "safe-buffer": "5.1.1"
           }
         }
       }
     },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
     "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -649,7 +676,8 @@
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
     },
     "asn1.js": {
       "version": "4.9.1",
@@ -672,9 +700,9 @@
       }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
     "ast-types": {
@@ -765,13 +793,19 @@
           "requires": {
             "has-flag": "2.0.0"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "dev": true
     },
     "aws4": {
@@ -836,6 +870,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
       "optional": true,
       "requires": {
         "tweetnacl": "0.14.5"
@@ -851,15 +886,15 @@
       }
     },
     "big.js": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
-      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
       "dev": true
     },
     "binary-extensions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz",
-      "integrity": "sha1-ZlBsFs5vTWkopbPNajPKQelB43s=",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
       "dev": true
     },
     "bl": {
@@ -896,9 +931,9 @@
       }
     },
     "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
       "dev": true
     },
     "bn.js": {
@@ -920,58 +955,56 @@
       }
     },
     "body-parser": {
-      "version": "1.17.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
-      "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=",
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
       "dev": true,
       "requires": {
-        "bytes": "2.4.0",
-        "content-type": "1.0.2",
-        "debug": "2.6.7",
-        "depd": "1.1.0",
-        "http-errors": "1.6.1",
-        "iconv-lite": "0.4.15",
+        "bytes": "3.0.0",
+        "content-type": "1.0.4",
+        "debug": "2.6.9",
+        "depd": "1.1.1",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
         "on-finished": "2.3.0",
-        "qs": "6.4.0",
-        "raw-body": "2.2.0",
+        "qs": "6.5.1",
+        "raw-body": "2.3.2",
         "type-is": "1.6.15"
       },
       "dependencies": {
         "bytes": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
-          "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
           "dev": true
         },
-        "debug": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
         },
         "raw-body": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz",
-          "integrity": "sha1-mUl2z2pQlqQRYoQEkvC9xdbn+5Y=",
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+          "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
           "dev": true,
           "requires": {
-            "bytes": "2.4.0",
-            "iconv-lite": "0.4.15",
+            "bytes": "3.0.0",
+            "http-errors": "1.6.2",
+            "iconv-lite": "0.4.19",
             "unpipe": "1.0.0"
           }
         }
       }
     },
     "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "brace-expansion": {
@@ -1176,7 +1209,7 @@
       "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1",
+        "no-case": "2.3.2",
         "upper-case": "1.1.3"
       }
     },
@@ -1251,7 +1284,7 @@
       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
       "dev": true,
       "requires": {
-        "anymatch": "1.3.0",
+        "anymatch": "1.3.2",
         "async-each": "1.0.1",
         "fsevents": "1.1.2",
         "glob-parent": "2.0.0",
@@ -1312,9 +1345,9 @@
       }
     },
     "cli-width": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
-      "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
     "cliui": {
@@ -1343,7 +1376,8 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
     },
     "color-convert": {
       "version": "1.9.0",
@@ -1397,9 +1431,9 @@
       "dev": true
     },
     "component-emitter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
       "dev": true
     },
     "component-inherit": {
@@ -1409,9 +1443,9 @@
       "dev": true
     },
     "compress-commons": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz",
-      "integrity": "sha1-WFhwku8g03y1i68AARLJJ4/3O58=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+      "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
       "dev": true,
       "requires": {
         "buffer-crc32": "0.2.13",
@@ -1502,25 +1536,22 @@
       }
     },
     "connect": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz",
-      "integrity": "sha1-aU6NIGgb/kkCgsiriGvpjwn0L+c=",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
+      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
       "dev": true,
       "requires": {
-        "debug": "2.6.7",
-        "finalhandler": "1.0.3",
-        "parseurl": "1.3.1",
-        "utils-merge": "1.0.0"
+        "debug": "2.6.9",
+        "finalhandler": "1.0.6",
+        "parseurl": "1.3.2",
+        "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+          "dev": true
         }
       }
     },
@@ -1536,7 +1567,8 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "dev": true
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -1551,9 +1583,9 @@
       "dev": true
     },
     "content-type": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
-      "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
     "continuable-cache": {
@@ -1581,9 +1613,9 @@
       "dev": true
     },
     "core-js": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
       "dev": true
     },
     "core-util-is": {
@@ -1592,9 +1624,9 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "crc": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
-      "integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms=",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+      "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
       "dev": true
     },
     "crc32-stream": {
@@ -1603,7 +1635,7 @@
       "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
       "dev": true,
       "requires": {
-        "crc": "3.4.4",
+        "crc": "3.5.0",
         "readable-stream": "2.3.3"
       },
       "dependencies": {
@@ -1683,16 +1715,27 @@
       "requires": {
         "lru-cache": "4.1.1",
         "shebang-command": "1.2.0",
-        "which": "1.2.14"
+        "which": "1.3.0"
       }
     },
     "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
       "dev": true,
       "requires": {
-        "boom": "2.10.1"
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
       }
     },
     "crypto-browserify": {
@@ -1752,15 +1795,9 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
       }
     },
     "date-now": {
@@ -1770,9 +1807,9 @@
       "dev": true
     },
     "debug": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "requires": {
         "ms": "2.0.0"
@@ -1784,12 +1821,14 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
-    "deep-extend": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+    "default-require-extensions": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
+      "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
       "dev": true,
-      "optional": true
+      "requires": {
+        "strip-bom": "2.0.0"
+      }
     },
     "deferred-leveldown": {
       "version": "0.2.0",
@@ -1812,7 +1851,7 @@
         "object-assign": "4.1.1",
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.1"
+        "rimraf": "2.6.2"
       }
     },
     "delayed-stream": {
@@ -1824,12 +1863,13 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
     },
     "depd": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
-      "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
       "dev": true
     },
     "des.js": {
@@ -1855,9 +1895,9 @@
       "dev": true
     },
     "diff": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz",
-      "integrity": "sha512-w0XZubFWn0Adlsapj9EAWX0FqWdO4tz8kc3RiYdWLh4k/V8PTb6i0SMgXt0vRM3zyKnT8tKO7mUlieRQHIjMNg==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
+      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
       "dev": true
     },
     "diffie-hellman": {
@@ -1911,6 +1951,7 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
       "optional": true,
       "requires": {
         "jsbn": "0.1.1"
@@ -1995,6 +2036,16 @@
         "ws": "1.1.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
+          "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.17",
+            "negotiator": "0.6.1"
+          }
+        },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
@@ -2042,12 +2093,6 @@
         "yeast": "0.1.2"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
@@ -2090,15 +2135,15 @@
       }
     },
     "enhanced-resolve": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz",
-      "integrity": "sha512-2qbxE7ek3YxPJ1ML6V+satHkzHpJQKWkRHmRx6mfAoW59yP8YH8BFplbegSP+u2hBd6B6KCOpvJQ3dZAP+hkpg==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "memory-fs": "0.4.1",
         "object-assign": "4.1.1",
-        "tapable": "0.2.7"
+        "tapable": "0.2.8"
       }
     },
     "ent": {
@@ -2180,6 +2225,12 @@
         "event-emitter": "0.3.5"
       }
     },
+    "es6-promise": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
+      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
+      "dev": true
+    },
     "es6-set": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
@@ -2233,8 +2284,8 @@
           "requires": {
             "ast-types": "0.9.6",
             "esprima": "3.1.3",
-            "private": "0.1.7",
-            "source-map": "0.5.6"
+            "private": "0.1.8",
+            "source-map": "0.5.7"
           }
         }
       }
@@ -2366,6 +2417,21 @@
         "strip-eof": "1.0.0"
       }
     },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
+      }
+    },
     "exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -2440,14 +2506,14 @@
       "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.3",
+        "accepts": "1.3.4",
         "array-flatten": "1.1.1",
         "content-disposition": "0.5.2",
-        "content-type": "1.0.2",
+        "content-type": "1.0.4",
         "cookie": "0.3.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.7",
-        "depd": "1.1.0",
+        "depd": "1.1.1",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
@@ -2456,7 +2522,7 @@
         "merge-descriptors": "1.0.1",
         "methods": "1.1.2",
         "on-finished": "2.3.0",
-        "parseurl": "1.3.1",
+        "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "1.1.5",
         "qs": "6.4.0",
@@ -2494,22 +2560,14 @@
       "dev": true
     },
     "external-editor": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz",
-      "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz",
+      "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.18",
-        "jschardet": "1.5.0",
-        "tmp": "0.0.31"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.18",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz",
-          "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==",
-          "dev": true
-        }
+        "iconv-lite": "0.4.19",
+        "jschardet": "1.5.1",
+        "tmp": "0.0.33"
       }
     },
     "extglob": {
@@ -2522,9 +2580,9 @@
       }
     },
     "extsprintf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
     "falafel": {
@@ -2556,7 +2614,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": "0.6.5"
+        "websocket-driver": "0.7.0"
       }
     },
     "figures": {
@@ -2574,6 +2632,16 @@
       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
       "dev": true
     },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.1",
+        "minimatch": "3.0.4"
+      }
+    },
     "fill-range": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
@@ -2588,29 +2656,18 @@
       }
     },
     "finalhandler": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
-      "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
       "dev": true,
       "requires": {
-        "debug": "2.6.7",
+        "debug": "2.6.9",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "on-finished": "2.3.0",
-        "parseurl": "1.3.1",
+        "parseurl": "1.3.2",
         "statuses": "1.3.1",
         "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "find-up": {
@@ -2655,14 +2712,14 @@
       "dev": true
     },
     "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
       "dev": true,
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.5",
-        "mime-types": "2.1.15"
+        "mime-types": "2.1.17"
       }
     },
     "formidable": {
@@ -2716,92 +2773,895 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.6.2",
+        "nan": "2.7.0",
         "node-pre-gyp": "0.6.36"
       },
       "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
         },
-        "nopt": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
           "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
           }
         },
-        "npmlog": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
-          "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "tweetnacl": "0.14.5"
           }
         },
-        "readable-stream": {
-          "version": "2.2.9",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-          "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
+            "inherits": "2.0.3"
           }
         },
-        "sshpk": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
-          "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
           "requires": {
-            "asn1": "0.2.3",
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
             "assert-plus": "1.0.0",
             "bcrypt-pbkdf": "1.0.1",
             "dashdash": "1.14.1",
             "ecc-jsbn": "0.1.1",
             "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
             "jsbn": "0.1.1",
             "tweetnacl": "0.14.5"
           },
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+              "bundled": true,
+              "dev": true,
+              "optional": true
             }
           }
         },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
         "string_decoder": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+          "bundled": true,
+          "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
           }
         },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
         "uuid": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
         }
       }
     },
@@ -2814,19 +3674,7 @@
         "graceful-fs": "4.1.11",
         "inherits": "2.0.3",
         "mkdirp": "0.5.1",
-        "rimraf": "2.6.1"
-      }
-    },
-    "fstream-ignore": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "fstream": "1.0.11",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4"
+        "rimraf": "2.6.2"
       }
     },
     "fwd-stream": {
@@ -2842,8 +3690,9 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
       "requires": {
-        "aproba": "1.1.2",
+        "aproba": "1.2.0",
         "console-control-strings": "1.1.0",
         "has-unicode": "2.0.1",
         "object-assign": "4.1.1",
@@ -2884,15 +3733,9 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
       }
     },
     "glob": {
@@ -2980,20 +3823,102 @@
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
       "dev": true
     },
+    "handlebars": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
+      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "optimist": "0.6.1",
+        "source-map": "0.4.4",
+        "uglify-js": "2.8.29"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true,
+          "optional": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "source-map": "0.5.7",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
       "dev": true
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "4.11.8",
-        "har-schema": "1.0.5"
+        "ajv": "5.2.4",
+        "har-schema": "2.0.0"
       }
     },
     "has-ansi": {
@@ -3029,7 +3954,8 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
     },
     "hash-base": {
       "version": "2.0.2",
@@ -3051,15 +3977,15 @@
       }
     },
     "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
       "dev": true,
       "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.0.2"
       }
     },
     "he": {
@@ -3080,9 +4006,9 @@
       }
     },
     "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
       "dev": true
     },
     "hosted-git-info": {
@@ -3099,50 +4025,56 @@
       "requires": {
         "es6-templates": "0.2.3",
         "fastparse": "1.1.1",
-        "html-minifier": "3.5.3",
+        "html-minifier": "3.5.6",
         "loader-utils": "1.1.0",
         "object-assign": "4.1.1"
       }
     },
     "html-minifier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.3.tgz",
-      "integrity": "sha512-iKRzQQDuTCsq0Ultbi/mfJJnR0D3AdZKTq966Gsp92xkmAPCV4Xi08qhJ0Dl3ZAWemSgJ7qZK+UsZc0gFqK6wg==",
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.6.tgz",
+      "integrity": "sha512-88FjtKrlak2XjczhxrBomgzV4jmGzM3UnHRBScRkJcmcRum0kb+IwhVAETJ8AVp7j0p3xugjSaw9L+RmI5/QOA==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.0",
-        "clean-css": "4.1.7",
+        "clean-css": "4.1.9",
         "commander": "2.11.0",
         "he": "1.1.1",
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.0.26"
+        "uglify-js": "3.1.5"
       },
       "dependencies": {
         "clean-css": {
-          "version": "4.1.7",
-          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz",
-          "integrity": "sha1-ua6k+FZ5iJzz6ui0A0nsTr390DI=",
+          "version": "4.1.9",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
+          "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
           "dev": true,
           "requires": {
-            "source-map": "0.5.6"
+            "source-map": "0.5.7"
           }
         }
       }
     },
     "http-errors": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
-      "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
       "dev": true,
       "requires": {
-        "depd": "1.1.0",
+        "depd": "1.1.1",
         "inherits": "2.0.3",
         "setprototypeof": "1.0.3",
         "statuses": "1.3.1"
       }
     },
+    "http-parser-js": {
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+      "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+      "dev": true
+    },
     "http-proxy": {
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
@@ -3154,13 +4086,13 @@
       }
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "0.2.0",
-        "jsprim": "1.4.0",
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
         "sshpk": "1.13.1"
       }
     },
@@ -3177,14 +4109,14 @@
       "dev": true,
       "requires": {
         "agent-base": "2.1.1",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "extend": "3.0.1"
       }
     },
     "iconv-lite": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
       "dev": true
     },
     "idb-wrapper": {
@@ -3407,7 +4339,7 @@
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
+            "supports-color": "4.5.0"
           }
         },
         "ci-info": {
@@ -3876,7 +4808,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.9.0"
+        "binary-extensions": "1.10.0"
       }
     },
     "is-buffer": {
@@ -3934,6 +4866,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -4080,36 +5013,159 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "istanbul-api": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.1.tgz",
+      "integrity": "sha512-oFCwXvd65amgaPCzqrR+a2XjanS1MvpXN6l/MlMUTv6uiA1NOgGX+I0uyq8Lg3GDxsxPsaP1049krz3hIJ5+KA==",
+      "dev": true,
+      "requires": {
+        "async": "2.5.0",
+        "fileset": "2.0.3",
+        "istanbul-lib-coverage": "1.1.1",
+        "istanbul-lib-hook": "1.1.0",
+        "istanbul-lib-instrument": "1.9.1",
+        "istanbul-lib-report": "1.1.2",
+        "istanbul-lib-source-maps": "1.2.2",
+        "istanbul-reports": "1.1.3",
+        "js-yaml": "3.10.0",
+        "mkdirp": "0.5.1",
+        "once": "1.4.0"
+      }
+    },
+    "istanbul-instrumenter-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.0.tgz",
+      "integrity": "sha512-alLSEFX06ApU75sm5oWcaVNaiss/bgMRiWTct3g0P0ZZTKjR+6QiCcuVOKDI1kWJgwHEnIXsv/dWm783kPpmtw==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "1.5.0",
+        "istanbul-lib-instrument": "1.9.1",
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz",
+      "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz",
+      "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==",
+      "dev": true,
+      "requires": {
+        "append-transform": "0.4.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz",
+      "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==",
+      "dev": true,
+      "requires": {
+        "babel-generator": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "istanbul-lib-coverage": "1.1.1",
+        "semver": "5.4.1"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz",
+      "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "1.1.1",
+        "mkdirp": "0.5.1",
+        "path-parse": "1.0.5",
+        "supports-color": "3.2.3"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz",
+      "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==",
+      "dev": true,
+      "requires": {
+        "debug": "3.1.0",
+        "istanbul-lib-coverage": "1.1.1",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz",
+      "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==",
+      "dev": true,
+      "requires": {
+        "handlebars": "4.0.11"
+      }
+    },
     "jasmine": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.6.0.tgz",
-      "integrity": "sha1-ayLnCIPo5YnUVjRhU7TSBt2+IX8=",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
+      "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
       "dev": true,
       "requires": {
         "exit": "0.1.2",
         "glob": "7.1.1",
-        "jasmine-core": "2.6.4"
+        "jasmine-core": "2.8.0"
       }
     },
     "jasmine-core": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
-      "integrity": "sha1-3skmzQqfoof7bbXHVfpIfnTOysU=",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+      "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
       "dev": true
     },
     "jasmine-spec-reporter": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.1.tgz",
-      "integrity": "sha1-Wm1Yq11hvqcwn7wnkjlRF1axtYg=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
       "dev": true,
       "requires": {
         "colors": "1.1.2"
       }
     },
     "jasminewd2": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.1.0.tgz",
-      "integrity": "sha1-2llSddGuYx3nNqwKfH2Fyfc+9lI=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
       "dev": true
     },
     "js-base64": {
@@ -4124,16 +5180,35 @@
       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
       "dev": true
     },
+    "js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+          "dev": true
+        }
+      }
+    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
       "optional": true
     },
     "jschardet": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.0.tgz",
-      "integrity": "sha512-+Q8JsoEQbrdE+a/gg1F9XO92gcKXgpE5UACqr0sIubjDmBEkd+OOWPGzQeMrWSLxd73r4dHxBeRW7edHu5LmJQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz",
+      "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==",
       "dev": true
     },
     "json-loader": {
@@ -4197,23 +5272,15 @@
       "dev": true
     },
     "jsprim": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
       "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
-        "extsprintf": "1.0.2",
+        "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
-        "verror": "1.3.6"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
+        "verror": "1.10.0"
       }
     },
     "jstransform": {
@@ -4236,19 +5303,75 @@
         }
       }
     },
+    "jszip": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.4.tgz",
+      "integrity": "sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA==",
+      "dev": true,
+      "requires": {
+        "core-js": "2.3.0",
+        "es6-promise": "3.0.2",
+        "lie": "3.1.1",
+        "pako": "1.0.6",
+        "readable-stream": "2.0.6"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
+          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "lie": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+          "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+          "dev": true,
+          "requires": {
+            "immediate": "3.0.6"
+          }
+        },
+        "pako": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+          "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
+          }
+        }
+      }
+    },
     "karma": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz",
-      "integrity": "sha1-b3oaQGRG+i4YfslTmGmPTO5HYmk=",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
+      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.0",
-        "body-parser": "1.17.2",
+        "bluebird": "3.5.1",
+        "body-parser": "1.18.2",
         "chokidar": "1.7.0",
         "colors": "1.1.2",
         "combine-lists": "1.0.1",
-        "connect": "3.6.2",
-        "core-js": "2.4.1",
+        "connect": "3.6.5",
+        "core-js": "2.5.1",
         "di": "0.0.1",
         "dom-serialize": "2.2.1",
         "expand-braces": "0.1.2",
@@ -4263,10 +5386,10 @@
         "optimist": "0.6.1",
         "qjobs": "1.1.5",
         "range-parser": "1.2.0",
-        "rimraf": "2.6.1",
+        "rimraf": "2.6.2",
         "safe-buffer": "5.1.1",
         "socket.io": "1.7.3",
-        "source-map": "0.5.6",
+        "source-map": "0.5.7",
         "tmp": "0.0.31",
         "useragent": "2.2.1"
       },
@@ -4276,6 +5399,15 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
+        },
+        "tmp": {
+          "version": "0.0.31",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
+          "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
         }
       }
     },
@@ -4286,7 +5418,17 @@
       "dev": true,
       "requires": {
         "fs-access": "1.0.1",
-        "which": "1.2.14"
+        "which": "1.3.0"
+      }
+    },
+    "karma-coverage-istanbul-reporter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.0.tgz",
+      "integrity": "sha1-0ULNnFVzHJ42Pvc3To7xoxvr+ts=",
+      "dev": true,
+      "requires": {
+        "istanbul-api": "1.2.1",
+        "minimatch": "3.0.4"
       }
     },
     "karma-jasmine": {
@@ -4314,16 +5456,16 @@
       }
     },
     "karma-webpack": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.4.tgz",
-      "integrity": "sha1-Pi1PSLqUqHjhxmu44a5hKJh6F1s=",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.5.tgz",
+      "integrity": "sha512-tb+P6rCNqPpVOzaDkNvuAX5gXJ/baGIFBSD/Pin1p1RTa3cookXxEc5wRkrLVA9acwEKvEq1TetGkOX1f8mf8A==",
       "dev": true,
       "requires": {
         "async": "0.9.2",
         "loader-utils": "0.2.17",
         "lodash": "3.10.1",
         "source-map": "0.1.43",
-        "webpack-dev-middleware": "1.11.0"
+        "webpack-dev-middleware": "1.12.0"
       },
       "dependencies": {
         "async": {
@@ -4338,7 +5480,7 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "3.1.3",
+            "big.js": "3.2.0",
             "emojis-list": "2.1.0",
             "json5": "0.5.1",
             "object-assign": "4.1.1"
@@ -4432,7 +5574,7 @@
       "integrity": "sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=",
       "dev": true,
       "requires": {
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "lodash.assign": "3.2.0",
         "rsvp": "3.6.2"
       },
@@ -4656,7 +5798,7 @@
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "dev": true,
       "requires": {
-        "big.js": "3.1.3",
+        "big.js": "3.2.0",
         "emojis-list": "2.1.0",
         "json5": "0.5.1"
       }
@@ -5003,7 +6145,7 @@
         "normalize-path": "2.1.1",
         "object.omit": "2.0.1",
         "parse-glob": "3.0.4",
-        "regex-cache": "0.4.3"
+        "regex-cache": "0.4.4"
       }
     },
     "miller-rabin": {
@@ -5023,18 +6165,18 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.15",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "dev": true,
       "requires": {
-        "mime-db": "1.27.0"
+        "mime-db": "1.30.0"
       }
     },
     "mimic-fn": {
@@ -5085,9 +6227,9 @@
       }
     },
     "moment": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
+      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
     },
     "ms": {
       "version": "2.0.0",
@@ -5102,9 +6244,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
       "dev": true
     },
     "ncname": {
@@ -5135,9 +6277,9 @@
       "dev": true
     },
     "no-case": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
-      "integrity": "sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
       "requires": {
         "lower-case": "1.1.4"
@@ -5157,11 +6299,19 @@
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
-        "request": "2.81.0",
-        "rimraf": "2.6.1",
+        "request": "2.83.0",
+        "rimraf": "2.6.2",
         "semver": "5.3.0",
         "tar": "2.2.1",
-        "which": "1.2.14"
+        "which": "1.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true
+        }
       }
     },
     "node-libs-browser": {
@@ -5229,24 +6379,6 @@
         }
       }
     },
-    "node-pre-gyp": {
-      "version": "0.6.36",
-      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-      "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "npmlog": "4.1.2",
-        "rc": "1.2.1",
-        "request": "2.81.0",
-        "rimraf": "2.6.1",
-        "semver": "5.3.0",
-        "tar": "2.2.1",
-        "tar-pack": "3.4.0"
-      }
-    },
     "node-sass": {
       "version": "4.5.3",
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz",
@@ -5265,10 +6397,10 @@
         "lodash.mergewith": "4.6.0",
         "meow": "3.7.0",
         "mkdirp": "0.5.1",
-        "nan": "2.6.2",
+        "nan": "2.7.0",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "sass-graph": "2.2.4",
         "stdout-stream": "1.4.0"
       },
@@ -5280,7 +6412,7 @@
           "dev": true,
           "requires": {
             "lru-cache": "4.1.1",
-            "which": "1.2.14"
+            "which": "1.3.0"
           }
         }
       }
@@ -5291,7 +6423,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.0"
+        "abbrev": "1.1.1"
       }
     },
     "normalize-package-data": {
@@ -5302,7 +6434,7 @@
       "requires": {
         "hosted-git-info": "2.5.0",
         "is-builtin-module": "1.0.0",
-        "semver": "5.3.0",
+        "semver": "5.4.1",
         "validate-npm-package-license": "3.0.1"
       }
     },
@@ -5312,7 +6444,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "1.0.2"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "normalize-range": {
@@ -5363,7 +6495,8 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
     },
     "oauth-sign": {
       "version": "0.8.2",
@@ -5374,7 +6507,8 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
     },
     "object-component": {
       "version": "0.0.3",
@@ -5463,7 +6597,8 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
     },
     "os-locale": {
       "version": "1.4.0",
@@ -5487,12 +6622,14 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
     },
     "osenv": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
       "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "dev": true,
       "requires": {
         "os-homedir": "1.0.2",
         "os-tmpdir": "1.0.2"
@@ -5519,6 +6656,27 @@
         "p-limit": "1.1.0"
       }
     },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
+      "dev": true
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "1.1.0"
+      }
+    },
     "pako": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
@@ -5531,7 +6689,7 @@
       "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1"
+        "no-case": "2.3.2"
       }
     },
     "parse-asn1": {
@@ -5568,6 +6726,12 @@
         "error-ex": "1.3.1"
       }
     },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
     "parsejson": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
@@ -5596,9 +6760,9 @@
       }
     },
     "parseurl": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
-      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
       "dev": true
     },
     "path-browserify": {
@@ -5673,9 +6837,9 @@
       }
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
     "pify": {
@@ -5741,9 +6905,9 @@
       "dev": true
     },
     "private": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE="
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
     },
     "process": {
       "version": "0.11.10",
@@ -5760,35 +6924,42 @@
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
     },
     "protractor": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz",
-      "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.2.0.tgz",
+      "integrity": "sha1-0/ObGV6F81Oa2djLZWCp0rYyl8Q=",
       "dev": true,
       "requires": {
-        "@types/node": "6.0.85",
+        "@types/node": "6.0.90",
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "2.53.42",
         "blocking-proxy": "0.0.5",
         "chalk": "1.1.3",
         "glob": "7.1.1",
-        "jasmine": "2.6.0",
-        "jasminewd2": "2.1.0",
+        "jasmine": "2.8.0",
+        "jasminewd2": "2.2.0",
         "optimist": "0.6.1",
         "q": "1.4.1",
         "saucelabs": "1.3.0",
-        "selenium-webdriver": "3.0.1",
-        "source-map-support": "0.4.15",
+        "selenium-webdriver": "3.6.0",
+        "source-map-support": "0.4.18",
         "webdriver-js-extender": "1.0.0",
         "webdriver-manager": "12.0.6"
       },
       "dependencies": {
         "@types/node": {
-          "version": "6.0.85",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.85.tgz",
-          "integrity": "sha512-6qLZpfQFO/g5Ns2e7RsW6brk0Q6Xzwiw7kVVU/XiQNOiJXSojhX76GP457PBYIsNMH2WfcGgcnZB4awFDHrwpA==",
+          "version": "6.0.90",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz",
+          "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==",
+          "dev": true
+        },
+        "adm-zip": {
+          "version": "0.4.7",
+          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
+          "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=",
           "dev": true
         },
         "webdriver-manager": {
@@ -5804,9 +6975,9 @@
             "ini": "1.3.4",
             "minimist": "1.2.0",
             "q": "1.4.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
+            "request": "2.83.0",
+            "rimraf": "2.6.2",
+            "semver": "5.4.1",
             "xml2js": "0.4.17"
           }
         }
@@ -5955,19 +7126,6 @@
         "string_decoder": "0.10.31"
       }
     },
-    "rc": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-      "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "deep-extend": "0.4.2",
-        "ini": "1.3.4",
-        "minimist": "1.2.0",
-        "strip-json-comments": "2.0.1"
-      }
-    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -6051,8 +7209,8 @@
       "requires": {
         "ast-types": "0.8.15",
         "esprima-fb": "15001.1001.0-dev-harmony-fb",
-        "private": "0.1.7",
-        "source-map": "0.5.6"
+        "private": "0.1.8",
+        "source-map": "0.5.7"
       },
       "dependencies": {
         "esprima-fb": {
@@ -6078,13 +7236,12 @@
       "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="
     },
     "regex-cache": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "0.1.3",
-        "is-primitive": "2.0.0"
+        "is-equal-shallow": "0.1.3"
       }
     },
     "relateurl": {
@@ -6094,9 +7251,9 @@
       "dev": true
     },
     "remove-trailing-separator": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
-      "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
       "dev": true
     },
     "repeat-element": {
@@ -6121,33 +7278,41 @@
       }
     },
     "request": {
-      "version": "2.81.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
       "dev": true,
       "requires": {
-        "aws-sign2": "0.6.0",
+        "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
         "caseless": "0.12.0",
         "combined-stream": "1.0.5",
         "extend": "3.0.1",
         "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
         "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.15",
+        "mime-types": "2.1.17",
         "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.4.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
         "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
+        }
       }
     },
     "require-directory": {
@@ -6197,9 +7362,9 @@
       }
     },
     "rimraf": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
         "glob": "7.1.1"
@@ -6373,7 +7538,8 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "dev": true
     },
     "safe-json-parse": {
       "version": "1.0.1",
@@ -6408,6 +7574,15 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
+    "schema-utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+      "dev": true,
+      "requires": {
+        "ajv": "5.2.4"
+      }
+    },
     "scss-tokenizer": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
@@ -6430,13 +7605,13 @@
       }
     },
     "selenium-webdriver": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz",
-      "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
+      "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
       "dev": true,
       "requires": {
-        "adm-zip": "0.4.7",
-        "rimraf": "2.6.1",
+        "jszip": "3.1.4",
+        "rimraf": "2.6.2",
         "tmp": "0.0.30",
         "xml2js": "0.4.17"
       },
@@ -6453,9 +7628,9 @@
       }
     },
     "semver": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
       "dev": true
     },
     "send": {
@@ -6465,13 +7640,13 @@
       "dev": true,
       "requires": {
         "debug": "2.6.7",
-        "depd": "1.1.0",
+        "depd": "1.1.1",
         "destroy": "1.0.4",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
         "fresh": "0.5.0",
-        "http-errors": "1.6.1",
+        "http-errors": "1.6.2",
         "mime": "1.3.4",
         "ms": "2.0.0",
         "on-finished": "2.3.0",
@@ -6498,7 +7673,7 @@
       "requires": {
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
-        "parseurl": "1.3.1",
+        "parseurl": "1.3.2",
         "send": "0.15.3"
       }
     },
@@ -6510,7 +7685,8 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -6558,7 +7734,8 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
     },
     "slice-ansi": {
       "version": "1.0.0",
@@ -6578,12 +7755,12 @@
       }
     },
     "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "socket.io": {
@@ -6670,12 +7847,6 @@
         "to-array": "0.1.4"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
@@ -6705,6 +7876,12 @@
         "json3": "3.3.2"
       },
       "dependencies": {
+        "component-emitter": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+          "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
+          "dev": true
+        },
         "debug": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
@@ -6729,16 +7906,16 @@
       "dev": true
     },
     "source-map": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
     "source-map-support": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
-      "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "requires": {
-        "source-map": "0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "spdx-correct": {
@@ -6782,14 +7959,6 @@
         "getpass": "0.1.7",
         "jsbn": "0.1.1",
         "tweetnacl": "0.14.5"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "statuses": {
@@ -6926,11 +8095,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-    },
     "string-range": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz",
@@ -6947,12 +8111,18 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
       "requires": {
         "code-point-at": "1.1.0",
         "is-fullwidth-code-point": "1.0.0",
         "strip-ansi": "3.0.1"
       }
     },
+    "string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -6963,6 +8133,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
       "requires": {
         "ansi-regex": "2.1.1"
       }
@@ -6998,9 +8169,9 @@
       "dev": true
     },
     "supports-color": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-      "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+      "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
       "dev": true,
       "requires": {
         "has-flag": "2.0.0"
@@ -7021,9 +8192,9 @@
       "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
     },
     "tapable": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.7.tgz",
-      "integrity": "sha1-5GwNqsuyuKmLmwzqD0BSEFgX7Vw=",
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
       "dev": true
     },
     "tar": {
@@ -7037,23 +8208,6 @@
         "inherits": "2.0.3"
       }
     },
-    "tar-pack": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-      "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "debug": "2.6.8",
-        "fstream": "1.0.11",
-        "fstream-ignore": "1.0.5",
-        "once": "1.4.0",
-        "readable-stream": "1.0.34",
-        "rimraf": "2.6.1",
-        "tar": "2.2.1",
-        "uid-number": "0.0.6"
-      }
-    },
     "tar-stream": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
@@ -7121,6 +8275,12 @@
         "xtend": "4.0.1"
       }
     },
+    "time-stamp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz",
+      "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=",
+      "dev": true
+    },
     "timers-browserify": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
@@ -7162,9 +8322,9 @@
       }
     },
     "tmp": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "1.0.2"
@@ -7183,9 +8343,9 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "dev": true,
       "requires": {
         "punycode": "1.4.1"
@@ -7198,66 +8358,66 @@
       "dev": true
     },
     "ts-loader": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.3.1.tgz",
-      "integrity": "sha512-qpHhht5OaOTlZe0scI5zjFrMIEmqt2qEyhpBiDJBA4nIV/iSF+jj1dGoDwFndL1D71dAr3P+gCmCShqolaQ+HQ==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.3.7.tgz",
+      "integrity": "sha512-8t3bu2FcEkXb+D4L+Cn8qiK2E2C6Ms4/GQChvz6IMbVurcFHLXrhW4EMtfaol1a1ASQACZGDUGit4NHnX9g7hQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.0.1",
-        "enhanced-resolve": "3.3.0",
+        "chalk": "2.2.0",
+        "enhanced-resolve": "3.4.1",
         "loader-utils": "1.1.0",
-        "semver": "5.3.0"
+        "semver": "5.4.1"
       },
       "dependencies": {
         "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
+            "supports-color": "4.5.0"
           }
         }
       }
     },
     "ts-node": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.2.1.tgz",
-      "integrity": "sha1-lZXdhA0D5ivHkhTOWntR5V48T/w=",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.3.0.tgz",
+      "integrity": "sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=",
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
-        "chalk": "2.0.1",
-        "diff": "3.3.0",
+        "chalk": "2.2.0",
+        "diff": "3.4.0",
         "make-error": "1.3.0",
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "source-map-support": "0.4.15",
+        "source-map-support": "0.4.18",
         "tsconfig": "6.0.0",
-        "v8flags": "3.0.0",
+        "v8flags": "3.0.1",
         "yn": "2.0.0"
       },
       "dependencies": {
         "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
+            "supports-color": "4.5.0"
           }
         },
         "v8flags": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.0.tgz",
-          "integrity": "sha512-AGl+C+4qpeSu2g3JxCD/mGFFOs/vVZ3XREkD3ibQXEqr4Y4zgIrPWW124/IKJFHOIVFIoH8miWrLf0o84HYjwA==",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.1.tgz",
+          "integrity": "sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s=",
           "dev": true,
           "requires": {
-            "user-home": "1.1.1"
+            "homedir-polyfill": "1.0.1"
           }
         }
       }
@@ -7287,8 +8447,8 @@
       "requires": {
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "source-map": "0.5.6",
-        "source-map-support": "0.4.15"
+        "source-map": "0.5.7",
+        "source-map-support": "0.4.18"
       }
     },
     "tslib": {
@@ -7306,7 +8466,7 @@
         "builtin-modules": "1.1.1",
         "chalk": "2.3.0",
         "commander": "2.11.0",
-        "diff": "3.3.0",
+        "diff": "3.4.0",
         "glob": "7.1.1",
         "minimatch": "3.0.4",
         "resolve": "1.4.0",
@@ -7375,6 +8535,7 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
       "optional": true
     },
     "type-is": {
@@ -7384,7 +8545,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.15"
+        "mime-types": "2.1.17"
       }
     },
     "typedarray": {
@@ -7424,13 +8585,21 @@
       }
     },
     "uglify-js": {
-      "version": "3.0.26",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.26.tgz",
-      "integrity": "sha512-+D/BjzuvT1oRMSkH0fuF3M/BCvDxDywmZasd1UTPPHsdsHZqJEAZSvrojgFlS7lrM3ZZWq5h7Bb5i96X1TbOJw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.5.tgz",
+      "integrity": "sha512-tSqlO7/GZHAVSw6mbtJt2kz0ZcUrKUH7Xg92o52aE+gL0r6cXiASZY4dpHqQ7RVGXmoQuPA2qAkG4TkP59f8XA==",
       "dev": true,
       "requires": {
         "commander": "2.11.0",
-        "source-map": "0.5.6"
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "uglify-to-browserify": {
@@ -7446,7 +8615,7 @@
       "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.6",
+        "source-map": "0.5.7",
         "uglify-js": "2.8.29",
         "webpack-sources": "1.0.1"
       },
@@ -7474,7 +8643,7 @@
           "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
           "dev": true,
           "requires": {
-            "source-map": "0.5.6",
+            "source-map": "0.5.7",
             "uglify-to-browserify": "1.0.2",
             "yargs": "3.10.0"
           }
@@ -7493,13 +8662,6 @@
         }
       }
     },
-    "uid-number": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-      "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-      "dev": true,
-      "optional": true
-    },
     "ultron": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
@@ -7565,7 +8727,7 @@
       "dev": true,
       "requires": {
         "lru-cache": "2.2.4",
-        "tmp": "0.0.31"
+        "tmp": "0.0.33"
       },
       "dependencies": {
         "lru-cache": {
@@ -7596,7 +8758,8 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "utils-merge": {
       "version": "1.0.0",
@@ -7627,12 +8790,14 @@
       "dev": true
     },
     "verror": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "extsprintf": "1.0.2"
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
       }
     },
     "vlq": {
@@ -7677,12 +8842,6 @@
         "selenium-webdriver": "2.53.3"
       },
       "dependencies": {
-        "adm-zip": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz",
-          "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=",
-          "dev": true
-        },
         "sax": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
@@ -7696,7 +8855,7 @@
           "dev": true,
           "requires": {
             "adm-zip": "0.4.4",
-            "rimraf": "2.6.1",
+            "rimraf": "2.6.2",
             "tmp": "0.0.24",
             "ws": "1.1.1",
             "xml2js": "0.4.4"
@@ -7762,10 +8921,7 @@
           "integrity": "sha1-Pa+ai2ciEpn9ro2C0RftjmyAJEs=",
           "dev": true,
           "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
+            "locate-path": "2.0.0"
           }
         },
         "ansi-regex": {
@@ -7924,15 +9080,16 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz",
-      "integrity": "sha1-CWkdCXOjCtH4Ksc6EuIIfwpHVPk=",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
+      "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
       "dev": true,
       "requires": {
         "memory-fs": "0.4.1",
         "mime": "1.3.4",
         "path-is-absolute": "1.0.1",
-        "range-parser": "1.2.0"
+        "range-parser": "1.2.0",
+        "time-stamp": "2.0.0"
       }
     },
     "webpack-sources": {
@@ -7942,28 +9099,29 @@
       "dev": true,
       "requires": {
         "source-list-map": "2.0.0",
-        "source-map": "0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "websocket-driver": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "websocket-extensions": "0.1.1"
+        "http-parser-js": "0.4.9",
+        "websocket-extensions": "0.1.2"
       }
     },
     "websocket-extensions": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
       "dev": true
     },
     "which": {
-      "version": "1.2.14",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "dev": true,
       "requires": {
         "isexe": "2.0.0"
@@ -7979,6 +9137,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
       "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "dev": true,
       "requires": {
         "string-width": "1.0.2"
       }
@@ -7989,7 +9148,7 @@
       "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
       "dev": true,
       "requires": {
-        "semver": "5.3.0"
+        "semver": "5.4.1"
       }
     },
     "window-size": {
@@ -8149,7 +9308,7 @@
       "dev": true,
       "requires": {
         "archiver-utils": "1.3.0",
-        "compress-commons": "1.2.0",
+        "compress-commons": "1.2.2",
         "lodash": "4.17.4",
         "readable-stream": "2.3.3"
       },
diff --git a/package.json b/package.json
index f8d70d2d..bdfc7438 100755
--- a/package.json
+++ b/package.json
@@ -56,11 +56,11 @@
     "karma-jasmine": "^1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^2.0.3",
+    "karma-webpack": "^2.0.5",
     "null-loader": "^0.1.1",
-    "protractor": "^5.1.1",
-    "ts-loader": "^2.0.3",
-    "ts-node": "^3.0.2",
+    "protractor": "^5.2.0",
+    "ts-loader": "^2.3.7",
+    "ts-node": "^3.3.0",
     "typescript": "2.3.4"
   }
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7f975a77..e5566dba 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -4,11 +4,10 @@ import { Platform, NavController } from 'ionic-angular';
 import { CacheService } from '../shared/cache/cache.service';
 import { AuthService } from '../services/auth.service';
 // pages
-import { TermConditionPage } from '../pages/term-condition/term-condition.page';
 import { SidenavPage } from '../pages/sidenav/sidenav';
 import { ResetPasswordPage } from '../pages/reset-password/reset-password';
 import { TabsPage } from '../pages/tabs/tabs.page';
-import { RegistrationPage } from '../pages/registration/registration.page';
+import { RegisterPage } from '../pages/registration/register.page';
 import { LoginPage } from '../pages/login/login';
 import { MagicLinkPage } from '../pages/magic-link/magic-link';
 import { TestPage } from '../pages/tabs/test.page';
@@ -21,7 +20,7 @@ export class MyApp implements OnInit {
   rootPage: any;
   urlParameters: Array<any> = [];
   do = {
-    'registration': RegistrationPage,
+    'registration': RegisterPage,
     'login': LoginPage,
     'resetpassword': ResetPasswordPage,
     'secure': MagicLinkPage,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index fd019212..02daabce 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -18,7 +18,7 @@ import { i18nData } from './assets/i18n-en';
 import { AppConfigModule } from '../shared/app-config/app-config.module';
 import { TranslationModule } from '../shared/translation/translation.module';
 import { MomentModule } from 'angular2-moment';
-
+import { WindowRef } from '../shared/window';
 // services
 import { AchievementService } from '../services/achievement.service';
 import { ActivityService } from '../services/activity.service';
@@ -35,24 +35,21 @@ import { NotificationService } from '../shared/notification/notification.service
 import { RequestModule } from '../shared/request/request.module';
 import { SessionService } from '../services/session.service';
 import { SubmissionService } from '../services/submission.service';
-
 import { TeamService } from '../services/team.service';
-import { WindowRef } from '../shared/window';
 // components
-import { ModalComponent } from '../shared/notification/modal.component';
-import { QuestionGroupComponent } from '../components/question-group/question-group.component';
 import { EventComponent } from '../components/event/event.component';
+import { FeedbackComponent } from '../components/questions/feedback';
+import { FileQuestionComponent } from '../components/questions/file';
 import { LevelComponent } from '../components/level/level';
 import { LoadingMarkerComponent } from '../components/loadingMarker/loadingMarker';
 import { LockerComponent } from '../components/locker/locker';
 import { MemberComponent } from '../components/member/member';
-import { PhotoComponent } from '../components/photo/photo';
-import { TermContentComponent } from '../pages/term-condition/term-content.component';
-import { FileQuestionComponent } from '../components/questions/file';
+import { ModalComponent } from '../shared/notification/modal.component';
+import { MultipleQuestionComponent } from '../components/questions/multiple';
 import { OneofQuestionComponent } from '../components/questions/oneof';
+import { PhotoComponent } from '../components/photo/photo';
+import { QuestionGroupComponent } from '../components/question-group/question-group.component';
 import { TextQuestionComponent } from '../components/questions/text';
-import { MultipleQuestionComponent } from '../components/questions/multiple';
-import { FeedbackComponent } from '../components/questions/feedback';
 // pages
 import { AchievementsViewPage } from '../pages/achievements/view/achievements-view.page';
 import { ActivitiesListPage } from '../pages/activities/list/list.page';
@@ -78,21 +75,19 @@ import { RankingBadgesPage } from '../pages/rankings/view/ranking-badges';
 import { RankingDetailsPage } from '../pages/rankings/view/ranking-details.page';
 import { RankingsPage } from '../pages/rankings/list/rankings.page';
 import { RegisterPage } from '../pages/registration/register.page';
-import { RegistrationPage } from '../pages/registration/registration.page';
 import { ResetPasswordPage } from '../pages/reset-password/reset-password';
 import { SettingsPage } from '../pages/settings/settings.page';
 import { SidenavPage } from '../pages/sidenav/sidenav';
 import { TabsPage } from '../pages/tabs/tabs.page';
-import { TeamPage } from '../pages/team/team.page';
-import { TermConditionPage } from '../pages/term-condition/term-condition.page';
+import { TeamPage } from '../pages/team/team';
+import { TermsConditionsPage } from '../pages/registration/terms-conditions/terms-conditions.page';
 import { TestPage } from '../pages/tabs/test.page';
 import { TutorialPage } from '../pages/settings/tutorial/tutorial.page';
 // custom pipes
+import { EscapeHtmlPipe } from '../pipes/keep-html.pipe';
 import { TimeAgoPipe } from '../pipes/timeago';
-import { UcfirstPipe } from '../pipes/ucfirst.pipe';
 import { TruncatePipe } from '../pipes/truncate.pipe';
-import { EscapeHtmlPipe } from '../pipes/keep-html.pipe';
-
+import { UcfirstPipe } from '../pipes/ucfirst.pipe';
 // configs
 import { default as Configure } from '../configs/config';
 // AoT requires an exported function for factories
@@ -139,7 +134,6 @@ export function createTranslateLoader(http: HttpClient) {
     RankingDetailsPage,
     RankingsPage,
     RegisterPage,
-    RegistrationPage,
     ResetPasswordPage,
     SettingsPage,
     SidenavPage,
@@ -147,8 +141,7 @@ export function createTranslateLoader(http: HttpClient) {
     TeamPage,
     TestPage,
     TutorialPage,
-    TermConditionPage,
-    TermContentComponent,
+    TermsConditionsPage,
     TextQuestionComponent,
     TimeAgoPipe,
     TruncatePipe,
@@ -201,10 +194,10 @@ export function createTranslateLoader(http: HttpClient) {
           defaultHistory: [ MagicLinkPage ]
         },
         {
-          component: RegistrationPage,
+          component: RegisterPage,
           name: 'Registration',
           segment: 'registration',
-          defaultHistory: [ RegistrationPage ]
+          defaultHistory: [ RegisterPage ]
         },
         {
           component: TestPage,
@@ -249,15 +242,13 @@ export function createTranslateLoader(http: HttpClient) {
     RankingDetailsPage,
     RankingsPage,
     RegisterPage,
-    RegistrationPage,
     ResetPasswordPage,
     SettingsPage,
     SidenavPage,
     TabsPage,
     TestPage,
-    TermConditionPage,
+    TermsConditionsPage,
     TutorialPage,
-    TermContentComponent,
   ],
   providers: [
     { provide: AchievementService, useClass: AchievementService },
diff --git a/src/app/messages.ts b/src/app/messages.ts
index c21a0958..aa412bba 100644
--- a/src/app/messages.ts
+++ b/src/app/messages.ts
@@ -52,10 +52,10 @@ export const errMessages = {
   },
   PasswordValidation: {
     mismatch: {
-      "mismatch": "You must enter matching passwords. Please Try again."
+      "mismatch": "Passwords don’t match"
     },
     minlength: {
-      "minlength": "The minimum length allowed for a password is 8 characters."
+      "minlength": "At least 8 characters required"
     }
   },
   Registration: {
@@ -76,6 +76,9 @@ export const errMessages = {
     },
     verifyFailed: {
       "verifyfailed": "Sorry, verification failed, please resend your email and password."
+    },
+    acceptTermsConditions: {
+      "accepted": "You need to agree to the Terms & Conditions before completing registration."
     }
   },
   ResetPassword: {
@@ -83,12 +86,12 @@ export const errMessages = {
       "failed": "Whoops, we were unable to reset your password. Please try again."
     },
     invalidLink: {
-      "invalid": "Oops... The log in link is broken. You will be redirected to the login page. Try again with your username and password."
+      "invalid": "Oops... The reset password link is expired, please contact your program coordinator."
     }
   },
   TermConditions: {
     disagreement: {
-      "noAccepted": "You must agree to the Terms and Conditions."
+      "noAccepted": "You need to agree to the Terms & Conditions."
     },
     verifyFailed: {
       "verifyfailed": "Oops... Registration verification has failed. Please try again later."
diff --git a/src/assets/i18n-en.json b/src/assets/i18n-en.json
index 6a17e730..057a04bc 100644
--- a/src/assets/i18n-en.json
+++ b/src/assets/i18n-en.json
@@ -30,15 +30,16 @@
     "NEXT": "Next",
     "PREV": "Prev",
     "SKIP": "Skip",
-    "SUBMIT": "Submit"
+    "SUBMIT": "Submit",
+    "BACKTO": "Back to Login"
   },
   "LOGIN": {
     "HEADER": "Welcome to Practera",
     "PAGETITLE": "Login",
-    "PASSWORDFORGOT": "Forget Your Password?"
+    "PASSWORDFORGOT": "Forgot Your Password?"
   },
   "REGISTRATION": {
-    "HEADER": "Great - you are almost there! Just one more thing...",
+    "HEADER": "Great - you are almost there! Just one more step...",
     "PAGETITLE": "Set Password"
   },
   "RANKING": {
diff --git a/src/configs/config.ts.default b/src/configs/config.ts.default
deleted file mode 100644
index ec398a10..00000000
--- a/src/configs/config.ts.default
+++ /dev/null
@@ -1,9 +0,0 @@
-// Need update read me
-// Copy file to config.ts
-export default {
-  prefixUrl: 'http://local.practera.com:8080/',
-  appKey: '',
-  filestack: {
-    apiKey: ''
-  },
-}
diff --git a/src/pages/forget-password/forget-password.html b/src/pages/forget-password/forget-password.html
index 616e4304..2a937af8 100644
--- a/src/pages/forget-password/forget-password.html
+++ b/src/pages/forget-password/forget-password.html
@@ -1,20 +1,22 @@
 <ion-header>
   <ion-navbar>
     <ion-title>{{ 'FORGOTPASSWORD.PAGETITLE' | translate }}</ion-title>
+    <ion-buttons end>
+      <button ion-button icon-only (click)="dismiss()">
+        <ion-icon name="close"></ion-icon>
+      </button>
+    </ion-buttons>
   </ion-navbar>
 </ion-header>
-
 <ion-content padding class="login-module login-container">
-  <p>
-    {{ 'FORGOTPASSWORD.INPUTTITLE' | translate }}
-  </p>
+  <p>{{ 'FORGOTPASSWORD.INPUTTITLE' | translate }}</p>
   <form #resetPasswordForm="ngForm" [formGroup]="forgotPwdFormGroup">
     <ion-list>
       <ion-item no-lines>
         <ion-input type="text"
           [(ngModel)]="email"
           name="email"
-          placeholder="Enter your email"
+          placeholder="Please enter your email"
           formControlName="email"></ion-input>
       </ion-item>
     </ion-list>
diff --git a/src/pages/forget-password/forget-password.ts b/src/pages/forget-password/forget-password.ts
index 04fab688..8eadcd16 100644
--- a/src/pages/forget-password/forget-password.ts
+++ b/src/pages/forget-password/forget-password.ts
@@ -1,16 +1,18 @@
 import { Component } from '@angular/core';
+import { AlertController,
+         LoadingController,
+         NavController,
+         NavParams,
+         ToastController,
+         ViewController } from 'ionic-angular';
 import { FormBuilder, Validators } from '@angular/forms';
-import { NavController, NavParams, LoadingController, AlertController, ToastController } from 'ionic-angular';
 import { Observable } from 'rxjs/Observable';
-
+import { TranslationService } from '../../shared/translation/translation.service';
+import { loadingMessages, errMessages } from '../../app/messages';
 // services
 import { AuthService } from '../../services/auth.service';
 // directives
 import { FormValidator } from '../../shared/validators/formValidator';
-// Others
-import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages';
-
 @Component({
   selector: 'page-forget-password',
   templateUrl: 'forget-password.html'
@@ -19,59 +21,59 @@ export class ForgetPasswordPage {
   email: string;
   forgotPwdFormGroup: any;
   // loading & error message variables
-  sendingEmailLoadingMessage = loadingMessages.SendingEmail.send;
-  sentEmailMessagePartOne = loadingMessages.SentMessage.partOne;
-  sentEmailMessagePartTwo = loadingMessages.SentMessage.partTwo;
-
+  public sendingEmailLoadingMessage = loadingMessages.SendingEmail.send;
+  public sentEmailMessagePartOne = loadingMessages.SentMessage.partOne;
+  public sentEmailMessagePartTwo = loadingMessages.SentMessage.partTwo;
   constructor(
+    public alertCtrl: AlertController,
+    public authService: AuthService,
+    public formBuilder: FormBuilder,
+    public loadingCtrl: LoadingController,
     public navCtrl: NavController,
     public navParams: NavParams,
-    public loadingCtrl: LoadingController,
-    public alertCtrl: AlertController,
     public translationService: TranslationService,
-    public authService: AuthService,
     public toastCtrl: ToastController,
-    public formBuilder: FormBuilder
-  ) {
-    this.forgotPwdFormGroup = formBuilder.group({
-      email: ['', [FormValidator.isValidEmail,
-                  Validators.required]],
-    });
-  }
-
-  ionViewDidLoad() {
-  }
-
-  userForgotPassword() {
+    public viewCtrl: ViewController) {
+      this.forgotPwdFormGroup = formBuilder.group({
+        email: ['', [FormValidator.isValidEmail,
+                    Validators.required]],
+      });
+    }
+  userForgotPassword(){
     const loading = this.loadingCtrl.create({
       dismissOnPageChange: true,
       content: this.sendingEmailLoadingMessage
     });
-
+    // defaultMsg is used for display the email sent message after user clicked send button
     let defaultMsg = this.sentEmailMessagePartOne + ` ${this.email} ` + this.sentEmailMessagePartTwo;
-
     loading.present();
     // This part is calling post_forget_password() API from backend
     this.authService.forgotPassword(this.email)
       .subscribe(data => {
-          loading.dismiss();
-          defaultMsg = data.msg || defaultMsg;
-          const successSMS = this.toastCtrl.create({
-            message: defaultMsg,
-            duration: 5000
+          loading.dismiss().then(() => {
+            defaultMsg = data.msg || defaultMsg;
+            const successSMS = this.toastCtrl.create({
+              message: defaultMsg,
+              duration: 5000
+            });
+            successSMS.present();
+            this.forgotPwdFormGroup.reset();
           });
-          successSMS.present();
         },
         error => {
-          loading.dismiss();
-          // this.logError(error);
-          defaultMsg = error.msg || defaultMsg;
-          const errorSMS = this.toastCtrl.create({
-            message: defaultMsg,
-            duration: 5000
+          loading.dismiss().then(() => {
+            defaultMsg = error.msg || defaultMsg;
+            const errorSMS = this.toastCtrl.create({
+              message: defaultMsg,
+              duration: 5000
+            });
+            errorSMS.present();
+            this.forgotPwdFormGroup.reset();
           });
-          errorSMS.present();
         }
      );
   }
+  dismiss() {
+    this.viewCtrl.dismiss();
+  }
 }
diff --git a/src/pages/login/login.html b/src/pages/login/login.html
index 75c7327d..9d2c8658 100644
--- a/src/pages/login/login.html
+++ b/src/pages/login/login.html
@@ -2,15 +2,13 @@
   <ion-grid class="default-center-container">
     <ion-row>
       <ion-col>
-        <img class="default-logo" src="./assets/img/default/practera.png" alt="App Logo"/>
-        <h3>
-          {{ 'LOGIN.HEADER' | translate }}
-        </h3>
+        <img class="default-logo" src="/assets/img/default/practera.png" alt="Logo"/>
+        <h3>{{ 'LOGIN.HEADER' | translate }}</h3>
       </ion-col>
     </ion-row>
     <ion-row>
       <ion-col col-10 offset-1>
-          <form #loginForm="ngForm"
+        <form #loginForm="ngForm"
           [formGroup]="loginFormGroup"
           class="general-form">
           <ion-list>
@@ -33,16 +31,17 @@ <h3>
           <button ion-button
             type="submit"
             block
+            class="general-circle-btn"
             color="practera-thick"
             (click)="userLogin()"
             [disabled]="loginForm.invalid">
             {{ 'LOGIN.PAGETITLE' | translate }}
           </button>
-          <div class="forget-password-container">
-            <button class="general-circle-btn"
+          <div class="forgot-password-container">
+            <div class="forgot-password-link"
               (click)="linkToForgetPassword()">
               {{ 'LOGIN.PASSWORDFORGOT' | translate }}
-            </button>
+            </div>
           </div>
         </form>
       </ion-col>
diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts
index 301c3ff2..839ee63d 100644
--- a/src/pages/login/login.ts
+++ b/src/pages/login/login.ts
@@ -1,60 +1,59 @@
 import { Component, ViewChild } from '@angular/core';
-import { NavController,
-         NavParams,
+import { AlertController,
          LoadingController,
-         AlertController,
          ModalController,
+         NavController,
+         NavParams,
          ViewController } from 'ionic-angular';
 import { FormBuilder, Validators } from '@angular/forms';
 import { Injectable } from '@angular/core';
+import { loadingMessages, errMessages } from '../../app/messages';
 import { Observable } from 'rxjs/Observable';
-
-import * as _ from 'lodash';
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages';
+import * as _ from 'lodash';
+// directives
+import { FormValidator } from '../../shared/validators/formValidator';
+// pages
+import { TabsPage } from '../../pages/tabs/tabs.page';
+import { ForgetPasswordPage } from '../../pages/forget-password/forget-password';
 // services
 import { AuthService } from '../../services/auth.service';
-import { MilestoneService } from '../../services/milestone.service';
 import { CacheService } from '../../shared/cache/cache.service';
 import { GameService } from '../../services/game.service';
+import { MilestoneService } from '../../services/milestone.service';
 import { RequestServiceConfig } from '../../shared/request/request.service';
-// directives
-import {FormValidator} from '../../shared/validators/formValidator';
-// pages
-import { TabsPage } from '../../pages/tabs/tabs.page';
-import { ForgetPasswordPage } from '../../pages/forget-password/forget-password';
 /* This page is for handling user login process */
 @Component({
   selector: 'page-login',
   templateUrl: 'login.html'
 })
 export class LoginPage {
-  email: string;
-  password: any;
-  userName: string;
-  userImage: string;
-  API_KEY: string;
-  milestone_id: string;
-  loginFormGroup: any;
+  API_KEY: string = null;
+  email: string = null;
+  gameID: string = null;
   forgetpasswordPage = ForgetPasswordPage;
-  loginLoadingMessages: any = loadingMessages.Login.login;
   invalidLoginMessage: any = errMessages.Login.login;
-
+  loginFormGroup: any;
+  loginLoadingMessages: any = loadingMessages.Login.login;
+  milestone_id: string = null;
+  password: any = null;
+  userData: any = [];
+  userName: string = null;
+  userImage: string = null;
   constructor(
-    public navCtrl: NavController,
-    public navParams: NavParams,
-    public loadingCtrl: LoadingController,
+    public config: RequestServiceConfig,
+    public formBuilder: FormBuilder,
     public alertCtrl: AlertController,
+    public loadingCtrl: LoadingController,
     public modalCtrl: ModalController,
+    public navCtrl: NavController,
+    public navParams: NavParams,
     public viewCtrl: ViewController,
     public authService: AuthService,
+    public cacheService: CacheService,
     public gameService: GameService,
-    public translationService: TranslationService,
-    public config: RequestServiceConfig,
-    public formBuilder: FormBuilder,
     public milestoneService: MilestoneService,
-    public cacheService: CacheService
-  ) {
+    public translationService: TranslationService) {
     this.navCtrl = navCtrl;
     this.loginFormGroup = formBuilder.group({
       email: ['', [FormValidator.isValidEmail,
@@ -64,14 +63,9 @@ export class LoginPage {
   }
 
   ionViewCanLeave(): boolean {
-    // user is authorized
-    console.log('authorized');
+    // to check whether user is authorized
     let authorized = true;
-    if (authorized){
-      return true;
-    } else {
-      return false;
-    }
+    return authorized ? true : false;
   }
 
   /**
@@ -179,7 +173,6 @@ export class LoginPage {
     cacheProcesses.push(this.cacheService.write('teams', data.Teams));
     this.cacheService.setLocal('apikey', data.apikey);
     this.cacheService.setLocal('timeline_id', data.Timelines[0].Timeline.id);
-    console.log("cache data: " + cacheProcesses);
     return Observable.from(cacheProcesses);
   }
 
@@ -195,7 +188,6 @@ export class LoginPage {
     this.cacheService.write('userData', userData);
     this.cacheService.setLocal('userData', userData);
     this.API_KEY = user.data.apikey;
-    // console.log("Timeline ID: " + user.data.Timelines[0].Timeline.id);
     // to get API KEY and timeline_id and stored in localStorage
     // then other API calls can directly use (API KEY and timeline_id)
   }
@@ -208,8 +200,8 @@ export class LoginPage {
    */
   logError(error) {
     const alert = this.alertCtrl.create({
-      title: 'Login Failed ..',
-      message: this.invalidLoginMessage,
+      title: 'Error Message',
+      message: 'Oops, loading failed, please try it again later.',
       buttons: ['Close']
     });
     alert.present();
@@ -220,7 +212,6 @@ export class LoginPage {
    * forget password page link function
    */
   linkToForgetPassword() {
-    this.navCtrl.push(this.forgetpasswordPage);
-    this.viewCtrl.dismiss();
+    this.modalCtrl.create(this.forgetpasswordPage).present(); // go to forgot password modal window
   }
 }
diff --git a/src/pages/magic-link/magic-link.ts b/src/pages/magic-link/magic-link.ts
index 7be371e2..4693a54e 100644
--- a/src/pages/magic-link/magic-link.ts
+++ b/src/pages/magic-link/magic-link.ts
@@ -1,40 +1,41 @@
 import { Component } from '@angular/core';
-import { NavController, NavParams, LoadingController, AlertController } from 'ionic-angular';
-
+import { AlertController, NavController, NavParams, LoadingController, ViewController } from 'ionic-angular';
 // services
 import { AuthService } from '../../services/auth.service';
 import { CacheService } from '../../shared/cache/cache.service';
 import { GameService } from '../../services/game.service';
 import { MilestoneService } from '../../services/milestone.service';
 // pages
-import { TabsPage } from '../tabs/tabs.page';
 import { LoginPage } from '../login/login';
+import { TabsPage } from '../tabs/tabs.page';
 // Others
 import { loadingMessages, errMessages } from '../../app/messages';
+import { Observable } from 'rxjs/Observable';
 import * as _ from 'lodash';
-
 @Component({
   selector: 'page-magic-link',
   templateUrl: 'magic-link.html'
 })
 export class MagicLinkPage {
-  auth_token: string;
-  loginLoadingMessage: any = loadingMessages.Login.login;
-  milestone_id: string;
-  misMatchTokenErrMessage: any = errMessages.DirectLink.mismatch;
-  verifySuccess = null;
-
+  public auth_token: string = null;
+  public gameID: string = null;
+  public loginLoadingMessage: any = loadingMessages.Login.login;
+  public milestone_id: string = null;
+  public misMatchTokenErrMessage: any = errMessages.DirectLink.mismatch;
+  public userData: any = [];
+  public verifySuccess = null;
   constructor(
     public alertCtrl: AlertController,
+    public loadingCtrl: LoadingController,
+    public navCtrl: NavController,
+    public navParams: NavParams,
+    public viewCtrl: ViewController,
     public authService: AuthService,
     public cacheService: CacheService,
     public gameService: GameService,
-    public loadingCtrl: LoadingController,
-    public milestoneService: MilestoneService,
-    public navCtrl: NavController,
-    public navParams: NavParams
-  ) {}
-
+    public milestoneService: MilestoneService) {
+      this.cacheService.setLocal('gotNewItems', false);
+    }
   ionViewDidLoad() {
     this.auth_token = this.navParams.get('auth_token');
   }
diff --git a/src/pages/registration/register.html b/src/pages/registration/register.html
index d332d8a3..a0f2762a 100644
--- a/src/pages/registration/register.html
+++ b/src/pages/registration/register.html
@@ -2,43 +2,57 @@
   <ion-grid class="default-center-container">
     <ion-row>
       <ion-col col-12>
-        <img class="default-logo" src="./assets/img/default/practera.png" alt="App Logo"/>
-        <p>
-          {{ 'REGISTRATION.HEADER' | translate }}
-        </p>
+        <img class="default-logo" src="/assets/img/default/practera.png" alt="Logo"/>
       </ion-col>
     </ion-row>
     <ion-row>
       <ion-col col-10 offset-1>
           <form [formGroup]="regForm" (ngSubmit)="onSubmit(regForm)" class="general-form" [formGroup]="regForm">
-              <ion-list>
-                <ion-item no-lines>
-                  <ion-input type="password" [(ngModel)]="password" placeholder="New Password" formControlName="password"></ion-input>
-                </ion-item>
-                <ion-item no-lines>
-                  <ion-input (keyup)="verifyPwdKeyUp()" type="password" name="verify_password" [(ngModel)]="verify_password" placeholder="Confirm password" formControlName="verify_password"></ion-input>
-                </ion-item>
-              </ion-list>
-              <button type="submit"
-                ion-button
-                block
-                color="practera-thick"
-                [disabled]="password!=verify_password || regForm.invalid">
-                {{ 'GENERAL.DONE' | translate }}
-              </button>
+            <ion-list>
+              <ion-item no-lines>
+                <ion-input type="password"
+                  [(ngModel)]="password"
+                  placeholder="New Password"
+                  formControlName="password">
+                </ion-input>
+              </ion-item>
+              <ion-item no-lines>
+                <ion-input (keyup)="verifyPwdKeyUp()"
+                  type="password"
+                  name="verify_password"
+                  [(ngModel)]="verify_password"
+                  placeholder="Confirm password"
+                  formControlName="verify_password">
+                </ion-input>
+              </ion-item>
+            </ion-list>
+            <div class="term-condition-link">
+              <ion-checkbox class="agree-tick" [(ngModel)]="agreed" (change)="toggleAgree()" formControlName="agreed"></ion-checkbox>
+              <span class="agree-text">I accept the </span> <u (click)="openTermsCondition()">terms & conditions</u>
+            </div>
+            <button type="submit"
+              ion-button
+              block
+              class="general-circle-btn"
+              color="practera-thick"
+              [disabled]="password!=verify_password || regForm.invalid || agreed === false">
+              {{ 'GENERAL.DONE' | translate }}
+            </button>
+            <div class="errors">
               <div *ngIf="verifyPwd == true">
                 <div *ngIf="pwdMatchCheck()" class="error-hint">
-                  <small class="text-danger">
-                   {{ passwordMismatchMessage }}
+                  <small>
+                    {{ passwordMismatchMessage }}
                   </small>
                 </div>
                 <div *ngIf="checkMinLength() == true" class="error-hint">
-                  <small class="text-danger">
-                   {{ passwordMinlengthMessage }}
+                  <small>
+                    {{ passwordMinlengthMessage }}
                   </small>
                 </div>
               </div>
-            </form>
+            </div>
+          </form>
       </ion-col>
     </ion-row>
   </ion-grid>
diff --git a/src/pages/registration/register.page.ts b/src/pages/registration/register.page.ts
index 9c38e092..4be1b47c 100644
--- a/src/pages/registration/register.page.ts
+++ b/src/pages/registration/register.page.ts
@@ -1,8 +1,16 @@
 import { Component, ViewChild, OnInit, Inject } from '@angular/core';
 import { NgForm, FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { NavController, ViewController, AlertController, LoadingController, NavParams } from 'ionic-angular';
+import { AlertController, LoadingController, NavController, NavParams, ModalController, ViewController } from 'ionic-angular';
+import { loadingMessages, errMessages, generalVariableMessages } from '../../app/messages';
 import { Observable } from 'rxjs/Observable';
-
+import * as _ from 'lodash';
+import 'rxjs/add/operator/map';
+// directives
+import { FormValidator } from '../../shared/validators/formValidator';
+// pages
+import { TabsPage } from '../tabs/tabs.page';
+import { LoginPage } from '../login/login';
+import { TermsConditionsPage } from './terms-conditions/terms-conditions.page';
 // services
 import { AuthService } from '../../services/auth.service';
 import { CacheService } from '../../shared/cache/cache.service';
@@ -10,81 +18,131 @@ import { GameService } from '../../services/game.service';
 import { MilestoneService } from '../../services/milestone.service';
 import { NotificationService } from '../../shared/notification/notification.service';
 import { TranslationService } from '../../shared/translation/translation.service';
-// pages
-import { LoginPage } from '../login/login';
-import { TabsPage } from '../tabs/tabs.page';
-// Others
-import { loadingMessages, errMessages, generalVariableMessages } from '../../app/messages';
-import * as _ from 'lodash';
-
 const supportEmail = generalVariableMessages.helpMail.email;
-
 @Component({
   selector: 'register',
-  templateUrl: 'register.html',
+  templateUrl: 'register.html'
 })
-export class RegisterPage implements OnInit {
+export class RegisterPage implements OnInit { // this part of registration is for setting password before login
   @ViewChild('registrationForm') registrationForm: NgForm;
-
+  agreed: boolean = false;
   changeContent: boolean = false;
   clickSuspended: boolean = false;
-  invalidUserErrMessage: any = errMessages.Registration.invalidUser.account;
+  gameID: string = null;
   isPwdMatch: boolean = false;
-  milestone_id: string;
+  milestone_id: string = null;
   minLengthCheck: boolean = true;
-  noPasswordErrMessage: any = errMessages.Registration.noPassword.password;
-  password: string;
-  passwordMismatchErrMessage: any = errMessages.Registration.mismatch.mismatch;
-  passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
-  passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
-  pwdMacthBool: boolean = false;
+  password: string = null;
   regForm: any;
-  registrationErrMessage: any = errMessages.Registration.error.error;
-  registeredErrMessage: any = errMessages.Registration.alreadyRegistered.registered;
   submitted: boolean = false;
-  successRegistrationLoading: any = loadingMessages.SuccessRegistration.successRegistration;
-  user: any = {
+  userInput: any = {
     password: '',
     verify_password: ''
   };
+  user: any = {
+    email: null,
+    key: null
+  };
+  pwdMacthBool: boolean = false;
+  userData: any = [];
   verify_password: string;
-  verifyFailedErrMessage = errMessages.Registration.verifyFailed.verifyfailed;
   verifyPwd: boolean = false;
   verifySuccess: boolean = null;
-
-  ngOnInit() {}
-
+  // loading & error messages variables
+  invalidUserErrMessage: any = errMessages.Registration.invalidUser.account;
+  noPasswordErrMessage: any = errMessages.Registration.noPassword.password;
+  termConditionsErrMessage: any = errMessages.Registration.acceptTermsConditions.accepted;
+  passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
+  passwordMismatchErrMessage: any = errMessages.Registration.mismatch.mismatch;
+  passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
+  registeredErrMessage: any = errMessages.Registration.alreadyRegistered.registered;
+  registrationErrMessage: any = errMessages.Registration.error.error;
+  successRegistrationLoading: any = loadingMessages.SuccessRegistration.successRegistration;
+  termConditionsVerifyFailedErr = errMessages.TermConditions.verifyFailed.verifyfailed;
+  verifyFailedErrMessage = errMessages.Registration.verifyFailed.verifyfailed;
   constructor(
     @Inject(FormBuilder) fb: FormBuilder,
     public alertCtrl: AlertController,
     public authService: AuthService,
-    public cache: CacheService,
+    public cacheService: CacheService,
     public gameService: GameService,
     public loading: LoadingController,
-    public milestone: MilestoneService,
+    public milestoneService: MilestoneService,
     public navCtrl: NavController,
     public navParams: NavParams,
+    public modalCtrl: ModalController,
     public notificationService: NotificationService,
-    public viewCtrl: ViewController,
     public translationService: TranslationService,
-  ) {
-    // validation for both password values: required & minlength is 8
+    public viewCtrl: ViewController) {
+    // validation for both password values: required & minlength is 8 and accept for terms and conditions
     this.regForm = fb.group({
       password: ['', [Validators.minLength(8), Validators.required]],
       verify_password: ['', [Validators.minLength(8), Validators.required]],
+      agreed: [this.agreed, Validators.required]
     });
   }
-
-
+  displayError(errorMessage?: any): void {
+    let alert = this.alertCtrl.create({
+      title: 'Invalid registration code',
+      subTitle: errorMessage || 'Registration Code is invalid, please contact our tech support for assistance.',
+      buttons: [{
+        text: 'OK',
+        handler: () => {
+          alert.dismiss().then(() => {
+            this.navCtrl.setRoot(LoginPage).then(() => {
+              window.history.replaceState({}, '', window.location.origin);
+            });
+          })
+          return false;
+        }
+      }]
+    });
+    alert.present();
+  }
+  ngOnInit() {
+    const loading = this.loading.create({
+      content: 'Verifying user identity..'
+    });
+    if (!decodeURIComponent(this.navParams.get('email')) || !this.navParams.get('key')) {
+      this.displayError();
+    }
+    else {
+      loading.present().then(() => {
+        let email = decodeURIComponent(this.navParams.get('email')),
+            key = this.navParams.get('key');
+        this.authService.verifyRegistration({
+          email: email,
+          key: key
+        }).subscribe(
+          res => {
+            loading.dismiss().then(() => {
+              this.cacheService.setLocal('user.email', email);
+              this.cacheService.setLocal('user.registration_key', key);
+              this.cacheService.setLocal('user.id', res.data.User.id);
+              this.user = {
+                email: email,
+                key: key
+              };
+            });
+          },
+          err => {
+            loading.dismiss().then(() => {
+              this.displayError(err.msg);
+            });
+          }
+        );
+      });
+    }
+  }
 
   displayAlert(message) {
     return this.alertCtrl.create({
-      title: 'Test',
+      title: 'Error',
       message: message,
-      buttons: ['OK']
+      buttons: ['Close']
     });
   }
-
+  // submit registration form and display error message when error occurs
   onSubmit(form: NgForm):void {
     let self = this;
     self.submitted = true;
@@ -109,13 +167,7 @@ export class RegisterPage implements OnInit {
       self.displayAlert(message).present();
       self.submitted = false;
     }
-
-    function onFinally() {
-      //@TODO: log something maybe
-      // self.navCtrl.push(TabsPage);
-      console.log('Final step - log something here');
-    }
-    if (this.user.password !== this.user.verify_password) {
+    if (this.userInput.password !== this.userInput.verify_password) {
       this.notificationService.alert({
         title: 'Incorrect Password',
         subTitle: this.passwordMismatchErrMessage,
@@ -129,86 +181,71 @@ export class RegisterPage implements OnInit {
       // registration api call: to let user set password and complete registration process
       loading.present().then(() => {
         this.authService.register({
-          email: this.cache.getLocal('user.email'),
-          key: this.cache.getLocal('user.registration_key'),
-          user_id: this.cache.getLocal('user.id'),
+          email: this.cacheService.getLocal('user.email'),
+          key: this.cacheService.getLocal('user.registration_key'),
+          user_id: this.cacheService.getLocal('user.id'),
           password: this.regForm.get('password').value
         }).subscribe(regRespond => {
           //@TODO: set user data
           regRespond = regRespond.data;
           console.log(regRespond);
-          this.cache.setLocal('apikey', regRespond.apikey);
-          this.cache.setLocal('timelineID', regRespond.Timeline.id);
-          this.cache.setLocal('gotNewItems', false);
+          this.cacheService.setLocal('apikey', regRespond.apikey);
+          this.cacheService.setLocal('timelineID', regRespond.Timeline.id);
+          this.cacheService.setLocal('gotNewItems', false);
           // after passed registration api call, we come to post_auth api call to let user directly login after registred successfully
-          this.authService.loginAuth(this.cache.getLocal('user.email'), this.regForm.get('password').value)
+          this.authService.loginAuth(this.cacheService.getLocal('user.email'), this.regForm.get('password').value)
               .subscribe(
                 data => {
-                  // get game_id data after login
-                  this.gameService.getGames()
-                      .subscribe(
-                        data => {
-                          console.log("game data: ", data);
-                          _.map(data, (element) => {
-                            console.log("game id: ", element[0].id);
-                            this.cache.setLocal('game_id', element[0].id);
-                          });
-                        },
-                        err => {
-                          console.log("game err: ", err);
-                        }
-                      );
-                  // get user data after registration and login
-                  self.authService.getUser()
-                      .subscribe(
-                        data => {
-                          console.log(data);
-                        },
-                        err => {
-                          console.log(err);
-                        }
-                      );
-                  // get milestone data after registration and login
-                  self.milestone.getMilestones()
-                      .subscribe( data => {
+                  let getGame = this.gameService.getGames();
+                  let getUser = this.authService.getUser();
+                  let getMilestone = this.milestoneService.getMilestones();
+                  Observable.forkJoin([getGame, getUser, getMilestone])
+                    .subscribe(
+                      results => {
                         loading.dismiss().then(() => {
                           this.milestone_id = data[0].id;
-                          self.cache.setLocal('milestone_id', data[0].id);
+                          self.cacheService.setLocal('milestone_id', data[0].id);
                           self.navCtrl.push(TabsPage).then(() => {
                             window.history.replaceState({}, '', window.location.origin);
                           });
                         });
                       },
                       err => {
-                        loading.dismiss().then(() => {
-                          console.log(err);
-                        });
-                      });
+                        this.logError(err);
+                      }
+                    )
                 },
                 err => {
                   loading.dismiss().then(() => {
-                    console.log(err);
+                    this.logError(err);
                   });
                 }
               );
-        }, onRegError, onFinally);
+        }, onRegError);
       });
     }
   }
-
+  logError(error){
+    const alert = this.alertCtrl.create({
+      title: 'Error Message',
+      message: 'Oops, loading failed, please try it again later.',
+      buttons: ['Close']
+    });
+    alert.present();
+  }
   setRegistrationData(data) {
     let cacheProcesses = [];
     _.forEach(data, (datum, key) => {
-      cacheProcesses.push(this.cache.set(key, datum));
+      cacheProcesses.push(this.cacheService.set(key, datum));
     });
-    cacheProcesses.push(this.cache.set('timelineID', data.Timeline.id));
-    this.cache.setLocal('timelineID', data.Timeline.id);
+    cacheProcesses.push(this.cacheService.set('timelineID', data.Timeline.id));
+    this.cacheService.setLocal('timelineID', data.Timeline.id);
     return Observable.from(cacheProcesses);
   }
 
   goToLogin() {
-    this.cache.clear().then(() => {
-      this.navCtrl.push(LoginPage);
+    this.cacheService.clear().then(() => {
+      this.navCtrl.setRoot(LoginPage);
     });
   }
 
@@ -216,13 +253,20 @@ export class RegisterPage implements OnInit {
   checkMinLength(){
     return (this.password.length < 8 || this.verify_password.length < 8) ? this.minLengthCheck = true : this.minLengthCheck = false;
   }
-
   // check password mismacth issue
   verifyPwdKeyUp() {
     return this.verifyPwd = true;
   }
-
+  // check password mismacth
   pwdMatchCheck() {
     return this.password != this.verify_password ? this.isPwdMatch = true : this.isPwdMatch = false;
   }
+  // toggleAgree()
+  toggleAgree(): void {
+    this.agreed = !this.agreed;
+  }
+  // openTermsCondition()
+  openTermsCondition() {
+    this.modalCtrl.create(TermsConditionsPage).present();
+  }
 }
diff --git a/src/pages/registration/terms-conditions/terms-conditions.html b/src/pages/registration/terms-conditions/terms-conditions.html
new file mode 100644
index 00000000..af7d19dc
--- /dev/null
+++ b/src/pages/registration/terms-conditions/terms-conditions.html
@@ -0,0 +1,55 @@
+<ion-header>
+  <ion-navbar hideBackButton="true">
+    <ion-title>{{ 'TERMCONDITIONS.PAGETITLE' | translate }}</ion-title>
+    <ion-buttons end>
+      <button ion-button icon-only (click)="dismiss()">
+        <ion-icon name="close"></ion-icon>
+      </button>
+    </ion-buttons>
+  </ion-navbar>
+</ion-header>
+<ion-content padding>
+  <h2>Terms of Use Agreement</h2>
+  <p>Welcome! By using this platform managed by Intersective Pty Ltd, you are agreeing to comply with and be bound by the following terms of use. These terms are intended to cover the use of the Practera Platform (the Platform) and activities and tasks closely associated with the use of the Platform. Please review the following terms carefully.  If you do not agree to these terms, you should not progress any further, and/or communicate with your organisation’s program coordinator. </p>
+  <p><b>1. Acceptance of Agreement.</b> You agree to the terms and conditions outlined in this Terms of Use Agreement ("Agreement") with respect to the program platform (the "Platform").  This Agreement constitutes the entire and only agreement between us and you, and supersedes all prior or contemporaneous agreements, representations, warranties and understandings with respect to the Platform, the content, products or services provided by or through the Platform, and the subject matter of this Agreement.  This Agreement may be amended at any time by us from time to time without specific notice to you.  The latest Agreement will be posted on the Platform, and you should review this Agreement prior to using the Platform.</p>
+  <p><b>2. Copyright.</b> The content, organization, graphics, design, compilation, magnetic translation, digital conversion and other matters related to the Platform are protected under applicable copyrights, trademarks and other proprietary (including but not limited to intellectual property) rights.  The copying, redistribution, use or publication by you of anysuch matters or any part of the Platform, except as allowed by Section 3, is strictly prohibited.  You do not acquire ownership rights to any content, document or other materials viewed through the Platform.  The posting of information or materials on the Platform does not constitute a waiver of any right in such information and materials.</p>
+  <p><b>3. Limited Right to Use.</b> The viewing, printing or downloading of any content, graphic, form or document from the Platform grants you only a limited, nonexclusive license for use solely by you for your own personal use and not for republication, distribution, assignment, sublicense, sale, preparation of derivative works or other use.  No part of any content, form or document may be reproduced in any form or incorporated into any information retrieval system, electronic or mechanical, other than for your personal use (but not for resale or redistribution).</p>
+  <p><b>4. Editing, Deleting and Modification.</b> We reserve the right in our sole discretion to edit or delete any documents, information or other content appearing on the Platform.</p>
+  <p><b>5. Indemnification.</b> You agree to indemnify, defend and hold us and our partners, staff and affiliates (collectively, "Affiliated Parties") harmless from any liability, loss, claim and expense, including reasonable legal fees, related to your violation of this Agreement or use of the Platform.</p>
+  <p><b>6. Nontransferable.</b> Your right to use the Platform is not transferable.  Any password or right given to you to obtain information or documents is not transferable.</p>
+  <p><b>7. Disclaimer and Limits.</b> All responsibility or liability for any damages caused by viruses contained within the electronic file containing the form or document is disclaimed.  WE WILL NOT BE LIABLE TO YOU FOR ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OF ANY KIND THAT MAY RESULT FROM USE OF OR INABILITY TO USE OUR PLATFORM.</p>
+  <p><b>8. Use of Information.</b> We reserve the right, and you authorize us, to the use and assignment of all information regarding Platform uses by you and all information provided by you in any manner consistent with our Privacy Policy.</p>
+  <p><b>9. Third-Party Access.</b> We may allow access to the platform, or to any information contained within the platform, to thirdparties in our absolute discretion, subject to our Privacy Policy.</p>
+  <p><b>10. Privacy Policy.</b> Our Privacy Policy, as it may change from time to time, is a part of this Agreement.</p>
+  <p><b>11. Links to other Web Sites.</b> The Site contains links to other Web Sites.  We are not responsible for the content, accuracy or opinions express in such Web Sites, and such Web Sites are not investigated, monitored or checked for accuracy or completeness by us.  Inclusion of any linked Web Site on our Site does not imply approval or endorsement of the linked Web Site by us.  If you decide to leave our Site and access these third-party Sites, you do so at your own risk.</p>
+  <p><b>12. License of user content.</b> You grant Intersective and any other users of the platform, an irrevocable, global and perpetual license to use any and all content submitted into the platform, including, without limitation, your documents, deliverables, assignments, class notes, course outlines, submits, posts, uploads, displays, reviews, suggestions, ideas, solutions, questions, answers, messages, images, videos, texts of any kind, or other materials for any purposes whatsoever, including, without limitation, developing, manufacturing and marketing products and services for commercial purposes, without any payment or compensation to you. You further agree that Intersective may give free access to all of your above mentioned user content to other third parties, including, without limitation, affiliates, distributors, other users or potential users. You waive any legal or moral rights you may have in any User Content you submit, even if such User Content is altered or changed in any manner.</p>
+  <h2>Privacy Policy</h2>
+  <p><b>1. We respect your privacy.</b> As the manager of the program Platform (“The Platform”) Intersective respects your right to privacy and this policy sets out how we collect and treat your personal information. “Personal information” is information we hold which is identifiable as being about you.</p>
+  <p><b>2. What personal information we collect.</b> We may collect a range of types of personal information from you, including, but not limited to, the following:</p>
+  <ul>
+    <li>name</li>
+    <li>demographic information – eg; age, gender, socio-economic status</li>
+    <li>psychographic information – eg personality, interests, attitudes, behaviours and opinions</li>
+    <li>educational history</li>
+    <li>employment history</li>
+    <li>student number</li>
+    <li>user ideas and comments</li>
+    <li>information from enquiries you have made</li>
+    <li>communications between program participants</li>
+    <li>assessments marks and details</li>
+    <li>digital and multimedia</li>
+  </ul>
+  <p><b>3. How we collect your personal information.</b> We collect personal information from you in a variety of ways, including: when you interact with us electronically or in person; when you access our website; and when we provide our services to you.</p>
+  <p><b>4. Use of your personal information.</b> We use your information to provide our service to you. We also use it to improve our service and to notify you of opportunities that we think you might be interested in. We do not provide or sell your information to third parties, except that we may provide your information to our program partners who support the provision of our services to you expressly for the purpose of facilitating the delivery of that service.</p>
+  <p><b>5. Disclosure of your personal information overseas.</b> We are likely to disclose your personal information to recipients globally.</p>
+  <p><b>6. Security of your personal information.</b> We take reasonable steps to protect your personal information. However we are not liable for any unauthorised access to this information.</p>
+  <p><b>7. Access to your personal information.</b> You can access and update your personal information by contacting us on {{ helpEmailMessage }}</p>
+  <p><b>8. Complaints about privacy.</b> If you have any complaints about our privacy practices, please feel free to send in details of your complaints to {{helpline}}. We take complaints very seriously and will respond shortly after receiving written notice of your complaint.</p>
+  <p><b>9. Changes.</b> Please be aware that we may change this Privacy Policy in the future. The revised versions will be uploaded onto our website, so please check back from time to time.</p>
+  <p><b>10. Website.</b></p>
+  <p><em>When you visit our website</em></p>
+  <p>When you come on to our website we may collect certain information such as browser type, operating system, website visited immediately before coming to our site, etc. This information is used in an aggregated manner to analyse how people use our site, such that we can improve our service.</p>
+  <p><em>Cookies</em></p>
+  <p>As is very common for companies, we use cookies on our website. Cookies are very small files which a website uses to identify you when you come back to the site and to store details about your use of the site. Cookies are not malicious programs that access or damage your computer. We use cookies to improve the experience of people using our website.
+  Third party sites Our site has links to other websites not owned or controlled by us. We are not responsible for these sites or the consequences of you going on to those sites.</p>
+</ion-content>
\ No newline at end of file
diff --git a/src/pages/registration/terms-conditions/terms-conditions.page.ts b/src/pages/registration/terms-conditions/terms-conditions.page.ts
new file mode 100644
index 00000000..c28a4fc4
--- /dev/null
+++ b/src/pages/registration/terms-conditions/terms-conditions.page.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { ViewController } from 'ionic-angular';
+import { generalVariableMessages } from '../../../app/messages';
+//services
+import { TranslationService } from '../../../shared/translation/translation.service';
+@Component({
+  selector: 'terms-conditions',
+  templateUrl: 'terms-conditions.html'
+})
+export class TermsConditionsPage {
+  public helpEmailMessage = generalVariableMessages.helpMail.email;
+  constructor(public viewCtrl: ViewController,
+    public translationService: TranslationService){}
+  dismiss(){
+    this.viewCtrl.dismiss();
+  }
+}
\ No newline at end of file
diff --git a/src/pages/reset-password/reset-password.html b/src/pages/reset-password/reset-password.html
index 8ac61f6a..458b9d6a 100644
--- a/src/pages/reset-password/reset-password.html
+++ b/src/pages/reset-password/reset-password.html
@@ -2,7 +2,7 @@
   <ion-grid class="default-center-container">
     <ion-row>
       <ion-col col-12>
-        <img class="default-logo" src="./assets/img/default/practera.png" alt="App Logo"/>
+        <img class="default-logo" src="/assets/img/default/practera.png" alt="App Logo"/>
         <h3>
           {{ 'RESETPASSWORD.PAGETITLE' | translate }}
         </h3>
@@ -33,21 +33,24 @@ <h3>
             <button type="submit"
               ion-button
               block
+              class="general-circle-btn"
               color="practera-thick"
               (click)="updatePassword()"
               [disabled]="password!=verify_password || resetPasswordForm.invalid">
               {{ 'GENERAL.DONE' | translate }}
             </button>
-          <div *ngIf="verifyPwd == true">
-            <div *ngIf="pwdMatchCheck()" class="error-hint">
-              <small class="text-danger">
-                {{ passwordMismatchMessage }}
-              </small>
-            </div>
-            <div *ngIf="checkMinLength() == true" class="error-hint">
-              <small class="text-danger">
-                {{ passwordMinlengthMessage }}
-              </small>
+          <div class="errors">
+            <div *ngIf="verifyPwd == true">
+              <div *ngIf="pwdMatchCheck()" class="error-hint">
+                <small class="text-danger">
+                  {{ passwordMismatchMessage }}
+                </small>
+              </div>
+              <div *ngIf="checkMinLength() == true" class="error-hint">
+                <small class="text-danger">
+                  {{ passwordMinlengthMessage }}
+                </small>
+              </div>
             </div>
           </div>
         </form>
@@ -61,6 +64,14 @@ <h3>
       <span>
         {{ invalidLinkErrMessage }}
       </span>
+      <button type="button"
+        ion-button
+        block
+        class="general-circle-btn"
+        color="practera-thick"
+        (click)="goToLogin()">
+        {{ 'GENERAL.BACKTO' | translate }}
+      </button>
     </div>
   </div>
 </ion-content>
diff --git a/src/pages/reset-password/reset-password.ts b/src/pages/reset-password/reset-password.ts
index 1b028250..0c2283b6 100644
--- a/src/pages/reset-password/reset-password.ts
+++ b/src/pages/reset-password/reset-password.ts
@@ -1,62 +1,63 @@
 import { Component, NgZone, OnInit } from '@angular/core';
-import { NavController, ViewController, NavParams, LoadingController, AlertController, ModalController } from 'ionic-angular';
+import { AlertController,
+         LoadingController,
+         ModalController,
+         NavController,
+         NavParams,
+         ViewController } from 'ionic-angular';
 import { FormBuilder, Validators } from '@angular/forms';
-
-// services
-import { AuthService } from '../../services/auth.service';
-import { CacheService } from '../../shared/cache/cache.service';
-import { GameService } from '../../services/game.service';
-import { MilestoneService } from '../../services/milestone.service';
+import { loadingMessages, errMessages } from '../../app/messages';
+import { Observable } from 'rxjs/Observable';
+import * as _ from 'lodash';
 // directives
 import { FormValidator } from '../../shared/validators/formValidator';
 // pages
-import { LoginPage } from '../login/login';
 import { TabsPage } from '../tabs/tabs.page';
+import { LoginPage } from '../login/login';
 import { ResetpasswordModelPage } from '../../pages/resetpassword-model/resetpassword-model';
-// Others
+// services
+import { AuthService } from '../../services/auth.service';
+import { CacheService } from '../../shared/cache/cache.service';
+import { GameService } from '../../services/game.service';
+import { MilestoneService } from '../../services/milestone.service';
+import { ResponsiveService } from '../../services/responsive.service';
 import { TranslationService } from '../../shared/translation/translation.service';
-import { loadingMessages, errMessages } from '../../app/messages';
-import * as _ from 'lodash';
-
 @Component({
   selector: 'page-reset-password',
   templateUrl: 'reset-password.html'
 })
 export class ResetPasswordPage implements OnInit {
-
-  emailVal: string;
-  keyVal: string;
-
-  invalidLinkErrMessage = errMessages.ResetPassword.invalidLink.invalid;
-  isLandscaped: boolean = false;
-  isPwdMatch: boolean = false;
-  minLengthCheck: boolean = true;
-  milestone_id: string;
-  password: string;
-  passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
-  passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
-  resetPasswordLoginFailedMessage: any = errMessages.ResetPassword.resetLoginFailed.failed;
-  resetPwdFormGroup: any;
-  successResetPasswordMessage: any = loadingMessages.SuccessResetPassword.successResetPassword;
-  verify_password: string;
-  verifyPwd: boolean = false;
-  verifySuccess: boolean = null;
-  verifyUserMessage = loadingMessages.VerifyUser.verify;
-  windowHeight: number = window.innerHeight / 3;
-
-  constructor(
+  public emailVal: string;
+  public gameID: string = null;
+  public isLandscaped: boolean = false;
+  public isPwdMatch: boolean = false;
+  public keyVal: string;
+  public minLengthCheck: boolean = true;
+  public milestone_id: string;
+  public password: string;
+  public resetPwdFormGroup: any;
+  public userData: any = [];
+  public verify_password: string;
+  public verifyPwd: boolean = false;
+  public verifySuccess: boolean = null;
+  // loading & error message variables
+  public invalidLinkErrMessage = errMessages.ResetPassword.invalidLink.invalid;
+  public passwordMismatchMessage: any = errMessages.PasswordValidation.mismatch.mismatch;
+  public passwordMinlengthMessage: any = errMessages.PasswordValidation.minlength.minlength;
+  public resetPasswordLoginFailedMessage: any = errMessages.ResetPassword.resetLoginFailed.failed;
+  public successResetPasswordMessage: any = loadingMessages.SuccessResetPassword.successResetPassword;
+  public verifyUserMessage = loadingMessages.VerifyUser.verify;
+  constructor(public formBuilder: FormBuilder,
     public alertCtrl: AlertController,
-    public authService: AuthService,
-    public cacheService: CacheService,
-    public formBuilder: FormBuilder,
-    public gameService: GameService,
     public loadingCtrl: LoadingController,
     public milestoneService: MilestoneService,
     public navCtrl: NavController,
     public navParams: NavParams,
-    public translationService: TranslationService,
-    public viewCtrl: ViewController
-  ) {
+    public viewCtrl: ViewController,
+    public authService: AuthService,
+    public cacheService: CacheService,
+    public gameService: GameService,
+    public translationService: TranslationService) {
       // validation for both password values: required & minlength is 8
       this.resetPwdFormGroup = formBuilder.group({
           password: ['', [Validators.minLength(8), Validators.required]],
@@ -73,12 +74,7 @@ export class ResetPasswordPage implements OnInit {
              user screen is mobile device or desktop device. If device is mobile
              device, ngOnInit() will disable landscape mode for mobile device
   */
-  ngOnInit() {
-  }
-
-  ionViewDidLoad() {
-    console.log('ionViewDidLoad ResetpasswordPage');
-  }
+  ngOnInit() {}
 
   ionViewWillEnter() {
     this.verifyKeyEmail();
@@ -107,17 +103,15 @@ export class ResetPasswordPage implements OnInit {
       .subscribe(data => {
         loading.dismiss();
         this.verifySuccess = true;
-        console.log("valueTrue: " + this.verifySuccess);
       },
       err => {
         loading.dismiss();
         this.verifySuccess = false;
-        console.log("valueFalse: " + this.verifySuccess);
         setTimeout(() => {
-          this.navCtrl.push(LoginPage).then(() => {
+          this.navCtrl.setRoot(LoginPage).then(() => {
               window.history.replaceState({}, '', window.location.origin);
             });
-        }, 5000);
+        }, 30000);
       });
   }
 
@@ -137,8 +131,6 @@ export class ResetPasswordPage implements OnInit {
     });
     loading.present().then(() => {
       this.authService.resetUserPassword(key, email, this.password, this.verify_password).subscribe(data => {
-        // loading.dismiss();
-        // this.navCtrl.push(LoginPage);
         this.authService.loginAuth(email, this.password)
             .subscribe(data => {
               this.cacheService.setLocal('apikey', data.apikey);
@@ -187,19 +179,18 @@ export class ResetPasswordPage implements OnInit {
                           window.history.replaceState({}, '', window.location.origin);
                         });
                       });
-                    },
-                    err => {
-                      loading.dismiss().then(() => {
-                        console.log(err);
-                      });
-                    }
-                  )
+                    });
+                  },
+                  err => {
+                    this.logError(err);
+                  }
+                )
               this.cacheService.write('isAuthenticated', true);
               this.cacheService.setLocal('isAuthenticated', true);
             },
             err => {
               loading.dismiss().then(() => {
-                this.loginError(err);
+                this.logError(err);
                 this.cacheService.removeLocal('isAuthenticated');
                 this.cacheService.write('isAuthenticated', false);
               });
@@ -207,17 +198,16 @@ export class ResetPasswordPage implements OnInit {
       },
       err => {
         loading.dismiss().then(() => {
-          console.log(err);
+          this.logError(err);
         });
       });
-    });
   }
 
   // after password set, auto login error alertbox
-  loginError(error) {
+  logError(error) {
     const alertLogin = this.alertCtrl.create({
-      title: 'Login Failed ..',
-      message: this.resetPasswordLoginFailedMessage,
+      title: 'Error Message',
+      message: 'Oops, loading failed, please try it again later.',
       buttons: ['Close']
     });
     alertLogin.present();
@@ -236,4 +226,10 @@ export class ResetPasswordPage implements OnInit {
   pwdMatchCheck() {
     return this.password != this.verify_password ? this.isPwdMatch = true : this.isPwdMatch = false;
   }
+  // go to login page when verification is failed
+  goToLogin() {
+    this.navCtrl.setRoot(LoginPage).then(() => {
+      window.history.replaceState({}, '', window.location.origin);
+    });
+  }
 }
diff --git a/src/pages/settings/settings.page.ts b/src/pages/settings/settings.page.ts
index a4ee4f9d..5c1650c8 100644
--- a/src/pages/settings/settings.page.ts
+++ b/src/pages/settings/settings.page.ts
@@ -1,13 +1,12 @@
 import { Component } from '@angular/core';
 import { App, NavController, MenuController, LoadingController, AlertController } from 'ionic-angular';
-
 // services
 import { CacheService } from '../../shared/cache/cache.service';
 import { GameService } from '../../services/game.service';
 // pages
 import { LoginPage } from '../../pages/login/login';
 import { TutorialPage } from '../settings/tutorial/tutorial.page';
-import { TermConditionPage } from '../term-condition/term-condition.page';
+import { TermsConditionsPage } from '../registration/terms-conditions/terms-conditions.page';
 // Others
 import { TranslationService } from '../../shared/translation/translation.service';
 import { loadingMessages } from '../../app/messages';
@@ -21,7 +20,6 @@ export class SettingsPage {
   hideName: boolean = false;
   logoutMessage: any = loadingMessages.Logout.logout;
   settings: any = [];
-
   constructor(
     public appCtrl: App,
     public alertCtrl: AlertController,
@@ -109,7 +107,7 @@ export class SettingsPage {
   }
 
   goToTermConditions() {
-    this.navCtrl.push(TermConditionPage);
+    this.navCtrl.push(TermsConditionsPage);
   }
 
   logout() {
@@ -122,7 +120,7 @@ export class SettingsPage {
         localStorage.clear();
         window.location.reload(); // the reason of doing this is because of we need to refresh page content instead of API data cache issue occurs
         loader.dismiss();
-        this.navCtrl.push(LoginPage);
+        this.navCtrl.setRoot(LoginPage);
       });
     });
   }
diff --git a/src/pages/settings/tutorial/tutorial.html b/src/pages/settings/tutorial/tutorial.html
index bd72a1ce..b706516f 100644
--- a/src/pages/settings/tutorial/tutorial.html
+++ b/src/pages/settings/tutorial/tutorial.html
@@ -8,19 +8,19 @@
 <ion-content>
   <ion-slides pager="true" class="tutorial-slides">
     <ion-slide>
-      <img src="./assets/img/tutorial/tutorial_tour01.png" />
+      <img src="/assets/img/tutorial/tutorial_tour01.png" />
       <h1>Welcome</h1>
       <p>Great to see you. The Practera App will help you getting the most out of your learning experience! Let’s get started.</p>
     </ion-slide>
     <ion-slide>
-      <img src="./assets/img/tutorial/tutorial_tour02.png" />
+      <img src="/assets/img/tutorial/tutorial_tour02.png" />
       <h1>Real Feedback</h1>
       <p>The tasks you submit will be reviewed by real experts in their industry. This will help you to develop the right skills that you need to advance your career!</p>
     </ion-slide>
     <ion-slide>
       <ion-row>
         <ion-col>
-          <img src="./assets/img/tutorial/tutorial_tour03.png" />
+          <img src="/assets/img/tutorial/tutorial_tour03.png" />
           <h1>Leaderboard</h1>
           <p>By engaging and interacting with the app, you will earn points and badges, which will put you on top of the leaderboard and make you even more interesting for employers!</p>
         </ion-col>
@@ -34,4 +34,4 @@ <h1>Leaderboard</h1>
     <button *ngIf="hideNextButton == false" ion-button class="next-button" (click)="goNext()">{{ 'GENERAL.NEXT' | translate }}</button>
     <button *ngIf="hideNextButton == true" ion-button class="next-button" (click)="goDashbaord()">{{ 'GENERAL.DONE' | translate }}</button>
   </ion-toolbar>
-</ion-footer>
\ No newline at end of file
+</ion-footer>
diff --git a/src/pages/term-condition/term-condition.html b/src/pages/term-condition/term-condition.html
deleted file mode 100644
index 1c69df83..00000000
--- a/src/pages/term-condition/term-condition.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<ion-header>
-  <ion-navbar hideBackButton="true">
-    <ion-title>{{ 'TERMCONDITIONS.PAGETITLE' | translate }}</ion-title>
-  </ion-navbar>
-</ion-header>
-<ion-content>
-  <ion-list>
-    <term-content></term-content>
-  </ion-list>
-  <!-- <ion-list *ngIf="content">
-    <iframe width="100%" height="2500px" [src]="content" frameborder="0" marginwidth="0"></iframe>
-  </ion-list> -->
-  <ion-list *ngIf="accessMethod() == true">
-    <!-- <button ion-item stable block (click)="signIn()">Skip (temporary)</button> -->
-    <ion-item>
-     <ion-label>{{ 'TERMCONDITIONS.AGREE' | translate }}</ion-label>
-     <ion-checkbox [(ngModel)]="agreed" (change)="toggleAgree()" value="Agree"></ion-checkbox>
-   </ion-item>
-  </ion-list>
-  <ion-list class="register-next" *ngIf="accessMethod() == true">
-    <button stable block disabled [disabled]="!agreed" (click)="agree(user)">{{ 'TERMCONDITIONS.NEXT' | translate }}</button>
-  </ion-list>
-  <ion-list *ngIf="accessMethod() != true">
-    <button class="general-circle-btn"
-      ion-button
-      block
-      color="practera-thick" 
-      (click)="backToSAccountPage()">
-      Back
-    </button>
-  </ion-list>
-</ion-content>
diff --git a/src/pages/term-condition/term-condition.scss b/src/pages/term-condition/term-condition.scss
deleted file mode 100644
index 9210abc5..00000000
--- a/src/pages/term-condition/term-condition.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-term-condition {
-  ion-content {
-    padding: 0px !important;
-    overflow-y: hidden;
-    .scroll-content {
-      padding: 5px !important;
-    }
-    ion-item,
-    .item-inner {
-      border: none !important;
-    }
-    button.item-cover {
-      border: 1px solid #ddd !important;
-    }
-    .list.list-ios,
-    .list.list-md {
-      margin: 0px 0 16px 0 !important;
-    }
-    .register-next {
-      text-align: center;
-      button {
-        background-color: transparent;
-        font-size: 14pt;
-      }
-    }
-  }
-}
diff --git a/src/pages/term-condition/term-content.component.ts b/src/pages/term-condition/term-content.component.ts
deleted file mode 100755
index 6c0626f8..00000000
--- a/src/pages/term-condition/term-content.component.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { Component } from '@angular/core';
-import { DomSanitizer } from '@angular/platform-browser';
-import { AuthService } from '../../services/auth.service';
-
-
-const TermContent = `<h2>Terms of Use Agreement</h2>
-
-<p>Welcome! By using this platform managed by Intersective Pty Ltd, you are agreeing to comply with and be bound by the following terms of use. These terms are intended to cover the use of the Practera Platform (the Platform) and activities and tasks closely associated with the use of the Platform. Please review the following terms carefully.  If you do not agree to these terms, you should not progress any further, and/or communicate with your organisation’s program coordinator. </p>
-<p><b>1. Acceptance of Agreement.</b>  You agree to the terms and conditions outlined in this Terms of Use Agreement ("Agreement") with respect to the program platform (the "Platform").  This Agreement constitutes the entire and only agreement between us and you, and supersedes all prior or contemporaneous agreements, representations, warranties and understandings with respect to the Platform, the content, products or services provided by or through the Platform, and the subject matter of this Agreement.  This Agreement may be amended at any time by us from time to time without specific notice to you.  The latest Agreement will be posted on the Platform, and you should review this Agreement prior to using the Platform.
-</p>
-
-<p><b>2. Copyright.</b>  The content, organization, graphics, design, compilation, magnetic translation, digital conversion and other matters related to the Platform are protected under applicable copyrights, trademarks and other proprietary (including but not limited to intellectual property) rights.  The copying, redistribution, use or publication by you of anysuch matters or any part of the Platform, except as allowed by Section 3, is strictly prohibited.  You do not acquire ownership rights to any content, document or other materials viewed through the Platform.  The posting of information or materials on the Platform does not constitute a waiver of any right in such information and materials.
-</p>
-
-<p><b>3. Limited Right to Use.</b>  The viewing, printing or downloading of any content, graphic, form or document from the Platform grants you only a limited, nonexclusive license for use solely by you for your own personal use and not for republication, distribution, assignment, sublicense, sale, preparation of derivative works or other use.  No part of any content, form or document may be reproduced in any form or incorporated into any information retrieval system, electronic or mechanical, other than for your personal use (but not for resale or redistribution).
-</p>
-
-<p><b>4. Editing, Deleting and Modification.</b>  We reserve the right in our sole discretion to edit or delete any documents, information or other content appearing on the Platform.
-</p>
-
-<p><b>5. Indemnification.</b>  You agree to indemnify, defend and hold us and our partners, staff and affiliates (collectively, "Affiliated Parties") harmless from any liability, loss, claim and expense, including reasonable legal fees, related to your violation of this Agreement or use of the Platform.
-</p>
-
-<p><b>6. Nontransferable.</b>  Your right to use the Platform is not transferable.  Any password or right given to you to obtain information or documents is not transferable.
-</p>
-
-<p><b>7. Disclaimer and Limits.</b> All responsibility or liability for any damages caused by viruses contained within the electronic file containing the form or document is disclaimed.  WE WILL NOT BE LIABLE TO YOU FOR ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OF ANY KIND THAT MAY RESULT FROM USE OF OR INABILITY TO USE OUR PLATFORM.
-</p>
-
-<p><b>8. Use of Information.</b>  We reserve the right, and you authorize us, to the use and assignment of all information regarding Platform uses by you and all information provided by you in any manner consistent with our Privacy Policy.
-</p>
-
-<p><b>9. Third-Party Access.</b>  We may allow access to the platform, or to any information contained within the platform, to thirdparties in our absolute discretion, subject to our Privacy Policy.
-</p>
-
-<p><b>10. Privacy Policy.</b>  Our Privacy Policy, as it may change from time to time, is a part of this Agreement.
-</p>
-
-<p><b>11. Links to other Web Sites.</b>  The Site contains links to other Web Sites.  We are not responsible for the content, accuracy or opinions express in such Web Sites, and such Web Sites are not investigated, monitored or checked for accuracy or completeness by us.  Inclusion of any linked Web Site on our Site does not imply approval or endorsement of the linked Web Site by us.  If you decide to leave our Site and access these third-party Sites, you do so at your own risk.
-</p>
-
-<p><b>12. License of user content.</b>  You grant Intersective and any other users of the platform, an irrevocable, global and perpetual license to use any and all content submitted into the platform, including, without limitation, your documents, deliverables, assignments, class notes, course outlines, submits, posts, uploads, displays, reviews, suggestions, ideas, solutions, questions, answers, messages, images, videos, texts of any kind, or other materials for any purposes whatsoever, including, without limitation, developing, manufacturing and marketing products and services for commercial purposes, without any payment or compensation to you. You further agree that Intersective may give free access to all of your above mentioned user content to other third parties, including, without limitation, affiliates, distributors, other users or potential users. You waive any legal or moral rights you may have in any User Content you submit, even if such User Content is altered or changed in any manner.
-</p>
-
-<h2>Privacy Policy</h2>
-<p><b>1. We respect your privacy.</b> As the manager of the program Platform (“The Platform”) Intersective respects your right to privacy and this policy sets out how we collect and treat your personal information. “Personal information” is information we hold which is identifiable as being about you.
-</p>
-
-<p><b>2. What personal information we collect.</b> We may collect a range of types of personal information from you, including, but not limited to, the following:</p>
-<ul>
-  <li>name</li>
-  <li>demographic information – eg; age, gender, socio-economic status</li>
-  <li>psychographic information – eg personality, interests, attitudes, behaviours and opinions</li>
-  <li>educational history</li>
-  <li>employment history</li>
-  <li>student number</li>
-  <li>user ideas and comments</li>
-  <li>information from enquiries you have made</li>
-  <li>communications between program participants</li>
-  <li>assessments marks and details</li>
-  <li>digital and multimedia</li>
-</ul>
-</p>
-
-<p><b>3. How we collect your personal information.</b> We collect personal information from you in a variety of ways, including: when you interact with us electronically or in person; when you access our website; and when we provide our services to you.
-</p>
-
-<p><b>4. Use of your personal information.</b> We use your information to provide our service to you. We also use it to improve our service and to notify you of opportunities that we think you might be interested in. We do not provide or sell your information to third parties, except that we may provide your information to our program partners who support the provision of our services to you expressly for the purpose of facilitating the delivery of that service.
-</p>
-
-<p><b>5. Disclosure of your personal information overseas.</b> We are likely to disclose your personal information to recipients globally.
-</p>
-
-<p><b>6. Security of your personal information.</b> We take reasonable steps to protect your personal information. However we are not liable for any unauthorised access to this information.
-</p>
-
-<p><b>7. Access to your personal information.</b> You can access and update your personal information by contacting us on {{helpline}}
-</p>
-
-<p><b>8. Complaints about privacy.</b> If you have any complaints about our privacy practices, please feel free to send in details of your complaints to {{helpline}}. We take complaints very seriously and will respond shortly after receiving written notice of your complaint.
-</p>
-
-<p><b>9. Changes.</b> Please be aware that we may change this Privacy Policy in the future. The revised versions will be uploaded onto our website, so please check back from time to time.
-</p>
-
-<p><b>10. Website.</b></p>
-<p><em>When you visit our website</em></p>
-<p>When you come on to our website we may collect certain information such as browser type, operating system, website visited immediately before coming to our site, etc. This information is used in an aggregated manner to analyse how people use our site, such that we can improve our service.</p>
-
-<p><em>Cookies</em></p>
-<p>As is very common for companies, we use cookies on our website. Cookies are very small files which a website uses to identify you when you come back to the site and to store details about your use of the site. Cookies are not malicious programs that access or damage your computer. We use cookies to improve the experience of people using our website.
-Third party sites
-Our site has links to other websites not owned or controlled by us. We are not responsible for these sites or the consequences of you going on to those sites.</p>`;
-
-@Component({
-  selector: 'term-content',
-  template: '<div [innerHTML]="content"></div>'
-})
-export class TermContentComponent {
-  content: string;
-  constructor(public sanitizer: DomSanitizer, public authService: AuthService) {
-    this.content = TermContent;
-  }
-}
diff --git a/src/services/auth.service.spec.ts b/src/services/auth.service.spec.ts
new file mode 100644
index 00000000..1042355a
--- /dev/null
+++ b/src/services/auth.service.spec.ts
@@ -0,0 +1,121 @@
+import {} from 'jasmine';
+import 'rxjs/Rx';
+import { TestBed, getTestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { IonicStorageModule } from '@ionic/storage';
+import { CacheComponent } from '../shared/cache/cache.component';
+// service file
+import { AuthService } from './auth.service';
+import { CacheService } from '../shared/cache/cache.service';
+import { RequestModule } from '../shared/request/request.module';
+
+describe('AuthService', () => {
+  let injector;
+  let service: AuthService;
+  let httpMock: HttpTestingController;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        CacheComponent
+      ],
+      imports: [
+        HttpClientTestingModule,
+        IonicStorageModule.forRoot({
+          name: '__test-app-vault',
+          driverOrder: ['localstorage']
+        }),
+        RequestModule.forRoot({
+          appKey: '',
+          prefixUrl: ''
+        })
+      ],
+      providers: [
+        { provide: AuthService, useClass: AuthService },
+        { provide: CacheService, useClass: CacheService }
+      ]
+    });
+    injector = getTestBed();
+    service = injector.get(AuthService);
+    httpMock = injector.get(HttpTestingController);
+  });
+  // get users API returns
+  describe('getUser()' , () => {
+    it('return user data', () => {
+      const fakeData = {
+        email: 'test@test.com',
+        experience_id: 3,
+        image: null,
+        linkedinConnected: false,
+        linkedin_url: null,
+        name: 'test',
+        program_id: 6,
+        project_id: 6,
+        role: 'participant',
+        timeline_id: 7
+      };
+      service.getUser().subscribe(data => {
+        expect(data).toEqual(fakeData);
+      });
+      const req = httpMock.expectOne({
+        url: 'api/users.json',
+        method: 'GET'
+      });
+      req.flush(fakeData);
+    })
+  });
+  // login authentication API returns
+  describe('loginAuth()' , () => {
+    it('login successfully', () => {
+      const expectedLoggedInData = {
+        success: true,
+        tutorial: true,
+        apikey: '7xxxxxxxa3fdxxxx9330a6',
+        Timelines: [
+          {
+            Timeline: {
+              id: 5,
+              title: 'test 1 2016S2',
+              start_date: '2016-10-23',
+              state: 1
+            },
+            Program: {
+              id: 4,
+              name: 'test 1',
+              max_achievable_points: 500
+            },
+            Project: {
+              id: 7,
+              name: 'test 1',
+              description: 'This is test project',
+              lead_image: null,
+              emails: ''
+            },
+            Enrolment: {
+              id: 3559,
+              status: 'fullaccess'
+            }
+          }
+        ],
+        Teams: [
+          {
+            id: 1,
+            name: 'Team 1'
+          }
+        ],
+        Experience: {
+          config: {}
+        }
+      };
+      const userData = {
+        email: 'test@test.com',
+        password: 'w467r32a3yg3fy4#dfghjsdfsd'
+      }
+      let actualLoggedInData = {};
+      service.loginAuth(userData.email, userData.password).subscribe(data => {
+        actualLoggedInData = data;
+      });
+      httpMock.expectOne('api/auths.json?action=authentication').flush(expectedLoggedInData);
+      expect(actualLoggedInData).toEqual(expectedLoggedInData);
+    })
+  });
+})
diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
index 76588ced..f922942d 100755
--- a/src/services/auth.service.ts
+++ b/src/services/auth.service.ts
@@ -1,25 +1,18 @@
 import { Injectable } from '@angular/core';
 import { RequestService } from '../shared/request/request.service';
 import { HttpParams } from '@angular/common/http';
-
 const AUTH_ENDPOINT = 'api/auths.json?action=';
 
 @Injectable()
 export class AuthService {
   appkey: any = this.request.getAppkey();
   prefixUrl: any = this.request.getPrefixUrl();
-
   constructor(
     public request: RequestService,
   ) {}
-
-  getTerms() {
-    return this.request.get('api/registration_details.json');
-  }
   private postRequest(type, body) {
     return this.request.post(AUTH_ENDPOINT + type, body);
   }
-
   verifyRegistration(data) {
     let params = new HttpParams();
     params.set('email', data.email);
@@ -27,7 +20,6 @@ export class AuthService {
 
     return this.postRequest('verify_registration', params);
   }
-
   register(data) {
     return this.postRequest('registration', {
       password: data.password,
@@ -35,34 +27,27 @@ export class AuthService {
       key: data.key,
     });
   }
-
   loginAuth(email, password) {
     return this.postRequest('authentication', `data[User][email]=${email}&data[User][password]=${password}`);
   }
-
   forgotPassword(email) {
     return this.postRequest('forgot_password', { email });
   }
-
   verifyUserKeyEmail(key, email) {
     return this.postRequest('verify_reset_password', {
       key: key,
       email: email,
     });
   }
-
   resetUserPassword(key, email, password, verify_password) {
     return this.postRequest('reset_password', { key, email, password, verify_password });
   }
-
   magicLinkLogin(auth_token) {
     return this.request.post('api/auths.json', { auth_token });
   }
-
   getUser() {
     return this.request.get('api/users.json');
   }
-
   isAuthenticated() {
     return true;
   }
diff --git a/src/shared/cache/cache.component.ts b/src/shared/cache/cache.component.ts
new file mode 100644
index 00000000..4319f815
--- /dev/null
+++ b/src/shared/cache/cache.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+import { CacheService } from './cache.service';
+
+@Component({
+  selector: 'app-cache',
+  template: ``
+})
+export class CacheComponent {
+
+  constructor(
+    public cacheService: CacheService
+  ) {}
+
+  setLocal(key: string, value: string | Boolean) {
+    return this.cacheService.setLocal(key, value);
+  }
+
+  getLocal(key: string) {
+    return this.cacheService.getLocal(key);
+  }
+}
diff --git a/src/shared/cache/cache.module.spec.ts b/src/shared/cache/cache.module.spec.ts
old mode 100755
new mode 100644
index e4bbb1d1..517ae27c
--- a/src/shared/cache/cache.module.spec.ts
+++ b/src/shared/cache/cache.module.spec.ts
@@ -1,14 +1,18 @@
+import {} from 'jasmine';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
 import { CacheComponent } from './cache.component';
 import { CacheService } from './cache.service';
 import { IonicStorageModule } from '@ionic/storage';
 
-import { async, TestBed } from '@angular/core/testing';
-
 describe('Cache read/write test', () => {
 
-  let fixture;
+  let comp: CacheComponent;
+  let fixture: ComponentFixture<CacheComponent>;
 
-  beforeAll(() => {
+  beforeEach(() => {
     TestBed.configureTestingModule({
       declarations: [
         CacheComponent
@@ -20,44 +24,18 @@ describe('Cache read/write test', () => {
         IonicStorageModule.forRoot({
           name: '__app-vault',
           driverOrder: ['localstorage']
-        }),
+        })
       ]
     });
+
     fixture = TestBed.createComponent(CacheComponent);
-    fixture.detectChanges();
+    comp = fixture.componentInstance;
   });
 
   it('write/read single value', async(() => {
-    fixture.componentInstance.save('singleValue', 'yes')
-    .then((saved) => {
-      fixture.componentInstance.load('singleValue')
-      .then((content) => {
-        expect(content).toEqual('yes');
-      });
-    });
-  }));
-
-  it('write/read multi-level value', async(() => {
-    fixture.componentInstance.save('multiLevels.one', 'yes')
-    .then((saved) => {
-      fixture.componentInstance.load('multiLevels.one')
-      .then((content) => {
-        expect(content).toEqual('yes');
-      });
-    });
-  }));
-
-  it('Write in parallel', async(() => {
-    fixture.componentInstance.save('paralle.writeOne', 'one');
-    fixture.componentInstance.save('paralle.writeTwo', 'two');
-
-    fixture.componentInstance.load('paralle')
-    .then((content) => {
-      // console.log('c', content)
-      expect(content).toEqual({
-        writeOne: 'one',
-        writeTwo: 'two'
-      });
-    });
+    let yes: any ='yes';
+    fixture.componentInstance.setLocal('singleValue', yes)
+    fixture.componentInstance.getLocal('singleValue')
+    expect(fixture.componentInstance.getLocal('singleValue')).toEqual(yes);
   }));
 });
diff --git a/src/shared/request/request.service.ts b/src/shared/request/request.service.ts
index 78f5f58e..9fbb1bdb 100755
--- a/src/shared/request/request.service.ts
+++ b/src/shared/request/request.service.ts
@@ -172,6 +172,6 @@ export class RequestService {
   }
 
   extractData(res) {
-    return res.data || {};
+    return res.data || res;
   }
 }
diff --git a/src/shared/testModules/pages/test/test-start.page.ts b/src/shared/testModules/pages/test/test-start.page.ts
index b4d7fa5e..a3c150f4 100755
--- a/src/shared/testModules/pages/test/test-start.page.ts
+++ b/src/shared/testModules/pages/test/test-start.page.ts
@@ -10,7 +10,7 @@ import { EventsDownloadPage } from '../../../../pages/events/download/events-dow
 import { GalleryPage } from '../../../../pages/gallery/gallery.page';
 import { LevelsListPage } from '../../../../pages/levels/list/list';
 import { LoginPage } from '../../../../pages/login/login';
-import { RegistrationPage } from '../../../../pages/registration/registration.page';
+import { RegisterPage } from '../../../../pages/registration/register.page';
 import { SettingsPage } from '../../../../pages/settings/settings.page';
 import { EventCheckinPage } from '../../../../pages/events/checkin/event-checkin.page';
 import { TeamPage } from '../../../../pages/team/team.page';
@@ -972,7 +972,7 @@ const PAGES = [
   },
   {
     name: 'Registration',
-    page: RegistrationPage
+    page: RegisterPage    
   },
   {
     name: 'Gallery',
diff --git a/src/theme/pages/authenticate/default-center-container.scss b/src/theme/pages/authenticate/default-center-container.scss
index 16060d5c..6bb60c46 100644
--- a/src/theme/pages/authenticate/default-center-container.scss
+++ b/src/theme/pages/authenticate/default-center-container.scss
@@ -12,14 +12,13 @@
     width: 100%;
     text-align: center;
     .default-logo {
-      width: 128pt;
-      height: 128pt;
+      width: 120pt;
+      height: 120pt;
     }
     h3 {
       color: color($colors, practera-thick);
       z-index: 3;
-      font-size: 22pt;
-      padding-bottom: 12pt;
+      font-size: 20pt;
     }
   }
 }
diff --git a/src/theme/pages/authenticate/login-container.scss b/src/theme/pages/authenticate/login-container.scss
index b17d3a1c..793f5e05 100644
--- a/src/theme/pages/authenticate/login-container.scss
+++ b/src/theme/pages/authenticate/login-container.scss
@@ -1,7 +1,6 @@
 /**
  * @page pages/forget-password/forget-password.html
  */
-
 .login-container {
   @include placeholderColor;
   background-color: color($colors, secondary, base);
@@ -22,16 +21,6 @@
       padding-top: 5pt;
     }
   }
-  .forget-password-container {
-    text-align: center;
-    border: none;
-    button {
-      color: color($colors, practera-thick); // default-theme
-      margin-top: 24pt;
-      font-size: 11pt;
-      background-color: transparent;
-    }
-  }
   ion-item {
     border-bottom: 1px solid $border-primary !important;
     color: color($colors, dark, base);
diff --git a/src/theme/pages/authenticate/login-module.scss b/src/theme/pages/authenticate/login-module.scss
index 92b17c7e..e955d807 100644
--- a/src/theme/pages/authenticate/login-module.scss
+++ b/src/theme/pages/authenticate/login-module.scss
@@ -4,7 +4,6 @@
  * @page pages/register/register.html
  * @page pages/reset-password/reset-password.html
  */
-
 .login-module {
   font-family: $font-secondary;
   background-color: color($colors, secondary, base);
@@ -39,9 +38,43 @@
         border-bottom: 1px solid color($colors, border, base) !important;
       }
     }
-    .general-circle-btn {
+  }
+  .errors {
+    height: 32px;
+    text-align: left;
+    small {
+      text-align: left;
+      padding-left: 1px;
+    }
+  }
+  .forgot-password-container {
+    text-align: center;
+    border: none;
+    padding-top: 20pt;
+    .forgot-password-link {
       background: none;
-      padding-top: 20pt;
+      font-size: 10pt;
+    }
+  }
+  // term & condition css 
+  .term-condition-link {
+    text-align: left;
+    padding: 0 0 15px 1px;
+    position: relative;
+    top: -5px;
+    .agree-tick {
+      position: relative;
+      top: 6px;
+    }
+    .checkbox-md {
+      position: relative;
+      top: 3px !important;
+    }
+    .platform-android u {
+      padding-left: 4px; 
+    }
+    .agree-text {
+      padding-left: 4px;
     }
   }
 }
diff --git a/test-config/karma.conf.js b/test-config/karma.conf.js
index daac6e57..bb4f9962 100755
--- a/test-config/karma.conf.js
+++ b/test-config/karma.conf.js
@@ -36,7 +36,10 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
-    singleRun: false
+    singleRun: false,
+    resolve: {
+      extensions: ['.js', '.ts']
+    }
   };
 
   config.set(_config);
diff --git a/yarn.lock b/yarn.lock
index 4d7be30d..f89b54ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -118,9 +118,9 @@
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-2.0.0.tgz#9c16d07cd070c67ada270a2e940281eb826b3f43"
 
-"@types/jasmine@^2.5.47":
-  version "2.5.53"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.53.tgz#4e0cefad09df5ec48c8dd40433512f84b1568d61"
+"@types/jasmine@^2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.2.tgz#6e6d4cb183cd55c7a1ad6270bced10fdd5367a3c"
 
 "@types/localforage@0.0.30":
   version "0.0.30"
@@ -130,9 +130,9 @@
   version "6.0.85"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.85.tgz#ec02bfe54a61044f2be44f13b389c6a0e8ee05ae"
 
-"@types/node@^7.0.13":
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.39.tgz#8aced4196387038113f6f9aa4014ab4c51edab3c"
+"@types/node@^8.0.47":
+  version "8.0.47"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -207,6 +207,15 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
+ajv@^5.0.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
 ajv@^5.1.5:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
@@ -265,6 +274,12 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  dependencies:
+    default-require-extensions "^1.0.0"
+
 aproba@^1.0.3:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
@@ -276,6 +291,12 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -860,6 +881,10 @@ core-js@^2.2.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
+core-js@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
+
 core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -983,6 +1008,12 @@ deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  dependencies:
+    strip-bom "^2.0.0"
+
 deferred-leveldown@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz#2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"
@@ -1203,6 +1234,10 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
+es6-promise@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
+
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -1423,6 +1458,13 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -1642,6 +1684,16 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
+handlebars@^4.0.3:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+  dependencies:
+    async "^1.4.0"
+    optimist "^0.6.1"
+    source-map "^0.4.4"
+  optionalDependencies:
+    uglify-js "^2.6"
+
 har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
@@ -1985,13 +2037,89 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
+istanbul-api@^1.1.8:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.2.1.tgz#0c60a0515eb11c7d65c6b50bba2c6e999acd8620"
+  dependencies:
+    async "^2.1.4"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-hook "^1.1.0"
+    istanbul-lib-instrument "^1.9.1"
+    istanbul-lib-report "^1.1.2"
+    istanbul-lib-source-maps "^1.2.2"
+    istanbul-reports "^1.1.3"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-instrumenter-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.0.tgz#9f553923b22360bac95e617aaba01add1f7db0b2"
+  dependencies:
+    convert-source-map "^1.5.0"
+    istanbul-lib-instrument "^1.7.3"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
+
+istanbul-lib-coverage@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+
+istanbul-lib-hook@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.7.3, istanbul-lib-instrument@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.1.1"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425"
+  dependencies:
+    istanbul-lib-coverage "^1.1.1"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.1.1"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10"
+  dependencies:
+    handlebars "^4.0.3"
+
 jasmine-core@~2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.7.0.tgz#50ff8c4f92d8ef5c0b2c1b846dd263ed85152091"
 
-jasmine-spec-reporter@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.1.tgz#5a6d58ab5d61bea7309fbc279239511756b1b588"
+jasmine-core@~2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+
+jasmine-spec-reporter@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
   dependencies:
     colors "1.1.2"
 
@@ -2003,6 +2131,14 @@ jasmine@^2.5.3:
     glob "^7.0.6"
     jasmine-core "~2.7.0"
 
+jasmine@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  dependencies:
+    exit "^0.1.2"
+    glob "^7.0.6"
+    jasmine-core "~2.8.0"
+
 jasminewd2@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.1.0.tgz#da595275d1ae631de736ac0a7c7d85c9f73ef652"
@@ -2011,10 +2147,17 @@ js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
-js-tokens@^3.0.0:
+js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
+js-yaml@^3.7.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -2076,13 +2219,30 @@ jstransform@~3.0.0:
     esprima-fb "~3001.1.0-dev-harmony-fb"
     source-map "0.1.31"
 
-karma-chrome-launcher@^2.0.0:
+jszip@^3.1.3:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.4.tgz#fc323fe41bb1730348d20dd022aa4d8b57cbbcf9"
+  dependencies:
+    core-js "~2.3.0"
+    es6-promise "~3.0.2"
+    lie "~3.1.0"
+    pako "~1.0.2"
+    readable-stream "~2.0.6"
+
+karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
   dependencies:
     fs-access "^1.0.0"
     which "^1.2.1"
 
+karma-coverage-istanbul-reporter@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.0.tgz#d142cd9c55731c9e363ef7374e8ef1a31bebfadb"
+  dependencies:
+    istanbul-api "^1.1.8"
+    minimatch "^3.0.4"
+
 karma-jasmine-html-reporter@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
@@ -2099,9 +2259,9 @@ karma-sourcemap-loader@^0.3.7:
   dependencies:
     graceful-fs "^4.1.2"
 
-karma-webpack@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.4.tgz#3e2d4f48ba94a878e1c66bb8e1ae6128987a175b"
+karma-webpack@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.5.tgz#4f56887e32cf4f9583391c2388415de06af06efd"
   dependencies:
     async "~0.9.0"
     loader-utils "^0.2.5"
@@ -2109,9 +2269,9 @@ karma-webpack@^2.0.3:
     source-map "^0.1.41"
     webpack-dev-middleware "^1.0.11"
 
-karma@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.0.tgz#6f7a1a406446fa2e187ec95398698f4cee476269"
+karma@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -2248,6 +2408,12 @@ lie@3.0.2:
     inline-process-browser "^1.0.0"
     unreachable-branch-transform "^0.3.0"
 
+lie@~3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  dependencies:
+    immediate "~3.0.5"
+
 livereload-js@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.2.2.tgz#6c87257e648ab475bc24ea257457edcc1f8d0bc2"
@@ -2484,7 +2650,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -2972,9 +3138,9 @@ process@^0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
-protractor@^5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.1.2.tgz#9b221741709a4c62d5cd53c6aadd54a71137e95f"
+protractor@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.2.0.tgz#d3f39b195e85f3539ad9d8cb6560a9d2b63297c4"
   dependencies:
     "@types/node" "^6.0.46"
     "@types/q" "^0.0.32"
@@ -2987,7 +3153,7 @@ protractor@^5.1.1:
     optimist "~0.6.0"
     q "1.4.1"
     saucelabs "~1.3.0"
-    selenium-webdriver "3.0.1"
+    selenium-webdriver "3.6.0"
     source-map-support "~0.4.0"
     webdriver-js-extender "^1.0.0"
     webdriver-manager "^12.0.6"
@@ -3141,6 +3307,17 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readable-stream@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -3367,6 +3544,12 @@ sax@>=0.6.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  dependencies:
+    ajv "^5.0.0"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -3374,11 +3557,11 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-selenium-webdriver@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz#a2dea5da4a97f6672e89e7ca7276cefa365147a7"
+selenium-webdriver@3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
   dependencies:
-    adm-zip "^0.4.7"
+    jszip "^3.1.3"
     rimraf "^2.5.4"
     tmp "0.0.30"
     xml2js "^0.4.17"
@@ -3546,7 +3729,7 @@ source-map@0.1.31:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.4.x, source-map@^0.4.2:
+source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -3698,7 +3881,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.2.3:
+supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -3817,7 +4000,7 @@ ts-loader@^2.0.3:
     loader-utils "^1.0.2"
     semver "^5.0.1"
 
-ts-node@^3.0.2:
+ts-node@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69"
   dependencies:
@@ -3925,7 +4108,7 @@ uglify-es@^3.1.0:
     commander "~2.11.0"
     source-map "~0.6.1"
 
-uglify-js@^2.8.29:
+uglify-js@^2.6, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:

From 7816a673fa61f46096556ba03c9cbbc1d98dd399 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Tue, 7 Nov 2017 12:11:06 +0800
Subject: [PATCH 21/23] Fix keep changing of toggle button [ISDK-84]

---
 src/app/app.module.ts                       |  2 +-
 src/pages/registration/registration.page.ts | 12 ++--
 src/pages/settings/settings.page.ts         | 67 ++++++++++++---------
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 02daabce..811ac2eb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -79,7 +79,7 @@ import { ResetPasswordPage } from '../pages/reset-password/reset-password';
 import { SettingsPage } from '../pages/settings/settings.page';
 import { SidenavPage } from '../pages/sidenav/sidenav';
 import { TabsPage } from '../pages/tabs/tabs.page';
-import { TeamPage } from '../pages/team/team';
+import { TeamPage } from '../pages/team/team.page';
 import { TermsConditionsPage } from '../pages/registration/terms-conditions/terms-conditions.page';
 import { TestPage } from '../pages/tabs/test.page';
 import { TutorialPage } from '../pages/settings/tutorial/tutorial.page';
diff --git a/src/pages/registration/registration.page.ts b/src/pages/registration/registration.page.ts
index fb992a41..fcef1e5a 100644
--- a/src/pages/registration/registration.page.ts
+++ b/src/pages/registration/registration.page.ts
@@ -89,12 +89,12 @@ export class RegistrationPage implements OnInit {
   }
 
   ionViewDidEnter(): void {
-    this.authService.getTerms().subscribe(res => {
-      console.log("terms data: ", res);
-      this.term = res.terms_description;
-      this.content = this.sanitizer.bypassSecurityTrustResourceUrl(this.prefixUrl + res.terms_url);
-    });
-    this.params.get('test');
+    // this.authService.getTerms().subscribe(res => {
+    //   console.log("terms data: ", res);
+    //   this.term = res.terms_description;
+    //   this.content = this.sanitizer.bypassSecurityTrustResourceUrl(this.prefixUrl + res.terms_url);
+    // });
+    // this.params.get('test');
   }
 
   ionViewDidLoad(): void {
diff --git a/src/pages/settings/settings.page.ts b/src/pages/settings/settings.page.ts
index 5c1650c8..e69c08f0 100644
--- a/src/pages/settings/settings.page.ts
+++ b/src/pages/settings/settings.page.ts
@@ -20,6 +20,7 @@ export class SettingsPage {
   hideName: boolean = false;
   logoutMessage: any = loadingMessages.Logout.logout;
   settings: any = [];
+  isLock: boolean = false;
   constructor(
     public appCtrl: App,
     public alertCtrl: AlertController,
@@ -62,40 +63,46 @@ export class SettingsPage {
   }
 
   triggerHideName() {
-    const showAlert = (msg) => {
-      let alert = this.alertCtrl.create({
-        subTitle: msg,
-        buttons: ['OK']
-      });
-      alert.present();
-    }
+    if (this.isLock) {
+      this.isLock = false;
+    } else {
+      const showAlert = (msg) => {
+        let alert = this.alertCtrl.create({
+          subTitle: msg,
+          buttons: ['OK']
+        });
+        alert.present();
+      }
 
-    const loader = this.loadingCtrl.create({
-      content: 'Updating'
-    });
+      const loader = this.loadingCtrl.create({
+        content: 'Updating'
+      });
 
-    loader.present().then(() => {
-      this.gameService.postCharacter({
-        Character: {
-          id: this.cacheService.getLocal('character_id'),
-          meta: {
-            private: (this.hideName) ? 1 : 0
+      loader.present().then(() => {
+        this.isLock = true;
+        this.gameService.postCharacter({
+          Character: {
+            id: this.cacheService.getLocal('character_id'),
+            meta: {
+              private: (this.hideName) ? 1 : 0
+            }
           }
-        }
-      })
-      .subscribe((result) => {
-        loader.dismiss();
-        let msg = 'You name will now be hidden if in the ranking';
-        if (!this.hideName) {
-          msg = 'Your name will now be displayed if in the ranking';
-        }
-        showAlert(msg);
-      }, (err) => {
-        this.hideName = !this.hideName;
-        showAlert('Unabled to change your privacy setting.');
-        loader.dismiss();
+        })
+        .subscribe((result) => {
+          this.isLock = false;
+          loader.dismiss();
+          let msg = 'You name will now be hidden if in the ranking';
+          if (!this.hideName) {
+            msg = 'Your name will now be displayed if in the ranking';
+          }
+          showAlert(msg);
+        }, (err) => {
+          this.hideName = !this.hideName;
+          showAlert('Unabled to change your privacy setting.');
+          loader.dismiss();
+        });
       });
-    });
+    }
   }
 
   getUserEmail() {

From c3e726ebb0f1fa626d7bd50ea25a4d1eca647d7e Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Wed, 8 Nov 2017 15:08:15 +0800
Subject: [PATCH 22/23] Remove useless code [ISDK-84]

---
 src/shared/app-config/app-config.service.ts | 27 ---------------------
 1 file changed, 27 deletions(-)

diff --git a/src/shared/app-config/app-config.service.ts b/src/shared/app-config/app-config.service.ts
index 10262164..8d7965a6 100644
--- a/src/shared/app-config/app-config.service.ts
+++ b/src/shared/app-config/app-config.service.ts
@@ -24,33 +24,6 @@ export class AppConfigService {
     team: TeamPage
   }
 
-  // JSON format sent back from server
-  appConfigContent: any = {
-    app: {
-      name: 'ISDK'
-    },
-    tabs: {
-      events: {
-        name: 'events',
-        title: 'Events',
-        icon: 'md-calendar',
-        order: 1
-      },
-      rankings: {
-        name: 'rankings',
-        title: 'Rankings',
-        icon: 'md-medal',
-        order: 2
-      },
-      settings: {
-        name: 'settings',
-        title: 'Settings',
-        icon: 'md-person',
-        order: 3
-      }
-    }
-  };
-
   constructor (
     private cacheService: CacheService
   ) {}

From 34bd8462888b7dcf51a54c18dcb3308b8a43f399 Mon Sep 17 00:00:00 2001
From: Kven Ho <k2command@gmail.com>
Date: Thu, 9 Nov 2017 10:07:30 +0800
Subject: [PATCH 23/23] Content-type is not form format [ISDK-84]

---
 src/shared/request/request.service.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/shared/request/request.service.ts b/src/shared/request/request.service.ts
index 9fbb1bdb..5d890a48 100755
--- a/src/shared/request/request.service.ts
+++ b/src/shared/request/request.service.ts
@@ -149,10 +149,6 @@ export class RequestService {
    */
   post(endPoint: string, data: any, header?: any) {
     let headers = this.appendHeader();
-
-    // @TODO: make sure if Content-Type is optional
-    headers = headers.delete('Content-Type');
-    headers = headers.set('Content-Type', 'application/x-www-form-urlencoded');
     return this.http.post(this.prefixUrl + endPoint, data, { headers })
       .map(this.extractData)
       .catch(this.handleError);