diff --git a/nativescript-angular/animation-driver.ts b/nativescript-angular/animation-driver.ts
deleted file mode 100644
index 3ad2be803..000000000
--- a/nativescript-angular/animation-driver.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { AnimationPlayer } from "@angular/core";
-import { AnimationStyles, AnimationKeyframe } from "./private_import_core";
-import { NativeScriptAnimationPlayer } from "./animation-player";
-import { View } from "tns-core-modules/ui/core/view";
-
-export abstract class AnimationDriver {
-    abstract animate(
-        element: any, startingStyles: AnimationStyles, keyframes: AnimationKeyframe[],
-        duration: number, delay: number, easing: string): AnimationPlayer;
-}
-
-export class NativeScriptAnimationDriver implements AnimationDriver {
-
-    computeStyle(element: any, prop: string): string {
-        const view = <View>element;
-        return view.style[`css-${prop}`];
-    }
-
-    animate(
-        element: any,
-        _startingStyles: AnimationStyles,
-        keyframes: AnimationKeyframe[],
-        duration: number,
-        delay: number,
-        easing: string
-    ): AnimationPlayer {
-        return new NativeScriptAnimationPlayer(element, keyframes, duration, delay, easing);
-    }
-}
diff --git a/nativescript-angular/animation-player.ts b/nativescript-angular/animation-player.ts
deleted file mode 100644
index c03805c7e..000000000
--- a/nativescript-angular/animation-player.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import { AnimationPlayer } from "@angular/core";
-import { AnimationKeyframe } from "./private_import_core";
-import {
-    KeyframeAnimation,
-    KeyframeAnimationInfo,
-    KeyframeInfo,
-    KeyframeDeclaration
-} from "tns-core-modules/ui/animation/keyframe-animation";
-import { View } from "tns-core-modules/ui/core/view";
-import { AnimationCurve } from "tns-core-modules/ui/enums";
-import { isString } from "tns-core-modules/utils/types";
-import { CssAnimationProperty } from "tns-core-modules/ui/core/properties";
-
-export class NativeScriptAnimationPlayer implements AnimationPlayer {
-
-    public parentPlayer: AnimationPlayer;
-
-    private _startSubscriptions: Function[] = [];
-    private _doneSubscriptions: Function[] = [];
-    private _finished = false;
-    private _started = false;
-    private animation: KeyframeAnimation;
-    private target: View;
-
-    constructor(
-        element: Node,
-        keyframes: AnimationKeyframe[],
-        duration: number,
-        delay: number,
-        easing: string
-    ) {
-
-        this.parentPlayer = null;
-
-        if (duration === 0) {
-            duration = 0.01;
-        }
-
-        if (!(element instanceof View)) {
-            throw new Error("NativeScript: Can animate only Views!");
-        }
-
-        this.target = <any>element;
-
-        let keyframeAnimationInfo = new KeyframeAnimationInfo();
-        keyframeAnimationInfo.duration = duration;
-        keyframeAnimationInfo.delay = delay;
-        keyframeAnimationInfo.iterations = 1;
-        keyframeAnimationInfo.curve = easing ?
-            NativeScriptAnimationPlayer.animationTimingFunctionConverter(easing) :
-            AnimationCurve.ease;
-        keyframeAnimationInfo.keyframes = new Array<KeyframeInfo>();
-        keyframeAnimationInfo.isForwards = true;
-
-        for (let keyframe of keyframes) {
-            let keyframeInfo = <KeyframeInfo>{};
-            keyframeInfo.duration = keyframe.offset;
-            keyframeInfo.declarations = new Array<KeyframeDeclaration>();
-            for (let style of keyframe.styles.styles) {
-                for (let substyle in style) {
-                    let value = style[substyle];
-
-                    let property = CssAnimationProperty._getByCssName(substyle);
-                    if (property) {
-                        if (typeof value === "string" && property._valueConverter) {
-                            value = property._valueConverter(<string>value);
-                        }
-                        keyframeInfo.declarations.push({ property: property.name, value: value });
-                    } else if (typeof value === "string" && substyle === "transform") {
-                        NativeScriptAnimationPlayer.parseTransform(<string>value, keyframeInfo);
-                    }
-                }
-            }
-            keyframeAnimationInfo.keyframes.push(keyframeInfo);
-        }
-
-        this.animation = KeyframeAnimation.keyframeAnimationFromInfo(keyframeAnimationInfo);
-    }
-
-    init(): void {
-    }
-
-    hasStarted(): boolean {
-        return this._started;
-    }
-
-
-    onStart(fn: Function): void { this._startSubscriptions.push(fn); }
-    onDone(fn: Function): void { this._doneSubscriptions.push(fn); }
-
-    private _onStart() {
-        if (!this._started) {
-            this._started = true;
-            this._startSubscriptions.forEach(fn => fn());
-            this._startSubscriptions = [];
-        }
-    }
-
-    private _onFinish() {
-        if (!this._finished) {
-            this._finished = true;
-            this._started = false;
-            this._doneSubscriptions.forEach(fn => fn());
-            this._doneSubscriptions = [];
-        }
-    }
-
-    play(): void {
-        if (this.animation) {
-            this._onStart();
-            this.animation.play(this.target)
-                .then(() => { this._onFinish(); })
-                .catch((_e) => { });
-        }
-    }
-
-    pause(): void {
-        throw new Error("AnimationPlayer.pause method is not supported!");
-    }
-
-    finish(): void {
-        throw new Error("AnimationPlayer.finish method is not supported!");
-    }
-
-    reset(): void {
-        if (this.animation && this.animation.isPlaying) {
-            this.animation.cancel();
-        }
-    }
-
-    restart(): void {
-        this.reset();
-        this.play();
-    }
-
-    destroy(): void {
-        this.reset();
-        this._onFinish();
-    }
-
-    setPosition(_p: any): void {
-        throw new Error("AnimationPlayer.setPosition method is not supported!");
-    }
-
-    getPosition(): number {
-        return 0;
-    }
-
-    static animationTimingFunctionConverter(value): any {
-        switch (value) {
-            case "ease":
-                return AnimationCurve.ease;
-            case "linear":
-                return AnimationCurve.linear;
-            case "ease-in":
-                return AnimationCurve.easeIn;
-            case "ease-out":
-                return AnimationCurve.easeOut;
-            case "ease-in-out":
-                return AnimationCurve.easeInOut;
-            case "spring":
-                return AnimationCurve.spring;
-            default:
-                if (value.indexOf("cubic-bezier(") === 0) {
-                    let bezierArr = value.substring(13).split(/[,]+/);
-                    if (bezierArr.length !== 4) {
-                        throw new Error("Invalid value for animation: " + value);
-                    }
-                    return AnimationCurve.cubicBezier(
-                        NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[0]),
-                        NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[1]),
-                        NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[2]),
-                        NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[3]));
-                } else {
-                    throw new Error("Invalid value for animation: " + value);
-                }
-        }
-    }
-
-    static bezieArgumentConverter(value): number {
-        let result = parseFloat(value);
-        result = Math.max(0.0, result);
-        result = Math.min(1.0, result);
-        return result;
-    }
-
-    static transformConverter(value: any): Object {
-        if (value === "none") {
-            let operations = {};
-            operations[value] = value;
-            return operations;
-        } else if (isString(value)) {
-            let operations = {};
-            let operator = "";
-            let pos = 0;
-            while (pos < value.length) {
-                if (value[pos] === " " || value[pos] === ",") {
-                    pos++;
-                } else if (value[pos] === "(") {
-                    let start = pos + 1;
-                    while (pos < value.length && value[pos] !== ")") {
-                        pos++;
-                    }
-                    let operand = value.substring(start, pos);
-                    operations[operator] = operand.trim();
-                    operator = "";
-                    pos++;
-                } else {
-                    operator += value[pos++];
-                }
-            }
-            return operations;
-        } else {
-            return undefined;
-        }
-    }
-
-    static parseTransform(value: string, animationInfo: KeyframeInfo) {
-        let newTransform = NativeScriptAnimationPlayer.transformConverter(value);
-        let values = undefined;
-        for (let transform in newTransform) {
-            switch (transform) {
-                case "scaleX":
-                    animationInfo.declarations.push({
-                        property: "scale",
-                        value: { x: parseFloat(newTransform[transform]), y: 1 }
-                    });
-                    break;
-                case "scaleY":
-                    animationInfo.declarations.push({
-                        property: "scale",
-                        value: { x: 1, y: parseFloat(newTransform[transform]) }
-                    });
-                    break;
-                case "scale":
-                case "scale3d":
-                    values = newTransform[transform].split(",");
-                    if (values.length === 2 || values.length === 3) {
-                        animationInfo.declarations.push({
-                            property: "scale",
-                            value: { x: parseFloat(values[0]), y: parseFloat(values[1]) }
-                        });
-                    }
-                    break;
-                case "translateX":
-                    animationInfo.declarations.push({
-                        property: "translate",
-                        value: { x: parseFloat(newTransform[transform]), y: 0 }
-                    });
-                    break;
-                case "translateY":
-                    animationInfo.declarations.push({
-                        property: "translate",
-                        value: { x: 0, y: parseFloat(newTransform[transform]) }
-                    });
-                    break;
-                case "translate":
-                case "translate3d":
-                    values = newTransform[transform].split(",");
-                    if (values.length === 2 || values.length === 3) {
-                        animationInfo.declarations.push({
-                            property: "translate",
-                            value: {
-                                x: parseFloat(values[0]),
-                                y: parseFloat(values[1])
-                            }
-                        });
-                    }
-                    break;
-                case "rotate":
-                    let text = newTransform[transform];
-                    let val = parseFloat(text);
-                    if (text.slice(-3) === "rad") {
-                        val = val * (180.0 / Math.PI);
-                    }
-                    animationInfo.declarations.push({ property: "rotate", value: val });
-                    break;
-                case "none":
-                    animationInfo.declarations.push({ property: "scale", value: { x: 1, y: 1 } });
-                    animationInfo.declarations.push({ property: "translate", value: { x: 0, y: 0 } });
-                    animationInfo.declarations.push({ property: "rotate", value: 0 });
-                    break;
-                default:
-                    throw new Error("Unsupported transform: " + transform);
-            }
-        }
-    }
-}
diff --git a/nativescript-angular/animations.ts b/nativescript-angular/animations.ts
new file mode 100644
index 000000000..30b32f3d6
--- /dev/null
+++ b/nativescript-angular/animations.ts
@@ -0,0 +1,52 @@
+import { NgModule, Injectable, NgZone, Provider, RendererFactory2 } from "@angular/core";
+
+import {
+    AnimationDriver,
+    ɵAnimationEngine as AnimationEngine,
+    ɵAnimationStyleNormalizer as AnimationStyleNormalizer,
+    ɵWebAnimationsStyleNormalizer as WebAnimationsStyleNormalizer
+} from "@angular/animations/browser";
+
+import { ɵAnimationRendererFactory as AnimationRendererFactory } from "@angular/platform-browser/animations";
+
+import { NativeScriptAnimationEngine } from "./animations/animation-engine";
+import { NativeScriptAnimationDriver } from "./animations/animation-driver";
+import { NativeScriptModule } from "./nativescript.module";
+import { NativeScriptRendererFactory } from "./renderer";
+
+@Injectable()
+export class InjectableAnimationEngine extends NativeScriptAnimationEngine {
+    constructor(driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
+        super(driver, normalizer);
+    }
+}
+
+export function instantiateSupportedAnimationDriver() {
+    return new NativeScriptAnimationDriver();
+}
+
+export function instantiateRendererFactory(
+        renderer: NativeScriptRendererFactory, engine: AnimationEngine, zone: NgZone) {
+    return new AnimationRendererFactory(renderer, engine, zone);
+}
+
+export function instanciateDefaultStyleNormalizer() {
+    return new WebAnimationsStyleNormalizer();
+}
+
+export const NATIVESCRIPT_ANIMATIONS_PROVIDERS: Provider[] = [
+    {provide: AnimationDriver, useFactory: instantiateSupportedAnimationDriver},
+    {provide: AnimationStyleNormalizer, useFactory: instanciateDefaultStyleNormalizer},
+    {provide: AnimationEngine, useClass: InjectableAnimationEngine}, {
+        provide: RendererFactory2,
+        useFactory: instantiateRendererFactory,
+        deps: [NativeScriptRendererFactory, AnimationEngine, NgZone]
+    }
+];
+
+@NgModule({
+    imports: [NativeScriptModule],
+    providers: NATIVESCRIPT_ANIMATIONS_PROVIDERS,
+})
+export class NativeScriptAnimationsModule {
+}
diff --git a/nativescript-angular/animations/animation-driver.ts b/nativescript-angular/animations/animation-driver.ts
new file mode 100644
index 000000000..d1dd2b032
--- /dev/null
+++ b/nativescript-angular/animations/animation-driver.ts
@@ -0,0 +1,32 @@
+import { AnimationPlayer } from "@angular/animations";
+import { NgView } from "../element-registry";
+
+import { NativeScriptAnimationPlayer } from "./animation-player";
+import { Keyframe } from "./utils";
+
+export abstract class AnimationDriver {
+    abstract animate(
+        element: any,
+        keyframes: Keyframe[],
+        duration: number,
+        delay: number,
+        easing: string
+    ): AnimationPlayer;
+}
+
+export class NativeScriptAnimationDriver implements AnimationDriver {
+    computeStyle(element: NgView, prop: string): string {
+        return element.style[`css-${prop}`];
+    }
+
+    animate(
+        element: NgView,
+        keyframes: Keyframe[],
+        duration: number,
+        delay: number,
+        easing: string
+    ): AnimationPlayer {
+        return new NativeScriptAnimationPlayer(
+            element, keyframes, duration, delay, easing);
+    }
+}
diff --git a/nativescript-angular/animations/animation-engine.ts b/nativescript-angular/animations/animation-engine.ts
new file mode 100644
index 000000000..0dcbd51ff
--- /dev/null
+++ b/nativescript-angular/animations/animation-engine.ts
@@ -0,0 +1,144 @@
+import { ɵDomAnimationEngine as DomAnimationEngine } from "@angular/animations/browser";
+import { AnimationEvent, AnimationPlayer } from "@angular/animations";
+
+import { NgView } from "../element-registry";
+import {
+    copyArray,
+    cssClasses,
+    deleteFromArrayMap,
+    eraseStylesOverride,
+    getOrSetAsInMap,
+    makeAnimationEvent,
+    optimizeGroupPlayer,
+    setStyles,
+} from "./dom-utils";
+
+const MARKED_FOR_ANIMATION_CLASSNAME = "ng-animating";
+const MARKED_FOR_ANIMATION_SELECTOR = ".ng-animating";
+
+interface QueuedAnimationTransitionTuple {
+    element: NgView;
+    player: AnimationPlayer;
+    triggerName: string;
+    event: AnimationEvent;
+}
+
+// we are extending Angular's animation engine and
+// overriding a few methods that work on the DOM
+export class NativeScriptAnimationEngine extends DomAnimationEngine {
+    // this method is almost completely copied from
+    // the original animation engine, just replaced
+    // a few method invocations with overriden ones
+    animateTransition(element: NgView, instruction: any): AnimationPlayer {
+        const triggerName = instruction.triggerName;
+
+        let previousPlayers: AnimationPlayer[];
+        if (instruction.isRemovalTransition) {
+            previousPlayers = this._onRemovalTransitionOverride(element);
+        } else {
+            previousPlayers = [];
+            const existingTransitions = this._getTransitionAnimation(element);
+            const existingPlayer = existingTransitions ? existingTransitions[triggerName] : null;
+            if (existingPlayer) {
+                previousPlayers.push(existingPlayer);
+            }
+        }
+
+        // it's important to do this step before destroying the players
+        // so that the onDone callback below won"t fire before this
+        eraseStylesOverride(element, instruction.fromStyles);
+
+        // we first run this so that the previous animation player
+        // data can be passed into the successive animation players
+        let totalTime = 0;
+        const players = instruction.timelines.map((timelineInstruction, i) => {
+            totalTime = Math.max(totalTime, timelineInstruction.totalTime);
+            return (<any>this)._buildPlayer(element, timelineInstruction, previousPlayers, i);
+        });
+
+        previousPlayers.forEach(previousPlayer => previousPlayer.destroy());
+        const player = optimizeGroupPlayer(players);
+        player.onDone(() => {
+            player.destroy();
+            const elmTransitionMap = this._getTransitionAnimation(element);
+            if (elmTransitionMap) {
+                delete elmTransitionMap[triggerName];
+                if (Object.keys(elmTransitionMap).length === 0) {
+                    (<any>this)._activeTransitionAnimations.delete(element);
+                }
+            }
+            deleteFromArrayMap((<any>this)._activeElementAnimations, element, player);
+            setStyles(element, instruction.toStyles);
+        });
+
+        const elmTransitionMap = getOrSetAsInMap((<any>this)._activeTransitionAnimations, element, {});
+        elmTransitionMap[triggerName] = player;
+
+        this._queuePlayerOverride(
+                element, triggerName, player,
+                makeAnimationEvent(
+                        element, triggerName, instruction.fromState, instruction.toState,
+                        null,    // this will be filled in during event creation
+                        totalTime));
+
+        return player;
+    }
+
+   // overriden to use eachChild method of View
+   // instead of DOM querySelectorAll
+   private _onRemovalTransitionOverride(element: NgView): AnimationPlayer[] {
+        // when a parent animation is set to trigger a removal we want to
+        // find all of the children that are currently animating and clear
+        // them out by destroying each of them.
+        let elms = [];
+        element.eachChild(child => {
+            if (cssClasses(<NgView>child).get(MARKED_FOR_ANIMATION_SELECTOR)) {
+                elms.push(child);
+            }
+
+            return true;
+        });
+
+        for (let i = 0; i < elms.length; i++) {
+            const elm = elms[i];
+            const activePlayers = this._getElementAnimation(elm);
+            if (activePlayers) {
+                activePlayers.forEach(player => player.destroy());
+            }
+
+            const activeTransitions = this._getTransitionAnimation(elm);
+            if (activeTransitions) {
+                Object.keys(activeTransitions).forEach(triggerName => {
+                    const player = activeTransitions[triggerName];
+                    if (player) {
+                        player.destroy();
+                    }
+                });
+            }
+        }
+
+        // we make a copy of the array because the actual source array is modified
+        // each time a player is finished/destroyed (the forEach loop would fail otherwise)
+        return copyArray(this._getElementAnimation(element));
+    }
+
+    // overriden to use cssClasses method to access native element's styles
+    // instead of DOM element's classList
+    private _queuePlayerOverride(
+        element: NgView, triggerName: string, player: AnimationPlayer, event: AnimationEvent) {
+        const tuple = <QueuedAnimationTransitionTuple>{ element, player, triggerName, event };
+        (<any>this)._queuedTransitionAnimations.push(tuple);
+        player.init();
+
+        cssClasses(element).set(MARKED_FOR_ANIMATION_CLASSNAME, true);
+        player.onDone(() => cssClasses(element).set(MARKED_FOR_ANIMATION_CLASSNAME, false));
+    }
+
+    private _getElementAnimation(element: NgView) {
+        return (<any>this)._activeElementAnimations.get(element);
+    }
+
+    private _getTransitionAnimation(element: NgView) {
+        return (<any>this)._activeTransitionAnimations.get(element);
+    }
+}
diff --git a/nativescript-angular/animations/animation-player.ts b/nativescript-angular/animations/animation-player.ts
new file mode 100644
index 000000000..fcc60d8f1
--- /dev/null
+++ b/nativescript-angular/animations/animation-player.ts
@@ -0,0 +1,108 @@
+import { AnimationPlayer } from "@angular/animations";
+import {
+    KeyframeAnimation,
+    KeyframeAnimationInfo,
+} from "tns-core-modules/ui/animation/keyframe-animation";
+
+import { NgView } from "../element-registry";
+import { Keyframe, getAnimationCurve, parseAnimationKeyframe } from "./utils";
+
+export class NativeScriptAnimationPlayer implements AnimationPlayer {
+    public parentPlayer: AnimationPlayer = null;
+
+    private _startSubscriptions: Function[] = [];
+    private _doneSubscriptions: Function[] = [];
+    private _finished = false;
+    private _started = false;
+    private animation: KeyframeAnimation;
+
+    constructor(
+        private target: NgView,
+        keyframes: Keyframe[],
+        duration: number,
+        delay: number,
+        easing: string
+    ) {
+        this.initKeyframeAnimation(keyframes, duration, delay, easing);
+    }
+
+    init(): void {
+    }
+
+    hasStarted(): boolean {
+        return this._started;
+    }
+
+    onStart(fn: Function): void { this._startSubscriptions.push(fn); }
+    onDone(fn: Function): void { this._doneSubscriptions.push(fn); }
+    onDestroy(fn: Function): void { this._doneSubscriptions.push(fn); }
+
+    play(): void {
+        if (!this.animation) {
+            return;
+        }
+
+        if (!this._started) {
+            this._started = true;
+            this._startSubscriptions.forEach(fn => fn());
+            this._startSubscriptions = [];
+        }
+
+        this.animation.play(this.target)
+            .then(() => this.onFinish())
+            .catch((_e) => { });
+    }
+
+    pause(): void {
+        throw new Error("AnimationPlayer.pause method is not supported!");
+    }
+
+    finish(): void {
+        throw new Error("AnimationPlayer.finish method is not supported!");
+    }
+
+    reset(): void {
+        if (this.animation && this.animation.isPlaying) {
+            this.animation.cancel();
+        }
+    }
+
+    restart(): void {
+        this.reset();
+        this.play();
+    }
+
+    destroy(): void {
+        this.reset();
+        this.onFinish();
+    }
+
+    setPosition(_p: any): void {
+        throw new Error("AnimationPlayer.setPosition method is not supported!");
+    }
+
+    getPosition(): number {
+        return 0;
+    }
+
+    private initKeyframeAnimation(keyframes: Keyframe[], duration: number, delay: number, easing: string) {
+        let info = new KeyframeAnimationInfo();
+        info.isForwards = true;
+        info.iterations = 1;
+        info.duration = duration === 0 ? 0.01 : duration;
+        info.delay = delay;
+        info.curve = getAnimationCurve(easing);
+        info.keyframes = keyframes.map(parseAnimationKeyframe);
+
+        this.animation = KeyframeAnimation.keyframeAnimationFromInfo(info);
+    }
+
+    private onFinish() {
+        if (!this._finished) {
+            this._finished = true;
+            this._started = false;
+            this._doneSubscriptions.forEach(fn => fn());
+            this._doneSubscriptions = [];
+        }
+    }
+}
diff --git a/nativescript-angular/animations/dom-utils.ts b/nativescript-angular/animations/dom-utils.ts
new file mode 100644
index 000000000..00584f70e
--- /dev/null
+++ b/nativescript-angular/animations/dom-utils.ts
@@ -0,0 +1,77 @@
+import {
+    AnimationEvent,
+    AnimationPlayer,
+    NoopAnimationPlayer,
+    ɵAnimationGroupPlayer,
+    ɵStyleData,
+} from "@angular/animations";
+import { unsetValue } from "tns-core-modules/ui/core/view";
+
+import { NgView } from "../element-registry";
+
+// overriden to use the default 'unsetValue'
+// instead of empty string ''
+export function eraseStylesOverride(element: NgView, styles: ɵStyleData) {
+    if (element["style"]) {
+        Object.keys(styles).forEach(prop => {
+            element.style[prop] = unsetValue;
+        });
+    }
+}
+
+export function cssClasses(element: NgView) {
+    if (!element.ngCssClasses) {
+        element.ngCssClasses = new Map<string, boolean>();
+    }
+    return element.ngCssClasses;
+}
+
+// The following functions are from
+// the original DomAnimationEngine
+export function getOrSetAsInMap(map: Map<any, any>, key: any, defaultValue: any) {
+    let value = map.get(key);
+    if (!value) {
+        map.set(key, value = defaultValue);
+    }
+    return value;
+}
+
+export function deleteFromArrayMap(map: Map<any, any[]>, key: any, value: any) {
+    let arr = map.get(key);
+    if (arr) {
+        const index = arr.indexOf(value);
+        if (index >= 0) {
+            arr.splice(index, 1);
+            if (arr.length === 0) {
+                map.delete(key);
+            }
+        }
+    }
+}
+
+export function optimizeGroupPlayer(players: AnimationPlayer[]): AnimationPlayer {
+    switch (players.length) {
+        case 0:
+            return new NoopAnimationPlayer();
+        case 1:
+            return players[0];
+        default:
+            return new ɵAnimationGroupPlayer(players);
+    }
+}
+
+export function copyArray(source: any[]): any[] {
+    return source ? source.splice(0) : [];
+}
+
+export function makeAnimationEvent(
+        element: NgView, triggerName: string, fromState: string, toState: string, phaseName: string,
+        totalTime: number): AnimationEvent {
+    return <AnimationEvent>{element, triggerName, fromState, toState, phaseName, totalTime};
+}
+
+export function setStyles(element: NgView, styles: ɵStyleData) {
+    if (element["style"]) {
+        Object.keys(styles).forEach(prop => element.style[prop] = styles[prop]);
+    }
+}
diff --git a/nativescript-angular/animations/utils.ts b/nativescript-angular/animations/utils.ts
new file mode 100644
index 000000000..05833e3a3
--- /dev/null
+++ b/nativescript-angular/animations/utils.ts
@@ -0,0 +1,139 @@
+import {
+    KeyframeDeclaration,
+    KeyframeInfo,
+} from "tns-core-modules/ui/animation/keyframe-animation";
+import { CssAnimationProperty } from "tns-core-modules/ui/core/properties";
+import { AnimationCurve } from "tns-core-modules/ui/enums";
+
+export interface Keyframe {
+    [key: string]: string | number;
+}
+
+interface Transformation {
+    property: string;
+    value: number | { x: number, y: number };
+}
+
+const TRANSFORM_MATCHER = new RegExp(/(.+)\((.+)\)/);
+const TRANSFORM_SPLITTER = new RegExp(/[\s,]+/);
+
+const STYLE_TRANSFORMATION_MAP = Object.freeze({
+    "scale": value => ({ property: "scale", value }),
+    "scale3d": value => ({ property: "scale", value }),
+    "scaleX": value => ({ property: "scale", value: { x: value, y: 1 } }),
+    "scaleY": value => ({ property: "scale", value: { x: 1, y: value } }),
+
+    "translate": value => ({ property: "translate", value }),
+    "translate3d": value => ({ property: "translate", value }),
+    "translateX": value => ({ property: "translate", value: { x: value, y: 0 } }),
+    "translateY": value => ({ property: "translate", value: { x: 0, y: value } }),
+
+    "rotate": value => ({ property: "rotate", value }),
+
+    "none": _value => [
+        { property: "scale", value: { x: 1, y: 1 } },
+        { property: "translate", value: { x: 0, y: 0 } },
+        { property: "rotate", value: 0 },
+    ],
+});
+
+const STYLE_CURVE_MAP = Object.freeze({
+    "ease": AnimationCurve.ease,
+    "linear": AnimationCurve.linear,
+    "ease-in": AnimationCurve.easeIn,
+    "ease-out": AnimationCurve.easeOut,
+    "ease-in-out": AnimationCurve.easeInOut,
+    "spring": AnimationCurve.spring,
+});
+
+export function getAnimationCurve(value: string): any {
+    if (!value) {
+        return AnimationCurve.ease;
+    }
+
+    const curve = STYLE_CURVE_MAP[value];
+    if (curve) {
+        return curve;
+    }
+
+    const [, property = "", pointsString = ""] = TRANSFORM_MATCHER.exec(value) || [];
+    const coords = pointsString.split(TRANSFORM_SPLITTER).map(stringToBezieCoords);
+
+    if (property !== "cubic-bezier" || coords.length !== 4) {
+        throw new Error(`Invalid value for animation: ${value}`);
+    } else {
+        return (<any>AnimationCurve).cubicBezier(...coords);
+    }
+}
+
+export function parseAnimationKeyframe(styles: Keyframe) {
+    let keyframeInfo = <KeyframeInfo>{};
+    keyframeInfo.duration = <number>styles.offset;
+    keyframeInfo.declarations = Object.keys(styles).reduce((declarations, prop) => {
+        let value = styles[prop];
+
+        const property = CssAnimationProperty._getByCssName(prop);
+        if (property) {
+            if (typeof value === "string" && property._valueConverter) {
+                value = property._valueConverter(<string>value);
+            }
+            declarations.push({ property: property.name, value });
+        } else if (typeof value === "string" && prop === "transform") {
+            declarations.push(...parseTransformation(<string>value));
+        }
+
+        return declarations;
+    }, new Array<KeyframeDeclaration>());
+
+    return keyframeInfo;
+}
+
+function stringToBezieCoords(value: string): number {
+    let result = parseFloat(value);
+    if (result < 0) {
+        return 0;
+    } else if (result > 1) {
+        return 1;
+    }
+
+    return result;
+}
+
+function parseTransformation(styleString: string): KeyframeDeclaration[] {
+    return parseStyle(styleString)
+        .reduce((transformations, style) => {
+            const transform = STYLE_TRANSFORMATION_MAP[style.property](style.value);
+
+            if (Array.isArray(transform)) {
+                transformations.push(...transform);
+            } else if (typeof transform !== "undefined") {
+                transformations.push(transform);
+            }
+
+            return transformations;
+        }, new Array<Transformation>());
+}
+
+function parseStyle(text: string): Transformation[] {
+    return text.split(TRANSFORM_SPLITTER).map(stringToTransformation).filter(t => !!t);
+}
+
+function stringToTransformation(text: string): Transformation {
+    const [, property = "", stringValue = ""] = TRANSFORM_MATCHER.exec(text) || [];
+    if (!property) {
+        return;
+    }
+
+    const [x, y] = stringValue.split(",").map(parseFloat);
+    if (x && y) {
+        return { property, value: {x, y} };
+    } else {
+        let value: number = x;
+
+        if (stringValue.slice(-3) === "rad") {
+            value *= 180.0 / Math.PI;
+        }
+
+        return { property, value };
+     }
+}
diff --git a/nativescript-angular/common/detached-loader.ts b/nativescript-angular/common/detached-loader.ts
index f5af4ff49..d4ae6a73f 100644
--- a/nativescript-angular/common/detached-loader.ts
+++ b/nativescript-angular/common/detached-loader.ts
@@ -36,7 +36,6 @@ export class DetachedLoader { // tslint:disable-line:component-class-suffix
         // We are inside a promise here so no need for setTimeout - CD should trigger
         // after the promise.
         log("DetachedLoader.loadInLocation component loaded -> markForCheck");
-        this.changeDetector.markForCheck();
 
         return Promise.resolve(componentRef);
     }
diff --git a/nativescript-angular/directives/action-bar.ts b/nativescript-angular/directives/action-bar.ts
index 3337d22f2..b659310eb 100644
--- a/nativescript-angular/directives/action-bar.ts
+++ b/nativescript-angular/directives/action-bar.ts
@@ -3,7 +3,7 @@ import { ActionItem, ActionBar, NavigationButton } from "tns-core-modules/ui/act
 import { isBlank } from "../lang-facade";
 import { Page } from "tns-core-modules/ui/page";
 import { View } from "tns-core-modules/ui/core/view";
-import { registerElement, ViewClassMeta, NgView, TEMPLATE } from "../element-registry";
+import { registerElement, ViewClassMeta, NgView } from "../element-registry";
 
 let actionBarMeta: ViewClassMeta = {
     skipAddToDom: true,
@@ -17,8 +17,6 @@ let actionBarMeta: ViewClassMeta = {
         } else if (child instanceof ActionItem) {
             bar.actionItems.addItem(childView);
             childView.parent = bar;
-        } else if (child.nodeName === TEMPLATE) {
-            child.templateParent = parent;
         } else if (child.nodeName !== "#text" && child instanceof View) {
             bar.titleView = childView;
         }
@@ -34,8 +32,7 @@ let actionBarMeta: ViewClassMeta = {
         } else if (child instanceof ActionItem) {
             bar.actionItems.removeItem(childView);
             childView.parent = null;
-        } else if (child.nodeName !== TEMPLATE && child instanceof View &&
-            bar.titleView && bar.titleView === childView) {
+        } else if (child instanceof View && bar.titleView && bar.titleView === childView) {
             bar.titleView = null;
         }
     },
diff --git a/nativescript-angular/directives/list-view-comp.ts b/nativescript-angular/directives/list-view-comp.ts
index e3642c000..a865c0072 100644
--- a/nativescript-angular/directives/list-view-comp.ts
+++ b/nativescript-angular/directives/list-view-comp.ts
@@ -62,7 +62,7 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
 
     private listView: ListView;
     private _items: any;
-    private _differ: IterableDiffer;
+    private _differ: IterableDiffer<KeyedTemplate>;
     private _templateMap: Map<string, KeyedTemplate>;
 
     @ViewChild("loader", { read: ViewContainerRef }) loader: ViewContainerRef;
diff --git a/nativescript-angular/dom-adapter.ts b/nativescript-angular/dom-adapter.ts
index 1427c8518..119e41d91 100644
--- a/nativescript-angular/dom-adapter.ts
+++ b/nativescript-angular/dom-adapter.ts
@@ -1,17 +1,17 @@
 /* tslint:disable */
 import { Type } from "@angular/core";
-import { DomAdapter } from "./private_import_platform-browser";
+import { ɵDomAdapter } from "@angular/platform-browser";
 import { rendererLog } from "./trace";
 import { print } from "./lang-facade";
 
-export class NativeScriptDomAdapter implements DomAdapter {
+export class NativeScriptDomAdapter implements ɵDomAdapter {
   static makeCurrent() {
 
     // Don't register when bundling (likely AoT setup).
     if (!global.TNS_WEBPACK) {
         try {
-            const privateAPI = global.require("@angular/platform-browser").__platform_browser_private__;
-            const setRootDomAdapter = privateAPI.setRootDomAdapter;
+            const privateAPI = global.require("@angular/platform-browser");
+            const setRootDomAdapter = privateAPI.ɵsetRootDomAdapter;
 
             rendererLog("Setting root DOM adapter...");
             setRootDomAdapter(new NativeScriptDomAdapter());
@@ -49,6 +49,7 @@ export class NativeScriptDomAdapter implements DomAdapter {
   getProperty(_el: Element, _name: string): any { throw new Error("Not implemented!") }
   invoke(_el: Element, _methodName: string, _args: any[]): any { throw new Error("Not implemented!") }
 
+  contains(_nodeA: any, _nodeB: any): any /** TODO #9100 */ { throw new Error("Not implemented!") }
   parse(_templateHtml: string): any /** TODO #9100 */ { throw new Error("Not implemented!") }
   query(_selector: string): any { throw new Error("Not implemented!") }
   querySelector(_el: any /** TODO #9100 */, _selector: string): HTMLElement { throw new Error("Not implemented!") }
@@ -145,7 +146,7 @@ export class NativeScriptDomAdapter implements DomAdapter {
   defaultDoc(): HTMLDocument { throw new Error("Not implemented!") }
   getBoundingClientRect(_el: any /** TODO #9100 */): any /** TODO #9100 */ { throw new Error("Not implemented!") }
   getTitle(): string { throw new Error("Not implemented!") }
-  setTitle(_newTitle: string): any /** TODO #9100 */ { throw new Error("Not implemented!") }
+  setTitle(_doc: Document, _newTitle: string): any /** TODO #9100 */ { throw new Error("Not implemented!") }
   elementMatches(_n: any /** TODO #9100 */, _selector: string): boolean { throw new Error("Not implemented!") }
   isTemplateElement(_el: any): boolean { throw new Error("Not implemented!") }
   isTextNode(_node: any /** TODO #9100 */): boolean { throw new Error("Not implemented!") }
@@ -161,7 +162,7 @@ export class NativeScriptDomAdapter implements DomAdapter {
       /** TODO #9100 */ { throw new Error("Not implemented!") }
   supportsDOMEvents(): boolean { throw new Error("Not implemented!") }
   supportsNativeShadowDOM(): boolean { throw new Error("Not implemented!") }
-  getGlobalEventTarget(_target: string): any { throw new Error("Not implemented!") }
+  getGlobalEventTarget(_doc: Document, _target: string): any { throw new Error("Not implemented!") }
   getHistory(): History { throw new Error("Not implemented!") }
   getLocation(): Location { throw new Error("Not implemented!") }
   getBaseHref(): string { throw new Error("Not implemented!") }
diff --git a/nativescript-angular/element-registry.ts b/nativescript-angular/element-registry.ts
index 8686a4bea..534377b0c 100644
--- a/nativescript-angular/element-registry.ts
+++ b/nativescript-angular/element-registry.ts
@@ -2,16 +2,14 @@ import { View } from "tns-core-modules/ui/core/view";
 
 export type ViewResolver = () => ViewClass;
 export type NgView = View & ViewExtensions;
-export const TEMPLATE = "template";
-
 export interface ViewClassMeta {
     skipAddToDom?: boolean;
     insertChild?: (parent: NgView, child: NgView, atIndex: number) => void;
     removeChild?: (parent: NgView, child: NgView) => void;
-    isTemplateAnchor?: boolean;
 }
 
 export interface ViewExtensions {
+    nodeType: number;
     nodeName: string;
     templateParent: NgView;
     ngCssClasses: Map<string, boolean>;
@@ -71,11 +69,6 @@ export function isKnownView(elementName: string): boolean {
         elementMap.has(elementName.toLowerCase());
 }
 
-// Empty view used for template anchors
-export class TemplateView extends View {
-}
-registerElement(TEMPLATE, () => TemplateView, { isTemplateAnchor: true });
-
 // Register default NativeScript components
 // Note: ActionBar related components are registerd together with action-bar directives.
 registerElement("AbsoluteLayout", () => require("tns-core-modules/ui/layouts/absolute-layout").AbsoluteLayout);
@@ -117,3 +110,10 @@ registerElement("Span", () => require("tns-core-modules/text/span").Span);
 
 registerElement("DetachedContainer", () => require("tns-core-modules/ui/proxy-view-container").ProxyViewContainer,
     { skipAddToDom: true });
+
+registerElement("DetachedText", () => require("ui/placeholder").Placeholder,
+    { skipAddToDom: true });
+
+registerElement("Comment", () => require("ui/placeholder").Placeholder,
+    { skipAddToDom: false });
+
diff --git a/nativescript-angular/http/ns-http.ts b/nativescript-angular/http/ns-http.ts
index 70c9d3de4..6b6fff33e 100644
--- a/nativescript-angular/http/ns-http.ts
+++ b/nativescript-angular/http/ns-http.ts
@@ -2,6 +2,7 @@ import { Injectable } from "@angular/core";
 import {
     Http,
     ConnectionBackend,
+    RequestOptions,
     RequestOptionsArgs,
     ResponseOptions,
     ResponseType,
@@ -19,7 +20,7 @@ export class NSXSRFStrategy {
 
 @Injectable()
 export class NSHttp extends Http {
-  constructor(backend: ConnectionBackend, defaultOptions: any, private nsFileSystem: NSFileSystem) {
+  constructor(backend: ConnectionBackend, defaultOptions: RequestOptions, private nsFileSystem: NSFileSystem) {
     super(backend, defaultOptions);
   }
 
diff --git a/nativescript-angular/index.ts b/nativescript-angular/index.ts
index f8c21ffb6..e1309f312 100644
--- a/nativescript-angular/index.ts
+++ b/nativescript-angular/index.ts
@@ -14,17 +14,14 @@ export * from "./file-system/ns-file-system";
 export * from "./modal-dialog";
 export * from "./renderer";
 export * from "./view-util";
-export * from "./animation-driver";
 export * from "./resource-loader";
 export {
     ViewResolver,
-    TEMPLATE,
     ViewClass,
     ViewClassMeta,
     registerElement,
     getViewClass,
     getViewMeta,
     isKnownView,
-    TemplateView
 } from "./element-registry";
 export * from "./value-accessors/base-value-accessor";
diff --git a/nativescript-angular/nativescript.module.ts b/nativescript-angular/nativescript.module.ts
index 6c84cafaa..dd84f6366 100644
--- a/nativescript-angular/nativescript.module.ts
+++ b/nativescript-angular/nativescript.module.ts
@@ -1,4 +1,6 @@
-import "globals";
+import "tns-core-modules/globals";
+// Require application early to work around a circular import
+import "tns-core-modules/application";
 import "./zone-js/dist/zone-nativescript";
 
 import "reflect-metadata";
@@ -6,14 +8,13 @@ import "./polyfills/array";
 import "./polyfills/console";
 
 import { CommonModule } from "@angular/common";
-import { NativeScriptRootRenderer, NativeScriptRenderer } from "./renderer";
+import { NativeScriptRendererFactory } from "./renderer";
 import { DetachedLoader } from "./common/detached-loader";
 import { ModalDialogHost, ModalDialogService } from "./directives/dialogs";
 import {
     ApplicationModule,
     ErrorHandler,
-    Renderer,
-    RootRenderer,
+    RendererFactory2,
     NgModule, NO_ERRORS_SCHEMA,
 } from "@angular/core";
 import {
@@ -38,11 +39,8 @@ export function errorHandlerFactory() {
         defaultFrameProvider,
         defaultPageProvider,
         defaultDeviceProvider,
-
-        NativeScriptRootRenderer,
-        { provide: RootRenderer, useClass: NativeScriptRootRenderer },
-        NativeScriptRenderer,
-        { provide: Renderer, useClass: NativeScriptRenderer },
+        NativeScriptRendererFactory,
+        { provide: RendererFactory2, useClass: NativeScriptRendererFactory },
         ModalDialogService
     ],
     entryComponents: [
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index 37aee05c0..e9d84752b 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -16,35 +16,37 @@
   "scripts": {
     "tslint": "tslint --project tsconfig.json --config tslint.json",
     "postinstall": "node postinstall.js",
-    "ngc": "ngc -p tsconfig.json",
     "tsc": "tsc -p tsconfig.json",
+    "ngc": "ngc -p tsconfig.json",
     "prepublish": "npm run tsc && npm run ngc"
   },
   "bin": {
     "update-app-ng-deps": "./bin/update-app-ng-deps"
   },
   "dependencies": {
-    "@angular/common": "~2.4.3",
-    "@angular/compiler": "~2.4.3",
-    "@angular/core": "~2.4.3",
-    "@angular/forms": "~2.4.3",
-    "@angular/http": "~2.4.3",
-    "@angular/platform-browser": "~2.4.3",
-    "@angular/router": "~3.4.3",
     "nativescript-intl": "~0.0.8",
+    "@angular/core": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/router": "~4.0.0",
+    "rxjs": "^5.0.1",
+    "reflect-metadata": "~0.1.8",
     "punycode": "1.3.2",
     "querystring": "0.2.0",
-    "reflect-metadata": "~0.1.8",
-    "rxjs": "~5.0.1",
     "url": "0.10.3"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~2.4.3",
-    "codelyzer": "~2.0.0",
+    "@angular/animations": "~4.0.0",
+    "@angular/compiler-cli": "~4.0.0",
+    "codelyzer": "~3.0.0-beta.4",
     "tns-core-modules": "internal-preview",
-    "tslint": "~4.4.0",
+    "tslint": "~4.5.0",
     "typescript": "~2.2.1",
-    "zone.js": "^0.7.2"
+    "zone.js": "^0.8.2"
   },
   "nativescript": {}
 }
diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
index 4cb686175..a8381f5c5 100644
--- a/nativescript-angular/platform-common.ts
+++ b/nativescript-angular/platform-common.ts
@@ -1,5 +1,7 @@
 // Initial imports and polyfills
-import "globals";
+import "tns-core-modules/globals";
+// Require application early to work around a circular import
+import "tns-core-modules/application";
 import "./zone-js/dist/zone-nativescript";
 import "reflect-metadata";
 import "./polyfills/array";
diff --git a/nativescript-angular/platform.ts b/nativescript-angular/platform.ts
index 42cfd3984..1c418e794 100644
--- a/nativescript-angular/platform.ts
+++ b/nativescript-angular/platform.ts
@@ -16,15 +16,19 @@ import {
 import {
     COMPILER_OPTIONS,
     PlatformRef,
-    OpaqueToken,
-    createPlatformFactory
+    InjectionToken,
+    ViewEncapsulation,
+    createPlatformFactory,
+    MissingTranslationStrategy
 } from "@angular/core";
 
-// Work around a TS bug requiring an import of OpaqueToken without using it
+// Work around a TS bug requiring an imports of
+// InjectionToken, ViewEncapsulation and MissingTranslationStrategy
+// without using them
 if ((<any>global).___TS_UNUSED) {
-    (() => {
-        return OpaqueToken;
-    })();
+    (() => InjectionToken)();
+    (() => ViewEncapsulation)();
+    (() => MissingTranslationStrategy)();
 }
 
 // Register DOM adapter, if possible. Dynamic platform only!
diff --git a/nativescript-angular/private_import_core.ts b/nativescript-angular/private_import_core.ts
deleted file mode 100644
index 58e80a668..000000000
--- a/nativescript-angular/private_import_core.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { __core_private__ as r } from "@angular/core";
-
-export type RenderDebugInfo = typeof r._RenderDebugInfo;
-export let RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo;
-
-export let ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities;
-
-export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer;
-export let DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer;
-export let reflector: typeof r.reflector = r.reflector;
-
-export type NoOpAnimationPlayer = typeof r._NoOpAnimationPlayer;
-export let NoOpAnimationPlayer: typeof r.NoOpAnimationPlayer = r.NoOpAnimationPlayer;
-export type AnimationPlayer = typeof r._AnimationPlayer;
-export let AnimationPlayer: typeof r.AnimationPlayer = r.AnimationPlayer;
-export type AnimationSequencePlayer = typeof r._AnimationSequencePlayer;
-export let AnimationSequencePlayer: typeof r.AnimationSequencePlayer = r.AnimationSequencePlayer;
-export type AnimationGroupPlayer = typeof r._AnimationGroupPlayer;
-export let AnimationGroupPlayer: typeof r.AnimationGroupPlayer = r.AnimationGroupPlayer;
-export type AnimationKeyframe = typeof r._AnimationKeyframe;
-export let AnimationKeyframe: typeof r.AnimationKeyframe = r.AnimationKeyframe;
-export type AnimationStyles = typeof r._AnimationStyles;
-export let AnimationStyles: typeof r.AnimationStyles = r.AnimationStyles;
-export let prepareFinalAnimationStyles: typeof r.prepareFinalAnimationStyles =
-    r.prepareFinalAnimationStyles;
-export let balanceAnimationKeyframes: typeof r.balanceAnimationKeyframes =
-    r.balanceAnimationKeyframes;
-export let clearStyles: typeof r.clearStyles = r.clearStyles;
-export let collectAndResolveStyles: typeof r.collectAndResolveStyles = r.collectAndResolveStyles;
diff --git a/nativescript-angular/private_import_platform-browser.ts b/nativescript-angular/private_import_platform-browser.ts
deleted file mode 100644
index a9ab67f25..000000000
--- a/nativescript-angular/private_import_platform-browser.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { __platform_browser_private__ as _ } from "@angular/platform-browser";
-
-export type DomAdapter = typeof _._DomAdapter;
-export let DomAdapter: typeof _.DomAdapter = _.DomAdapter;
-export let setRootDomAdapter: typeof _.setRootDomAdapter = _.setRootDomAdapter;
-export let getDOM: typeof _.getDOM = _.getDOM;
diff --git a/nativescript-angular/renderer.ts b/nativescript-angular/renderer.ts
index eef9fb3d5..9773b0bf9 100644
--- a/nativescript-angular/renderer.ts
+++ b/nativescript-angular/renderer.ts
@@ -1,183 +1,187 @@
 import {
     Inject, Injectable, Optional, NgZone,
-    Renderer, RootRenderer, RenderComponentType, AnimationPlayer
+    Renderer2, RendererFactory2, RendererType2,
+    RendererStyleFlags2, ViewEncapsulation,
 } from "@angular/core";
-import { AnimationStyles, AnimationKeyframe } from "./private_import_core";
-import { APP_ROOT_VIEW, DEVICE } from "./platform-providers";
-import { isBlank } from "./lang-facade";
+
+import { Device } from "tns-core-modules/platform";
 import { View } from "tns-core-modules/ui/core/view";
 import { addCss } from "tns-core-modules/application";
 import { topmost } from "tns-core-modules/ui/frame";
-import { Page } from "tns-core-modules/ui/page";
+
+import { APP_ROOT_VIEW, DEVICE, getRootPage } from "./platform-providers";
+import { isBlank } from "./lang-facade";
 import { ViewUtil } from "./view-util";
 import { NgView } from "./element-registry";
 import { rendererLog as traceLog } from "./trace";
-import { escapeRegexSymbols } from "tns-core-modules/utils/utils";
-import { Device } from "tns-core-modules/platform";
-import { getRootPage } from "./platform-providers";
-
-import { NativeScriptAnimationDriver } from "./animation-driver";
 
-// CONTENT_ATTR not exported from dom_renderer - we need it for styles application.
+// CONTENT_ATTR not exported from NativeScript_renderer - we need it for styles application.
+const COMPONENT_REGEX = /%COMP%/g;
 export const COMPONENT_VARIABLE = "%COMP%";
+export const HOST_ATTR = `_nghost-${COMPONENT_VARIABLE}`;
 export const CONTENT_ATTR = `_ngcontent-${COMPONENT_VARIABLE}`;
-
+const ATTR_SANITIZER = /-/g;
 
 @Injectable()
-export class NativeScriptRootRenderer implements RootRenderer {
-    private _viewUtil: ViewUtil;
-    private _animationDriver: NativeScriptAnimationDriver;
-
-    protected get animationDriver(): NativeScriptAnimationDriver {
-        if (!this._animationDriver) {
-            this._animationDriver = new NativeScriptAnimationDriver();
-        }
-        return this._animationDriver;
-    }
+export class NativeScriptRendererFactory implements RendererFactory2 {
+    private componentRenderers = new Map<string, NativeScriptRenderer>();
+    private viewUtil: ViewUtil;
+    private defaultRenderer: NativeScriptRenderer;
+    private rootNgView: NgView;
 
     constructor(
-        @Optional() @Inject(APP_ROOT_VIEW) private _rootView: View,
+        @Optional() @Inject(APP_ROOT_VIEW) rootView: View,
         @Inject(DEVICE) device: Device,
-        private _zone: NgZone
+        private zone: NgZone
     ) {
-        this._viewUtil = new ViewUtil(device);
+        this.viewUtil = new ViewUtil(device);
+        this.setRootNgView(rootView);
+        this.defaultRenderer = new NativeScriptRenderer(this.rootNgView, zone, this.viewUtil);
     }
 
-    private _registeredComponents = new Map<string, NativeScriptRenderer>();
-
-    public get rootView(): View {
-        if (!this._rootView) {
-            this._rootView = getRootPage() || topmost().currentPage;
+    private setRootNgView(rootView: any) {
+        if (!rootView) {
+            rootView = getRootPage() || topmost().currentPage;
         }
-        return this._rootView;
+        rootView.nodeName = "NONE";
+        this.rootNgView = rootView;
     }
 
-    public get page(): Page {
-        return <Page>this.rootView.page;
-    }
+    createRenderer(element: any, type: RendererType2): NativeScriptRenderer {
+        if (!element || !type) {
+            return this.defaultRenderer;
+        }
 
-    public get viewUtil(): ViewUtil {
-        return this._viewUtil;
-    }
+        let renderer: NativeScriptRenderer = this.componentRenderers.get(type.id);
+        if (!isBlank(renderer)) {
+            return renderer;
+        }
 
-    renderComponent(componentProto: RenderComponentType): Renderer {
-        let renderer = this._registeredComponents.get(componentProto.id);
-        if (isBlank(renderer)) {
-            renderer = new NativeScriptRenderer(this, componentProto,
-                this.animationDriver, this._zone);
-            this._registeredComponents.set(componentProto.id, renderer);
+        if (type.encapsulation === ViewEncapsulation.Emulated) {
+            renderer = new EmulatedRenderer(type, this.rootNgView, this.zone, this.viewUtil);
+            (<EmulatedRenderer>renderer).applyToHost(element);
+        } else {
+            renderer = this.defaultRenderer;
         }
+
+        this.componentRenderers.set(type.id, renderer);
         return renderer;
     }
 }
 
-@Injectable()
-export class NativeScriptRenderer extends Renderer {
-    private componentProtoId: string;
-    private hasComponentStyles: boolean;
+export class NativeScriptRenderer extends Renderer2 {
+    data: { [key: string]: any } = Object.create(null);
 
-    private get viewUtil(): ViewUtil {
-        return this.rootRenderer.viewUtil;
+    constructor(
+        private rootView: NgView,
+        private zone: NgZone,
+        private viewUtil: ViewUtil
+    ) {
+        super();
+        traceLog("NativeScriptRenderer created");
     }
 
-    constructor(
-        private rootRenderer: NativeScriptRootRenderer,
-        private componentProto: RenderComponentType,
-        private animationDriver: NativeScriptAnimationDriver,
-        private zone: NgZone) {
+    appendChild(parent: any, newChild: NgView): void {
+        traceLog(`NativeScriptRenderer.appendChild child: ${newChild} parent: ${parent}`);
 
-        super();
-        let stylesLength = this.componentProto.styles.length;
-        this.componentProtoId = this.componentProto.id;
-        for (let i = 0; i < stylesLength; i++) {
-            this.hasComponentStyles = true;
-            let cssString = this.componentProto.styles[i] + "";
-            const realCSS = this.replaceNgAttribute(cssString, this.componentProtoId);
-            addCss(realCSS);
+        if (parent) {
+            this.viewUtil.insertChild(parent, newChild);
         }
-        traceLog("NativeScriptRenderer created");
     }
 
-    private attrReplacer = new RegExp(escapeRegexSymbols(CONTENT_ATTR), "g");
-    private attrSanitizer = /-/g;
+    insertBefore(parent: NgView, newChild: NgView, refChildIndex: number): void {
+        traceLog(`NativeScriptRenderer.insertBefore child: ${newChild} parent: ${parent}`);
 
-    private replaceNgAttribute(input: string, componentId: string): string {
-        return input.replace(this.attrReplacer,
-            "_ng_content_" + componentId.replace(this.attrSanitizer, "_"));
+        if (parent) {
+            this.viewUtil.insertChild(parent, newChild, refChildIndex);
+        }
     }
 
-    renderComponent(componentProto: RenderComponentType): Renderer {
-        return this.rootRenderer.renderComponent(componentProto);
+    removeChild(parent: any, oldChild: NgView): void {
+        traceLog(`NativeScriptRenderer.removeChild child: ${oldChild} parent: ${parent}`);
+
+        if (parent) {
+            this.viewUtil.removeChild(parent, oldChild);
+        }
     }
 
     selectRootElement(selector: string): NgView {
         traceLog("selectRootElement: " + selector);
-        const rootView = <NgView><any>this.rootRenderer.rootView;
-        rootView.nodeName = "ROOT";
-        return rootView;
+        return this.rootView;
+    }
+
+    parentNode(node: NgView): any {
+        return node.parent;
+    }
+
+    nextSibling(node: NgView): number {
+        traceLog(`NativeScriptRenderer.nextSibling ${node}`);
+        return this.viewUtil.nextSiblingIndex(node);
+    }
+
+    createComment(_value: any) {
+        traceLog(`NativeScriptRenderer.createComment ${_value}`);
+        return this.viewUtil.createComment();
+    }
+
+    createElement(name: any, _namespace: string): NgView {
+        traceLog(`NativeScriptRenderer.createElement: ${name}`);
+        return this.viewUtil.createView(name);
+    }
+
+    createText(_value: string) {
+        traceLog(`NativeScriptRenderer.createText ${_value}`);
+        return this.viewUtil.createText();
     }
 
     createViewRoot(hostElement: NgView): NgView {
-        traceLog("CREATE VIEW ROOT: " + hostElement.nodeName);
+        traceLog(`NativeScriptRenderer.createViewRoot ${hostElement.nodeName}`);
         return hostElement;
     }
 
     projectNodes(parentElement: NgView, nodes: NgView[]): void {
         traceLog("NativeScriptRenderer.projectNodes");
-        nodes.forEach((node) => {
-            this.viewUtil.insertChild(parentElement, node);
-        });
+        nodes.forEach((node) => this.viewUtil.insertChild(parentElement, node));
     }
 
-    attachViewAfter(anchorNode: NgView, viewRootNodes: NgView[]) {
-        traceLog("NativeScriptRenderer.attachViewAfter: " + anchorNode.nodeName + " " + anchorNode);
-        const parent = (<NgView>anchorNode.parent || anchorNode.templateParent);
-        const insertPosition = this.viewUtil.getChildIndex(parent, anchorNode);
-
-        viewRootNodes.forEach((node, index) => {
-            const childIndex = insertPosition + index + 1;
-            this.viewUtil.insertChild(parent, node, childIndex);
-        });
+    destroy() {
+        traceLog("NativeScriptRenderer.destroy");
+        // Seems to be called on component dispose only (router outlet)
+        // TODO: handle this when we resolve routing and navigation.
     }
 
-    detachView(viewRootNodes: NgView[]) {
-        traceLog("NativeScriptRenderer.detachView");
-        for (let i = 0; i < viewRootNodes.length; i++) {
-            let node = viewRootNodes[i];
-            this.viewUtil.removeChild(<NgView>node.parent, node);
-        }
+    setAttribute(view: NgView, name: string, value: string, namespace?: string) {
+        traceLog(`NativeScriptRenderer.setAttribute ${view} : ${name} = ${value}, namespace: ${namespace}`);
+        return this.viewUtil.setProperty(view, name, value, namespace);
     }
 
-    public destroyView(_hostElement: NgView, _viewAllNodes: NgView[]) {
-        traceLog("NativeScriptRenderer.destroyView");
-        // Seems to be called on component dispose only (router outlet)
-        // TODO: handle this when we resolve routing and navigation.
+    removeAttribute(_el: NgView, _name: string): void {
+        traceLog(`NativeScriptRenderer.removeAttribute ${_el}: ${_name}`);
     }
 
-    setElementProperty(renderElement: NgView, propertyName: string, propertyValue: any) {
-        traceLog("NativeScriptRenderer.setElementProperty " + renderElement + ": " +
-            propertyName + " = " + propertyValue);
-        this.viewUtil.setProperty(renderElement, propertyName, propertyValue);
+    setProperty(view: any, name: string, value: any) {
+        traceLog(`NativeScriptRenderer.setProperty ${view} : ${name} = ${value}`);
+        return this.viewUtil.setProperty(view, name, value);
     }
 
-    setElementAttribute(renderElement: NgView, attributeName: string, attributeValue: string) {
-        traceLog("NativeScriptRenderer.setElementAttribute " + renderElement + ": " +
-            attributeName + " = " + attributeValue);
-        return this.setElementProperty(renderElement, attributeName, attributeValue);
+    addClass(view: NgView, name: string): void {
+        traceLog(`NativeScriptRenderer.addClass ${name}`);
+        this.viewUtil.addClass(view, name);
     }
 
-    setElementClass(renderElement: NgView, className: string, isAdd: boolean): void {
-        traceLog("NativeScriptRenderer.setElementClass " + className + " - " + isAdd);
+    removeClass(view: NgView, name: string): void {
+        traceLog(`NativeScriptRenderer.removeClass ${name}`);
+        this.viewUtil.removeClass(view, name);
+    }
 
-        if (isAdd) {
-            this.viewUtil.addClass(renderElement, className);
-        } else {
-            this.viewUtil.removeClass(renderElement, className);
-        }
+    setStyle(view: NgView, styleName: string, value: any, _flags?: RendererStyleFlags2): void {
+        traceLog(`NativeScriptRenderer.setStyle: ${styleName} = ${value}`);
+        this.viewUtil.setStyle(view, styleName, value);
     }
 
-    setElementStyle(renderElement: NgView, styleName: string, styleValue: string): void {
-        this.viewUtil.setStyleProperty(renderElement, styleName, styleValue);
+    removeStyle(view: NgView, styleName: string, _flags?: RendererStyleFlags2): void {
+        traceLog("NativeScriptRenderer.removeStyle: ${styleName}");
+        this.viewUtil.removeStyle(view, styleName);
     }
 
     // Used only in debug mode to serialize property changes to comment nodes,
@@ -195,34 +199,12 @@ export class NativeScriptRenderer extends Renderer {
         traceLog("NativeScriptRenderer.invokeElementMethod " + methodName + " " + args);
     }
 
-    setText(_renderNode: any, _text: string) {
-        traceLog("NativeScriptRenderer.setText");
-    }
-
-    public createTemplateAnchor(parentElement: NgView): NgView {
-        traceLog("NativeScriptRenderer.createTemplateAnchor");
-        return this.viewUtil.createTemplateAnchor(parentElement);
-    }
-
-    public createElement(parentElement: NgView, name: string): NgView {
-        traceLog("NativeScriptRenderer.createElement: " + name + " parent: " +
-            parentElement + ", " + (parentElement ? parentElement.nodeName : "null"));
-        return this.viewUtil.createView(name, parentElement, (view) => {
-            // Set an attribute to the view to scope component-specific css.
-            // The property name is pre-generated by Angular.
-            if (this.hasComponentStyles) {
-                const cssAttribute = this.replaceNgAttribute(CONTENT_ATTR, this.componentProtoId);
-                view[cssAttribute] = true;
-            }
-        });
-    }
-
-    public createText(_parentElement: NgView, _value: string): NgView {
-        traceLog("NativeScriptRenderer.createText");
-        return this.viewUtil.createText();
+    setValue(_renderNode: any, _value: string) {
+        traceLog("NativeScriptRenderer.setValue");
     }
 
-    public listen(renderElement: NgView, eventName: string, callback: Function): Function {
+    listen(renderElement: any, eventName: string, callback: (event: any) => boolean):
+        () => void {
         traceLog("NativeScriptRenderer.listen: " + eventName);
         // Explicitly wrap in zone
         let zonedCallback = (...args) => {
@@ -238,21 +220,52 @@ export class NativeScriptRenderer extends Renderer {
         }
         return () => renderElement.off(eventName, zonedCallback);
     }
+}
+
+class EmulatedRenderer extends NativeScriptRenderer {
+    private contentAttr: string;
+    private hostAttr: string;
+
+    constructor(
+        component: RendererType2,
+        rootView: NgView,
+        zone: NgZone,
+        viewUtil: ViewUtil,
+    ) {
+        super(rootView, zone, viewUtil);
+
+        const componentId = component.id.replace(ATTR_SANITIZER, "_");
+        this.contentAttr = replaceNgAttribute(CONTENT_ATTR, componentId);
+        this.hostAttr = replaceNgAttribute(HOST_ATTR, componentId);
+        this.addStyles(component.styles, componentId);
+    }
 
-    public listenGlobal(_target: string, _eventName: string, _callback: Function): Function {
-        throw new Error("NativeScriptRenderer.listenGlobal() - Not implemented.");
+    applyToHost(view: NgView) {
+        super.setAttribute(view, this.hostAttr, "");
     }
 
-    public animate(
-        element: any,
-        startingStyles: AnimationStyles,
-        keyframes: AnimationKeyframe[],
-        duration: number,
-        delay: number,
-        easing: string
-    ): AnimationPlayer {
-        let player = this.animationDriver.animate(
-            element, startingStyles, keyframes, duration, delay, easing);
-        return player;
+    appendChild(parent: any, newChild: NgView): void {
+        super.appendChild(parent, newChild);
     }
+
+    createElement(parent: any, name: string): NgView {
+        const view = super.createElement(parent, name);
+
+        // Set an attribute to the view to scope component-specific css.
+        // The property name is pre-generated by Angular.
+        super.setAttribute(view, this.contentAttr, "");
+
+        return view;
+    }
+
+    private addStyles(styles: (string | any[])[], componentId: string) {
+        styles.map(s => s.toString())
+            .map(s => replaceNgAttribute(s, componentId))
+            .forEach(addCss);
+    }
+
+}
+
+function replaceNgAttribute(input: string, componentId: string): string {
+    return input.replace(COMPONENT_REGEX, componentId);
 }
diff --git a/nativescript-angular/router/ns-router-link.ts b/nativescript-angular/router/ns-router-link.ts
index 1cb1d9b95..e73c53b16 100644
--- a/nativescript-angular/router/ns-router-link.ts
+++ b/nativescript-angular/router/ns-router-link.ts
@@ -34,85 +34,89 @@ import { isString } from "tns-core-modules/utils/types";
  */
 @Directive({ selector: "[nsRouterLink]" })
 export class NSRouterLink implements OnChanges { // tslint:disable-line:directive-class-suffix
-  private commands: any[] = [];
-  @Input() target: string;
-  @Input() queryParams: { [k: string]: any };
-  @Input() fragment: string;
+    private commands: any[] = [];
+    @Input() target: string;
+    @Input() queryParams: { [k: string]: any };
+    @Input() fragment: string;
 
-  @Input() clearHistory: boolean;
-  @Input() pageTransition: boolean | string | NavigationTransition = true;
+    @Input() clearHistory: boolean;
+    @Input() pageTransition: boolean | string | NavigationTransition = true;
 
-  urlTree: UrlTree;
+    urlTree: UrlTree;
 
-  private usePageRoute: boolean;
+    private usePageRoute: boolean;
 
-  private get currentRoute(): ActivatedRoute {
-    return this.usePageRoute ? this.pageRoute.activatedRoute.getValue() : this.route;
-  }
-
-  constructor(
-    private router: Router,
-    private navigator: RouterExtensions,
-    private route: ActivatedRoute,
-    @Optional() private pageRoute: PageRoute) {
-
-    this.usePageRoute = (this.pageRoute && this.route === this.pageRoute.activatedRoute.getValue());
-  }
-
-  @Input("nsRouterLink")
-  set params(data: any[] | string) {
-    if (Array.isArray(data)) {
-      this.commands = data;
-    } else {
-      this.commands = [data];
+    private get currentRoute(): ActivatedRoute {
+        return this.usePageRoute ? this.pageRoute.activatedRoute.getValue() : this.route;
     }
-  }
-
-
-  @HostListener("tap")
-  onTap() {
-    routerLog("nsRouterLink.tapped: " + this.commands + " usePageRoute: " +
-        this.usePageRoute + " clearHistory: " + this.clearHistory + " transition: " +
-        JSON.stringify(this.pageTransition));
-
-    const transition = this.getTransition();
-
-    let extras: NavigationExtras & NavigationOptions = {
-      relativeTo: this.currentRoute,
-      queryParams: this.queryParams,
-      fragment: this.fragment,
-      clearHistory: this.clearHistory,
-      animated: transition.animated,
-      transition: transition.transition
-    };
-
-    this.navigator.navigate(this.commands, extras);
-  }
-
-  private getTransition(): { animated: boolean, transition?: NavigationTransition } {
-    if (typeof this.pageTransition === "boolean") {
-      return { animated: <boolean>this.pageTransition };
-    } else if (isString(this.pageTransition)) {
-      if (this.pageTransition === "none" || this.pageTransition === "false") {
-        return { animated: false };
-      } else {
-        return { animated: true, transition: { name: <string>this.pageTransition } };
-      }
-    } else {
-      return {
-        animated: true,
-        transition: this.pageTransition
-      };
-    }
-  }
-
-  ngOnChanges(_: {}): any {
-    this.updateUrlTree();
-  }
 
-  private updateUrlTree(): void {
-    this.urlTree = this.router.createUrlTree(
-      this.commands,
-      { relativeTo: this.currentRoute, queryParams: this.queryParams, fragment: this.fragment });
-  }
+    constructor(
+        private router: Router,
+        private navigator: RouterExtensions,
+        private route: ActivatedRoute,
+        @Optional() private pageRoute: PageRoute) {
+
+            this.usePageRoute = (this.pageRoute && this.route === this.pageRoute.activatedRoute.getValue());
+        }
+
+        @Input("nsRouterLink")
+        set params(data: any[] | string) {
+            if (Array.isArray(data)) {
+                this.commands = data;
+            } else {
+                this.commands = [data];
+            }
+        }
+
+
+        @HostListener("tap")
+        onTap() {
+            routerLog("nsRouterLink.tapped: " + this.commands + " usePageRoute: " +
+                      this.usePageRoute + " clearHistory: " + this.clearHistory + " transition: " +
+                      JSON.stringify(this.pageTransition));
+
+            const extras = this.getExtras();
+            this.navigator.navigate(this.commands, extras);
+        }
+
+        private getExtras() {
+            const transition = this.getTransition();
+            const extras: NavigationExtras & NavigationOptions = {
+                queryParams: this.queryParams,
+                fragment: this.fragment,
+                clearHistory: this.clearHistory,
+                animated: transition.animated,
+                transition: transition.transition,
+            };
+
+            return (<any>Object).assign(extras,
+                this.currentRoute.toString() !== "Route(url:'', path:'')" && this.currentRoute);
+        }
+
+        private getTransition(): { animated: boolean, transition?: NavigationTransition } {
+            if (typeof this.pageTransition === "boolean") {
+                return { animated: <boolean>this.pageTransition };
+            } else if (isString(this.pageTransition)) {
+                if (this.pageTransition === "none" || this.pageTransition === "false") {
+                    return { animated: false };
+                } else {
+                    return { animated: true, transition: { name: <string>this.pageTransition } };
+                }
+            } else {
+                return {
+                    animated: true,
+                    transition: this.pageTransition
+                };
+            }
+        }
+
+        ngOnChanges(_: {}): any {
+            this.updateUrlTree();
+        }
+
+        private updateUrlTree(): void {
+            this.urlTree = this.router.createUrlTree(
+                this.commands,
+                { relativeTo: this.currentRoute, queryParams: this.queryParams, fragment: this.fragment });
+        }
 }
diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts
index c764f69c4..690643325 100644
--- a/nativescript-angular/router/page-router-outlet.ts
+++ b/nativescript-angular/router/page-router-outlet.ts
@@ -1,20 +1,21 @@
 import {
     Attribute, ComponentFactory, ComponentRef, Directive,
-    ReflectiveInjector, ResolvedReflectiveProvider, ViewContainerRef,
+    ViewContainerRef,
     Inject, ComponentFactoryResolver, Injector
 } from "@angular/core";
-import { isPresent } from "../lang-facade";
 import { RouterOutletMap, ActivatedRoute, PRIMARY_OUTLET } from "@angular/router";
-import { NSLocationStrategy } from "./ns-location-strategy";
-import { DEVICE, PAGE_FACTORY, PageFactory } from "../platform-providers";
 import { Device } from "tns-core-modules/platform";
-import { routerLog } from "../trace";
-import { DetachedLoader } from "../common/detached-loader";
-import { ViewUtil } from "../view-util";
 import { Frame } from "tns-core-modules/ui/frame";
 import { Page, NavigatedData } from "tns-core-modules/ui/page";
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 
+import { isPresent } from "../lang-facade";
+import { DEVICE, PAGE_FACTORY, PageFactory } from "../platform-providers";
+import { routerLog } from "../trace";
+import { DetachedLoader } from "../common/detached-loader";
+import { ViewUtil } from "../view-util";
+import { NSLocationStrategy } from "./ns-location-strategy";
+
 interface CacheItem {
     componentRef: ComponentRef<any>;
     reusedRoute: PageRoute;
@@ -68,7 +69,9 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
 
     public outletMap: RouterOutletMap;
 
-    get locationInjector(): Injector { return this.containerRef.injector; }
+    /** @deprecated from Angular since v4 */
+    get locationInjector(): Injector { return this.location.injector; }
+    /** @deprecated from Angular since v4 */
     get locationFactoryResolver(): ComponentFactoryResolver { return this.resolver; }
 
     get isActivated(): boolean {
@@ -92,7 +95,7 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
 
     constructor(
         parentOutletMap: RouterOutletMap,
-        private containerRef: ViewContainerRef,
+        private location: ViewContainerRef,
         @Attribute("name") name: string,
         private locationStrategy: NSLocationStrategy,
         private componentFactoryResolver: ComponentFactoryResolver,
@@ -145,37 +148,40 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
      * Called by the Router to instantiate a new component during the commit phase of a navigation.
      * This method in turn is responsible for calling the `routerOnActivate` hook of its child.
      */
-    activate(
-        activatedRoute: ActivatedRoute, resolver: ComponentFactoryResolver, injector: Injector,
-        providers: ResolvedReflectiveProvider[], outletMap: RouterOutletMap): void {
+    activateWith(
+        activatedRoute: ActivatedRoute, resolver: ComponentFactoryResolver|null,
+        outletMap: RouterOutletMap): void {
         this.outletMap = outletMap;
         this.currentActivatedRoute = activatedRoute;
 
+        resolver = resolver || this.resolver;
+
         if (this.locationStrategy._isPageNavigatingBack()) {
             this.activateOnGoBack(activatedRoute, outletMap);
         } else {
-            this.activateOnGoForward(activatedRoute, providers, outletMap, resolver, injector);
+            this.activateOnGoForward(activatedRoute, outletMap, resolver);
         }
     }
 
     private activateOnGoForward(
         activatedRoute: ActivatedRoute,
-        providers: ResolvedReflectiveProvider[],
         outletMap: RouterOutletMap,
-        loadedResolver: ComponentFactoryResolver,
-        injector: Injector): void {
+        loadedResolver: ComponentFactoryResolver): void {
         const factory = this.getComponentFactory(activatedRoute, loadedResolver);
 
         const pageRoute = new PageRoute(activatedRoute);
-        providers = [...providers, ...ReflectiveInjector.resolve(
-            [{ provide: PageRoute, useValue: pageRoute }])];
 
         if (this.isInitialPage) {
             log("PageRouterOutlet.activate() initial page - just load component");
+
             this.isInitialPage = false;
-            const inj = ReflectiveInjector.fromResolvedProviders(providers, injector);
-            this.currentActivatedComp = this.containerRef.createComponent(
-                factory, this.containerRef.length, inj, []);
+
+            const injector = new OutletInjector(activatedRoute, outletMap, this.location.injector);
+            this.currentActivatedComp = this.location.createComponent(
+                factory, this.location.length, injector, []);
+
+            this.currentActivatedComp.changeDetectorRef.detectChanges();
+
             this.refCache.push(this.currentActivatedComp, pageRoute, outletMap, null);
 
         } else {
@@ -186,16 +192,17 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
                 isNavigation: true,
                 componentType: factory.componentType
             });
-            const pageResolvedProvider = ReflectiveInjector.resolve([
-                { provide: Page, useValue: page }
-            ]);
-            const childInjector = ReflectiveInjector.fromResolvedProviders(
-                [...providers, ...pageResolvedProvider], injector);
-            const loaderRef = this.containerRef.createComponent(
-                this.detachedLoaderFactory, this.containerRef.length, childInjector, []);
+
+            const childInjector = new ChildInjector(activatedRoute, outletMap, page, this.location.injector);
+
+            const loaderRef = this.location.createComponent(
+                this.detachedLoaderFactory, this.location.length, childInjector, []);
+            loaderRef.changeDetectorRef.detectChanges();
 
             this.currentActivatedComp = loaderRef.instance.loadWithFactory(factory);
             this.loadComponentInPage(page, this.currentActivatedComp);
+
+            this.currentActivatedComp.changeDetectorRef.detectChanges();
             this.refCache.push(this.currentActivatedComp, pageRoute, outletMap, loaderRef);
         }
     }
@@ -269,6 +276,38 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
     }
 }
 
+class OutletInjector implements Injector {
+    constructor(
+        private route: ActivatedRoute, private map: RouterOutletMap, private parent: Injector) { }
+
+    get(token: any, notFoundValue?: any): any {
+        if (token === ActivatedRoute) {
+            return this.route;
+        }
+
+        if (token === RouterOutletMap) {
+            return this.map;
+        }
+
+        return this.parent.get(token, notFoundValue);
+    }
+}
+
+class ChildInjector extends OutletInjector {
+    constructor(
+        route: ActivatedRoute, map: RouterOutletMap, private page: Page, parent: Injector) {
+            super(route, map, parent);
+        }
+
+    get(token: any, notFoundValue?: any): any {
+         if (token === Page) {
+            return this.page;
+        }
+
+        return super.get(token, notFoundValue);
+    }
+}
+
 function log(msg: string) {
     routerLog(msg);
 }
diff --git a/nativescript-angular/tsconfig.json b/nativescript-angular/tsconfig.json
index fc85cc25c..17fd0ba01 100644
--- a/nativescript-angular/tsconfig.json
+++ b/nativescript-angular/tsconfig.json
@@ -16,8 +16,16 @@
     "noImplicitAny": false,
     "lib": [
         "dom",
-        "es6"
-    ]
+        "es6",
+        "es2015.iterable"
+    ],
+    "baseUrl": ".",
+    "paths": {
+        "*": [
+            "./node_modules/tns-core-modules/*",
+            "./node_modules/*"
+        ]
+    }
   },
   "angularCompilerOptions": {
     "genDir": ".",
diff --git a/nativescript-angular/view-util.ts b/nativescript-angular/view-util.ts
index e9804df05..a395e961f 100644
--- a/nativescript-angular/view-util.ts
+++ b/nativescript-angular/view-util.ts
@@ -4,25 +4,24 @@ import { Placeholder } from "tns-core-modules/ui/placeholder";
 import { ContentView } from "tns-core-modules/ui/content-view";
 import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
 import {
-    ViewClass,
     getViewClass,
     getViewMeta,
     isKnownView,
     ViewExtensions,
     NgView,
-    TEMPLATE
 } from "./element-registry";
 import { platformNames, Device } from "tns-core-modules/platform";
 import { rendererLog as traceLog } from "./trace";
 
-const IOS_PREFX: string = ":ios:";
-const ANDROID_PREFX: string = ":android:";
+const XML_ATTRIBUTES = Object.freeze(["style", "rows", "columns", "fontAttributes"]);
+const ELEMENT_NODE_TYPE = 1;
 const whiteSpaceSplitter = /\s+/;
 
 export type ViewExtensions = ViewExtensions;
 export type NgView = NgView;
 export type NgLayoutBase = LayoutBase & ViewExtensions;
 export type NgContentView = ContentView & ViewExtensions;
+export type NgPlaceholder = Placeholder & ViewExtensions;
 export type BeforeAttachAction = (view: View) => void;
 
 export function isView(view: any): view is NgView {
@@ -48,7 +47,7 @@ export class ViewUtil {
         this.isAndroid = device.os === platformNames.android;
     }
 
-    public insertChild(parent: any, child: NgView, atIndex = -1) {
+    public insertChild(parent: any, child: NgView, atIndex: number = -1) {
         if (!parent || child.meta.skipAddToDom) {
             return;
         }
@@ -69,7 +68,7 @@ export class ViewUtil {
             }
         } else if (isContentView(parent)) {
             // Explicit handling of template anchors inside ContentView
-            if (child.meta.isTemplateAnchor) {
+            if (child.nodeName === "#comment") {
                 parent._addView(child, atIndex);
             } else {
                 parent.content = child;
@@ -96,7 +95,7 @@ export class ViewUtil {
             }
 
             // Explicit handling of template anchors inside ContentView
-            if (child.meta.isTemplateAnchor) {
+            if (child.nodeName === "#comment") {
                 parent._removeView(child);
             }
         } else if (isView(parent)) {
@@ -116,92 +115,45 @@ export class ViewUtil {
         }
     }
 
-    private createAndAttach(
-        name: string,
-        viewClass: ViewClass,
-        parent: NgView,
-        beforeAttach?: BeforeAttachAction
-    ): NgView {
-        const view = <NgView>new viewClass();
-        view.nodeName = name;
-        view.meta = getViewMeta(name);
-        if (beforeAttach) {
-            beforeAttach(view);
-        }
-        if (parent) {
-            this.insertChild(parent, view);
-        }
-        return view;
-    }
+    public createComment(): NgView {
+        const commentView = this.createView("Comment");
+        commentView.nodeName = "#comment";
+        commentView.visibility = "collapse";
 
-    public createView(name: string, parent: NgView, beforeAttach?: BeforeAttachAction): NgView {
-        if (isKnownView(name)) {
-            const viewClass = getViewClass(name);
-            return this.createAndAttach(name, viewClass, parent, beforeAttach);
-        } else {
-            return this.createViewContainer(parent, beforeAttach);
-        }
+        return commentView;
     }
 
     public createText(): NgView {
-        const text = <NgView>new Placeholder();
-        text.nodeName = "#text";
-        text.visibility = "collapse";
-        text.meta = getViewMeta("Placeholder");
-        return text;
-    }
-
-    public createViewContainer(parentElement: NgView, beforeAttach: BeforeAttachAction) {
-        traceLog("Creating view container in:" + parentElement);
+        const detachedText = this.createView("DetachedText");
+        detachedText.nodeName = "#text";
+        detachedText.visibility = "collapse";
 
-        const layout = this.createView("ProxyViewContainer", parentElement, beforeAttach);
-        layout.nodeName = "ProxyViewContainer";
-        return layout;
+        return detachedText;
     }
 
-    public createTemplateAnchor(parentElement: NgView) {
-        const viewClass = getViewClass(TEMPLATE);
-        const anchor = this.createAndAttach(TEMPLATE, viewClass, parentElement);
-        anchor.templateParent = parentElement;
-        anchor.visibility = "collapse";
-        traceLog("Created templateAnchor: " + anchor);
-        return anchor;
-    }
+    public createView(name: string): NgView {
+        traceLog(`Creating view: ${name}`);
 
-    private isXMLAttribute(name: string): boolean {
-        switch (name) {
-            case "style": return true;
-            case "rows": return true;
-            case "columns": return true;
-            case "fontAttributes": return true;
-            default: return false;
+        if (!isKnownView(name)) {
+            name = "ProxyViewContainer";
         }
-    }
+        const viewClass = getViewClass(name);
+        let view = <NgView>new viewClass();
+        view.nodeName = name;
+        view.meta = getViewMeta(name);
 
-    private platformFilter(attribute: string): string {
-        let lowered = attribute.toLowerCase();
-        if (lowered.indexOf(IOS_PREFX) === 0) {
-            if (this.isIos) {
-                return attribute.substr(IOS_PREFX.length);
-            } else {
-                return null;
-            }
-        }
+        // we're setting the node type of the view
+        // to 'element' because of checks done in the
+        // dom animation engine:
+        // tslint:disable-next-line:max-line-length
+        // https://github.com/angular/angular/blob/master/packages/animations/browser/src/render/dom_animation_engine.ts#L70-L81
+        view.nodeType = ELEMENT_NODE_TYPE;
 
-        if (lowered.indexOf(ANDROID_PREFX) === 0) {
-            if (this.isAndroid) {
-                return attribute.substr(ANDROID_PREFX.length);
-            } else {
-                return null;
-            }
-        }
-
-        return attribute;
+        return view;
     }
 
-    public setProperty(view: NgView, attributeName: string, value: any): void {
-        attributeName = this.platformFilter(attributeName);
-        if (!attributeName) {
+    public setProperty(view: NgView, attributeName: string, value: any, namespace?: string): void {
+        if (namespace && !this.runsIn(namespace)) {
             return;
         }
 
@@ -229,6 +181,34 @@ export class ViewUtil {
         }
     }
 
+    // finds the node in the parent's views and returns the next index
+    // returns -1 if the node has no parent or next sibling
+    public nextSiblingIndex(node: NgView): number {
+        const parent = node.parent;
+        if (!parent) {
+            return -1;
+        }
+
+        let index = 0;
+        let found = false;
+        parent.eachChild(child => {
+            if (child === node) {
+                found = true;
+            }
+
+            index += 1;
+            return !found;
+        });
+
+        return found ? index : -1;
+    }
+
+    private runsIn(platform: string): boolean {
+        return (platform === "ios" && this.isIos) ||
+            (platform === "android" && this.isAndroid);
+    }
+
+
     private setPropertyInternal(view: NgView, attributeName: string, value: any): void {
         traceLog("Setting attribute: " + attributeName);
 
@@ -236,7 +216,7 @@ export class ViewUtil {
 
         if (attributeName === "class") {
             this.setClasses(view, value);
-        } else if (this.isXMLAttribute(attributeName)) {
+        } else if (XML_ATTRIBUTES.indexOf(attributeName) !== -1) {
             view._applyXmlAttribute(attributeName, value);
         } else if (propMap.has(attributeName)) {
             // We have a lower-upper case mapped property.
@@ -308,16 +288,12 @@ export class ViewUtil {
         view.className = classValue;
     }
 
-    public setStyleProperty(view: NgView, styleName: string, styleValue: string): void {
-        traceLog("setStyleProperty: " + styleName + " = " + styleValue);
-
-        let name = styleName;
-        let resolvedValue = styleValue; // this.resolveCssValue(styleValue);
+    public setStyle(view: NgView, styleName: string, value: any) {
+        view.style[styleName] = value;
+    }
 
-        if (resolvedValue !== null) {
-            view.style[name] = resolvedValue;
-        } else {
-            view.style[name] = unsetValue;
-        }
+    public removeStyle(view: NgView, styleName: string) {
+        view.style[styleName] = unsetValue;
     }
 }
+
diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts
index 0772c7ced..3f803858a 100644
--- a/ng-sample/app/app.ts
+++ b/ng-sample/app/app.ts
@@ -1,13 +1,6 @@
-//import "globals";
-// import "./modules";
-//global.registerModule("./main-page", function () { return require("./main-page"); });
-
-//import * as profiling from "./profiling";
-//profiling.start("application-start");
-
-// "nativescript-angular/application" import should be first in order to load some required settings (like globals and reflect-metadata)
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { platformNativeScriptDynamic } from "nativescript-angular/platform";
+import { NativeScriptAnimationsModule } from "nativescript-angular/animations";
 import { onAfterLivesync, onBeforeLivesync } from "nativescript-angular/platform-common";
 import { NgModule } from "@angular/core";
 import { Router } from "@angular/router";
@@ -70,9 +63,12 @@ import { AnimationStatesTest } from "./examples/animation/animation-states-test"
 class ExampleModule { }
 
 function makeExampleModule(componentType) {
-    let imports: any[] = [ExampleModule];
+    let imports: any[] = [
+        NativeScriptAnimationsModule,
+        ExampleModule,
+    ];
     if (componentType.routes) {
-        imports.push(NativeScriptRouterModule.forRoot(componentType.routes))
+        imports.push(NativeScriptRouterModule.forRoot(componentType.routes));
     }
     let exports: any[] = [];
     if (componentType.exports) {
@@ -83,20 +79,22 @@ function makeExampleModule(componentType) {
         entries = componentType.entries;
     }
     entries.push(componentType);
+
     let providers = [];
     if (componentType.providers) {
-        providers = componentType.providers;
+        providers = [componentType.providers];
     }
+
     @NgModule({
         bootstrap: [componentType],
-        imports: imports,
+        imports,
         entryComponents: entries,
         declarations: [
             ...entries,
             ...exports,
         ],
-        providers: providers,
-        exports: exports,
+        providers,
+        exports,
     })
     class ExampleModuleForComponent { }
 
@@ -112,7 +110,7 @@ const customPageFactoryProvider = {
     }
 };
 
-platformNativeScriptDynamic().bootstrapModule(makeExampleModule(RendererTest));
+// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(RendererTest));
 // platformNativeScriptDynamic(undefined, [customPageFactoryProvider]).bootstrapModule(makeExampleModule(RendererTest));
 // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(TabViewTest));
 // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(Benchmark));
@@ -136,10 +134,10 @@ platformNativeScriptDynamic().bootstrapModule(makeExampleModule(RendererTest));
 // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationStatesTest));
 // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationNgClassTest));
 // platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationKeyframesTest));
-// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationEnterLeaveTest));
+platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationEnterLeaveTest));
 
-//Livesync test
-var cachedUrl: string;
+// Livesync test
+let cachedUrl: string;
 onBeforeLivesync.subscribe((moduleRef) => {
     console.log("------- onBeforeLivesync");
     if (moduleRef) {
@@ -158,5 +156,5 @@ onAfterLivesync.subscribe((moduleRef) => {
     }
 });
 
-//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(LivesyncApp));
+// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(LivesyncApp));
 console.log("APP RESTART");
diff --git a/ng-sample/app/examples/action-bar/action-bar-test.ts b/ng-sample/app/examples/action-bar/action-bar-test.ts
index a4e23ed4e..2186e2427 100644
--- a/ng-sample/app/examples/action-bar/action-bar-test.ts
+++ b/ng-sample/app/examples/action-bar/action-bar-test.ts
@@ -1,5 +1,5 @@
-import { Component } from '@angular/core';
-import { Page} from "ui/page";
+import { Component } from "@angular/core";
+import { Page } from "ui/page";
 
 @Component({
     selector: "first",
@@ -29,7 +29,6 @@ class FirstComponent {
 @Component({
     selector: "nested-component",
     template: `
-
     <ActionBarExtension>
         <ActionItem *ngIf="show" (tap)="onTap()">
             <Button text="CUSTOM"></Button>
@@ -70,7 +69,7 @@ class SecondComponent {
 }
 
 @Component({
-    selector: 'action-bar-test',
+    selector: "action-bar-test",
     template: `
     <GridLayout>
        <page-router-outlet></page-router-outlet>
@@ -79,14 +78,12 @@ class SecondComponent {
 })
 export class ActionBarTest {
     static routes = [
-        { path: '', component: FirstComponent },
-        { path: 'second', component: SecondComponent },
-    ]
+        { path: "", component: FirstComponent },
+        { path: "second", component: SecondComponent },
+    ];
 
     static entries = [
         FirstComponent,
         SecondComponent,
-    ]
+    ];
 }
-
-
diff --git a/ng-sample/app/examples/animation/animation-enter-leave-test.ts b/ng-sample/app/examples/animation/animation-enter-leave-test.ts
index ce527cac9..307534574 100644
--- a/ng-sample/app/examples/animation/animation-enter-leave-test.ts
+++ b/ng-sample/app/examples/animation/animation-enter-leave-test.ts
@@ -1,39 +1,39 @@
-import {Component, trigger, style, animate, state, transition } from '@angular/core';
+import {Component, trigger, style, animate, state, transition } from "@angular/core";
 
 @Component({
-    selector: 'animation-enter-leave',
-    templateUrl: './examples/animation/animation-enter-leave-test.html',
-    styleUrls: [ './examples/animation/animation-enter-leave-test.css' ],
+    selector: "animation-enter-leave",
+    templateUrl: "./examples/animation/animation-enter-leave-test.html",
+    styleUrls: [ "./examples/animation/animation-enter-leave-test.css" ],
     animations: [
-        trigger('state', [
-            state('in', style({ 'background-color': 'red', 'opacity': 1 })),
-            state('void', style({ 'background-color': 'white', 'opacity': 0 })),
-            transition('void => *', [ animate('600ms ease-out') ]),
-            transition('* => void', [ animate('600ms ease-out')])
+        trigger("state", [
+            state("in", style({ "background-color": "red", "opacity": 1 })),
+            state("void", style({ "background-color": "white", "opacity": 0 })),
+            transition("void => *", [ animate("600ms ease-out") ]),
+            transition("* => void", [ animate("600ms ease-out")])
         ])
     ]
 })
 export class AnimationEnterLeaveTest {
-    
+
     public items: Array<string>;
 
     constructor() {
         this.items = [];
-        for (var i = 0; i < 3; i++) {
+        for (let i = 0; i < 3; i++) {
             this.items.push("Item " + i);
         }
     }
-    
+
     onAddTap() {
         this.items.push("Item " + (this.items.length + 1));
     }
-    
+
     onRemoveAllTap() {
         this.items = [];
     }
-    
+
     onItemTap(event) {
-        var index = this.items.indexOf(event.object.text);
+        let index = this.items.indexOf(event.object.text);
         this.items.splice(index, 1);
     }
 }
diff --git a/ng-sample/app/examples/animation/animation-keyframes-test.ts b/ng-sample/app/examples/animation/animation-keyframes-test.ts
index f4c5a48ca..dd5d6ace7 100644
--- a/ng-sample/app/examples/animation/animation-keyframes-test.ts
+++ b/ng-sample/app/examples/animation/animation-keyframes-test.ts
@@ -1,34 +1,34 @@
-import {Component, trigger, style, animate, state, transition, keyframes } from '@angular/core';
+import {Component, trigger, style, animate, state, transition, keyframes } from "@angular/core";
 
 @Component({
-    selector: 'animation-states',
+    selector: "animation-states",
     template: `
         <StackLayout>
             <Button text="Touch me!" [@state]=" isOn ? 'active' : 'inactive' " (tap)="onTap()"></Button>
         </StackLayout>`,
     animations: [
-        trigger('state', [
-            state('active', style({ transform: 'translateX(0)', opacity: 1 })),
-            state('inactive', style({ transform: 'translateX(0)', opacity: 0.2 })),
-            transition('inactive => active', [
+        trigger("state", [
+            state("active", style({ transform: "translateX(0)", opacity: 1 })),
+            state("inactive", style({ transform: "translateX(0)", opacity: 0.2 })),
+            transition("inactive => active", [
                 animate(300, keyframes([
-                    style({opacity: 0.2, transform: 'translateX(-100)', offset: 0}),
-                    style({opacity: 1, transform: 'translateX(15)', offset: 0.3}),
-                    style({opacity: 1, transform: 'translateX(0)', offset: 1.0})
+                    style({opacity: 0.2, transform: "translateX(-100),translateY(100)", offset: 0}),
+                    style({opacity: 1, transform: "translateX(15)", offset: 0.3}),
+                    style({opacity: 1, transform: "translateX(0)", offset: 1.0})
                 ]))
             ]),
-            transition('active => inactive', [
+            transition("active => inactive", [
                 animate(300, keyframes([
-                    style({opacity: 1, transform: 'translateX(0)', offset: 0}),
-                    style({opacity: 1, transform: 'translateX(-15)', offset: 0.7}),
-                    style({opacity: 0.2, transform: 'translateX(100)', offset: 1.0})
+                    style({opacity: 1, transform: "translateX(0)", offset: 0}),
+                    style({opacity: 1, transform: "translateX(-15)", offset: 0.7}),
+                    style({opacity: 0.2, transform: "translateX(100)", offset: 1.0})
                 ]))
             ])
         ])
     ]
 })
 export class AnimationKeyframesTest {
-    
+
     isOn = false;
 
     onTap() {
diff --git a/ng-sample/app/examples/animation/animation-ngclass-test.ts b/ng-sample/app/examples/animation/animation-ngclass-test.ts
index 516dc34f0..c0d7b0ba7 100644
--- a/ng-sample/app/examples/animation/animation-ngclass-test.ts
+++ b/ng-sample/app/examples/animation/animation-ngclass-test.ts
@@ -13,11 +13,6 @@ export class AnimationNgClassTest {
 
     onTap() {
         this.isOn = !this.isOn;
-        if (this.isOn) {
-            this.text = "Toggled";
-        }
-        else {
-            this.text = "Normal";
-        }
+        this.text = this.isOn ? "Toggled" : "Normal";
     }
 }
diff --git a/ng-sample/app/examples/animation/animation-states-test.ts b/ng-sample/app/examples/animation/animation-states-test.ts
index b72ae4df9..ba6288ea5 100644
--- a/ng-sample/app/examples/animation/animation-states-test.ts
+++ b/ng-sample/app/examples/animation/animation-states-test.ts
@@ -1,22 +1,22 @@
-import {Component, trigger, style, animate, state, transition } from '@angular/core';
+import {Component, trigger, style, animate, state, transition } from "@angular/core";
 
 @Component({
-    selector: 'animation-states',
+    selector: "animation-states",
     template: `
         <StackLayout>
             <Button text="Touch me!" [@state]=" isOn ? 'active' : 'inactive' " (tap)="onTap()"></Button>
         </StackLayout>`,
     animations: [
-        trigger('state', [
-            state('inactive', style({ 'background-color': 'red' })),
-            state('active', style({ 'background-color': 'green' })),
-            transition('inactive => active', [ animate('600ms ease-out') ]),
-            transition('active => inactive', [ animate('600ms ease-out') ]),
+        trigger("state", [
+            state("inactive", style({ "background-color": "red" })),
+            state("active", style({ "background-color": "green" })),
+            transition("inactive => active", [ animate("600ms ease-out") ]),
+            transition("active => inactive", [ animate("600ms ease-out") ]),
         ])
     ]
 })
 export class AnimationStatesTest {
-    
+
     isOn = false;
 
     onTap() {
diff --git a/ng-sample/app/examples/http/http-test.ts b/ng-sample/app/examples/http/http-test.ts
index c661a749b..ae2c4b8ca 100644
--- a/ng-sample/app/examples/http/http-test.ts
+++ b/ng-sample/app/examples/http/http-test.ts
@@ -1,15 +1,17 @@
-import {Component} from '@angular/core';
-import {Http} from '@angular/http';
-import 'rxjs/add/operator/map';
+import {Component} from "@angular/core";
+import {Http} from "@angular/http";
+import "rxjs/add/operator/map";
 
 /* IMPORTANT
-In order to test out the full image example, to fix the App Transport Security error in iOS 9, you will need to follow this after adding the iOS platform:
+In order to test out the full image example,
+to fix the App Transport Security error in iOS 9,
+you will need to follow this after adding the iOS platform:
 
 https://blog.nraboy.com/2015/12/fix-ios-9-app-transport-security-issues-in-nativescript/
 */
 
 @Component({
-    selector: 'http-test',
+    selector: "http-test",
     template: `
     <StackLayout horizontalAlignment="center">
         <Button text="Load Local File with Http" (tap)='loadLocal()' cssClass="btn-primary"></Button>
@@ -28,12 +30,12 @@ export class HttpTest {
   public title: string;
   public description: string;
 
-  constructor(private http: Http) { 
-   
+  constructor(private http: Http) {
+
   }
-  
+
   public loadLocal() {
-    this.http.get('~/examples/http/data.json').map(res => res.json()).subscribe((response: any) => {
+    this.http.get("~/examples/http/data.json").map(res => res.json()).subscribe((response: any) => {
       let user = response.results[0];
       this.title = user.title;
       this.description = user.description;
diff --git a/ng-sample/app/examples/image/image-test.ts b/ng-sample/app/examples/image/image-test.ts
index 6d21c9840..8df56a6e6 100644
--- a/ng-sample/app/examples/image/image-test.ts
+++ b/ng-sample/app/examples/image/image-test.ts
@@ -1,13 +1,15 @@
-import {Component} from '@angular/core';
+import { Component } from "@angular/core";
 
 /* IMPORTANT
-In order to test out the full image example, to fix the App Transport Security error in iOS 9, you will need to follow this after adding the iOS platform:
+In order to test out the full image example,
+to fix the App Transport Security error in iOS 9,
+you will need to follow this after adding the iOS platform:
 
 https://blog.nraboy.com/2015/12/fix-ios-9-app-transport-security-issues-in-nativescript/
 */
 
 @Component({
-    selector: 'image-test',
+    selector: "image-test",
     template: `
     <StackLayout horizontalAlignment="center">
         <Image [src]="currentImage" width="300" height="300"></Image>
@@ -22,19 +24,19 @@ https://blog.nraboy.com/2015/12/fix-ios-9-app-transport-security-issues-in-nativ
     `
 })
 export class ImageTest {
-  
+
   public currentImage: string;
   private images: Array<string> = [
-    'res://300x300.jpg',
-    '~/examples/image/img/Default.png',
-    'http://www.codeproject.com/KB/mobile/883465/NativeScript.png'
+    "res://300x300.jpg",
+    "~/examples/image/img/Default.png",
+    "http://www.codeproject.com/KB/mobile/883465/NativeScript.png"
   ];
   private cnt: number = 0;
 
-  constructor() { 
+  constructor() {
     this.currentImage = this.images[this.cnt];
   }
-  
+
   changeImage(direction: number) {
     if (direction > 0) {
       this.cnt++;
@@ -50,12 +52,12 @@ export class ImageTest {
     }
     this.currentImage = this.images[this.cnt];
   }
-  
+
   addImage(e: any, name: string): void {
-    if (name.indexOf('http') === -1) {
+    if (name.indexOf("http") === -1) {
       alert(`Must be a valid url to an image starting with 'http'!`);
     } else {
-      this.images.push(name); 
+      this.images.push(name);
       this.currentImage = this.images[this.images.length - 1];
     }
   }
diff --git a/ng-sample/app/examples/list/data.service.ts b/ng-sample/app/examples/list/data.service.ts
index e7139138b..2aef70c26 100644
--- a/ng-sample/app/examples/list/data.service.ts
+++ b/ng-sample/app/examples/list/data.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable } from "@angular/core";
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 
 export class DataItem {
@@ -10,13 +10,13 @@ export class DataService {
     private _intervalId;
     private _counter = 0;
     private _currentItems: Array<DataItem>;
-    
+
     public items$: BehaviorSubject<Array<DataItem>>;
 
     constructor() {
         this._currentItems = [];
-        for (var i = 0; i < 3; i++) {
-            this.appendItem()
+        for (let i = 0; i < 3; i++) {
+            this.appendItem();
         }
 
         this.items$ = new BehaviorSubject(this._currentItems);
@@ -51,4 +51,5 @@ export class DataService {
         this._currentItems.push(new DataItem(this._counter, "data item " + this._counter));
         this._counter++;
     }
-}
\ No newline at end of file
+}
+
diff --git a/ng-sample/app/examples/list/list-test-async.ts b/ng-sample/app/examples/list/list-test-async.ts
index 5b0b76bcf..146ee9cba 100644
--- a/ng-sample/app/examples/list/list-test-async.ts
+++ b/ng-sample/app/examples/list/list-test-async.ts
@@ -1,12 +1,12 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { Component, ChangeDetectionStrategy } from "@angular/core";
 import { DataItem, DataService } from "./data.service";
 import { Observable } from "rxjs/Observable";
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 import "rxjs/add/operator/combineLatest";
 
 @Component({
-    selector: 'list-test-async',
-    styleUrls: ['examples/list/styles.css'],
+    selector: "list-test-async",
+    styleUrls: ["examples/list/styles.css"],
     providers: [DataService],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
@@ -29,7 +29,11 @@ import "rxjs/add/operator/combineLatest";
             </StackLayout>
         </StackLayout>
 
-        <button row="2" colSpan="2" (tap)="toggleAsyncUpdates()" [text]="isUpdating ? 'stop updates' : 'start updates'"></button>
+        <Button
+            row="2" colSpan="2"
+            (tap)="toggleAsyncUpdates()"
+            [text]="isUpdating ? 'stop updates' : 'start updates'">
+        </Button>
     </GridLayout>
     `
 })
@@ -54,8 +58,8 @@ export class ListTestAsync {
 }
 
 @Component({
-    selector: 'list-test-async-filter',
-    styleUrls: ['examples/list/styles.css'],
+    selector: "list-test-async-filter",
+    styleUrls: ["examples/list/styles.css"],
     providers: [DataService],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
diff --git a/ng-sample/app/examples/list/list-test.ts b/ng-sample/app/examples/list/list-test.ts
index 1a08a1075..ccec8a964 100644
--- a/ng-sample/app/examples/list/list-test.ts
+++ b/ng-sample/app/examples/list/list-test.ts
@@ -1,14 +1,14 @@
-import {Component, Input, WrappedValue, ChangeDetectionStrategy, AfterViewChecked, DoCheck} from '@angular/core';
-import {Label} from 'ui/label';
-import {ObservableArray} from 'data/observable-array';
+import {Component, Input, WrappedValue, ChangeDetectionStrategy, AfterViewChecked, DoCheck} from "@angular/core";
+import {Label} from "ui/label";
+import {ObservableArray} from "data/observable-array";
 
 class DataItem {
     constructor(public id: number, public name: string) { }
 }
 
 @Component({
-    selector: 'item-component',
-    styleUrls: ['examples/list/styles.css'],
+    selector: "item-component",
+    styleUrls: ["examples/list/styles.css"],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
         <StackLayout [class.odd]="odd" [class.even]="even">
@@ -34,8 +34,8 @@ export class ItemComponent implements AfterViewChecked, DoCheck {
 }
 
 @Component({
-    selector: 'list-test',
-    styleUrls: ['examples/list/styles.css'],
+    selector: "list-test",
+    styleUrls: ["examples/list/styles.css"],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
         <GridLayout rows="auto * auto">
@@ -58,7 +58,7 @@ export class ItemComponent implements AfterViewChecked, DoCheck {
     // IN-PLACE TEMPLATE
     // <template let-data="item" let-i="index" let-odd="odd" let-even="even">
     //     <StackLayout [class.odd]="odd" [class.even]="even">
-    //         <Label [text]='"index: " + i'></Label>                        
+    //         <Label [text]='"index: " + i'></Label>
     //         <Label [text]='"[" + data.id +"]" + data.name'></Label>
     //     </StackLayout>
     // </template>
@@ -70,7 +70,7 @@ export class ListTest {
     constructor() {
         this.myItems = [];
         this.counter = 0;
-        for (var i = 0; i < 100; i++) {
+        for (let i = 0; i < 100; i++) {
             this.myItems.push(new DataItem(i, "data item " + i));
             this.counter = i;
         }
@@ -87,5 +87,5 @@ export class ListTest {
 
     public static entries = [
         ItemComponent
-    ]
+    ];
 }
diff --git a/ng-sample/app/examples/list/template-selector.ts b/ng-sample/app/examples/list/template-selector.ts
index 1fce9e816..4557b7e9c 100644
--- a/ng-sample/app/examples/list/template-selector.ts
+++ b/ng-sample/app/examples/list/template-selector.ts
@@ -1,4 +1,4 @@
-import { Component, Input, ChangeDetectionStrategy, DoCheck } from '@angular/core';
+import { Component, Input, ChangeDetectionStrategy, DoCheck } from "@angular/core";
 
 class DataItem {
     private static count = 0;
@@ -9,8 +9,8 @@ class DataItem {
 }
 
 @Component({
-    selector: 'item-component',
-    styleUrls: ['examples/list/styles.css'],
+    selector: "item-component",
+    styleUrls: ["examples/list/styles.css"],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `<Label class="item" [text]='"[" + data.id +"]" + data.name'></Label>`
 })
@@ -20,8 +20,8 @@ export class ItemComponent implements DoCheck {
 }
 
 @Component({
-    selector: 'header-component',
-    styleUrls: ['examples/list/styles.css'],
+    selector: "header-component",
+    styleUrls: ["examples/list/styles.css"],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `<Label class="header" [text]='data.name'></Label>`
 })
@@ -31,14 +31,17 @@ export class HeaderComponent implements DoCheck {
 }
 
 @Component({
-    selector: 'list-test',
-    styleUrls: ['examples/list/styles.css'],
+    selector: "list-test",
+    styleUrls: ["examples/list/styles.css"],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
         <GridLayout rows="auto * auto">
             <Label text="ListView With Template Selector" class="list-title"></Label>
 
-            <ListView [items]="myItems" (itemTap)="onItemTap($event)" row="1" margin="10" [itemTemplateSelector]="templateSelector">
+            <ListView [items]="myItems"
+                (itemTap)="onItemTap($event)"
+                row="1" margin="10"
+                [itemTemplateSelector]="templateSelector">
                 
                 <template nsTemplateKey="header" let-item="item" let-i="index" let-odd="odd" let-even="even">
                     <header-component [data]="item"></header-component>
diff --git a/ng-sample/app/examples/livesync-test/livesync-test-app.ts b/ng-sample/app/examples/livesync-test/livesync-test-app.ts
index c28a5563e..1f7bf9174 100644
--- a/ng-sample/app/examples/livesync-test/livesync-test-app.ts
+++ b/ng-sample/app/examples/livesync-test/livesync-test-app.ts
@@ -4,7 +4,7 @@ import {FirstComponent} from "./first/first.component";
 import {SecondComponent} from "./second/second.component";
 
 @Component({
-    selector: 'livesync-app-test',
+    selector: "livesync-app-test",
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class LivesyncApp {
diff --git a/ng-sample/app/examples/modal/modal-content.ts b/ng-sample/app/examples/modal/modal-content.ts
index 7e5f691a1..0b2d1f360 100644
--- a/ng-sample/app/examples/modal/modal-content.ts
+++ b/ng-sample/app/examples/modal/modal-content.ts
@@ -1,8 +1,8 @@
-import {Component, Input} from '@angular/core';
+import {Component, Input} from "@angular/core";
 import {ModalDialogParams} from "nativescript-angular/directives/dialogs";
 
 @Component({
-    selector: 'modal-content',
+    selector: "modal-content",
     template: `
     <StackLayout margin="24" horizontalAlignment="center" verticalAlignment="center">
         <Label [text]="prompt"></Label>
@@ -16,7 +16,7 @@ import {ModalDialogParams} from "nativescript-angular/directives/dialogs";
 export class ModalContent {
     @Input() public prompt: string;
     constructor(private params: ModalDialogParams) {
-        console.log("ModalContent.constructor: " + JSON.stringify(params))
+        console.log("ModalContent.constructor: " + JSON.stringify(params));
         this.prompt = params.context.promptMsg;
     }
 
diff --git a/ng-sample/app/examples/modal/modal-test.ts b/ng-sample/app/examples/modal/modal-test.ts
index 6ae3f3555..74a31b62f 100644
--- a/ng-sample/app/examples/modal/modal-test.ts
+++ b/ng-sample/app/examples/modal/modal-test.ts
@@ -1,10 +1,10 @@
-import { Component, ViewContainerRef } from '@angular/core';
+import { Component, ViewContainerRef } from "@angular/core";
 import * as dialogs from "ui/dialogs";
 import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { ModalContent} from "./modal-content";
 
 @Component({
-    selector: 'modal-test',
+    selector: "modal-test",
     template: `
     <GridLayout rows="*, auto">
         <StackLayout verticalAlignment="top" margin="12">
@@ -105,7 +105,9 @@ export class ModalTest {
             userName: "John",
             password: "Reese"
         }).then((loginResult) => {
-            this.result = loginResult.result ? ("user: " + loginResult.userName + " pass: " + loginResult.password) : "no result";
+            this.result = loginResult.result ?
+                ("user: " + loginResult.userName + " pass: " + loginResult.password) :
+                "no result";
         });
     }
 }
diff --git a/ng-sample/app/examples/platform-directives/platform-directives-test.ts b/ng-sample/app/examples/platform-directives/platform-directives-test.ts
index dfbdc0683..50e9701cb 100644
--- a/ng-sample/app/examples/platform-directives/platform-directives-test.ts
+++ b/ng-sample/app/examples/platform-directives/platform-directives-test.ts
@@ -1,7 +1,7 @@
-import {Component} from '@angular/core';
+import {Component} from "@angular/core";
 
 @Component({
-    selector: 'action-bar-test',
+    selector: "action-bar-test",
     template: `
     <StackLayout>
         <android><Label text="This is Android specific content"></Label></android>
@@ -15,4 +15,3 @@ import {Component} from '@angular/core';
 export class PlatfromDirectivesTest {
 }
 
-
diff --git a/ng-sample/app/examples/renderer-test.ts b/ng-sample/app/examples/renderer-test.ts
index cd53aa18e..7ceb33849 100644
--- a/ng-sample/app/examples/renderer-test.ts
+++ b/ng-sample/app/examples/renderer-test.ts
@@ -1,8 +1,8 @@
-import { Component, Directive, Host, ElementRef, Input } from '@angular/core';
-import { Observable } from 'data/observable';
-import { TextValueAccessor } from 'nativescript-angular/value-accessors/text-value-accessor';
-import { CheckedValueAccessor } from 'nativescript-angular/value-accessors/checked-value-accessor';
-import { SegmentedBarItem } from 'ui/segmented-bar';
+import { Component, Directive, Host, ElementRef, Input } from "@angular/core";
+import { Observable } from "data/observable";
+import { TextValueAccessor } from "nativescript-angular/value-accessors/text-value-accessor";
+import { CheckedValueAccessor } from "nativescript-angular/value-accessors/checked-value-accessor";
+import { SegmentedBarItem } from "ui/segmented-bar";
 
 
 function createTabItem(title: string) {
@@ -58,7 +58,7 @@ export class RendererTest {
     ];
 
     constructor() {
-        this.buttonText = "Save..."
+        this.buttonText = "Save...";
         this.showDetails = true;
         this.detailsText = "plain ng-if directive \ndetail 1-2-3...";
         this.moreDetailsText = "More details:";
diff --git a/ng-sample/app/examples/router/clear-history-test.ts b/ng-sample/app/examples/router/clear-history-test.ts
index c2ba9df23..c83b40936 100644
--- a/ng-sample/app/examples/router/clear-history-test.ts
+++ b/ng-sample/app/examples/router/clear-history-test.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, OnDestroy, Injectable } from "@angular/core";
-import { Router } from '@angular/router';
+import { Router } from "@angular/router";
 import { RouterExtensions } from "nativescript-angular/router";
 import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
@@ -26,7 +26,7 @@ class LocationLogService {
 }
 
 @Component({
-    selector: 'location-log',
+    selector: "location-log",
     styleUrls: ["examples/router/styles.css"],
     template: `
     <GridLayout rows="auto *" columns="*">
@@ -34,11 +34,17 @@ class LocationLogService {
             [text]="service.showStack ? 'show events' : 'show stack'" 
             (tap)="service.showStack=!service.showStack"></button>
 
-        <ListView row="1" [items]="service.showStack ? (service.locationStack$ | async) : (service.routerEvents$ | async)" margin="10">
+        <ListView row="1"
+            [items]="service.showStack ?
+                (service.locationStack$ | async) :
+                (service.routerEvents$ | async)"
+                margin="10">
+
             <template let-data="item" let-odd="odd" let-even="even">
                 <Label [text]="data" textWrap="true"
                     [class.odd]="odd" [class.even]="even"></Label>
             </template>
+
         </ListView>
     </GridLayout>
   `
@@ -84,7 +90,7 @@ class ThirdComponent implements OnInit, OnDestroy {
 }
 
 @Component({
-    selector: 'navigation-test',
+    selector: "navigation-test",
     providers: [LocationLogService],
     template: `<page-router-outlet></page-router-outlet>`
 })
@@ -101,5 +107,5 @@ export class ClearHistoryAppComponent {
         SecondComponent,
         ThirdComponent,
         LocationLog,
-    ]
+    ];
 }
diff --git a/ng-sample/app/examples/router/login-test.ts b/ng-sample/app/examples/router/login-test.ts
index c1d4b590c..975d19c53 100644
--- a/ng-sample/app/examples/router/login-test.ts
+++ b/ng-sample/app/examples/router/login-test.ts
@@ -1,5 +1,5 @@
 import { Component, Injectable } from "@angular/core";
-import { CanActivate, Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { CanActivate, Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router";
 import { RouterExtensions, PageRoute } from "nativescript-angular/router";
 import * as appSettings from "application-settings";
 import { Observable } from "rxjs/Observable";
@@ -40,7 +40,7 @@ class LoginService {
 
 
 @Component({
-    selector: 'login',
+    selector: "login",
     styleUrls: ["examples/router/styles.css"],
     template: `
     <StackLayout>
@@ -69,11 +69,11 @@ class LoginComponent {
 
 
 export interface ResolvedData {
-    id: number
+    id: number;
 }
 
 @Component({
-    selector: 'main',
+    selector: "main",
     styleUrls: ["examples/router/styles.css"],
     template: `
     <StackLayout>
@@ -102,13 +102,13 @@ class MainComponent {
     }
 
     onResolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-        console.log("MainComponent.onResolve()")
+        console.log("MainComponent.onResolve()");
         return true;
     }
 }
 
 @Component({
-    selector: 'inner',
+    selector: "inner",
     styleUrls: ["examples/router/styles.css"],
     template: `
     <StackLayout>
@@ -145,8 +145,7 @@ class AuthGuard implements CanActivate {
         if (this.loginService.isLogged) {
             console.log("AuthGuard: authenticated");
             return true;
-        }
-        else {
+        } else {
             console.log("AuthGuard: redirecting to login");
             this.nav.navigate(["/login"]);
             return false;
@@ -157,15 +156,16 @@ class AuthGuard implements CanActivate {
 @Injectable()
 class ResolveGuard implements Resolve<ResolvedData> {
     static counter = 0;
-    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<ResolvedData> | Promise<ResolvedData> | ResolvedData {
-        const result: ResolvedData = { id: ResolveGuard.counter++ }
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
+            Observable<ResolvedData> | Promise<ResolvedData> | ResolvedData {
+        const result: ResolvedData = { id: ResolveGuard.counter++ };
         console.log(`ResolveGuard: Fetching new data. Result: ${JSON.stringify(result)} `);
         return result;
     }
 }
 
 @Component({
-    selector: 'navigation-test',
+    selector: "navigation-test",
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class LoginAppComponent {
diff --git a/ng-sample/app/examples/router/page-router-outlet-nested-test.ts b/ng-sample/app/examples/router/page-router-outlet-nested-test.ts
index 50a0a071b..104278c94 100644
--- a/ng-sample/app/examples/router/page-router-outlet-nested-test.ts
+++ b/ng-sample/app/examples/router/page-router-outlet-nested-test.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
-import { ActivatedRoute, Router } from '@angular/router';
-import { Location } from '@angular/common';
+import { ActivatedRoute, Router } from "@angular/router";
+import { Location } from "@angular/common";
 import { Page } from "ui/page";
 import { Observable } from "rxjs/Observable";
-import 'rxjs/add/operator/map';
+import "rxjs/add/operator/map";
 
 @Component({
     selector: "first",
@@ -32,9 +32,8 @@ class FirstComponent implements OnInit, OnDestroy {
 }
 
 
-
 @Component({
-    selector: 'master',
+    selector: "master",
     styleUrls: ["examples/router/styles.css"],
     template: `
     <StackLayout class="master">
@@ -53,7 +52,7 @@ class MasterComponent {
 }
 
 @Component({
-    selector: 'detail',
+    selector: "detail",
     styleUrls: ["examples/router/styles.css"],
     template: `
     <StackLayout class="detail">
@@ -84,7 +83,10 @@ class DetailComponent {
 
         <StackLayout class="nav">
             <Button class="link" text="< BACK" (tap)="goBack()"></Button>
-            <Button class="link" [text]="'Second ' + (nextDepth$ | async) + ' >'" [nsRouterLink]="['/second', (nextDepth$ | async)]"></Button>
+            <Button class="link"
+                [text]="'Second ' + (nextDepth$ | async) + ' >'"
+                [nsRouterLink]="['/second', (nextDepth$ | async)]">
+            </Button>
         </StackLayout>
 
         <router-outlet></router-outlet>
@@ -115,7 +117,7 @@ class SecondComponent implements OnInit, OnDestroy {
 
 
 @Component({
-    selector: 'navigation-test',
+    selector: "navigation-test",
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class PageRouterOutletNestedAppComponent {
@@ -135,11 +137,11 @@ export class PageRouterOutletNestedAppComponent {
         SecondComponent,
         MasterComponent,
         DetailComponent
-    ]
+    ];
 
     constructor(router: Router, private location: Location) {
         router.events.subscribe((e) => {
             console.log("--EVENT-->: " + e.toString());
-        })
+        });
     }
 }
diff --git a/ng-sample/app/examples/router/page-router-outlet-test.ts b/ng-sample/app/examples/router/page-router-outlet-test.ts
index 42450361d..b7dc43f90 100644
--- a/ng-sample/app/examples/router/page-router-outlet-test.ts
+++ b/ng-sample/app/examples/router/page-router-outlet-test.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
-import { ActivatedRoute, Router } from '@angular/router';
-import { Location } from '@angular/common';
+import { ActivatedRoute, Router } from "@angular/router";
+import { Location } from "@angular/common";
 import { Page } from "ui/page";
 import { Observable } from "rxjs/Observable";
-import 'rxjs/add/operator/map';
+import "rxjs/add/operator/map";
 
 
 @Component({
@@ -102,7 +102,7 @@ class ThirdComponent implements OnInit, OnDestroy {
 }
 
 @Component({
-    selector: 'navigation-test',
+    selector: "navigation-test",
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class PageRouterOutletAppComponent {
@@ -116,7 +116,7 @@ export class PageRouterOutletAppComponent {
         FirstComponent,
         SecondComponent,
         ThirdComponent
-    ]
+    ];
 
     constructor(router: Router, private location: Location) {
         router.events.subscribe((e) => {
diff --git a/ng-sample/app/examples/router/router-outlet-test.ts b/ng-sample/app/examples/router/router-outlet-test.ts
index 7a00132e2..fd9803c93 100644
--- a/ng-sample/app/examples/router/router-outlet-test.ts
+++ b/ng-sample/app/examples/router/router-outlet-test.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute } from "@angular/router";
 import "rxjs/add/operator/map";
 
 @Component({
@@ -44,14 +44,17 @@ class SecondComponent implements OnInit, OnDestroy {
 }
 
 @Component({
-    selector: 'navigation-test',
+    selector: "navigation-test",
     styleUrls: ["examples/router/styles.css"],
     template: `
         <StackLayout>
             <StackLayout class="nav">
                 <Button text="First" nsRouterLinkActive="active" nsRouterLink="/first"></Button>
-                <Button text="Second(1)" nsRouterLinkActive="active" nsRouterLink="/second/1"></Button>           <!-- Both work -->
-                <Button text="Second(2)" nsRouterLinkActive="active" [nsRouterLink]="['/second', '2' ]"></Button> <!-- Both work -->
+                <Button text="Second(1)" nsRouterLinkActive="active" nsRouterLink="/second/1"></Button>           
+                <Button text="Second(2)"
+                    nsRouterLinkActive="active"
+                    [nsRouterLink]="['/second', '2' ]">
+                </Button>
             </StackLayout>
             
             <router-outlet></router-outlet>
@@ -71,4 +74,3 @@ export class RouterOutletAppComponent {
     ];
 }
 
-
diff --git a/ng-sample/app/examples/tab-view/tab-view-test.ts b/ng-sample/app/examples/tab-view/tab-view-test.ts
index aea5c4f9b..73a17c312 100644
--- a/ng-sample/app/examples/tab-view/tab-view-test.ts
+++ b/ng-sample/app/examples/tab-view/tab-view-test.ts
@@ -1,13 +1,8 @@
-import {Component} from '@angular/core';
+import { Component } from "@angular/core";
 
 @Component({
-	selector: 'tab-view-test',
-	templateUrl: './examples/tab-view/tab-view-test.html' 
+    selector: "tab-view-test",
+    templateUrl: "./examples/tab-view/tab-view-test.html"
 })
-export class TabViewTest {
-    //public selectedIndex: number;
-    
-    constructor() {
-        //this.selectedIndex = 1;
-    }
-}
\ No newline at end of file
+export class TabViewTest { }
+
diff --git a/ng-sample/app/performance/benchmark.ts b/ng-sample/app/performance/benchmark.ts
index 1e53ca771..40d64aa30 100644
--- a/ng-sample/app/performance/benchmark.ts
+++ b/ng-sample/app/performance/benchmark.ts
@@ -1,12 +1,12 @@
-import {StackLayout} from 'ui/layouts/stack-layout';
-import {Button} from 'ui/button';
-import {Label} from 'ui/label';
-import {Inject, Component, ApplicationRef} from '@angular/core';
-import * as profiling from './profiling';
+import {StackLayout} from "ui/layouts/stack-layout";
+import {Button} from "ui/button";
+import {Label} from "ui/label";
+import {Inject, Component, ApplicationRef} from "@angular/core";
+import * as profiling from "./profiling";
 
 @Component({
-    selector: 'tree',
-    inputs: ['data'],
+    selector: "tree",
+    inputs: ["data"],
     template:
     `<StackLayout>
           <Label [text]="data.value"></Label>
@@ -24,7 +24,7 @@ class TreeComponent {
 }
 
 @Component({
-    selector: 'benchmark',
+    selector: "benchmark",
     template: `
     <StackLayout>
         <Label text='Benchmark!' fontSize='20' verticalAlignment='center' padding='20'></Label>
@@ -40,8 +40,8 @@ class TreeComponent {
 export class Benchmark {
     private count: number = 0;
     private maxDepth: number = 10;
-    public initDataNg = new TreeNode('', null, null);
-    public initDataBaseline = new TreeNode('', null, null);
+    public initDataNg = new TreeNode("", null, null);
+    public initDataBaseline = new TreeNode("", null, null);
 
     constructor(private appRef: ApplicationRef) {
     }
@@ -53,20 +53,20 @@ export class Benchmark {
     public baselineTest(container: StackLayout) {
         this.createBaselineDom();
 
-        profiling.start('baseline');
+        profiling.start("baseline");
         this.renderBaselineNode(container, this.initDataBaseline);
-        profiling.stop('baseline');
+        profiling.stop("baseline");
 
         container.removeChildren();
     }
 
     public componentTest() {
-        this.initDataNg = new TreeNode('', null, null);
+        this.initDataNg = new TreeNode("", null, null);
         this.appRef.tick();
 
-        profiling.start('angular');
+        profiling.start("angular");
         this.createNgDom();
-        profiling.stop('angular');
+        profiling.stop("angular");
     }
 
     private renderBaselineNode(container: StackLayout, node: TreeNode) {
@@ -87,15 +87,15 @@ export class Benchmark {
     }
 
     private createBaselineDom() {
-        var values = this.count++ % 2 == 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*'] :
-            ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', '-'];
+        let values = this.count++ % 2 === 0 ? ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "*"] :
+            ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "-"];
         this.initDataBaseline = buildTree(this.maxDepth, values, 0);
         this.appRef.tick();
     }
 
     private createNgDom() {
-        var values = this.count++ % 2 == 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*'] :
-            ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', '-'];
+        let values = this.count++ % 2 === 0 ? ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "*"] :
+            ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "-"];
         this.initDataNg = buildTree(this.maxDepth, values, 0);
         this.appRef.tick();
     }
@@ -113,7 +113,7 @@ export class TreeNode {
     }
 }
 
-var nodes = 0;
+let nodes = 0;
 
 function buildTree(maxDepth, values, curDepth) {
     if (curDepth === 0) {
@@ -121,8 +121,16 @@ function buildTree(maxDepth, values, curDepth) {
     } else {
         nodes++;
     }
-    if (maxDepth === curDepth) return new TreeNode('', null, null);
-    let result = new TreeNode(values[curDepth], buildTree(maxDepth, values, curDepth + 1), buildTree(maxDepth, values, curDepth + 1));
+
+    if (maxDepth === curDepth) {
+        return new TreeNode("", null, null);
+    }
+
+    let result = new TreeNode(
+        values[curDepth],
+        buildTree(maxDepth, values, curDepth + 1),
+        buildTree(maxDepth, values, curDepth + 1));
+
     if (curDepth === 0) {
         console.log(`${nodes} nodes created.`);
     }
diff --git a/ng-sample/app/performance/profiling.ts b/ng-sample/app/performance/profiling.ts
index faa41230f..1a6e2d295 100644
--- a/ng-sample/app/performance/profiling.ts
+++ b/ng-sample/app/performance/profiling.ts
@@ -3,9 +3,9 @@ declare var CACurrentMediaTime: any;
 declare var __startCPUProfiler: any;
 declare var __stopCPUProfiler: any;
 
-export var ENABLE_PROFILING = true;
+export let ENABLE_PROFILING = true;
 
-var anyGlobal = <any>global;
+let anyGlobal = <any>global;
 
 export function time(): number {
     if (!ENABLE_PROFILING) {
@@ -14,8 +14,7 @@ export function time(): number {
 
     if (anyGlobal.android) {
         return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
-    }
-    else {
+    } else {
         return CACurrentMediaTime() * 1000;
     }
 }
@@ -35,15 +34,14 @@ export function start(name: string): void {
         return;
     }
 
-    var info: TimerInfo;
+    let info: TimerInfo;
     if (anyGlobal.timers.has(name)) {
         info = anyGlobal.timers.get(name);
-        if (info.currentStart != 0) {
+        if (info.currentStart !== 0) {
             throw new Error(`Timer already started: ${name}`);
         }
         info.currentStart = time();
-    }
-    else {
+    } else {
         info = {
             totalTime: 0,
             count: 0,
@@ -58,7 +56,7 @@ export function pause(name: string) {
         return;
     }
 
-    var info = pauseInternal(name);
+    let info = pauseInternal(name);
     console.log(`---- [${name}] PAUSE last: ${info.lastTime} total: ${info.totalTime} count: ${info.count}`);
 }
 
@@ -67,14 +65,14 @@ export function stop(name: string) {
         return;
     }
 
-    var info = pauseInternal(name);
+    let info = pauseInternal(name);
     console.log(`---- [${name}] STOP total: ${info.totalTime} count:${info.count}`);
 
     anyGlobal.timers.delete(name);
 }
 
 function pauseInternal(name: string): TimerInfo {
-    var info = anyGlobal.timers.get(name);
+    let info = anyGlobal.timers.get(name);
     if (!info) {
         throw new Error(`No timer started: ${name}`);
     }
diff --git a/ng-sample/app/starter.ts b/ng-sample/app/starter.ts
index 38cfc3e99..07c7ba758 100644
--- a/ng-sample/app/starter.ts
+++ b/ng-sample/app/starter.ts
@@ -1,7 +1,7 @@
 declare var java: any;
 declare var CACurrentMediaTime: any;
 
-var anyGlobal = <any>global;
+let anyGlobal = <any>global;
 
 if (!anyGlobal.timers) {
     anyGlobal.timers = new Map();
@@ -10,13 +10,12 @@ if (!anyGlobal.timers) {
 function time() {
     if (anyGlobal.android) {
         return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
-    }
-    else {
+    } else {
         return CACurrentMediaTime() * 1000;
     }
 }
 
-var timerEntry = {
+let timerEntry = {
     totalTime: 0,
     count: 0,
     currentStart: time()
@@ -24,4 +23,4 @@ var timerEntry = {
 
 anyGlobal.timers.set("application-start", timerEntry);
 
-import "./app.js"
+import "./app.js";
diff --git a/ng-sample/package.json b/ng-sample/package.json
index 52bd39310..4b59f2282 100644
--- a/ng-sample/package.json
+++ b/ng-sample/package.json
@@ -1,4 +1,13 @@
 {
+  "nativescript": {
+    "id": "org.nativescript.ngsample",
+    "tns-android": {
+      "version": "2.5.0"
+    },
+    "tns-ios": {
+      "version": "2.5.0"
+    }
+  },
   "name": "tns-template-hello-world",
   "main": "app.js",
   "version": "1.1.0",
@@ -23,20 +32,21 @@
   },
   "homepage": "https://github.com/NativeScript/template-hello-world",
   "dependencies": {
-    "@angular/common": "~2.4.3",
-    "@angular/compiler": "~2.4.3",
-    "@angular/core": "~2.4.3",
-    "@angular/forms": "~2.4.3",
-    "@angular/http": "~2.4.3",
-    "@angular/platform-browser": "~2.4.3",
-    "@angular/platform-browser-dynamic": "~2.4.3",
-    "@angular/router": "~3.4.3",
+    "@angular/animations": "~4.0.0",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/forms": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
     "nativescript-angular": "file:../nativescript-angular",
-    "rxjs": "~5.0.1",
-    "tns-core-modules": "internal-preview"
+    "rxjs": "~5.2.0",
+    "tns-core-modules": "internal-preview",
+    "zone.js": "~0.8.2"
   },
   "devDependencies": {
-    "zone.js": "~0.7.2",
     "babel-traverse": "6.9.0",
     "babel-types": "6.10.0",
     "babylon": "6.8.1",
@@ -45,15 +55,10 @@
     "nativescript-dev-typescript": "^0.3.1",
     "nativescript-dev-webpack": "0.0.13",
     "shelljs": "^0.7.0",
+    "tslint": "^4.5.1",
     "typescript": "~2.2.0"
   },
-  "nativescript": {
-    "id": "org.nativescript.ngsample",
-    "tns-android": {
-      "version": "2.5.0"
-    },
-    "tns-ios": {
-      "version": "2.4.0"
-    }
+  "scripts": {
+    "tslint": "tslint --project tsconfig.json --config tslint.json"
   }
 }
diff --git a/ng-sample/tslint.json b/ng-sample/tslint.json
new file mode 100644
index 000000000..6cab565e9
--- /dev/null
+++ b/ng-sample/tslint.json
@@ -0,0 +1,117 @@
+{
+  "rules":{
+   "no-any": false,
+    "no-inferrable-types": false,
+    "no-internal-module": true,
+    "no-var-requires": false,
+    "typedef": false,
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      },
+      {
+        "call-signature": "space",
+        "index-signature": "space",
+        "parameter": "space",
+        "property-declaration": "space",
+        "variable-declaration": "space"
+      }
+    ],
+
+    "ban": false,
+    "curly": true,
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-conditional-assignment": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-variable": true,
+    "no-empty": false,
+    "no-eval": true,
+    "no-null-keyword": false,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-switch-case-fall-through": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "radix": false,
+    "switch-default": true,
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "eofline": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "max-line-length": [
+      true,
+      120
+    ],
+    "no-require-imports": false,
+    "no-trailing-whitespace": true,
+    "object-literal-sort-keys": false,
+    "trailing-comma": [
+      true,
+      {
+        "multiline": false,
+        "singleline": "never"
+      }
+    ],
+
+    "align": false,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "interface-name": false,
+    "jsdoc-format": true,
+    "no-consecutive-blank-lines": [
+        true, 2
+    ],
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-finally",
+      "check-whitespace"
+    ],
+    "quotemark": [
+      true,
+      "double",
+      "avoid-escape"
+    ],
+    "semicolon": [true, "always"],
+    "variable-name": [
+      true,
+      "check-format",
+      "allow-leading-underscore",
+      "ban-keywords"
+    ],
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ]
+  }
+}
diff --git a/tests/app/first.component.ts b/tests/app/first.component.ts
index f7a803bcd..c9a8832ec 100644
--- a/tests/app/first.component.ts
+++ b/tests/app/first.component.ts
@@ -1,4 +1,4 @@
-import { Router, ActivatedRoute } from '@angular/router';
+import { Router, ActivatedRoute } from "@angular/router";
 import { Component, Inject } from "@angular/core";
 import { RouterExtensions } from "nativescript-angular/router";
 import { HOOKS_LOG, BaseComponent } from "./base.component";
@@ -37,6 +37,6 @@ export class FirstComponent extends BaseComponent {
     }
 
     gotoSecondAndClearHistory() {
-        this.routerExtensions.navigateByUrl("/second/" + this.id, { clearHistory: true })
+        this.routerExtensions.navigateByUrl("/second/" + this.id, { clearHistory: true });
     }
 }
diff --git a/tests/app/lazy-loaded.module.ts b/tests/app/lazy-loaded.module.ts
index aeffd82e1..b3b60b401 100644
--- a/tests/app/lazy-loaded.module.ts
+++ b/tests/app/lazy-loaded.module.ts
@@ -1,8 +1,8 @@
-import { NgModule } from '@angular/core';
+import { NgModule } from "@angular/core";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 
-import { SecondComponent } from './second.component';
+import { SecondComponent } from "./second.component";
 
 const routes = [
     { path: ":id", component: SecondComponent },
diff --git a/tests/app/main.ts b/tests/app/main.ts
index 1e56c11d1..a35eaf68e 100644
--- a/tests/app/main.ts
+++ b/tests/app/main.ts
@@ -1,8 +1,12 @@
-// "nativescript-angular/platform" import should be first in order to load some required settings (like globals and reflect-metadata)
+// "nativescript-angular/platform" import
+// should be first in order to load some required settings
+// (like globals and reflect-metadata)
+
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 import { NativeScriptRouterModule, NSModuleFactoryLoader } from "nativescript-angular/router";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
+
 import { AppComponent } from "./app.component";
 import { GestureComponent } from "./snippets/gestures.component";
 import { LayoutsComponent } from "./snippets/layouts.component";
@@ -30,9 +34,9 @@ import { rendererTraceCategory, routerTraceCategory } from "nativescript-angular
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 
 import trace = require("trace");
-// trace.setCategories(rendererTraceCategory + "," + routerTraceCategory);
-trace.setCategories(routerTraceCategory);
-trace.enable();
+trace.setCategories(rendererTraceCategory + "," + routerTraceCategory);
+// trace.setCategories(routerTraceCategory);
+// trace.enable();
 
 // nativeScriptBootstrap(GestureComponent);
 // nativeScriptBootstrap(LayoutsComponent);
@@ -147,19 +151,19 @@ application.start({
         page.content = root;
 
         let onLoadedHandler = function (args) {
-            page.off('loaded', onLoadedHandler);
-            //profiling.stop('application-start');
-            console.log('Page loaded');
+            page.off("loaded", onLoadedHandler);
+            // profiling.stop('application-start');
+            console.log("Page loaded");
 
-            //profiling.start('ng-bootstrap');
-            console.log('BOOTSTRAPPING TEST APPS...');
+            // profiling.start('ng-bootstrap');
+            console.log("BOOTSTRAPPING TEST APPS...");
 
             platform.bootstrapModule(SinglePageModule);
             platform.bootstrapModule(MultiPageModule);
             platform.bootstrapModule(LazyLoadModule);
-        }
+        };
 
-        page.on('loaded', onLoadedHandler);
+        page.on("loaded", onLoadedHandler);
 
         return page;
     }
diff --git a/tests/app/multi-page-main.component.ts b/tests/app/multi-page-main.component.ts
index 561e24bdb..96a143ecb 100644
--- a/tests/app/multi-page-main.component.ts
+++ b/tests/app/multi-page-main.component.ts
@@ -1,6 +1,6 @@
-import {Router} from '@angular/router';
+import {Router} from "@angular/router";
 import {Component, ElementRef} from "@angular/core";
-import {Location, LocationStrategy} from '@angular/common';
+import {Location, LocationStrategy} from "@angular/common";
 import {FirstComponent} from "./first.component";
 import {SecondComponent} from "./second.component";
 
diff --git a/tests/app/second.component.ts b/tests/app/second.component.ts
index ced31dca2..20f32305e 100644
--- a/tests/app/second.component.ts
+++ b/tests/app/second.component.ts
@@ -33,7 +33,9 @@ export class SecondComponent extends BaseComponent implements OnInit {
 
     ngOnInit() {
         super.ngOnInit();
-        this.routerLocationStrategystates = this.routerExtensions.locationStrategy._getStates().map(state => state.url).join(",");
+        this.routerLocationStrategystates = this.routerExtensions.locationStrategy
+            ._getStates()
+            .map(state => state.url).join(",");
     }
 
     goBack() {
diff --git a/tests/app/single-page-main.component.ts b/tests/app/single-page-main.component.ts
index 33d518729..6f7a6fefb 100644
--- a/tests/app/single-page-main.component.ts
+++ b/tests/app/single-page-main.component.ts
@@ -1,12 +1,20 @@
-import {Router} from '@angular/router';
+import {Router} from "@angular/router";
 import {Component, ElementRef} from "@angular/core";
-import {Location, LocationStrategy} from '@angular/common';
+import {Location, LocationStrategy} from "@angular/common";
 import {FirstComponent} from "./first.component";
 import {SecondComponent} from "./second.component";
 
 @Component({
     selector: "single-page-main",
     template: `
+    <ListView [items]="['lqlq', 'shalqlq']" class="list-group">
+        <ng-template let-item="item" let-odd="odd" let-even="even">
+          <StackLayout>
+            <Label [text]="item" class="list-group-item"></Label>
+          </StackLayout>
+        </ng-template>
+    </ListView>
+
     <Label text="Single-page router"></Label>
     <router-outlet></router-outlet>
     `
diff --git a/tests/app/snippets/gestures.component.ts b/tests/app/snippets/gestures.component.ts
index d13d4a628..743b9e1f4 100644
--- a/tests/app/snippets/gestures.component.ts
+++ b/tests/app/snippets/gestures.component.ts
@@ -10,56 +10,58 @@ import {
 @Component({
     selector: "gestures",
     templateUrl: "snippets/gestures.component.html",
-    styles:['label { font-size: 32; margin: 2; background-color: lightgreen;}']
+    styles: ["label { font-size: 32; margin: 2; background-color: lightgreen;}"]
 })
 export class GestureComponent {
-    
+
     // >> ng-tap-gesture
     onTap(args: GestureEventData) {
-        console.log("Tap!")
+        console.log("Tap!");
     }
     // << ng-tap-gesture
-    
+
     // >> ng-double-tap-gesture
     onDoubleTap(args: GestureEventData) {
-        console.log("DoubleTap!")
+        console.log("DoubleTap!");
 
     }
     // << ng-double-tap-gesture
-    
+
     // >> ng-long-press-gesture
     onLongPress(args: GestureEventData) {
-        console.log("LongPress!")
+        console.log("LongPress!");
     }
     // << ng-long-press-gesture
-    
+
     // >> ng-swipe-gesture
     onSwipe(args: SwipeGestureEventData) {
         console.log("Swipe Direction: " + args.direction);
     }
     // << ng-swipe-gesture
-    
+
     // >> ng-pan-gesture
     onPan(args: PanGestureEventData) {
         console.log("Pan delta: [" + args.deltaX + ", " + args.deltaY + "] state: " + args.state);
     }
     // << ng-pan-gesture
-    
+
     // >> ng-pinch-gesture
     onPinch(args: PinchGestureEventData) {
         console.log("Pinch scale: " + args.scale + " state: " + args.state);
     }
     // << ng-pinch-gesture
-    
+
     // >> ng-rotate-gesture
     onRotate(args: RotationGestureEventData) {
         console.log("Rotate angle: " + args.rotation + " state: " + args.state);
     }
     // << ng-rotate-gesture
-    
+
     // >> ng-touch-gesture
     onTouch(args: TouchGestureEventData) {
-        console.log("Touch point: [" + args.getX() + ", " + args.getY() + "] activePointers: " + args.getActivePointers().length);
-    } 
+        console.log(
+            "Touch point: [" + args.getX() + ", " + args.getY() +
+            "] activePointers: " + args.getActivePointers().length);
+    }
     // << ng-touch-gesture
 }
diff --git a/tests/app/snippets/icon-font.component.ts b/tests/app/snippets/icon-font.component.ts
index 4cc084642..64fdc5e7f 100644
--- a/tests/app/snippets/icon-font.component.ts
+++ b/tests/app/snippets/icon-font.component.ts
@@ -1,7 +1,7 @@
 import {Component} from "@angular/core";
 
 // >> icon-font-sample
-@Component({ 
+@Component({
     // >> (hide)
     selector: "icon-font",
     templateUrl: "snippets/icon-font.component.html",
@@ -12,11 +12,11 @@ import {Component} from "@angular/core";
 export class IconFontComponent {
     public glyphs = new Array<{ icon: string, code: string }>();
     constructor() {
-        for (var charCode = 0xe903; charCode <= 0xeaea; charCode++) {
-            var glyph = {
+        for (let charCode = 0xe903; charCode <= 0xeaea; charCode++) {
+            let glyph = {
                 icon: String.fromCharCode(charCode),
                 code: charCode.toString(16)
-            }
+            };
             this.glyphs.push(glyph);
         }
     }
diff --git a/tests/app/snippets/layouts.component.ts b/tests/app/snippets/layouts.component.ts
index 32196b7d8..5912f1a27 100644
--- a/tests/app/snippets/layouts.component.ts
+++ b/tests/app/snippets/layouts.component.ts
@@ -3,14 +3,14 @@ import {Component} from "@angular/core";
 @Component({
     selector: "gestures",
     templateUrl: "snippets/layouts.component.html",
-    styles:[
-        'Image { background-color: coral }',
-        '.title { margin: 10; horizontal-align: center; font-size: 32 }',
-        '#main > AbsoluteLayout { margin: 10 }',
-        '#main > DockLayout { margin: 10 }',
-        '#main > GridLayout { margin: 10 }',
-        '#main > StackLayout { margin: 10 }',
-        '#main > WrapLayout { margin: 10 }'
+    styles: [
+        "Image { background-color: coral }",
+        ".title { margin: 10; horizontal-align: center; font-size: 32 }",
+        "#main > AbsoluteLayout { margin: 10 }",
+        "#main > DockLayout { margin: 10 }",
+        "#main > GridLayout { margin: 10 }",
+        "#main > StackLayout { margin: 10 }",
+        "#main > WrapLayout { margin: 10 }"
     ]
 })
 export class LayoutsComponent {
diff --git a/tests/app/snippets/list-view/template-selector.component.ts b/tests/app/snippets/list-view/template-selector.component.ts
index 4d12fb3ee..525724b8f 100644
--- a/tests/app/snippets/list-view/template-selector.component.ts
+++ b/tests/app/snippets/list-view/template-selector.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, Injectable } from '@angular/core';
+import { Component, Input, Injectable } from "@angular/core";
 
 class DataItem {
     private static count = 0;
@@ -9,7 +9,7 @@ class DataItem {
 }
 
 @Component({
-    selector: 'header-component',
+    selector: "header-component",
     template: `<Label [text]='"HEADER: " +data.name'></Label>`
 })
 export class HeaderComponent {
@@ -17,7 +17,7 @@ export class HeaderComponent {
 }
 
 @Component({
-    selector: 'item-component',
+    selector: "item-component",
     template: `<Label [text]='"ITEM: " + data.name'></Label>`
 })
 export class ItemComponent {
@@ -41,7 +41,7 @@ export class DataService {
 
 @Component({
     moduleId: module.id,
-    selector: 'list-test',
+    selector: "list-test",
     templateUrl: "./template-selector.component.html"
 })
 // >> list-view-template-selector
@@ -59,4 +59,5 @@ export class ListTemplateSelectorTest {
         this.myItems = this.dataService.getItems();
     }
 }
-// << list-view-template-selector
\ No newline at end of file
+// << list-view-template-selector
+
diff --git a/tests/app/snippets/navigation/page-outlet.ts b/tests/app/snippets/navigation/page-outlet.ts
index abfde2259..75354b5f6 100644
--- a/tests/app/snippets/navigation/page-outlet.ts
+++ b/tests/app/snippets/navigation/page-outlet.ts
@@ -1,16 +1,17 @@
 import { TestApp, registerTestApp } from "../../tests/test-app";
-import { ApplicationRef } from '@angular/core';
+import { ApplicationRef } from "@angular/core";
 import { Router, NavigationStart, NavigationEnd } from "@angular/router";
 // >> page-outlet-example
+import { Component, NgModule } from "@angular/core";
 import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
-import { Component, NgModule } from '@angular/core';
 import { NativeScriptRouterModule } from "nativescript-angular/router";
+
 import { routes } from "./app.routes";
 import { FirstComponent, SecondComponent } from "./navigation-common";
 
 @Component({
-    selector: 'page-navigation-test',
+    selector: "page-navigation-test",
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class PageNavigationApp {
@@ -29,7 +30,7 @@ export class PageNavigationApp {
                     this.startEvent = e;
                 }
                 if (e instanceof NavigationEnd) {
-                    this.endEvent = e
+                    this.endEvent = e;
                     resolve();
                 }
             });
diff --git a/tests/app/snippets/navigation/route-params.ts b/tests/app/snippets/navigation/route-params.ts
index ee72928c1..a70839ed6 100644
--- a/tests/app/snippets/navigation/route-params.ts
+++ b/tests/app/snippets/navigation/route-params.ts
@@ -1,10 +1,10 @@
 // >> router-params-activated-route
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute } from "@angular/router";
 class MyComponent {
   id: number;
   constructor(private route: ActivatedRoute) {
     this.route.params
-      .forEach((params) => { this.id = +params['id']; });
+      .forEach((params) => { this.id = +params["id"]; });
   }
 }
 // << router-params-activated-route
@@ -20,7 +20,8 @@ class MyPageComponent {
     // use switchMap to get the latest activatedRoute instance
     this.pageRoute.activatedRoute
       .switchMap(activatedRoute => activatedRoute.params)
-      .forEach((params) => { this.id = +params['id']; });
+      .forEach((params) => { this.id = +params["id"]; });
   }
 }
-// << router-params-page-route
\ No newline at end of file
+// << router-params-page-route
+
diff --git a/tests/app/snippets/navigation/router-extensions.ts b/tests/app/snippets/navigation/router-extensions.ts
index a7bfb35cd..bb72a6d2a 100644
--- a/tests/app/snippets/navigation/router-extensions.ts
+++ b/tests/app/snippets/navigation/router-extensions.ts
@@ -1,11 +1,11 @@
 import { Component } from "@angular/core";
-import { RouterExtensions } from 'nativescript-angular/router';
+import { RouterExtensions } from "nativescript-angular/router";
 
 @Component({
     // ...
     // >> (hide)
     selector: "router-extensions-import",
-    templateUrl: 'snippets/navigation/router-extensions.html'
+    templateUrl: "snippets/navigation/router-extensions.html"
     // << (hide)
 })
 export class MyComponent {
@@ -47,7 +47,7 @@ export class MyComponent {
 @Component({
     // ...
     // >> (hide)
-    selector: 'component',
+    selector: "component",
     template: `<StackLayout><Label text="Main Page"></Label></StackLayout>`
     // << (hide)
 })
@@ -59,7 +59,7 @@ export class MainComponent {
 // << router-extensions-import
 
 @Component({
-    selector: 'application',
+    selector: "application",
     template: "<page-router-outlet></page-router-outlet>"
 })
 export class App { }
diff --git a/tests/app/snippets/navigation/router-outlet.ts b/tests/app/snippets/navigation/router-outlet.ts
index f1f228b10..bfd50fafc 100644
--- a/tests/app/snippets/navigation/router-outlet.ts
+++ b/tests/app/snippets/navigation/router-outlet.ts
@@ -1,15 +1,15 @@
 import {TestApp, registerTestApp} from "../../tests/test-app";
-import { ApplicationRef } from '@angular/core';
+import { ApplicationRef } from "@angular/core";
 // >> router-outlet-example
-import { Component, NgModule } from '@angular/core';
+import { Component, NgModule } from "@angular/core";
 import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { Router, NavigationStart, NavigationEnd } from '@angular/router';
+import { Router, NavigationStart, NavigationEnd } from "@angular/router";
 import { routes } from "./app.routes";
 import {FirstComponent, SecondComponent} from "./navigation-common";
 
 @Component({
-    selector: 'navigation-test',
+    selector: "navigation-test",
     template: `
         <StackLayout>
             <StackLayout class="nav">
@@ -38,7 +38,7 @@ export class NavigationApp {
                     this.startEvent = e;
                 }
                 if (e instanceof NavigationEnd) {
-                    this.endEvent = e
+                    this.endEvent = e;
                     resolve();
                 }
             });
diff --git a/tests/app/tests/detached-loader-tests.ts b/tests/app/tests/detached-loader-tests.ts
index a93b02449..014217e35 100644
--- a/tests/app/tests/detached-loader-tests.ts
+++ b/tests/app/tests/detached-loader-tests.ts
@@ -1,7 +1,15 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {TestApp} from "./test-app";
-import {Component, ElementRef, Renderer, AfterViewInit, OnInit, ViewChild, ChangeDetectionStrategy} from "@angular/core";
+import {
+    Component,
+    ElementRef,
+    Renderer,
+    AfterViewInit,
+    OnInit,
+    ViewChild,
+    ChangeDetectionStrategy
+} from "@angular/core";
 import {ProxyViewContainer} from "ui/proxy-view-container";
 import {Red} from "color/known-colors";
 import {dumpView} from "./test-utils";
@@ -23,7 +31,7 @@ class LoaderComponentBase {
     constructor() {
         this.ready = new Promise((reslove, reject) => {
             this.resolve = reslove;
-        })
+        });
     }
     ngAfterViewInit() {
         console.log("!!! ngAfterViewInit -> loader: " + this.loader);
@@ -32,7 +40,7 @@ class LoaderComponentBase {
 }
 
 @Component({
-    selector: 'loader-component-on-push',
+    selector: "loader-component-on-push",
     template: `
     <StackLayout>
         <DetachedContainer #loader></DetachedContainer>
@@ -42,7 +50,7 @@ class LoaderComponentBase {
 export class LoaderComponent extends LoaderComponentBase { }
 
 @Component({
-    selector: 'loader-component-on-push',
+    selector: "loader-component-on-push",
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
     <StackLayout>
@@ -52,14 +60,14 @@ export class LoaderComponent extends LoaderComponentBase { }
 })
 export class LoaderComponentOnPush extends LoaderComponentBase { }
 
-describe('DetachedLoader', () => {
+describe("DetachedLoader", () => {
     let testApp: TestApp = null;
 
     before(() => {
         return TestApp.create([], [LoaderComponent, LoaderComponentOnPush, TestComponent]).then((app) => {
             console.log("TEST APP: " + app);
             testApp = app;
-        })
+        });
     });
 
     after(() => {
@@ -90,7 +98,7 @@ describe('DetachedLoader', () => {
     it("creates component when ChangeDetectionStrategy is OnPush", (done) => {
         testApp.loadComponent(LoaderComponentOnPush)
             .then((componentRef) => {
-                // wait for the ngAfterViewInit                
+                // wait for the ngAfterViewInit
                 return (<LoaderComponentOnPush>componentRef.instance).ready;
             })
             .then((comp) => {
@@ -102,4 +110,4 @@ describe('DetachedLoader', () => {
             })
             .catch(done);
     });
-})
+});
diff --git a/tests/app/tests/http.ts b/tests/app/tests/http.ts
index 0adfd9b88..b9456f95f 100644
--- a/tests/app/tests/http.ts
+++ b/tests/app/tests/http.ts
@@ -1,16 +1,16 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {
     async,
     inject,
-} from '@angular/core/testing';
-import {ReflectiveInjector} from '@angular/core';
-import {BaseRequestOptions, ConnectionBackend, Http, Response, ResponseOptions} from '@angular/http';
-import 'rxjs/add/operator/map';
-import {MockBackend} from '@angular/http/testing';
+} from "@angular/core/testing";
+import {ReflectiveInjector} from "@angular/core";
+import {BaseRequestOptions, ConnectionBackend, Http, Response, ResponseOptions} from "@angular/http";
+import "rxjs/add/operator/map";
+import {MockBackend} from "@angular/http/testing";
 import {NSHttp} from "nativescript-angular/http/ns-http";
 import {NSFileSystem} from "nativescript-angular/file-system/ns-file-system";
-import {NSFileSystemMock, FileResponses} from './mocks/ns-file-system.mock';
+import {NSFileSystemMock, FileResponses} from "./mocks/ns-file-system.mock";
 
 describe("Http", () => {
     let http: Http;
@@ -22,11 +22,14 @@ describe("Http", () => {
             MockBackend,
             { provide: NSFileSystem, useClass: NSFileSystemMock },
             {
-              provide: Http, 
-              useFactory: function (backend: ConnectionBackend, defaultOptions: BaseRequestOptions, nsFileSystem: NSFileSystem) {
-                //HACK: cast backend to any to work around an angular typings problem
-                return new NSHttp(<any>backend, defaultOptions, nsFileSystem);
-              },
+              provide: Http,
+              useFactory: function (
+                  connectionBackend: ConnectionBackend,
+                  defaultOptions: BaseRequestOptions,
+                  nsFileSystem: NSFileSystem) {
+                    // HACK: cast backend to any to work around an angular typings problem
+                    return new NSHttp(<any>connectionBackend, defaultOptions, nsFileSystem);
+                  },
               deps: [MockBackend, BaseRequestOptions, NSFileSystem]
             }
         ]);
@@ -36,25 +39,25 @@ describe("Http", () => {
     });
 
     it("should work with local files prefixed with '~'", () => {
-        http.get('~/test.json').map(res => res.json()).subscribe((response: any) => {
+        http.get("~/test.json").map(res => res.json()).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
-            assert.strictEqual('Alex', response[0].name);
+            assert.strictEqual("Alex", response[0].name);
         });
     });
 
     it("should work with local files prefixed with '/'", () => {
-        http.get('/test.json').map(res => res.json()).subscribe((response: any) => {
+        http.get("/test.json").map(res => res.json()).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
-            assert.strictEqual('Panayot', response[2].name);
+            assert.strictEqual("Panayot", response[2].name);
         });
     });
 
     it("should work with remote files", () => {
         let connection: any;
         backend.connections.subscribe((c: any) => connection = c);
-        http.get('http://www.nativescript.org/test.json').map(res => res.json()).subscribe((response: any) => {
+        http.get("http://www.nativescript.org/test.json").map(res => res.json()).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
-            assert.strictEqual('Rosen', response[1].name);
+            assert.strictEqual("Rosen", response[1].name);
         });
         connection.mockRespond(new Response(new ResponseOptions({ body: FileResponses.AWESOME_TEAM })));
     });
diff --git a/tests/app/tests/list-view-tests.ts b/tests/app/tests/list-view-tests.ts
index cd5dfba39..8237d5882 100644
--- a/tests/app/tests/list-view-tests.ts
+++ b/tests/app/tests/list-view-tests.ts
@@ -40,7 +40,7 @@ export class TestListViewComponent {
 }
 
 @Component({
-    selector: 'item-component',
+    selector: "item-component",
     template: `<Label text="template"></Label>`
 })
 export class ItemTemplateComponent {
@@ -56,7 +56,7 @@ export class ItemTemplateComponent {
 }
 
 @Component({
-    selector: 'list-with-template-selector',
+    selector: "list-with-template-selector",
     template: `
     <GridLayout>
         <ListView [items]="myItems" [itemTemplateSelector]="templateSelector">
@@ -82,7 +82,11 @@ describe("ListView-tests", () => {
     let testApp: TestApp = null;
 
     before(() => {
-        return TestApp.create([], [TestListViewComponent, TestListViewSelectorComponent, ItemTemplateComponent]).then((app) => {
+        return TestApp.create([], [
+            TestListViewComponent,
+            TestListViewSelectorComponent,
+            ItemTemplateComponent
+        ]).then((app) => {
             testApp = app;
         });
     });
diff --git a/tests/app/tests/mocks/ns-file-system.mock.ts b/tests/app/tests/mocks/ns-file-system.mock.ts
index 809936f16..0f841aff5 100644
--- a/tests/app/tests/mocks/ns-file-system.mock.ts
+++ b/tests/app/tests/mocks/ns-file-system.mock.ts
@@ -1,5 +1,5 @@
-import {Injectable} from '@angular/core';
-import {ResponseType, Response, ResponseOptions} from '@angular/http';
+import {Injectable} from "@angular/core";
+import {ResponseType, Response, ResponseOptions} from "@angular/http";
 
 export class FileResponses {
   public static AWESOME_TEAM: string = '[{"name":"Alex"}, {"name":"Rosen"}, {"name":"Panayot"}]';
@@ -10,11 +10,11 @@ class Folder {
   public getFile(url: string): any {
     let data;
     switch (url) {
-      case 'test.json':
+      case "test.json":
         data = FileResponses.AWESOME_TEAM;
         break;
       default:
-        throw (new Error('Unsupported file for the testing mock - ns-file-system-mock'));
+        throw (new Error("Unsupported file for the testing mock - ns-file-system-mock"));
     }
     return {
       readText: () => {
@@ -22,7 +22,7 @@ class Folder {
           resolve(data);
         });
       }
-    }
+    };
   }
 }
 
@@ -32,4 +32,5 @@ export class NSFileSystemMock {
   public currentApp(): Folder {
     return new Folder();
   }
-}
\ No newline at end of file
+}
+
diff --git a/tests/app/tests/modal-dialog.ts b/tests/app/tests/modal-dialog.ts
index 93a35ee3e..c14a13f36 100644
--- a/tests/app/tests/modal-dialog.ts
+++ b/tests/app/tests/modal-dialog.ts
@@ -1,4 +1,4 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
 import { TestApp } from "./test-app";
 import { Component, ViewContainerRef } from "@angular/core";
@@ -46,7 +46,7 @@ export class SuccessComponent {
     }
 }
 
-describe('modal-dialog', () => {
+describe("modal-dialog", () => {
     let testApp: TestApp = null;
 
     before((done) => {
@@ -77,7 +77,9 @@ describe('modal-dialog', () => {
         testApp.loadComponent(FailComponent)
             .then((ref) => {
                 const service = <ModalDialogService>ref.instance.service;
-                assert.throws(() => service.showModal(ModalComponent, {}), "No viewContainerRef: Make sure you pass viewContainerRef in ModalDialogOptions.");
+                assert.throws(() => service.showModal(ModalComponent, {}),
+                              "No viewContainerRef: Make sure you pass viewContainerRef in ModalDialogOptions."
+                             );
             }).then(() => done(), err => done(err));
     });
 
diff --git a/tests/app/tests/ns-location-strategy.ts b/tests/app/tests/ns-location-strategy.ts
index 176cf2ba1..3a89ff541 100644
--- a/tests/app/tests/ns-location-strategy.ts
+++ b/tests/app/tests/ns-location-strategy.ts
@@ -1,4 +1,4 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
 import { NSLocationStrategy, LocationState } from "nativescript-angular/router/ns-location-strategy";
 import { Frame, BackstackEntry, NavigationEntry } from "ui/frame";
@@ -60,7 +60,10 @@ function assertStatesEqual(actual: Array<LocationState>, expected: Array<Locatio
     for (let i = 0; i < actual.length; i++) {
         assert.deepEqual(
             actual[i], expected[i],
-            `State[${i}] does not match!\n  actual: ${JSON.stringify(actual[i])}\nexpected: ${JSON.stringify(expected[i])}`);
+            `State[${i}] does not match!
+    actual: ${JSON.stringify(actual[i])}
+    expected: ${JSON.stringify(expected[i])}
+            `);
     }
 }
 
@@ -85,7 +88,7 @@ function simulatePageBack(strategy: NSLocationStrategy) {
     strategy._finishBackPageNavigation();
 }
 
-describe('NSLocationStrategy', () => {
+describe("NSLocationStrategy", () => {
 
     it("initial path() value", () => {
         const strategy = new NSLocationStrategy(new FakeFrame());
diff --git a/tests/app/tests/platform-filter-components.ts b/tests/app/tests/platform-filter-components.ts
index ebf0d1be5..5665e1364 100644
--- a/tests/app/tests/platform-filter-components.ts
+++ b/tests/app/tests/platform-filter-components.ts
@@ -1,4 +1,4 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
 import { Component, ElementRef } from "@angular/core";
 import { dumpView, createDevice } from "./test-utils";
@@ -36,12 +36,16 @@ export class PlatformSpecificAttributeComponent {
     constructor(public elementRef: ElementRef) { }
 }
 
-describe('Platform filter directives', () => {
-    describe('on IOS device', () => {
+describe("Platform filter directives", () => {
+    describe("on IOS device", () => {
         let testApp: TestApp = null;
 
         before(() => {
-            return TestApp.create([{ provide: DEVICE, useValue: createDevice(platformNames.ios) }], [PlatformSpecificAttributeComponent, AndroidSpecificComponent, IosSpecificComponent]).then((app) => {
+            return TestApp.create([{ provide: DEVICE, useValue: createDevice(platformNames.ios) }], [
+                PlatformSpecificAttributeComponent,
+                AndroidSpecificComponent,
+                IosSpecificComponent
+            ]).then((app) => {
                 testApp = app;
             });
         });
@@ -75,11 +79,15 @@ describe('Platform filter directives', () => {
         });
     });
 
-    describe('on Android device', () => {
+    describe("on Android device", () => {
         let testApp: TestApp = null;
 
         before(() => {
-            return TestApp.create([{ provide: DEVICE, useValue: createDevice(platformNames.android) }], [AndroidSpecificComponent, IosSpecificComponent, PlatformSpecificAttributeComponent]).then((app) => {
+            return TestApp.create([{ provide: DEVICE, useValue: createDevice(platformNames.android) }], [
+                AndroidSpecificComponent,
+                IosSpecificComponent,
+                PlatformSpecificAttributeComponent
+            ]).then((app) => {
                 testApp = app;
             });
         });
diff --git a/tests/app/tests/property-sets.ts b/tests/app/tests/property-sets.ts
index de3364fc6..88472109e 100644
--- a/tests/app/tests/property-sets.ts
+++ b/tests/app/tests/property-sets.ts
@@ -1,4 +1,4 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {View} from "ui/core/view";
 import {ViewUtil} from "nativescript-angular/view-util";
@@ -9,6 +9,7 @@ import {createDevice} from "./test-utils";
 
 class TestView extends View implements ViewExtensions {
     public nodeName: string = "TestView";
+    public nodeType: number = 1;
     public templateParent: NgView = null;
     public meta: ViewClassMeta = { skipAddToDom: false };
     public ngCssClasses: Map<string, boolean> = new Map<string, boolean>();
@@ -23,19 +24,19 @@ class TestView extends View implements ViewExtensions {
 const iosDevice = createDevice(platformNames.ios);
 const androidDevice = createDevice(platformNames.android);
 
-describe('setting View properties', () => {
+describe("setting View properties", () => {
     let viewUtil: ViewUtil;
     before(() => {
         viewUtil = new ViewUtil(device);
     });
 
-    it('preserves string values', () => {
+    it("preserves string values", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "stringValue", "blah");
         assert.equal("blah", view.stringValue);
     });
 
-    it('converts number values', () => {
+    it("converts number values", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "numValue", "42");
         assert.strictEqual(42, view.numValue);
@@ -43,7 +44,7 @@ describe('setting View properties', () => {
         assert.strictEqual(0, view.numValue);
     });
 
-    it('converts boolean values', () => {
+    it("converts boolean values", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "boolValue", "true");
         assert.strictEqual(true, view.boolValue);
@@ -51,19 +52,19 @@ describe('setting View properties', () => {
         assert.strictEqual(false, view.boolValue);
     });
 
-    it('sets style values', () => {
+    it("sets style values", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "style", "color: red");
         assert.equal(Red, view.style.color.hex);
     });
 
-    it('doesn\'t convert blank strings', () => {
+    it("doesn\'t convert blank strings", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "stringValue", "");
         assert.strictEqual("", view.stringValue);
     });
 
-    it('doesn\'t convert booleans', () => {
+    it("doesn\'t convert booleans", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "boolValue", true);
         assert.strictEqual(true, view.boolValue);
@@ -71,44 +72,45 @@ describe('setting View properties', () => {
         assert.strictEqual(false, view.boolValue);
     });
 
-    it('preserves objects', () => {
+    it("preserves objects", () => {
         let value = { name: "Jim", age: 23 };
         let view = new TestView();
         viewUtil.setProperty(view, "anyValue", value);
         assert.deepEqual(value, view.anyValue);
     });
 
-    it('sets nested properties', () => {
+    it("sets nested properties", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "nested.property", "blah");
         assert.strictEqual("blah", view.nested.property);
     });
 
-    it('sets ios property in ios', () => {
+    it("sets ios property in ios", () => {
         let view = new TestView();
         let testUtil = new ViewUtil(iosDevice);
-        testUtil.setProperty(view, ":ios:anyValue", "blah");
+        testUtil.setProperty(view, "anyValue", "blah", "ios");
         assert.strictEqual("blah", view.anyValue);
     });
 
-    it('doesn\'t set android property in ios', () => {
+    it("doesn\'t set android property in ios", () => {
         let view = new TestView();
         let testUtil = new ViewUtil(iosDevice);
-        testUtil.setProperty(view, ":android:anyValue", "blah");
+        testUtil.setProperty(view, "anyValue", "blah", "android");
         assert.isUndefined(view.anyValue);
     });
 
-    it('sets android property in android', () => {
+    it("sets android property in android", () => {
         let view = new TestView();
         let testUtil = new ViewUtil(androidDevice);
-        testUtil.setProperty(view, ":android:anyValue", "blah");
+        testUtil.setProperty(view, "anyValue", "blah", "android");
         assert.strictEqual("blah", view.anyValue);
     });
 
-    it('doesn\'t set ios property in android', () => {
+    it("doesn\'t set ios property in android", () => {
         let view = new TestView();
         let testUtil = new ViewUtil(androidDevice);
-        testUtil.setProperty(view, ":ios:anyValue", "blah");
+        testUtil.setProperty(view, "anyValue", "blah", "ios");
         assert.isUndefined(view.anyValue);
     });
 });
+
diff --git a/tests/app/tests/renderer-tests.ts b/tests/app/tests/renderer-tests.ts
index fb60eaac6..779c79cee 100644
--- a/tests/app/tests/renderer-tests.ts
+++ b/tests/app/tests/renderer-tests.ts
@@ -1,6 +1,6 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
-import { Component, ElementRef, Renderer, NgZone } from "@angular/core";
+import { Component, ElementRef, Renderer2, NgZone } from "@angular/core";
 import { ProxyViewContainer } from "ui/proxy-view-container";
 import { Red } from "color/known-colors";
 import { dumpView } from "./test-utils";
@@ -104,7 +104,7 @@ export class NgForLabel {
     }
 }
 
-describe('Renderer E2E', () => {
+describe("Renderer E2E", () => {
     let testApp: TestApp = null;
 
     before(() => {
@@ -144,7 +144,9 @@ describe('Renderer E2E', () => {
     it("projects content into components", () => {
         return testApp.loadComponent(ProjectionContainer).then((componentRef) => {
             const componentRoot = componentRef.instance.elementRef.nativeElement;
-            assert.equal("(ProxyViewContainer (GridLayout (ProxyViewContainer (StackLayout (Button)))))", dumpView(componentRoot));
+            assert.equal(
+                "(ProxyViewContainer (GridLayout (ProxyViewContainer (StackLayout (Button)))))",
+                 dumpView(componentRoot));
         });
     });
 
@@ -212,7 +214,7 @@ describe('Renderer E2E', () => {
         it("ngIf hides component when false", () => {
             return testApp.loadComponent(NgIfLabel).then((componentRef) => {
                 const componentRoot = componentRef.instance.elementRef.nativeElement;
-                assert.equal("(ProxyViewContainer (template))", dumpView(componentRoot));
+                assert.equal("(ProxyViewContainer (#comment))", dumpView(componentRoot));
             });
         });
 
@@ -223,14 +225,16 @@ describe('Renderer E2E', () => {
 
                 component.show = true;
                 testApp.appRef.tick();
-                assert.equal("(ProxyViewContainer (template), (Label))", dumpView(componentRoot));
+                assert.equal("(ProxyViewContainer (#comment), (Label))", dumpView(componentRoot));
             });
         });
 
         it("ngFor creates element for each item", () => {
             return testApp.loadComponent(NgForLabel).then((componentRef) => {
                 const componentRoot = componentRef.instance.elementRef.nativeElement;
-                assert.equal("(ProxyViewContainer (template), (Label[text=one]), (Label[text=two]), (Label[text=three]))", dumpView(componentRoot, true));
+                assert.equal(
+                    "(ProxyViewContainer (#comment), (Label[text=one]), (Label[text=two]), (Label[text=three]))",
+                    dumpView(componentRoot, true));
             });
         });
 
@@ -242,7 +246,9 @@ describe('Renderer E2E', () => {
                 component.items.splice(1, 1);
                 testApp.appRef.tick();
 
-                assert.equal("(ProxyViewContainer (template), (Label[text=one]), (Label[text=three]))", dumpView(componentRoot, true));
+                assert.equal(
+                    "(ProxyViewContainer (#comment), (Label[text=one]), (Label[text=three]))",
+                    dumpView(componentRoot, true));
             });
         });
 
@@ -254,15 +260,18 @@ describe('Renderer E2E', () => {
                 component.items.splice(1, 0, "new");
                 testApp.appRef.tick();
 
-                assert.equal("(ProxyViewContainer (template), (Label[text=one]), (Label[text=new]), (Label[text=two]), (Label[text=three]))", dumpView(componentRoot, true));
+                assert.equal(
+                    "(ProxyViewContainer (#comment), " +
+                    "(Label[text=one]), (Label[text=new]), (Label[text=two]), (Label[text=three]))",
+                    dumpView(componentRoot, true));
             });
         });
     });
 });
 
-describe('Renderer createElement', () => {
+describe("Renderer createElement", () => {
     let testApp: TestApp = null;
-    let renderer: Renderer = null;
+    let renderer: Renderer2 = null;
 
     before(() => {
         return TestApp.create().then((app) => {
@@ -276,30 +285,30 @@ describe('Renderer createElement', () => {
     });
 
     it("creates element from CamelCase", () => {
-        const result = renderer.createElement(null, "StackLayout", null);
-        assert.instanceOf(result, StackLayout, "Renderer should create StackLayout form 'StackLayout'")
+        const result = renderer.createElement("StackLayout");
+        assert.instanceOf(result, StackLayout, "Renderer should create StackLayout form 'StackLayout'");
     });
 
     it("creates element from lowercase", () => {
-        const result = renderer.createElement(null, "stacklayout", null);
-        assert.instanceOf(result, StackLayout, "Renderer should create StackLayout form 'stacklayout'")
+        const result = renderer.createElement("stacklayout");
+        assert.instanceOf(result, StackLayout, "Renderer should create StackLayout form 'stacklayout'");
     });
 
     it("creates element from kebab-case", () => {
-        const result = renderer.createElement(null, "stack-layout", null);
-        assert.instanceOf(result, StackLayout, "Renderer should create StackLayout form 'stack-layout'")
+        const result = renderer.createElement("stack-layout");
+        assert.instanceOf(result, StackLayout, "Renderer should create StackLayout form 'stack-layout'");
     });
 
     it("creates ProxyViewContainer for unknownTag", () => {
-        const result = renderer.createElement(null, "unknown-tag", null);
-        assert.instanceOf(result, ProxyViewContainer, "Renderer should create ProxyViewContainer form 'unknown-tag'")
+        const result = renderer.createElement("unknown-tag");
+        assert.instanceOf(result, ProxyViewContainer, "Renderer should create ProxyViewContainer form 'unknown-tag'");
     });
 });
 
 
-describe('Renderer attach/detach', () => {
+describe("Renderer attach/detach", () => {
     let testApp: TestApp = null;
-    let renderer: Renderer = null;
+    let renderer: Renderer2 = null;
 
     before(() => {
         return TestApp.create().then((app) => {
@@ -313,64 +322,57 @@ describe('Renderer attach/detach', () => {
     });
 
     it("createElement element with parent attaches element to content view", () => {
-        const parent = <ContentView>renderer.createElement(null, "ContentView", null);
-        const button = <Button>renderer.createElement(parent, "Button", null);
+        const parent = <ContentView>renderer.createElement("ContentView");
+        const button = <Button>renderer.createElement("Button");
+        renderer.appendChild(parent, button);
 
         assert.equal(parent.content, button);
         assert.equal(button.parent, parent);
     });
 
     it("createElement element with parent attaches element to layout view", () => {
-        const parent = <StackLayout>renderer.createElement(null, "StackLayout", null);
-        const button = <Button>renderer.createElement(parent, "Button", null);
+        const parent = <StackLayout>renderer.createElement("StackLayout");
+        const button = <Button>renderer.createElement("Button");
+        renderer.appendChild(parent, button);
 
         assert.equal(parent.getChildAt(0), button);
         assert.equal(button.parent, parent);
     });
 
     it("detachView element removes element from content view", () => {
-        const parent = <ContentView>renderer.createElement(null, "ContentView", null);
-        const button = <Button>renderer.createElement(parent, "Button", null);
+        const parent = <ContentView>renderer.createElement("ContentView");
+        const button = <Button>renderer.createElement("Button");
+        renderer.appendChild(parent, button);
 
-        renderer.detachView([button]);
+        renderer.removeChild(parent, button);
 
         assert.isNull(parent.content);
         assert.isUndefined(button.parent);
     });
 
     it("detachView element removes element from layout view", () => {
-        const parent = <StackLayout>renderer.createElement(null, "StackLayout", null);
-        const button = <Button>renderer.createElement(parent, "Button", null);
+        const parent = <StackLayout>renderer.createElement("StackLayout");
+        const button = <Button>renderer.createElement("Button");
+        renderer.appendChild(parent, button);
 
-        renderer.detachView([button]);
+        renderer.removeChild(parent, button);
 
         assert.equal(parent.getChildrenCount(), 0);
         assert.isUndefined(button.parent);
     });
 
-    it("attaching template anchor in content view does not replace its content", () => {
-        const parent = <ContentView>renderer.createElement(null, "ContentView", null);
-        const button = <Button>renderer.createElement(parent, "Button", null);
+    it("attaching and detaching comment anchor to content view does not affect its content", () => {
+        const parent = <ContentView>renderer.createElement("ContentView");
+        const button = <Button>renderer.createElement("Button");
+        renderer.appendChild(parent, button);
+        const anchor = <NgView>renderer.createComment("anchor");
+        assert.equal(parent.content, button, "parent has button as initial content");
 
-        assert.equal(parent.content, button);
-
-        const anchor = <NgView>renderer.createTemplateAnchor(parent);
+        renderer.appendChild(parent, anchor);
+        assert.equal(parent.content, button, "parent still has button as content after inserting anchor");
 
-        assert.equal(parent.content, button);
-        assert.equal(anchor.parent, parent);
-        assert.equal(anchor.templateParent, parent);
+        renderer.removeChild(parent, anchor);
+        assert.equal(parent.content, button, "parent has button as content even after removing anchor");
     });
+});
 
-    it("attaching and detaching template anchor to content view does not affect its content", () => {
-        const parent = <ContentView>renderer.createElement(null, "ContentView", null);
-        const button = <Button>renderer.createElement(parent, "Button", null);
-        const anchor = <NgView>renderer.createTemplateAnchor(null);
-        assert.equal(parent.content, button);
-
-        renderer.attachViewAfter(button, [anchor]);
-        assert.equal(parent.content, button);
-
-        renderer.detachView([anchor]);
-        assert.equal(parent.content, button);
-    });
-});
\ No newline at end of file
diff --git a/tests/app/tests/snippets.ts b/tests/app/tests/snippets.ts
index 32c549f92..8883e49a5 100644
--- a/tests/app/tests/snippets.ts
+++ b/tests/app/tests/snippets.ts
@@ -1,4 +1,4 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
 
 import { NavigationEnd, NavigationStart } from "@angular/router";
@@ -13,12 +13,17 @@ import { PageNavigationApp } from "../snippets/navigation/page-outlet";
 import { NavigationApp } from "../snippets/navigation/router-outlet";
 import { FirstComponent, SecondComponent } from "../snippets/navigation/navigation-common";
 import { routes } from "../snippets/navigation/app.routes";
-import { HeaderComponent, ItemComponent, DataService, ListTemplateSelectorTest } from "../snippets/list-view/template-selector.component";
+import {
+    HeaderComponent,
+    ItemComponent,
+    DataService,
+    ListTemplateSelectorTest,
+} from "../snippets/list-view/template-selector.component";
 
 import { device, platformNames } from "platform";
 const IS_IOS = (device.os === platformNames.ios);
 
-describe('Snippets', () => {
+describe("Snippets", () => {
     let testApp: TestApp = null;
 
     before(() => {
@@ -50,13 +55,13 @@ describe('Snippets', () => {
         testApp.loadComponent(IconFontComponent).then((componentRef) => {
             const componentInstance = componentRef.instance;
             assert.instanceOf(componentInstance, IconFontComponent);
-            //Works around a "dehydrated change detector" exception.
+            // Works around a "dehydrated change detector" exception.
             setTimeout(done, 10);
         });
     });
 });
 
-describe('Snippets Navigation', () => {
+describe("Snippets Navigation", () => {
     let runningApp: any;
     let subscription: Subscription;
 
@@ -91,7 +96,12 @@ describe('Snippets Navigation', () => {
     });
 
     it("page-router-outlet app", (done) => {
-        bootstrapTestApp(PageNavigationApp, [], routes, [PageNavigationApp, FirstComponent, SecondComponent]).then((app) => {
+        bootstrapTestApp(PageNavigationApp, [], routes, [
+            PageNavigationApp,
+            FirstComponent,
+            SecondComponent
+        ]).then((app) => {
+
             console.log("PageNavigationApp instance: " + app);
             runningApp = app;
 
@@ -109,7 +119,7 @@ describe('Snippets Navigation', () => {
     });
 });
 
-describe('Snippets ListView', () => {
+describe("Snippets ListView", () => {
     let runningApp: any;
 
     const cleanup = () => {
@@ -122,7 +132,15 @@ describe('Snippets ListView', () => {
     after(cleanup);
 
     it("template selector", (done) => {
-        bootstrapTestApp(ListTemplateSelectorTest, [DataService], null, [HeaderComponent, ItemComponent, ListTemplateSelectorTest])
+        bootstrapTestApp(
+            ListTemplateSelectorTest,
+            [DataService],
+            null,
+            [
+                HeaderComponent,
+                ItemComponent,
+                ListTemplateSelectorTest
+            ])
             .then((app) => {
                 setTimeout(() => {
                     cleanup();
@@ -131,4 +149,5 @@ describe('Snippets ListView', () => {
             })
             .catch(err => done(err));
     });
-});
\ No newline at end of file
+});
+
diff --git a/tests/app/tests/style-properties.ts b/tests/app/tests/style-properties.ts
index d2a526ef3..63f2390d5 100644
--- a/tests/app/tests/style-properties.ts
+++ b/tests/app/tests/style-properties.ts
@@ -1,11 +1,10 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {TextField} from "ui/text-field";
 import {Red, Lime} from "color/known-colors";
-import {NativeScriptRenderer, NativeScriptRootRenderer} from "nativescript-angular/renderer";
-import {NativeScriptAnimationDriver} from "nativescript-angular/animation-driver";
+import { NativeScriptRendererFactory, NativeScriptRenderer } from "nativescript-angular/renderer";
 import {device} from "platform";
-import { ViewEncapsulation, RenderComponentType } from "@angular/core";
+import { ViewEncapsulation, RendererType2, Renderer2 } from "@angular/core";
 import {NgView} from "nativescript-angular/view-util";
 
 describe("Setting style properties", () => {
@@ -13,31 +12,29 @@ describe("Setting style properties", () => {
     let element: NgView = null;
 
     beforeEach(() => {
-        const rootRenderer = new NativeScriptRootRenderer(null, device, null);
-        const componentType = new RenderComponentType(
-            "id",
-            "templateUrl",
-            0,
-            ViewEncapsulation.None,
-            [],
-            {}
-        );
-        renderer = new NativeScriptRenderer(rootRenderer, componentType, null, null);
+        const rendererFactory = new NativeScriptRendererFactory(null, device, null);
+        renderer = rendererFactory.createRenderer(null, {
+            id: "id",
+            encapsulation: ViewEncapsulation.None,
+            styles: [],
+            data: {}
+        });
+
         element = <NgView><any>new TextField();
     });
 
     it("resolves hyphenated CSS names", () => {
-        renderer.setElementStyle(element, "background-color", "red");
+        renderer.setStyle(element, "background-color", "red");
         assert.equal(Red, element.style.backgroundColor.hex);
     });
 
     it("resolves camel-cased JavaScript names", () => {
-        renderer.setElementStyle(element, "backgroundColor", "lime");
+        renderer.setStyle(element, "backgroundColor", "lime");
         assert.equal(Lime, element.style.backgroundColor.hex);
     });
 
     it("resolves CSS shorthand properties", () => {
-        renderer.setElementStyle(element, "font", "12");
+        renderer.setStyle(element, "font", "12");
         assert.equal(12, element.style.fontSize);
     });
-})
+});
diff --git a/tests/app/tests/test-app.ts b/tests/app/tests/test-app.ts
index 7bd8b072d..33399903a 100644
--- a/tests/app/tests/test-app.ts
+++ b/tests/app/tests/test-app.ts
@@ -3,17 +3,17 @@ import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 import {
     Type, Component, ComponentRef,
-    ComponentFactoryResolver, ApplicationRef, Renderer,
+    ComponentFactoryResolver, ApplicationRef, Renderer2,
     ViewContainerRef, NgZone, NgModule,
 } from "@angular/core";
 
-import {GridLayout} from "ui/layouts/grid-layout";
-import {LayoutBase} from "ui/layouts/layout-base";
-import {topmost} from 'ui/frame';
-import {APP_ROOT_VIEW} from "nativescript-angular/platform-providers";
+import { GridLayout } from "ui/layouts/grid-layout";
+import { LayoutBase } from "ui/layouts/layout-base";
+import { topmost } from "ui/frame";
+import { APP_ROOT_VIEW } from "nativescript-angular/platform-providers";
 
 @Component({
-    selector: 'my-app',
+    selector: "my-app",
     template: `<StackLayout #loadSite></StackLayout>`
 })
 export class TestApp {
@@ -23,7 +23,7 @@ export class TestApp {
             private resolver: ComponentFactoryResolver,
             private containerRef: ViewContainerRef,
             public appRef: ApplicationRef,
-            public renderer: Renderer,
+            public renderer: Renderer2,
             public zone: NgZone
         ) {
 
@@ -31,7 +31,7 @@ export class TestApp {
     }
 
     public loadComponent(componentType: Type<any>): Promise<ComponentRef<any>> {
-        const factory = this.resolver.resolveComponentFactory(componentType)
+        const factory = this.resolver.resolveComponentFactory(componentType);
         const componentRef = this.containerRef.createComponent(
             factory, this.containerRef.length, this.containerRef.parentInjector);
         this._pendingDispose.push(componentRef);
@@ -69,7 +69,13 @@ export function registerTestApp(appType, appInstance, appRef) {
     });
 }
 
-export function bootstrapTestApp<T>(appComponentType: new (...args) => T, providers: any[] = [], routes: any[] = [], components: any[] = [], directives: any[] = []): Promise<T> {
+export function bootstrapTestApp<T>(
+    appComponentType: new (...args) => T,
+    providers: any[] = [],
+    routes: any[] = [],
+    components: any[] = [],
+    directives: any[] = []
+): Promise<T> {
     const page = topmost().currentPage;
     const rootLayout = <LayoutBase>page.content;
     const viewRoot = new GridLayout();
@@ -117,12 +123,12 @@ export function bootstrapTestApp<T>(appComponentType: new (...args) => T, provid
         public static viewRoot = viewRoot;
         public static container = rootLayout;
     }
-    //app registers with the module type via static fields on start
+    // app registers with the module type via static fields on start
     (<any>appComponentType).moduleType = TestAppModule;
 
     return platform.bootstrapModule(TestAppModule).then(moduleRef => {
-        //app component constructor has run and we should have a
-        //registered component instance.
+        // app component constructor has run and we should have a
+        // registered component instance.
         return (<any>TestAppModule).appInstance;
     });
 }
@@ -134,7 +140,7 @@ export function destroyTestApp(app: any) {
 
     const entry = runningApps.get(app);
     entry.container.removeChild(entry.appRoot);
-    //TODO: App disposal not doing anything useful anymore. Get rid of it?
-    //entry.appRef.dispose();
+    // TODO: App disposal not doing anything useful anymore. Get rid of it?
+    // entry.appRef.dispose();
     runningApps.delete(app);
 }
diff --git a/tests/app/tests/test-config.ts b/tests/app/tests/test-config.ts
index ceead7613..4a23e10d7 100644
--- a/tests/app/tests/test-config.ts
+++ b/tests/app/tests/test-config.ts
@@ -2,5 +2,5 @@
     timeout: 20000,
 });
 
-import * as chai from "chai"
-export var assert: typeof chai.assert = (<any>global).chai.assert;
+import * as chai from "chai";
+export let assert: typeof chai.assert = (<any>global).chai.assert;
diff --git a/tests/app/tests/test-utils.ts b/tests/app/tests/test-utils.ts
index 20e7be4d5..30a4427a1 100644
--- a/tests/app/tests/test-utils.ts
+++ b/tests/app/tests/test-utils.ts
@@ -1,9 +1,9 @@
-import {View} from "ui/core/view";
-import {TextBase} from "ui/text-base";
-import {Device} from "platform";
+import { View } from "ui/core/view";
+import { TextBase } from "ui/text-base";
+import { Device } from "platform";
 
 function getChildren(view: View): Array<View> {
-    var children: Array<View> = [];
+    let children: Array<View> = [];
     (<any>view).eachChildView((child) => {
         children.push(child);
         return true;
@@ -16,7 +16,7 @@ export function dumpView(view: View, verbose: boolean = false): string {
     let output = ["(", nodeName];
     if (verbose) {
         if (view instanceof TextBase) {
-            output.push("[text=", view.text, "]")
+            output.push("[text=", view.text, "]");
         }
     }
 
@@ -42,3 +42,4 @@ export function createDevice(os: string): Device {
         model: "test device"
     };
 }
+
diff --git a/tests/app/tests/third-party-view.ts b/tests/app/tests/third-party-view.ts
index 8b85c2595..e9b371d73 100644
--- a/tests/app/tests/third-party-view.ts
+++ b/tests/app/tests/third-party-view.ts
@@ -2,6 +2,6 @@ import {ContentView} from "ui/content-view";
 
 // >> third-party-simple-view
 export class SimpleTag extends ContentView {
-    //...
+    // ...
 }
 // << third-party-simple-view
diff --git a/tests/app/tests/third-party.ts b/tests/app/tests/third-party.ts
index f9e9aa528..d100314fa 100644
--- a/tests/app/tests/third-party.ts
+++ b/tests/app/tests/third-party.ts
@@ -1,4 +1,4 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {TestApp} from "./test-app";
 import {Component, Directive, ElementRef, ViewContainerRef, TemplateRef, Inject} from "@angular/core";
@@ -12,7 +12,7 @@ registerElement("third-party-view", () => require("./third-party-view").SimpleTa
 
 // >> third-party-simple-view-container
 @Component({
-    selector: 'simple-view-container',
+    selector: "simple-view-container",
     template: `
         <third-party-view prop1="value1"></third-party-view>
     `
@@ -23,8 +23,8 @@ export class SimpleViewContainer {
 //
 // >> third-party-document-form-component
 @Component({
-    selector: 'document-form',
-    template: ''
+    selector: "document-form",
+    template: ""
 })
 export class DocumentFormComponent {
     // >> (hide)
@@ -45,7 +45,7 @@ export class DocumentFormComponent {
 
 // >> third-party-template-directive
 @Directive({
-    selector: '[documentTitle]'
+    selector: "[documentTitle]"
 })
 export class DocumentTitleDirective {
     public static titleLabel: Label;
@@ -58,9 +58,9 @@ export class DocumentTitleDirective {
 
     ngOnInit() {
         const viewRef = this.viewContainer.createEmbeddedView(this.template);
-        //filter out whitespace nodes
+        // filter out whitespace nodes
         const titleViews = viewRef.rootNodes.filter((node) =>
-                            node && node.nodeName !== '#text')
+                            node && node.nodeName !== "#text");
 
         if (titleViews.length > 0) {
             const titleView = titleViews[0];
@@ -72,7 +72,7 @@ export class DocumentTitleDirective {
 
 // >> third-party-document-form-container
 @Component({
-    selector: 'document-form-container',
+    selector: "document-form-container",
     template: `
     <document-form src="document1.pdf">
         <Label *documentTitle text="Document1"></Label>
@@ -83,15 +83,19 @@ export class DocumentFormContainer {
 }
 // << third-party-document-form-container
 
-describe('Third party component snippets', () => {
+describe("Third party component snippets", () => {
     let testApp: TestApp = null;
 
     before(() => {
         registerElement("document-form", () => require("ui/layouts/stack-layout").StackLayout);
 
-        return TestApp.create([], [DocumentFormContainer, DocumentFormComponent, SimpleViewContainer], [DocumentTitleDirective]).then((app) => {
+        return TestApp.create([], [
+            DocumentFormContainer,
+            DocumentFormComponent,
+            SimpleViewContainer
+        ], [DocumentTitleDirective]).then((app) => {
             testApp = app;
-        })
+        });
     });
 
     after(() => {
@@ -110,4 +114,4 @@ describe('Third party component snippets', () => {
             assert.equal("Document1", DocumentFormComponent.titleLabel.text);
         });
     });
-})
+});
diff --git a/tests/app/tests/value-accessor-tests.ts b/tests/app/tests/value-accessor-tests.ts
index e218dd7fd..0f55fcba2 100644
--- a/tests/app/tests/value-accessor-tests.ts
+++ b/tests/app/tests/value-accessor-tests.ts
@@ -1,4 +1,4 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {View} from "ui/core/view";
 import {Slider} from "ui/slider";
@@ -13,7 +13,7 @@ import {DateValueAccessor} from "nativescript-angular/value-accessors/date-value
 import {TimeValueAccessor} from "nativescript-angular/value-accessors/time-value-accessor";
 import {SelectedIndexValueAccessor} from "nativescript-angular/value-accessors/selectedIndex-value-accessor";
 import {TextValueAccessor} from "nativescript-angular/value-accessors/text-value-accessor";
-import {ElementRef} from '@angular/core';
+import {ElementRef} from "@angular/core";
 
 class TestElementRef implements ElementRef {
     constructor(public nativeElement: View) {};
@@ -69,78 +69,78 @@ class TestTextValueAccessor extends TextValueAccessor {
 
 describe("two-way binding via ng-model", () => {
     it("converts strings to numbers", () => {
-        const accessor = new TestNumberValueAccessor()
+        const accessor = new TestNumberValueAccessor();
 
         accessor.writeValue(null);
-        assert.strictEqual(0, accessor.view.value, "default to 0 on empty")
+        assert.strictEqual(0, accessor.view.value, "default to 0 on empty");
 
         accessor.writeValue("42");
-        assert.strictEqual(42, accessor.view.value)
+        assert.strictEqual(42, accessor.view.value);
 
         accessor.writeValue("blah");
-        assert.strictEqual(0, accessor.view.value, "default to 0 on parse errors")
+        assert.strictEqual(0, accessor.view.value, "default to 0 on parse errors");
     });
 
     it("converts strings to bools", () => {
-        const accessor = new TestCheckedValueAccessor()
+        const accessor = new TestCheckedValueAccessor();
 
         accessor.writeValue(null);
-        assert.strictEqual(false, accessor.view.checked, "default to false on empty")
+        assert.strictEqual(false, accessor.view.checked, "default to false on empty");
 
         accessor.writeValue("true");
-        assert.strictEqual(true, accessor.view.checked)
+        assert.strictEqual(true, accessor.view.checked);
 
         accessor.writeValue("blah");
-        assert.strictEqual(false, accessor.view.checked, "default to false on parse errors")
+        assert.strictEqual(false, accessor.view.checked, "default to false on parse errors");
     });
 
     it("converts strings to dates", () => {
         const now = new Date();
-        const accessor = new TestDateValueAccessor()
+        const accessor = new TestDateValueAccessor();
 
         accessor.writeValue(null);
-        assert.equal(formatDate(now), formatDate(accessor.view.date), "default to now on empty")
+        assert.equal(formatDate(now), formatDate(accessor.view.date), "default to now on empty");
 
         accessor.writeValue("2010-03-17");
-        assert.equal(formatDate(new Date(2010, 2, 17)), formatDate(accessor.view.date))
+        assert.equal(formatDate(new Date(2010, 2, 17)), formatDate(accessor.view.date));
 
         accessor.writeValue("a fortnight ago");
-        assert.equal(formatDate(now), formatDate(accessor.view.date), "default to now on parse error")
+        assert.equal(formatDate(now), formatDate(accessor.view.date), "default to now on parse error");
     });
 
     it("converts strings to int selection", () => {
-        const accessor = new TestSelectedIndexValueAccessor()
+        const accessor = new TestSelectedIndexValueAccessor();
 
         accessor.writeValue(null);
         accessor.ngAfterViewInit();
-        assert.strictEqual(0, accessor.view.selectedIndex, "default to 0 on empty")
+        assert.strictEqual(0, accessor.view.selectedIndex, "default to 0 on empty");
 
         accessor.writeValue("3");
         accessor.ngAfterViewInit();
-        assert.strictEqual(3, accessor.view.selectedIndex)
+        assert.strictEqual(3, accessor.view.selectedIndex);
 
         accessor.writeValue("blah");
         accessor.ngAfterViewInit();
-        assert.strictEqual(0, accessor.view.selectedIndex, "default to 0 on parse errors")
+        assert.strictEqual(0, accessor.view.selectedIndex, "default to 0 on parse errors");
     });
 
     it("converts strings to times", () => {
         const now = new Date();
-        const accessor = new TestTimeValueAccessor()
+        const accessor = new TestTimeValueAccessor();
 
         accessor.writeValue(null);
-        assert.equal(formatTime(now), formatTime(accessor.view.time), "default to now on empty")
+        assert.equal(formatTime(now), formatTime(accessor.view.time), "default to now on empty");
 
         accessor.writeValue("2010/03/17 12:54");
-        assert.equal(formatTime(new Date(2010, 2, 17, 12, 54)), formatTime(accessor.view.time))
+        assert.equal(formatTime(new Date(2010, 2, 17, 12, 54)), formatTime(accessor.view.time));
 
         accessor.writeValue("three hours from now");
-        assert.equal(formatTime(now), formatTime(accessor.view.time), "default to now on parse error")
+        assert.equal(formatTime(now), formatTime(accessor.view.time), "default to now on parse error");
     });
 
     it("converts values to text", () => {
         const now = new Date();
-        const accessor = new TestTextValueAccessor()
+        const accessor = new TestTextValueAccessor();
 
         accessor.writeValue(null);
         assert.equal("", accessor.view.text);
@@ -151,7 +151,7 @@ describe("two-way binding via ng-model", () => {
         accessor.writeValue({toString: () => "stringified"});
         assert.equal("stringified", accessor.view.text);
     });
-})
+});
 
 function formatDate(date: Date) {
     return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
diff --git a/tests/app/tests/xhr-paths.ts b/tests/app/tests/xhr-paths.ts
index d618c9b99..9a4927515 100644
--- a/tests/app/tests/xhr-paths.ts
+++ b/tests/app/tests/xhr-paths.ts
@@ -1,20 +1,22 @@
-//make sure you import mocha-config before @angular/core
+// make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {FileSystemResourceLoader} from "nativescript-angular/resource-loader";
 
 describe("XHR name resolution", () => {
     it("resolves relative paths from app root", () => {
         const xhr = new FileSystemResourceLoader();
-        assert.strictEqual("/app/dir/mydir/mycomponent.html", xhr.resolve("mydir/mycomponent.html", "/app/dir"))
+        assert.strictEqual("/app/dir/mydir/mycomponent.html", xhr.resolve("mydir/mycomponent.html", "/app/dir"));
     });
 
     it("resolves double-slashed absolute paths as is", () => {
         const xhr = new FileSystemResourceLoader();
-        assert.strictEqual("//app/mydir/mycomponent.html", xhr.resolve("//app/mydir/mycomponent.html", "/app/dir"))
+        assert.strictEqual("//app/mydir/mycomponent.html", xhr.resolve("//app/mydir/mycomponent.html", "/app/dir"));
     });
 
     it("resolves single-slashed absolute paths as is", () => {
         const xhr = new FileSystemResourceLoader();
-        assert.strictEqual("/data/data/app/mydir/mycomponent.html", xhr.resolve("/data/data/app/mydir/mycomponent.html", "/app/dir"))
+        assert.strictEqual(
+            "/data/data/app/mydir/mycomponent.html",
+            xhr.resolve("/data/data/app/mydir/mycomponent.html", "/app/dir"));
     });
-})
+});
diff --git a/tests/e2e-tests/lazy-load-routing.js b/tests/e2e-tests/lazy-load-routing.js
index bb28e3ec6..044103081 100644
--- a/tests/e2e-tests/lazy-load-routing.js
+++ b/tests/e2e-tests/lazy-load-routing.js
@@ -61,6 +61,6 @@ describe("lazy load routing", function () {
                 .should.eventually.exist
                 .text().should.eventually.equal("Second: lazy-load")
             .elementByAccessibilityId("router-location-strategy-states-lazy-load")
-                .text().should.eventually.equal("/second/lazy-load")
+            .text().should.eventually.equal("/second/lazy-load")
     });
 });
diff --git a/tests/hooks/before-livesync/nativescript-angular-sync .js b/tests/hooks/before-livesync/nativescript-angular-sync .js
deleted file mode 100644
index 5a8510cb2..000000000
--- a/tests/hooks/before-livesync/nativescript-angular-sync .js	
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require("nativescript-angular/hooks/before-livesync");
diff --git a/tests/npm-shrinkwrap.json b/tests/npm-shrinkwrap.json
deleted file mode 100644
index 2a69074f9..000000000
--- a/tests/npm-shrinkwrap.json
+++ /dev/null
@@ -1,4131 +0,0 @@
-{
-  "name": "ngtests",
-  "version": "1.0.0",
-  "dependencies": {
-    "abbrev": {
-      "version": "1.0.9",
-      "from": "abbrev@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
-    },
-    "accepts": {
-      "version": "1.1.4",
-      "from": "accepts@1.1.4",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz",
-      "dependencies": {
-        "mime-db": {
-          "version": "1.12.0",
-          "from": "mime-db@>=1.12.0 <1.13.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-        },
-        "mime-types": {
-          "version": "2.0.14",
-          "from": "mime-types@>=2.0.4 <2.1.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"
-        }
-      }
-    },
-    "after": {
-      "version": "0.8.1",
-      "from": "after@0.8.1",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz"
-    },
-    "ansi-regex": {
-      "version": "2.0.0",
-      "from": "ansi-regex@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "from": "ansi-styles@>=2.2.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
-    },
-    "anymatch": {
-      "version": "1.3.0",
-      "from": "anymatch@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"
-    },
-    "appium": {
-      "version": "1.6.0",
-      "from": "appium@1.6.0",
-      "resolved": "https://registry.npmjs.org/appium/-/appium-1.6.0.tgz",
-      "dependencies": {
-        "accepts": {
-          "version": "1.3.3",
-          "from": "accepts@>=1.3.3 <1.4.0",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"
-        },
-        "acorn": {
-          "version": "1.2.2",
-          "from": "acorn@>=1.0.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-        },
-        "adbkit": {
-          "version": "2.6.0",
-          "from": "adbkit@>=2.4.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/adbkit/-/adbkit-2.6.0.tgz",
-          "dependencies": {
-            "bluebird": {
-              "version": "2.9.34",
-              "from": "bluebird@>=2.9.24 <2.10.0",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"
-            },
-            "debug": {
-              "version": "2.1.3",
-              "from": "debug@>=2.1.3 <2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"
-            },
-            "ms": {
-              "version": "0.7.0",
-              "from": "ms@0.7.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
-            }
-          }
-        },
-        "adbkit-logcat": {
-          "version": "1.1.0",
-          "from": "adbkit-logcat@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz"
-        },
-        "adbkit-monkey": {
-          "version": "1.0.1",
-          "from": "adbkit-monkey@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-            }
-          }
-        },
-        "adm-zip": {
-          "version": "0.4.7",
-          "from": "adm-zip@>=0.4.7 <0.5.0",
-          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"
-        },
-        "align-text": {
-          "version": "0.1.4",
-          "from": "align-text@>=0.1.3 <0.2.0",
-          "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
-        },
-        "alter": {
-          "version": "0.2.0",
-          "from": "alter@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz"
-        },
-        "amdefine": {
-          "version": "1.0.0",
-          "from": "amdefine@>=0.0.4",
-          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-        },
-        "ansi": {
-          "version": "0.3.1",
-          "from": "ansi@>=0.3.1 <0.4.0",
-          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
-        },
-        "ansi-regex": {
-          "version": "2.0.0",
-          "from": "ansi-regex@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "from": "ansi-styles@>=2.2.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
-        },
-        "appium-adb": {
-          "version": "2.6.17",
-          "from": "appium-adb@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-2.6.17.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-android-bootstrap": {
-          "version": "2.7.5",
-          "from": "appium-android-bootstrap@>=2.7.5 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-android-bootstrap/-/appium-android-bootstrap-2.7.5.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-android-driver": {
-          "version": "1.10.27",
-          "from": "appium-android-driver@>=1.10.27 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-1.10.27.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-android-ime": {
-          "version": "2.0.0",
-          "from": "appium-android-ime@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-android-ime/-/appium-android-ime-2.0.0.tgz"
-        },
-        "appium-atoms": {
-          "version": "0.1.0",
-          "from": "appium-atoms@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/appium-atoms/-/appium-atoms-0.1.0.tgz"
-        },
-        "appium-base-driver": {
-          "version": "2.0.19",
-          "from": "appium-base-driver@>=2.0.19 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-base-driver/-/appium-base-driver-2.0.19.tgz",
-          "dependencies": {
-            "request-promise": {
-              "version": "4.1.1",
-              "from": "request-promise@>=4.1.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.1.1.tgz",
-              "dependencies": {
-                "bluebird": {
-                  "version": "3.4.6",
-                  "from": "bluebird@>=3.4.1 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
-                }
-              }
-            }
-          }
-        },
-        "appium-chromedriver": {
-          "version": "2.9.2",
-          "from": "appium-chromedriver@>=2.9.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-2.9.2.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-cookies": {
-          "version": "1.1.0",
-          "from": "appium-cookies@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-cookies/-/appium-cookies-1.1.0.tgz",
-          "dependencies": {
-            "babel-runtime": {
-              "version": "5.8.20",
-              "from": "babel-runtime@5.8.20",
-              "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.20.tgz"
-            },
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-fake-driver": {
-          "version": "0.1.10",
-          "from": "appium-fake-driver@>=0.1.10 <0.2.0",
-          "resolved": "https://registry.npmjs.org/appium-fake-driver/-/appium-fake-driver-0.1.10.tgz",
-          "dependencies": {
-            "bluebird": {
-              "version": "3.4.6",
-              "from": "bluebird@>=3.1.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
-            },
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.9.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            }
-          }
-        },
-        "appium-instruments": {
-          "version": "3.8.5",
-          "from": "appium-instruments@>=3.8.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/appium-instruments/-/appium-instruments-3.8.5.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-ios-driver": {
-          "version": "1.12.27",
-          "from": "appium-ios-driver@>=1.12.27 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-ios-driver/-/appium-ios-driver-1.12.27.tgz",
-          "dependencies": {
-            "xpath": {
-              "version": "0.0.22",
-              "from": "xpath@0.0.22",
-              "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.22.tgz"
-            }
-          }
-        },
-        "appium-ios-log": {
-          "version": "1.2.1",
-          "from": "appium-ios-log@>=1.2.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-ios-log/-/appium-ios-log-1.2.1.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-ios-simulator": {
-          "version": "1.7.10",
-          "from": "appium-ios-simulator@>=1.7.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-ios-simulator/-/appium-ios-simulator-1.7.10.tgz"
-        },
-        "appium-logger": {
-          "version": "2.1.0",
-          "from": "appium-logger@>=2.1.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-logger/-/appium-logger-2.1.0.tgz",
-          "dependencies": {
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-remote-debugger": {
-          "version": "3.1.7",
-          "from": "appium-remote-debugger@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/appium-remote-debugger/-/appium-remote-debugger-3.1.7.tgz"
-        },
-        "appium-selendroid-driver": {
-          "version": "1.4.3",
-          "from": "appium-selendroid-driver@>=1.3.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-selendroid-driver/-/appium-selendroid-driver-1.4.3.tgz",
-          "dependencies": {
-            "bluebird": {
-              "version": "3.4.6",
-              "from": "bluebird@>=3.4.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
-            },
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "request-promise": {
-              "version": "4.1.1",
-              "from": "request-promise@>=4.1.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.1.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-support": {
-          "version": "2.3.3",
-          "from": "appium-support@>=2.3.3 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-support/-/appium-support-2.3.3.tgz"
-        },
-        "appium-uiauto": {
-          "version": "2.3.3",
-          "from": "appium-uiauto@>=2.3.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-uiauto/-/appium-uiauto-2.3.3.tgz",
-          "dependencies": {
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-uiautomator": {
-          "version": "1.1.0",
-          "from": "appium-uiautomator@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-uiautomator/-/appium-uiautomator-1.1.0.tgz",
-          "dependencies": {
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-uiautomator2-driver": {
-          "version": "0.0.4",
-          "from": "appium-uiautomator2-driver@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/appium-uiautomator2-driver/-/appium-uiautomator2-driver-0.0.4.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "request-promise": {
-              "version": "4.1.1",
-              "from": "request-promise@>=4.1.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.1.1.tgz",
-              "dependencies": {
-                "bluebird": {
-                  "version": "3.4.6",
-                  "from": "bluebird@>=3.4.1 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
-                }
-              }
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-uiautomator2-server": {
-          "version": "0.0.1",
-          "from": "appium-uiautomator2-server@>=0.0.1 <0.0.2",
-          "resolved": "https://registry.npmjs.org/appium-uiautomator2-server/-/appium-uiautomator2-server-0.0.1.tgz"
-        },
-        "appium-unlock": {
-          "version": "0.1.1",
-          "from": "appium-unlock@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/appium-unlock/-/appium-unlock-0.1.1.tgz"
-        },
-        "appium-windows-driver": {
-          "version": "0.2.0",
-          "from": "appium-windows-driver@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/appium-windows-driver/-/appium-windows-driver-0.2.0.tgz",
-          "dependencies": {
-            "punycode": {
-              "version": "2.0.0",
-              "from": "punycode@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.0.0.tgz"
-            },
-            "request-promise": {
-              "version": "3.0.0",
-              "from": "request-promise@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-3.0.0.tgz",
-              "dependencies": {
-                "bluebird": {
-                  "version": "3.4.6",
-                  "from": "bluebird@>=3.3.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
-                }
-              }
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-xcode": {
-          "version": "3.1.1",
-          "from": "appium-xcode@>=3.1.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/appium-xcode/-/appium-xcode-3.1.1.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "appium-xcuitest-driver": {
-          "version": "2.0.26",
-          "from": "appium-xcuitest-driver@>=2.0.26 <3.0.0",
-          "resolved": "https://registry.npmjs.org/appium-xcuitest-driver/-/appium-xcuitest-driver-2.0.26.tgz",
-          "dependencies": {
-            "bluebird": {
-              "version": "3.4.6",
-              "from": "bluebird@>=3.1.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
-            }
-          }
-        },
-        "appium-youiengine-driver": {
-          "version": "1.0.6",
-          "from": "appium-youiengine-driver@>=1.0.6 <2.0.0",
-          "resolved": "https://registry.npmjs.org/appium-youiengine-driver/-/appium-youiengine-driver-1.0.6.tgz"
-        },
-        "are-we-there-yet": {
-          "version": "1.1.2",
-          "from": "are-we-there-yet@>=1.1.2 <1.2.0",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"
-        },
-        "argparse": {
-          "version": "1.0.9",
-          "from": "argparse@>=1.0.7 <2.0.0",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"
-        },
-        "array-filter": {
-          "version": "0.0.1",
-          "from": "array-filter@>=0.0.0 <0.1.0",
-          "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"
-        },
-        "array-flatten": {
-          "version": "1.1.1",
-          "from": "array-flatten@1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
-        },
-        "array-map": {
-          "version": "0.0.0",
-          "from": "array-map@>=0.0.0 <0.1.0",
-          "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"
-        },
-        "array-reduce": {
-          "version": "0.0.0",
-          "from": "array-reduce@>=0.0.0 <0.1.0",
-          "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "from": "asn1@>=0.2.3 <0.3.0",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "from": "assert-plus@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-        },
-        "assertion-error": {
-          "version": "1.0.2",
-          "from": "assertion-error@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz"
-        },
-        "ast-traverse": {
-          "version": "0.1.1",
-          "from": "ast-traverse@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz"
-        },
-        "ast-types": {
-          "version": "0.8.5",
-          "from": "ast-types@0.8.5",
-          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.5.tgz"
-        },
-        "async": {
-          "version": "1.5.2",
-          "from": "async@>=1.5.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
-        },
-        "async-listener": {
-          "version": "0.6.3",
-          "from": "async-listener@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/async-listener/-/async-listener-0.6.3.tgz"
-        },
-        "asyncbox": {
-          "version": "2.3.1",
-          "from": "asyncbox@>=2.3.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/asyncbox/-/asyncbox-2.3.1.tgz",
-          "dependencies": {
-            "babel-runtime": {
-              "version": "5.5.5",
-              "from": "babel-runtime@5.5.5",
-              "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.5.5.tgz"
-            },
-            "core-js": {
-              "version": "0.9.18",
-              "from": "core-js@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/core-js/-/core-js-0.9.18.tgz"
-            },
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "from": "asynckit@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "from": "aws-sign2@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-        },
-        "aws4": {
-          "version": "1.4.1",
-          "from": "aws4@>=1.2.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
-        },
-        "babel-core": {
-          "version": "5.8.24",
-          "from": "babel-core@5.8.24",
-          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.24.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "minimatch": {
-              "version": "2.0.10",
-              "from": "minimatch@>=2.0.3 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
-            },
-            "source-map": {
-              "version": "0.4.4",
-              "from": "source-map@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
-            },
-            "source-map-support": {
-              "version": "0.2.10",
-              "from": "source-map-support@>=0.2.10 <0.3.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
-              "dependencies": {
-                "source-map": {
-                  "version": "0.1.32",
-                  "from": "source-map@0.1.32",
-                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"
-                }
-              }
-            }
-          }
-        },
-        "babel-plugin-constant-folding": {
-          "version": "1.0.1",
-          "from": "babel-plugin-constant-folding@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz"
-        },
-        "babel-plugin-dead-code-elimination": {
-          "version": "1.0.2",
-          "from": "babel-plugin-dead-code-elimination@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz"
-        },
-        "babel-plugin-eval": {
-          "version": "1.0.1",
-          "from": "babel-plugin-eval@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz"
-        },
-        "babel-plugin-inline-environment-variables": {
-          "version": "1.0.1",
-          "from": "babel-plugin-inline-environment-variables@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz"
-        },
-        "babel-plugin-jscript": {
-          "version": "1.0.4",
-          "from": "babel-plugin-jscript@>=1.0.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz"
-        },
-        "babel-plugin-member-expression-literals": {
-          "version": "1.0.1",
-          "from": "babel-plugin-member-expression-literals@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz"
-        },
-        "babel-plugin-property-literals": {
-          "version": "1.0.1",
-          "from": "babel-plugin-property-literals@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz"
-        },
-        "babel-plugin-proto-to-assign": {
-          "version": "1.0.4",
-          "from": "babel-plugin-proto-to-assign@>=1.0.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.9.3 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            }
-          }
-        },
-        "babel-plugin-react-constant-elements": {
-          "version": "1.0.3",
-          "from": "babel-plugin-react-constant-elements@>=1.0.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz"
-        },
-        "babel-plugin-react-display-name": {
-          "version": "1.0.3",
-          "from": "babel-plugin-react-display-name@>=1.0.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz"
-        },
-        "babel-plugin-remove-console": {
-          "version": "1.0.1",
-          "from": "babel-plugin-remove-console@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz"
-        },
-        "babel-plugin-remove-debugger": {
-          "version": "1.0.1",
-          "from": "babel-plugin-remove-debugger@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz"
-        },
-        "babel-plugin-runtime": {
-          "version": "1.0.7",
-          "from": "babel-plugin-runtime@>=1.0.7 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz"
-        },
-        "babel-plugin-undeclared-variables-check": {
-          "version": "1.0.2",
-          "from": "babel-plugin-undeclared-variables-check@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz"
-        },
-        "babel-plugin-undefined-to-void": {
-          "version": "1.1.6",
-          "from": "babel-plugin-undefined-to-void@>=1.1.6 <2.0.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz"
-        },
-        "babel-runtime": {
-          "version": "5.8.24",
-          "from": "babel-runtime@5.8.24",
-          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.24.tgz"
-        },
-        "babylon": {
-          "version": "5.8.38",
-          "from": "babylon@>=5.8.23 <6.0.0",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz"
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "from": "balanced-match@>=0.4.1 <0.5.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-        },
-        "base64-js": {
-          "version": "0.0.8",
-          "from": "base64-js@0.0.8",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
-        },
-        "basic-auth": {
-          "version": "1.0.4",
-          "from": "basic-auth@>=1.0.3 <1.1.0",
-          "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.0",
-          "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"
-        },
-        "big-integer": {
-          "version": "1.6.16",
-          "from": "big-integer@>=1.6.7 <2.0.0",
-          "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"
-        },
-        "bignumber.js": {
-          "version": "2.4.0",
-          "from": "bignumber.js@>=2.1.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz"
-        },
-        "bl": {
-          "version": "1.1.2",
-          "from": "bl@>=1.1.2 <1.2.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.0.6",
-              "from": "readable-stream@>=2.0.5 <2.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
-            }
-          }
-        },
-        "bluebird": {
-          "version": "2.11.0",
-          "from": "bluebird@>=2.10.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"
-        },
-        "bmp-js": {
-          "version": "0.0.1",
-          "from": "bmp-js@0.0.1",
-          "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.1.tgz"
-        },
-        "body-parser": {
-          "version": "1.15.2",
-          "from": "body-parser@>=1.14.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"
-        },
-        "boom": {
-          "version": "2.10.1",
-          "from": "boom@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-        },
-        "bplist-creator": {
-          "version": "0.0.6",
-          "from": "bplist-creator@>=0.0.6 <0.0.7",
-          "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.6.tgz"
-        },
-        "bplist-parser": {
-          "version": "0.1.1",
-          "from": "bplist-parser@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"
-        },
-        "brace-expansion": {
-          "version": "1.1.6",
-          "from": "brace-expansion@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
-        },
-        "breakable": {
-          "version": "1.0.0",
-          "from": "breakable@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz"
-        },
-        "buffer-equal": {
-          "version": "0.0.1",
-          "from": "buffer-equal@0.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "from": "buffer-shims@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
-        },
-        "bufferpack": {
-          "version": "0.0.6",
-          "from": "bufferpack@0.0.6",
-          "resolved": "https://registry.npmjs.org/bufferpack/-/bufferpack-0.0.6.tgz"
-        },
-        "bytes": {
-          "version": "2.4.0",
-          "from": "bytes@2.4.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"
-        },
-        "camelcase": {
-          "version": "2.1.1",
-          "from": "camelcase@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"
-        },
-        "caseless": {
-          "version": "0.11.0",
-          "from": "caseless@>=0.11.0 <0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-        },
-        "center-align": {
-          "version": "0.1.3",
-          "from": "center-align@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"
-        },
-        "chai": {
-          "version": "3.5.0",
-          "from": "chai@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz"
-        },
-        "chai-as-promised": {
-          "version": "5.3.0",
-          "from": "chai-as-promised@>=5.1.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-5.3.0.tgz"
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "from": "chalk@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "from": "cliui@>=3.0.3 <4.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
-        },
-        "cls-bluebird": {
-          "version": "1.1.3",
-          "from": "cls-bluebird@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-1.1.3.tgz",
-          "dependencies": {
-            "shimmer": {
-              "version": "1.1.0",
-              "from": "shimmer@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.1.0.tgz"
-            }
-          }
-        },
-        "code-point-at": {
-          "version": "1.0.1",
-          "from": "code-point-at@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"
-        },
-        "colors": {
-          "version": "1.1.2",
-          "from": "colors@>=1.1.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "from": "combined-stream@>=1.0.5 <1.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
-        },
-        "commander": {
-          "version": "2.9.0",
-          "from": "commander@>=2.9.0 <2.10.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-        },
-        "commoner": {
-          "version": "0.10.4",
-          "from": "commoner@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "5.0.15",
-              "from": "glob@>=5.0.15 <6.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-            }
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "from": "concat-map@0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-        },
-        "connected-domain": {
-          "version": "1.0.0",
-          "from": "connected-domain@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz"
-        },
-        "content-disposition": {
-          "version": "0.5.1",
-          "from": "content-disposition@0.5.1",
-          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"
-        },
-        "content-type": {
-          "version": "1.0.2",
-          "from": "content-type@>=1.0.2 <1.1.0",
-          "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"
-        },
-        "continuation-local-storage": {
-          "version": "3.2.0",
-          "from": "continuation-local-storage@>=3.1.7 <4.0.0",
-          "resolved": "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.0.tgz"
-        },
-        "convert-source-map": {
-          "version": "1.3.0",
-          "from": "convert-source-map@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz"
-        },
-        "cookie": {
-          "version": "0.3.1",
-          "from": "cookie@0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"
-        },
-        "cookie-signature": {
-          "version": "1.0.6",
-          "from": "cookie-signature@1.0.6",
-          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
-        },
-        "core-js": {
-          "version": "1.2.7",
-          "from": "core-js@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "from": "core-util-is@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "from": "cryptiles@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-        },
-        "cycle": {
-          "version": "1.0.3",
-          "from": "cycle@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-        },
-        "dashdash": {
-          "version": "1.14.0",
-          "from": "dashdash@>=1.12.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "from": "assert-plus@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-            }
-          }
-        },
-        "date-utils": {
-          "version": "1.2.21",
-          "from": "date-utils@>=1.2.21 <2.0.0",
-          "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"
-        },
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "from": "decamelize@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
-        },
-        "deep-eql": {
-          "version": "0.1.3",
-          "from": "deep-eql@>=0.1.3 <0.2.0",
-          "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-          "dependencies": {
-            "type-detect": {
-              "version": "0.1.1",
-              "from": "type-detect@0.1.1",
-              "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"
-            }
-          }
-        },
-        "defined": {
-          "version": "1.0.0",
-          "from": "defined@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
-        },
-        "defs": {
-          "version": "1.1.1",
-          "from": "defs@>=1.1.0 <1.2.0",
-          "resolved": "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz",
-          "dependencies": {
-            "camelcase": {
-              "version": "1.2.1",
-              "from": "camelcase@>=1.2.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-            },
-            "cliui": {
-              "version": "2.1.0",
-              "from": "cliui@>=2.1.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"
-            },
-            "esprima-fb": {
-              "version": "15001.1001.0-dev-harmony-fb",
-              "from": "esprima-fb@>=15001.1001.0-dev-harmony-fb <15001.1002.0",
-              "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz"
-            },
-            "yargs": {
-              "version": "3.27.0",
-              "from": "yargs@>=3.27.0 <3.28.0",
-              "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz"
-            }
-          }
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "from": "delayed-stream@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "from": "delegates@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
-        },
-        "depd": {
-          "version": "1.1.0",
-          "from": "depd@>=1.1.0 <1.2.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
-        },
-        "destroy": {
-          "version": "1.0.4",
-          "from": "destroy@>=1.0.4 <1.1.0",
-          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
-        },
-        "detect-indent": {
-          "version": "3.0.1",
-          "from": "detect-indent@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "from": "minimist@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-            }
-          }
-        },
-        "detective": {
-          "version": "4.3.1",
-          "from": "detective@>=4.3.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz"
-        },
-        "dom-walk": {
-          "version": "0.1.1",
-          "from": "dom-walk@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "from": "ecc-jsbn@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-        },
-        "ee-first": {
-          "version": "1.1.1",
-          "from": "ee-first@1.1.1",
-          "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
-        },
-        "emitter-listener": {
-          "version": "1.0.1",
-          "from": "emitter-listener@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.0.1.tgz"
-        },
-        "encodeurl": {
-          "version": "1.0.1",
-          "from": "encodeurl@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"
-        },
-        "es6-error": {
-          "version": "2.1.1",
-          "from": "es6-error@>=2.0.2 <3.0.0",
-          "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-2.1.1.tgz"
-        },
-        "es6-mapify": {
-          "version": "1.0.0",
-          "from": "es6-mapify@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/es6-mapify/-/es6-mapify-1.0.0.tgz"
-        },
-        "es6-promise": {
-          "version": "3.3.1",
-          "from": "es6-promise@>=3.0.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"
-        },
-        "escape-html": {
-          "version": "1.0.3",
-          "from": "escape-html@>=1.0.3 <1.1.0",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-        },
-        "esprima-fb": {
-          "version": "15001.1.0-dev-harmony-fb",
-          "from": "esprima-fb@>=15001.1.0-dev-harmony-fb <15001.2.0",
-          "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz"
-        },
-        "esutils": {
-          "version": "2.0.2",
-          "from": "esutils@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
-        },
-        "etag": {
-          "version": "1.7.0",
-          "from": "etag@>=1.7.0 <1.8.0",
-          "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"
-        },
-        "exif-parser": {
-          "version": "0.1.9",
-          "from": "exif-parser@>=0.1.9 <0.2.0",
-          "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.9.tgz"
-        },
-        "express": {
-          "version": "4.14.0",
-          "from": "express@>=4.13.3 <5.0.0",
-          "resolved": "https://registry.npmjs.org/express/-/express-4.14.0.tgz"
-        },
-        "extend": {
-          "version": "3.0.0",
-          "from": "extend@>=3.0.0 <3.1.0",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "from": "extsprintf@1.0.2",
-          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-        },
-        "eyes": {
-          "version": "0.1.8",
-          "from": "eyes@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-        },
-        "file-type": {
-          "version": "3.8.0",
-          "from": "file-type@>=3.1.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.8.0.tgz"
-        },
-        "finalhandler": {
-          "version": "0.5.0",
-          "from": "finalhandler@0.5.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"
-        },
-        "for-each": {
-          "version": "0.3.2",
-          "from": "for-each@>=0.3.2 <0.4.0",
-          "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "from": "forever-agent@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-        },
-        "form-data": {
-          "version": "2.0.0",
-          "from": "form-data@>=2.0.0 <2.1.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"
-        },
-        "forwarded": {
-          "version": "0.1.0",
-          "from": "forwarded@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"
-        },
-        "fresh": {
-          "version": "0.3.0",
-          "from": "fresh@0.3.0",
-          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"
-        },
-        "fs-readdir-recursive": {
-          "version": "0.1.2",
-          "from": "fs-readdir-recursive@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz"
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "from": "fs.realpath@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-        },
-        "gauge": {
-          "version": "1.2.7",
-          "from": "gauge@>=1.2.5 <1.3.0",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
-        },
-        "generate-function": {
-          "version": "2.0.0",
-          "from": "generate-function@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-        },
-        "generate-object-property": {
-          "version": "1.2.0",
-          "from": "generate-object-property@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-        },
-        "get-stdin": {
-          "version": "4.0.1",
-          "from": "get-stdin@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-        },
-        "getpass": {
-          "version": "0.1.6",
-          "from": "getpass@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "from": "assert-plus@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-            }
-          }
-        },
-        "glob": {
-          "version": "6.0.4",
-          "from": "glob@>=6.0.4 <7.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
-        },
-        "global": {
-          "version": "4.3.1",
-          "from": "global@>=4.3.0 <4.4.0",
-          "resolved": "https://registry.npmjs.org/global/-/global-4.3.1.tgz"
-        },
-        "globals": {
-          "version": "6.4.1",
-          "from": "globals@>=6.4.0 <7.0.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz"
-        },
-        "graceful-fs": {
-          "version": "4.1.9",
-          "from": "graceful-fs@>=4.1.4 <5.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"
-        },
-        "graceful-readlink": {
-          "version": "1.0.1",
-          "from": "graceful-readlink@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-        },
-        "har-validator": {
-          "version": "2.0.6",
-          "from": "har-validator@>=2.0.6 <2.1.0",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
-        },
-        "has-ansi": {
-          "version": "2.0.0",
-          "from": "has-ansi@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "from": "has-unicode@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "from": "hawk@>=3.1.3 <3.2.0",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "from": "hoek@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-        },
-        "home-or-tmp": {
-          "version": "1.0.0",
-          "from": "home-or-tmp@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz"
-        },
-        "http-errors": {
-          "version": "1.5.0",
-          "from": "http-errors@>=1.5.0 <1.6.0",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz",
-          "dependencies": {
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            }
-          }
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "from": "http-signature@>=1.1.0 <1.2.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
-        },
-        "iconv-lite": {
-          "version": "0.4.13",
-          "from": "iconv-lite@0.4.13",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
-        },
-        "inflight": {
-          "version": "1.0.5",
-          "from": "inflight@>=1.0.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "from": "inherits@>=2.0.1 <2.1.0",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-        },
-        "invert-kv": {
-          "version": "1.0.0",
-          "from": "invert-kv@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
-        },
-        "io.appium.settings": {
-          "version": "2.1.0",
-          "from": "io.appium.settings@>=2.1.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-2.1.0.tgz"
-        },
-        "ios-app-utils": {
-          "version": "1.1.0",
-          "from": "ios-app-utils@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/ios-app-utils/-/ios-app-utils-1.1.0.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            },
-            "source-map-support": {
-              "version": "0.3.3",
-              "from": "source-map-support@>=0.3.1 <0.4.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz"
-            }
-          }
-        },
-        "ip-regex": {
-          "version": "1.0.3",
-          "from": "ip-regex@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"
-        },
-        "ipaddr.js": {
-          "version": "1.1.1",
-          "from": "ipaddr.js@1.1.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz"
-        },
-        "is-bluebird": {
-          "version": "1.0.2",
-          "from": "is-bluebird@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-bluebird/-/is-bluebird-1.0.2.tgz"
-        },
-        "is-buffer": {
-          "version": "1.1.4",
-          "from": "is-buffer@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"
-        },
-        "is-finite": {
-          "version": "1.0.2",
-          "from": "is-finite@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
-        },
-        "is-function": {
-          "version": "1.0.1",
-          "from": "is-function@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"
-        },
-        "is-integer": {
-          "version": "1.0.6",
-          "from": "is-integer@>=1.0.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.6.tgz"
-        },
-        "is-my-json-valid": {
-          "version": "2.15.0",
-          "from": "is-my-json-valid@>=2.12.4 <3.0.0",
-          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"
-        },
-        "is-os": {
-          "version": "1.0.0",
-          "from": "is-os@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-os/-/is-os-1.0.0.tgz"
-        },
-        "is-property": {
-          "version": "1.0.2",
-          "from": "is-property@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "from": "is-typedarray@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "from": "isarray@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-        },
-        "isexe": {
-          "version": "1.1.2",
-          "from": "isexe@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "from": "isstream@>=0.1.2 <0.2.0",
-          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-        },
-        "jimp": {
-          "version": "0.2.27",
-          "from": "jimp@>=0.2.24 <0.3.0",
-          "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.2.27.tgz"
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "from": "jodid25519@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
-        },
-        "jpeg-js": {
-          "version": "0.2.0",
-          "from": "jpeg-js@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.2.0.tgz"
-        },
-        "js-tokens": {
-          "version": "1.0.1",
-          "from": "js-tokens@1.0.1",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz"
-        },
-        "js2xmlparser2": {
-          "version": "0.2.0",
-          "from": "js2xmlparser2@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/js2xmlparser2/-/js2xmlparser2-0.2.0.tgz"
-        },
-        "jsbn": {
-          "version": "0.1.0",
-          "from": "jsbn@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-        },
-        "jsesc": {
-          "version": "0.5.0",
-          "from": "jsesc@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "from": "json-schema@0.2.3",
-          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-        },
-        "json5": {
-          "version": "0.4.0",
-          "from": "json5@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "from": "jsonify@>=0.0.0 <0.1.0",
-          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-        },
-        "jsonpointer": {
-          "version": "4.0.0",
-          "from": "jsonpointer@>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"
-        },
-        "jsprim": {
-          "version": "1.3.1",
-          "from": "jsprim@>=1.2.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"
-        },
-        "kind-of": {
-          "version": "3.0.4",
-          "from": "kind-of@>=3.0.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"
-        },
-        "lazy-cache": {
-          "version": "1.0.4",
-          "from": "lazy-cache@>=1.0.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
-        },
-        "lcid": {
-          "version": "1.0.0",
-          "from": "lcid@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"
-        },
-        "left-pad": {
-          "version": "0.0.3",
-          "from": "left-pad@0.0.3",
-          "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-0.0.3.tgz"
-        },
-        "leven": {
-          "version": "1.0.2",
-          "from": "leven@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"
-        },
-        "line-numbers": {
-          "version": "0.2.0",
-          "from": "line-numbers@0.2.0",
-          "resolved": "https://registry.npmjs.org/line-numbers/-/line-numbers-0.2.0.tgz"
-        },
-        "load-bmfont": {
-          "version": "1.2.3",
-          "from": "load-bmfont@>=1.2.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.2.3.tgz"
-        },
-        "lodash": {
-          "version": "4.16.4",
-          "from": "lodash@>=4.13.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
-        },
-        "lodash.pad": {
-          "version": "4.5.1",
-          "from": "lodash.pad@>=4.1.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz"
-        },
-        "lodash.padend": {
-          "version": "4.6.1",
-          "from": "lodash.padend@>=4.1.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"
-        },
-        "lodash.padstart": {
-          "version": "4.6.1",
-          "from": "lodash.padstart@>=4.1.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz"
-        },
-        "longest": {
-          "version": "1.0.1",
-          "from": "longest@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-        },
-        "md5-file": {
-          "version": "2.0.7",
-          "from": "md5-file@>=2.0.4 <3.0.0",
-          "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-2.0.7.tgz"
-        },
-        "media-typer": {
-          "version": "0.3.0",
-          "from": "media-typer@0.3.0",
-          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
-        },
-        "merge-descriptors": {
-          "version": "1.0.1",
-          "from": "merge-descriptors@1.0.1",
-          "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
-        },
-        "method-override": {
-          "version": "2.3.6",
-          "from": "method-override@>=2.3.5 <3.0.0",
-          "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"
-        },
-        "methods": {
-          "version": "1.1.2",
-          "from": "methods@>=1.1.2 <1.2.0",
-          "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
-        },
-        "mime": {
-          "version": "1.3.4",
-          "from": "mime@1.3.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
-        },
-        "mime-db": {
-          "version": "1.24.0",
-          "from": "mime-db@>=1.24.0 <1.25.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"
-        },
-        "mime-types": {
-          "version": "2.1.12",
-          "from": "mime-types@>=2.1.11 <2.2.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"
-        },
-        "min-document": {
-          "version": "2.19.0",
-          "from": "min-document@>=2.19.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"
-        },
-        "minimatch": {
-          "version": "3.0.3",
-          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "from": "minimist@0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "from": "mkdirp@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-        },
-        "morgan": {
-          "version": "1.7.0",
-          "from": "morgan@>=1.6.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.7.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        },
-        "mv": {
-          "version": "2.1.1",
-          "from": "mv@>=2.1.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-          "dependencies": {
-            "rimraf": {
-              "version": "2.4.5",
-              "from": "rimraf@>=2.4.0 <2.5.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"
-            }
-          }
-        },
-        "ncp": {
-          "version": "2.0.0",
-          "from": "ncp@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"
-        },
-        "negotiator": {
-          "version": "0.6.1",
-          "from": "negotiator@0.6.1",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"
-        },
-        "net": {
-          "version": "1.0.2",
-          "from": "net@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/net/-/net-1.0.2.tgz"
-        },
-        "node-forge": {
-          "version": "0.6.43",
-          "from": "node-forge@>=0.6.12 <0.7.0",
-          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.43.tgz"
-        },
-        "node-idevice": {
-          "version": "0.1.6",
-          "from": "node-idevice@>=0.1.6 <0.2.0",
-          "resolved": "https://registry.npmjs.org/node-idevice/-/node-idevice-0.1.6.tgz"
-        },
-        "node-simctl": {
-          "version": "3.4.4",
-          "from": "node-simctl@>=3.4.3 <4.0.0",
-          "resolved": "https://registry.npmjs.org/node-simctl/-/node-simctl-3.4.4.tgz"
-        },
-        "node-uuid": {
-          "version": "1.4.7",
-          "from": "node-uuid@>=1.4.7 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-        },
-        "npmlog": {
-          "version": "2.0.4",
-          "from": "npmlog@>=2.0.4 <3.0.0",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz"
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "from": "number-is-nan@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "from": "oauth-sign@>=0.8.1 <0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
-        },
-        "object-assign": {
-          "version": "4.1.0",
-          "from": "object-assign@>=4.1.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"
-        },
-        "on-finished": {
-          "version": "2.3.0",
-          "from": "on-finished@>=2.3.0 <2.4.0",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
-        },
-        "on-headers": {
-          "version": "1.0.1",
-          "from": "on-headers@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"
-        },
-        "once": {
-          "version": "1.4.0",
-          "from": "once@>=1.3.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-        },
-        "options": {
-          "version": "0.0.6",
-          "from": "options@>=0.0.5",
-          "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
-        },
-        "os-locale": {
-          "version": "1.4.0",
-          "from": "os-locale@>=1.4.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "from": "os-tmpdir@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-        },
-        "output-file-sync": {
-          "version": "1.1.2",
-          "from": "output-file-sync@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz"
-        },
-        "parse-bmfont-ascii": {
-          "version": "1.0.6",
-          "from": "parse-bmfont-ascii@>=1.0.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"
-        },
-        "parse-bmfont-binary": {
-          "version": "1.0.6",
-          "from": "parse-bmfont-binary@>=1.0.5 <2.0.0",
-          "resolved": "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"
-        },
-        "parse-bmfont-xml": {
-          "version": "1.1.3",
-          "from": "parse-bmfont-xml@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.3.tgz"
-        },
-        "parse-headers": {
-          "version": "2.0.1",
-          "from": "parse-headers@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"
-        },
-        "parseurl": {
-          "version": "1.3.1",
-          "from": "parseurl@>=1.3.1 <1.4.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"
-        },
-        "path": {
-          "version": "0.12.7",
-          "from": "path@>=0.12.7 <0.13.0",
-          "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-          "dependencies": {
-            "process": {
-              "version": "0.11.9",
-              "from": "process@>=0.11.1 <0.12.0",
-              "resolved": "https://registry.npmjs.org/process/-/process-0.11.9.tgz"
-            }
-          }
-        },
-        "path-exists": {
-          "version": "1.0.0",
-          "from": "path-exists@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz"
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-        },
-        "path-to-regexp": {
-          "version": "0.1.7",
-          "from": "path-to-regexp@0.1.7",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
-        },
-        "pinkie": {
-          "version": "2.0.4",
-          "from": "pinkie@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
-        },
-        "pinkie-promise": {
-          "version": "2.0.1",
-          "from": "pinkie-promise@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-        },
-        "pixelmatch": {
-          "version": "4.0.2",
-          "from": "pixelmatch@>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz"
-        },
-        "pkginfo": {
-          "version": "0.3.1",
-          "from": "pkginfo@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
-        },
-        "plist": {
-          "version": "1.2.0",
-          "from": "plist@>=1.2.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz"
-        },
-        "pngjs": {
-          "version": "3.0.0",
-          "from": "pngjs@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.0.0.tgz"
-        },
-        "portfinder": {
-          "version": "1.0.7",
-          "from": "portfinder@>=1.0.6 <2.0.0",
-          "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.7.tgz"
-        },
-        "private": {
-          "version": "0.1.6",
-          "from": "private@>=0.1.6 <0.2.0",
-          "resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz"
-        },
-        "process": {
-          "version": "0.5.2",
-          "from": "process@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz"
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "from": "process-nextick-args@>=1.0.6 <1.1.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
-        },
-        "proxy-addr": {
-          "version": "1.1.2",
-          "from": "proxy-addr@>=1.1.2 <1.2.0",
-          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz"
-        },
-        "ps-node": {
-          "version": "0.0.5",
-          "from": "ps-node@>=0.0.5 <0.0.6",
-          "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.0.5.tgz"
-        },
-        "punycode": {
-          "version": "1.3.2",
-          "from": "punycode@1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-        },
-        "q": {
-          "version": "1.4.1",
-          "from": "q@>=1.1.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
-        },
-        "qs": {
-          "version": "6.2.0",
-          "from": "qs@6.2.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"
-        },
-        "querystring": {
-          "version": "0.2.0",
-          "from": "querystring@0.2.0",
-          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-        },
-        "range-parser": {
-          "version": "1.2.0",
-          "from": "range-parser@>=1.2.0 <1.3.0",
-          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"
-        },
-        "raw-body": {
-          "version": "2.1.7",
-          "from": "raw-body@>=2.1.7 <2.2.0",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"
-        },
-        "read-chunk": {
-          "version": "1.0.1",
-          "from": "read-chunk@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-1.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "2.1.5",
-          "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
-        },
-        "recast": {
-          "version": "0.10.24",
-          "from": "recast@0.10.24",
-          "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.24.tgz",
-          "dependencies": {
-            "source-map": {
-              "version": "0.4.4",
-              "from": "source-map@>=0.4.1 <0.5.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
-            }
-          }
-        },
-        "regenerate": {
-          "version": "1.3.1",
-          "from": "regenerate@>=1.2.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.1.tgz"
-        },
-        "regenerator": {
-          "version": "0.8.35",
-          "from": "regenerator@0.8.35",
-          "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.35.tgz"
-        },
-        "regexpu": {
-          "version": "1.3.0",
-          "from": "regexpu@>=1.1.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu/-/regexpu-1.3.0.tgz",
-          "dependencies": {
-            "esprima": {
-              "version": "2.7.3",
-              "from": "esprima@>=2.6.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"
-            }
-          }
-        },
-        "regjsgen": {
-          "version": "0.2.0",
-          "from": "regjsgen@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz"
-        },
-        "regjsparser": {
-          "version": "0.1.5",
-          "from": "regjsparser@>=0.1.4 <0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz"
-        },
-        "repeat-string": {
-          "version": "1.5.4",
-          "from": "repeat-string@>=1.5.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"
-        },
-        "repeating": {
-          "version": "1.1.3",
-          "from": "repeating@>=1.1.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"
-        },
-        "request": {
-          "version": "2.75.0",
-          "from": "request@>=2.64.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz"
-        },
-        "request-promise": {
-          "version": "1.0.2",
-          "from": "request-promise@>=1.0.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-1.0.2.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.10.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            }
-          }
-        },
-        "request-promise-core": {
-          "version": "1.1.1",
-          "from": "request-promise-core@1.1.1",
-          "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz"
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "from": "resolve@>=1.1.6 <2.0.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
-        },
-        "right-align": {
-          "version": "0.1.3",
-          "from": "right-align@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"
-        },
-        "rimraf": {
-          "version": "2.5.4",
-          "from": "rimraf@>=2.5.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "7.1.1",
-              "from": "glob@>=7.0.5 <8.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
-            }
-          }
-        },
-        "rsvp": {
-          "version": "3.3.3",
-          "from": "rsvp@>=3.0.13 <4.0.0",
-          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.3.3.tgz"
-        },
-        "safari-launcher": {
-          "version": "2.0.5",
-          "from": "safari-launcher@>=2.0.5 <3.0.0",
-          "resolved": "https://registry.npmjs.org/safari-launcher/-/safari-launcher-2.0.5.tgz"
-        },
-        "sax": {
-          "version": "1.2.1",
-          "from": "sax@>=0.6.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"
-        },
-        "semver": {
-          "version": "4.3.6",
-          "from": "semver@>=4.3.3 <5.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-        },
-        "semver-compare": {
-          "version": "1.0.0",
-          "from": "semver-compare@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"
-        },
-        "send": {
-          "version": "0.14.1",
-          "from": "send@0.14.1",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.14.1.tgz"
-        },
-        "serve-favicon": {
-          "version": "2.3.0",
-          "from": "serve-favicon@>=2.3.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"
-        },
-        "serve-static": {
-          "version": "1.11.1",
-          "from": "serve-static@>=1.11.1 <1.12.0",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz"
-        },
-        "setprototypeof": {
-          "version": "1.0.1",
-          "from": "setprototypeof@1.0.1",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "from": "shebang-regex@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
-        },
-        "shell-quote": {
-          "version": "1.6.1",
-          "from": "shell-quote@>=1.4.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"
-        },
-        "shimmer": {
-          "version": "1.0.0",
-          "from": "shimmer@1.0.0",
-          "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.0.0.tgz"
-        },
-        "simple-fmt": {
-          "version": "0.1.0",
-          "from": "simple-fmt@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz"
-        },
-        "simple-is": {
-          "version": "0.2.0",
-          "from": "simple-is@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz"
-        },
-        "slash": {
-          "version": "1.0.0",
-          "from": "slash@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "from": "sntp@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-        },
-        "source-map": {
-          "version": "0.1.32",
-          "from": "source-map@0.1.32",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"
-        },
-        "source-map-support": {
-          "version": "0.4.3",
-          "from": "source-map-support@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.3.tgz",
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.6",
-              "from": "source-map@>=0.5.3 <0.6.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
-            }
-          }
-        },
-        "split": {
-          "version": "0.3.3",
-          "from": "split@>=0.3.3 <0.4.0",
-          "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz"
-        },
-        "sprintf-js": {
-          "version": "1.0.3",
-          "from": "sprintf-js@>=1.0.2 <1.1.0",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-        },
-        "sshpk": {
-          "version": "1.10.1",
-          "from": "sshpk@>=1.7.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "from": "assert-plus@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-            }
-          }
-        },
-        "stable": {
-          "version": "0.1.5",
-          "from": "stable@>=0.1.3 <0.2.0",
-          "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.5.tgz"
-        },
-        "stack-trace": {
-          "version": "0.0.9",
-          "from": "stack-trace@>=0.0.0 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-        },
-        "statuses": {
-          "version": "1.3.0",
-          "from": "statuses@>=1.3.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"
-        },
-        "stealthy-require": {
-          "version": "1.0.0",
-          "from": "stealthy-require@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.0.0.tgz"
-        },
-        "stream-buffers": {
-          "version": "2.2.0",
-          "from": "stream-buffers@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"
-        },
-        "stream-to": {
-          "version": "0.2.2",
-          "from": "stream-to@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/stream-to/-/stream-to-0.2.2.tgz"
-        },
-        "stream-to-buffer": {
-          "version": "0.1.0",
-          "from": "stream-to-buffer@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz"
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "from": "string_decoder@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "from": "string-width@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
-        },
-        "stringmap": {
-          "version": "0.2.2",
-          "from": "stringmap@>=0.2.2 <0.3.0",
-          "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz"
-        },
-        "stringset": {
-          "version": "0.2.1",
-          "from": "stringset@>=0.2.1 <0.3.0",
-          "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz"
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "from": "stringstream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "from": "strip-ansi@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "from": "supports-color@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-        },
-        "table-parser": {
-          "version": "0.1.1",
-          "from": "table-parser@*",
-          "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.1.tgz"
-        },
-        "teen_process": {
-          "version": "1.7.1",
-          "from": "teen_process@>=1.7.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-1.7.1.tgz",
-          "dependencies": {
-            "source-map-support": {
-              "version": "0.2.10",
-              "from": "source-map-support@>=0.2.10 <0.3.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz"
-            }
-          }
-        },
-        "temp": {
-          "version": "0.8.3",
-          "from": "temp@>=0.8.3 <0.9.0",
-          "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
-          "dependencies": {
-            "rimraf": {
-              "version": "2.2.8",
-              "from": "rimraf@>=2.2.6 <2.3.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-            }
-          }
-        },
-        "through": {
-          "version": "2.3.8",
-          "from": "through@>=2.3.8 <3.0.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-        },
-        "tinycolor2": {
-          "version": "1.4.1",
-          "from": "tinycolor2@>=1.1.2 <2.0.0",
-          "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz"
-        },
-        "to-fast-properties": {
-          "version": "1.0.2",
-          "from": "to-fast-properties@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.2.tgz"
-        },
-        "tough-cookie": {
-          "version": "2.3.1",
-          "from": "tough-cookie@>=2.3.0 <2.4.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"
-        },
-        "traceur": {
-          "version": "0.0.111",
-          "from": "traceur@>=0.0.74 <0.1.0",
-          "resolved": "https://registry.npmjs.org/traceur/-/traceur-0.0.111.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "5.0.15",
-              "from": "glob@>=5.0.0 <5.1.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-            },
-            "source-map-support": {
-              "version": "0.2.10",
-              "from": "source-map-support@>=0.2.8 <0.3.0",
-              "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz"
-            }
-          }
-        },
-        "trim": {
-          "version": "0.0.1",
-          "from": "trim@0.0.1",
-          "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"
-        },
-        "trim-right": {
-          "version": "1.0.1",
-          "from": "trim-right@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
-        },
-        "try-resolve": {
-          "version": "1.0.1",
-          "from": "try-resolve@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/try-resolve/-/try-resolve-1.0.1.tgz"
-        },
-        "tryor": {
-          "version": "0.1.2",
-          "from": "tryor@>=0.1.2 <0.2.0",
-          "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz"
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "from": "tunnel-agent@>=0.4.1 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-        },
-        "tweetnacl": {
-          "version": "0.14.3",
-          "from": "tweetnacl@>=0.14.0 <0.15.0",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"
-        },
-        "type-detect": {
-          "version": "1.0.0",
-          "from": "type-detect@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz"
-        },
-        "type-is": {
-          "version": "1.6.13",
-          "from": "type-is@>=1.6.13 <1.7.0",
-          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"
-        },
-        "ultron": {
-          "version": "1.0.2",
-          "from": "ultron@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
-        },
-        "unpipe": {
-          "version": "1.0.0",
-          "from": "unpipe@1.0.0",
-          "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
-        },
-        "url": {
-          "version": "0.11.0",
-          "from": "url@>=0.11.0 <0.12.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz"
-        },
-        "url-regex": {
-          "version": "3.2.0",
-          "from": "url-regex@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz"
-        },
-        "user-home": {
-          "version": "1.1.1",
-          "from": "user-home@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
-        },
-        "utf7": {
-          "version": "1.0.2",
-          "from": "utf7@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
-          "dependencies": {
-            "semver": {
-              "version": "5.3.0",
-              "from": "semver@>=5.3.0 <5.4.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
-            }
-          }
-        },
-        "util": {
-          "version": "0.10.3",
-          "from": "util@>=0.10.3 <0.11.0",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "dependencies": {
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            }
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "from": "util-deprecate@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-        },
-        "uuid-js": {
-          "version": "0.7.5",
-          "from": "uuid-js@>=0.7.5 <0.8.0",
-          "resolved": "https://registry.npmjs.org/uuid-js/-/uuid-js-0.7.5.tgz"
-        },
-        "validate.js": {
-          "version": "0.9.0",
-          "from": "validate.js@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/validate.js/-/validate.js-0.9.0.tgz"
-        },
-        "vary": {
-          "version": "1.1.0",
-          "from": "vary@>=1.1.0 <1.2.0",
-          "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"
-        },
-        "verror": {
-          "version": "1.3.6",
-          "from": "verror@1.3.6",
-          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-        },
-        "which": {
-          "version": "1.2.11",
-          "from": "which@>=1.2.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.11.tgz"
-        },
-        "window-size": {
-          "version": "0.1.4",
-          "from": "window-size@>=0.1.4 <0.2.0",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
-        },
-        "winston": {
-          "version": "2.2.0",
-          "from": "winston@>=2.2.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.0.0",
-              "from": "async@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
-            },
-            "colors": {
-              "version": "1.0.3",
-              "from": "colors@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-            }
-          }
-        },
-        "wordwrap": {
-          "version": "0.0.2",
-          "from": "wordwrap@0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
-        },
-        "wrap-ansi": {
-          "version": "2.0.0",
-          "from": "wrap-ansi@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "from": "wrappy@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-        },
-        "ws": {
-          "version": "1.1.1",
-          "from": "ws@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"
-        },
-        "xhr": {
-          "version": "2.2.2",
-          "from": "xhr@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.2.2.tgz"
-        },
-        "xml-parse-from-string": {
-          "version": "1.0.0",
-          "from": "xml-parse-from-string@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.0.tgz"
-        },
-        "xml2js": {
-          "version": "0.4.17",
-          "from": "xml2js@>=0.4.5 <0.5.0",
-          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
-          "dependencies": {
-            "xmlbuilder": {
-              "version": "4.2.1",
-              "from": "xmlbuilder@>=4.1.0 <5.0.0",
-              "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"
-            }
-          }
-        },
-        "xmlbuilder": {
-          "version": "4.0.0",
-          "from": "xmlbuilder@4.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.5.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            }
-          }
-        },
-        "xmldom": {
-          "version": "0.1.22",
-          "from": "xmldom@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"
-        },
-        "xpath": {
-          "version": "0.0.9",
-          "from": "xpath@0.0.9",
-          "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.9.tgz"
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "from": "xtend@>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "from": "y18n@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"
-        },
-        "yargs": {
-          "version": "3.32.0",
-          "from": "yargs@>=3.10.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"
-        }
-      }
-    },
-    "archiver": {
-      "version": "0.14.4",
-      "from": "archiver@>=0.14.0 <0.15.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.14.4.tgz",
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "from": "async@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-        },
-        "glob": {
-          "version": "4.3.5",
-          "from": "glob@>=4.3.0 <4.4.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "lodash": {
-          "version": "3.2.0",
-          "from": "lodash@>=3.2.0 <3.3.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "from": "minimatch@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.26 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    },
-    "arr-diff": {
-      "version": "2.0.0",
-      "from": "arr-diff@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"
-    },
-    "arr-flatten": {
-      "version": "1.0.1",
-      "from": "arr-flatten@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
-    },
-    "array-slice": {
-      "version": "0.2.3",
-      "from": "array-slice@>=0.2.3 <0.3.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
-    },
-    "array-unique": {
-      "version": "0.2.1",
-      "from": "array-unique@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
-    },
-    "arraybuffer.slice": {
-      "version": "0.0.6",
-      "from": "arraybuffer.slice@0.0.6",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "from": "arrify@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
-    },
-    "asn1": {
-      "version": "0.1.11",
-      "from": "asn1@0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-    },
-    "assert-plus": {
-      "version": "0.1.5",
-      "from": "assert-plus@>=0.1.5 <0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-    },
-    "assertion-error": {
-      "version": "1.0.2",
-      "from": "assertion-error@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz"
-    },
-    "async": {
-      "version": "1.0.0",
-      "from": "async@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
-    },
-    "async-each": {
-      "version": "1.0.1",
-      "from": "async-each@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"
-    },
-    "aws-sign2": {
-      "version": "0.5.0",
-      "from": "aws-sign2@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-    },
-    "babel-code-frame": {
-      "version": "6.16.0",
-      "from": "babel-code-frame@>=6.8.0 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz"
-    },
-    "babel-messages": {
-      "version": "6.8.0",
-      "from": "babel-messages@>=6.8.0 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz"
-    },
-    "babel-runtime": {
-      "version": "6.18.0",
-      "from": "babel-runtime@>=6.0.0 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz"
-    },
-    "babel-traverse": {
-      "version": "6.8.0",
-      "from": "babel-traverse@6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.8.0.tgz"
-    },
-    "babel-types": {
-      "version": "6.8.1",
-      "from": "babel-types@6.8.1",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.8.1.tgz"
-    },
-    "babylon": {
-      "version": "6.8.0",
-      "from": "babylon@6.8.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.0.tgz"
-    },
-    "backo2": {
-      "version": "1.0.2",
-      "from": "backo2@1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"
-    },
-    "balanced-match": {
-      "version": "0.4.2",
-      "from": "balanced-match@>=0.4.1 <0.5.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-    },
-    "base64-arraybuffer": {
-      "version": "0.1.2",
-      "from": "base64-arraybuffer@0.1.2",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"
-    },
-    "base64id": {
-      "version": "0.1.0",
-      "from": "base64id@0.1.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"
-    },
-    "batch": {
-      "version": "0.5.3",
-      "from": "batch@>=0.5.3 <0.6.0",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"
-    },
-    "benchmark": {
-      "version": "1.0.0",
-      "from": "benchmark@1.0.0",
-      "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"
-    },
-    "better-assert": {
-      "version": "1.0.2",
-      "from": "better-assert@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"
-    },
-    "binary-extensions": {
-      "version": "1.7.0",
-      "from": "binary-extensions@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz"
-    },
-    "bl": {
-      "version": "0.9.5",
-      "from": "bl@>=0.9.0 <0.10.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.26 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    },
-    "blob": {
-      "version": "0.0.4",
-      "from": "blob@0.0.4",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"
-    },
-    "bluebird": {
-      "version": "2.11.0",
-      "from": "bluebird@>=2.9.27 <3.0.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"
-    },
-    "body-parser": {
-      "version": "1.15.2",
-      "from": "body-parser@>=1.12.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        }
-      }
-    },
-    "boom": {
-      "version": "2.10.1",
-      "from": "boom@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-    },
-    "brace-expansion": {
-      "version": "1.1.6",
-      "from": "brace-expansion@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
-    },
-    "braces": {
-      "version": "1.8.5",
-      "from": "braces@>=1.8.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"
-    },
-    "buffer-crc32": {
-      "version": "0.2.6",
-      "from": "buffer-crc32@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.6.tgz"
-    },
-    "buffer-shims": {
-      "version": "1.0.0",
-      "from": "buffer-shims@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
-    },
-    "bytes": {
-      "version": "2.4.0",
-      "from": "bytes@2.4.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"
-    },
-    "callsite": {
-      "version": "1.0.0",
-      "from": "callsite@1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
-    },
-    "caseless": {
-      "version": "0.9.0",
-      "from": "caseless@>=0.9.0 <0.10.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "from": "chalk@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-    },
-    "chokidar": {
-      "version": "1.6.1",
-      "from": "chokidar@>=1.4.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz"
-    },
-    "colors": {
-      "version": "1.1.2",
-      "from": "colors@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
-    },
-    "combined-stream": {
-      "version": "0.0.7",
-      "from": "combined-stream@>=0.0.5 <0.1.0",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"
-    },
-    "commander": {
-      "version": "2.3.0",
-      "from": "commander@2.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz"
-    },
-    "component-bind": {
-      "version": "1.0.0",
-      "from": "component-bind@1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"
-    },
-    "component-emitter": {
-      "version": "1.1.2",
-      "from": "component-emitter@1.1.2",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"
-    },
-    "component-inherit": {
-      "version": "0.0.3",
-      "from": "component-inherit@0.0.3",
-      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"
-    },
-    "compress-commons": {
-      "version": "0.2.9",
-      "from": "compress-commons@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.2.9.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.26 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "from": "concat-map@0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-    },
-    "connect": {
-      "version": "3.5.0",
-      "from": "connect@>=3.3.5 <4.0.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        }
-      }
-    },
-    "content-type": {
-      "version": "1.0.2",
-      "from": "content-type@>=1.0.2 <1.1.0",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"
-    },
-    "core-js": {
-      "version": "2.4.1",
-      "from": "core-js@>=2.4.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "from": "core-util-is@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-    },
-    "crc32-stream": {
-      "version": "0.3.4",
-      "from": "crc32-stream@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.24 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    },
-    "cryptiles": {
-      "version": "2.0.5",
-      "from": "cryptiles@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-    },
-    "ctype": {
-      "version": "0.5.3",
-      "from": "ctype@0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-    },
-    "custom-event": {
-      "version": "1.0.1",
-      "from": "custom-event@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"
-    },
-    "debug": {
-      "version": "2.3.3",
-      "from": "debug@>=2.2.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"
-    },
-    "deep-eql": {
-      "version": "0.1.3",
-      "from": "deep-eql@>=0.1.3 <0.2.0",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-      "dependencies": {
-        "type-detect": {
-          "version": "0.1.1",
-          "from": "type-detect@0.1.1",
-          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "0.0.5",
-      "from": "delayed-stream@0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-    },
-    "depd": {
-      "version": "1.1.0",
-      "from": "depd@>=1.1.0 <1.2.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
-    },
-    "di": {
-      "version": "0.0.1",
-      "from": "di@>=0.0.1 <0.0.2",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz"
-    },
-    "diff": {
-      "version": "1.4.0",
-      "from": "diff@1.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"
-    },
-    "dom-serialize": {
-      "version": "2.2.1",
-      "from": "dom-serialize@>=2.2.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "from": "ee-first@1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
-    },
-    "end-of-stream": {
-      "version": "1.1.0",
-      "from": "end-of-stream@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
-      "dependencies": {
-        "once": {
-          "version": "1.3.3",
-          "from": "once@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
-        }
-      }
-    },
-    "engine.io": {
-      "version": "1.6.11",
-      "from": "engine.io@1.6.11",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "1.6.11",
-      "from": "engine.io-client@1.6.11",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        },
-        "ws": {
-          "version": "1.0.1",
-          "from": "ws@1.0.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz"
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "1.2.4",
-      "from": "engine.io-parser@1.2.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz",
-      "dependencies": {
-        "has-binary": {
-          "version": "0.1.6",
-          "from": "has-binary@0.1.6",
-          "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        }
-      }
-    },
-    "ent": {
-      "version": "2.2.0",
-      "from": "ent@>=2.2.0 <2.3.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "from": "escape-html@>=1.0.3 <1.1.0",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "from": "esutils@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
-    },
-    "eventemitter3": {
-      "version": "1.2.0",
-      "from": "eventemitter3@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"
-    },
-    "expand-braces": {
-      "version": "0.1.2",
-      "from": "expand-braces@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-      "dependencies": {
-        "braces": {
-          "version": "0.1.5",
-          "from": "braces@>=0.1.2 <0.2.0",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"
-        },
-        "expand-range": {
-          "version": "0.1.1",
-          "from": "expand-range@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"
-        },
-        "is-number": {
-          "version": "0.1.1",
-          "from": "is-number@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"
-        },
-        "repeat-string": {
-          "version": "0.2.2",
-          "from": "repeat-string@>=0.2.2 <0.3.0",
-          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"
-        }
-      }
-    },
-    "expand-brackets": {
-      "version": "0.1.5",
-      "from": "expand-brackets@>=0.1.4 <0.2.0",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "from": "expand-range@>=1.8.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"
-    },
-    "extend": {
-      "version": "3.0.0",
-      "from": "extend@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-    },
-    "extglob": {
-      "version": "0.3.2",
-      "from": "extglob@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"
-    },
-    "filename-regex": {
-      "version": "2.0.0",
-      "from": "filename-regex@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"
-    },
-    "fill-range": {
-      "version": "2.2.3",
-      "from": "fill-range@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"
-    },
-    "finalhandler": {
-      "version": "0.5.0",
-      "from": "finalhandler@0.5.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        }
-      }
-    },
-    "findup-sync": {
-      "version": "0.3.0",
-      "from": "findup-sync@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"
-    },
-    "for-in": {
-      "version": "0.1.6",
-      "from": "for-in@>=0.1.5 <0.2.0",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"
-    },
-    "for-own": {
-      "version": "0.1.4",
-      "from": "for-own@>=0.1.4 <0.2.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz"
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "from": "forever-agent@>=0.6.0 <0.7.0",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-    },
-    "form-data": {
-      "version": "0.2.0",
-      "from": "form-data@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "from": "async@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-        },
-        "mime-db": {
-          "version": "1.12.0",
-          "from": "mime-db@>=1.12.0 <1.13.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-        },
-        "mime-types": {
-          "version": "2.0.14",
-          "from": "mime-types@>=2.0.3 <2.1.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"
-        }
-      }
-    },
-    "fqueue": {
-      "version": "0.0.0",
-      "from": "fqueue@>=0.0.0 <0.1.0",
-      "resolved": "https://registry.npmjs.org/fqueue/-/fqueue-0.0.0.tgz"
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "from": "fs.realpath@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "from": "generate-function@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "from": "generate-object-property@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-    },
-    "glob": {
-      "version": "5.0.15",
-      "from": "glob@>=5.0.0 <5.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "from": "glob-base@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
-    },
-    "glob-parent": {
-      "version": "2.0.0",
-      "from": "glob-parent@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
-    },
-    "globals": {
-      "version": "8.18.0",
-      "from": "globals@>=8.3.0 <9.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz"
-    },
-    "graceful-fs": {
-      "version": "4.1.10",
-      "from": "graceful-fs@>=4.1.2 <5.0.0",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz"
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "from": "graceful-readlink@>=1.0.0",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-    },
-    "growl": {
-      "version": "1.9.2",
-      "from": "growl@1.9.2",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"
-    },
-    "grunt-known-options": {
-      "version": "1.1.0",
-      "from": "grunt-known-options@>=1.1.0 <1.2.0",
-      "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"
-    },
-    "har-validator": {
-      "version": "1.8.0",
-      "from": "har-validator@>=1.4.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
-      "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "from": "commander@>=2.8.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-        }
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "from": "has-ansi@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-    },
-    "has-binary": {
-      "version": "0.1.7",
-      "from": "has-binary@0.1.7",
-      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        }
-      }
-    },
-    "has-cors": {
-      "version": "1.1.0",
-      "from": "has-cors@1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"
-    },
-    "hawk": {
-      "version": "2.3.1",
-      "from": "hawk@>=2.3.0 <2.4.0",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"
-    },
-    "hoek": {
-      "version": "2.16.3",
-      "from": "hoek@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-    },
-    "http-errors": {
-      "version": "1.5.1",
-      "from": "http-errors@>=1.5.0 <1.6.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"
-    },
-    "http-proxy": {
-      "version": "1.15.2",
-      "from": "http-proxy@>=1.13.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz"
-    },
-    "http-signature": {
-      "version": "0.10.1",
-      "from": "http-signature@>=0.10.0 <0.11.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"
-    },
-    "iconv-lite": {
-      "version": "0.4.13",
-      "from": "iconv-lite@0.4.13",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "from": "indexof@0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "from": "inflight@>=1.0.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "from": "inherits@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-    },
-    "invariant": {
-      "version": "2.2.2",
-      "from": "invariant@>=2.2.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "from": "is-binary-path@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
-    },
-    "is-buffer": {
-      "version": "1.1.4",
-      "from": "is-buffer@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"
-    },
-    "is-dotfile": {
-      "version": "1.0.2",
-      "from": "is-dotfile@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "from": "is-equal-shallow@>=0.1.3 <0.2.0",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "from": "is-extendable@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-    },
-    "is-extglob": {
-      "version": "1.0.0",
-      "from": "is-extglob@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "from": "is-finite@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"
-    },
-    "is-glob": {
-      "version": "2.0.1",
-      "from": "is-glob@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-    },
-    "is-my-json-valid": {
-      "version": "2.15.0",
-      "from": "is-my-json-valid@>=2.12.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"
-    },
-    "is-number": {
-      "version": "2.1.0",
-      "from": "is-number@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "from": "is-posix-bracket@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "from": "is-primitive@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "from": "is-property@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "from": "isarray@1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-    },
-    "isbinaryfile": {
-      "version": "3.0.1",
-      "from": "isbinaryfile@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz"
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "from": "isobject@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "from": "isstream@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-    },
-    "jade": {
-      "version": "0.26.3",
-      "from": "jade@0.26.3",
-      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-      "dependencies": {
-        "commander": {
-          "version": "0.6.1",
-          "from": "commander@0.6.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
-        },
-        "mkdirp": {
-          "version": "0.3.0",
-          "from": "mkdirp@0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
-        }
-      }
-    },
-    "js-tokens": {
-      "version": "2.0.0",
-      "from": "js-tokens@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz"
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-    },
-    "json3": {
-      "version": "3.2.6",
-      "from": "json3@3.2.6",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"
-    },
-    "jsonpointer": {
-      "version": "4.0.0",
-      "from": "jsonpointer@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"
-    },
-    "karma": {
-      "version": "0.13.22",
-      "from": "karma@>=0.13.19 <0.14.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-0.13.22.tgz",
-      "dependencies": {
-        "glob": {
-          "version": "7.1.1",
-          "from": "glob@>=7.0.0 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
-        }
-      }
-    },
-    "kind-of": {
-      "version": "3.0.4",
-      "from": "kind-of@>=3.0.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"
-    },
-    "lazystream": {
-      "version": "0.1.0",
-      "from": "lazystream@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.2 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    },
-    "lodash": {
-      "version": "3.10.1",
-      "from": "lodash@>=3.10.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-    },
-    "log4js": {
-      "version": "0.6.38",
-      "from": "log4js@>=0.6.31 <0.7.0",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.2 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    },
-    "loose-envify": {
-      "version": "1.3.0",
-      "from": "loose-envify@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz"
-    },
-    "lru-cache": {
-      "version": "2.2.4",
-      "from": "lru-cache@>=2.2.0 <2.3.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "from": "media-typer@0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "from": "micromatch@>=2.1.5 <3.0.0",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
-    },
-    "mime": {
-      "version": "1.3.4",
-      "from": "mime@>=1.3.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
-    },
-    "mime-db": {
-      "version": "1.25.0",
-      "from": "mime-db@>=1.25.0 <1.26.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"
-    },
-    "mime-types": {
-      "version": "2.1.13",
-      "from": "mime-types@>=2.1.13 <2.2.0",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"
-    },
-    "minimatch": {
-      "version": "3.0.3",
-      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"
-    },
-    "minimist": {
-      "version": "0.0.10",
-      "from": "minimist@>=0.0.1 <0.1.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "from": "mkdirp@0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "from": "minimist@0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-        }
-      }
-    },
-    "mocha": {
-      "version": "2.5.3",
-      "from": "mocha@>=2.4.5 <3.0.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "escape-string-regexp": {
-          "version": "1.0.2",
-          "from": "escape-string-regexp@1.0.2",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
-        },
-        "glob": {
-          "version": "3.2.11",
-          "from": "glob@3.2.11",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"
-        },
-        "minimatch": {
-          "version": "0.3.0",
-          "from": "minimatch@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        },
-        "supports-color": {
-          "version": "1.2.0",
-          "from": "supports-color@1.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz"
-        }
-      }
-    },
-    "ms": {
-      "version": "0.7.2",
-      "from": "ms@0.7.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
-    },
-    "nan": {
-      "version": "2.4.0",
-      "from": "nan@>=2.3.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
-    },
-    "nativescript-angular": {
-      "version": "1.3.0",
-      "from": "../nativescript-angular",
-      "resolved": "file:../nativescript-angular"
-    },
-    "nativescript-hook": {
-      "version": "0.2.1",
-      "from": "nativescript-hook@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/nativescript-hook/-/nativescript-hook-0.2.1.tgz",
-      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "from": "glob@>=6.0.1 <7.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
-        }
-      }
-    },
-    "nativescript-intl": {
-      "version": "0.0.8",
-      "from": "nativescript-intl@>=0.0.8 <0.1.0",
-      "resolved": "https://registry.npmjs.org/nativescript-intl/-/nativescript-intl-0.0.8.tgz"
-    },
-    "nativescript-unit-test-runner": {
-      "version": "0.3.4",
-      "from": "nativescript-unit-test-runner@>=0.3.4 <0.4.0",
-      "resolved": "https://registry.npmjs.org/nativescript-unit-test-runner/-/nativescript-unit-test-runner-0.3.4.tgz"
-    },
-    "negotiator": {
-      "version": "0.4.9",
-      "from": "negotiator@0.4.9",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"
-    },
-    "node-int64": {
-      "version": "0.3.3",
-      "from": "node-int64@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz"
-    },
-    "node-uuid": {
-      "version": "1.4.7",
-      "from": "node-uuid@>=1.4.0 <1.5.0",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "from": "nopt@>=3.0.6 <3.1.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
-    },
-    "normalize-path": {
-      "version": "2.0.1",
-      "from": "normalize-path@>=2.0.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "from": "number-is-nan@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-    },
-    "oauth-sign": {
-      "version": "0.6.0",
-      "from": "oauth-sign@>=0.6.0 <0.7.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"
-    },
-    "object-component": {
-      "version": "0.0.3",
-      "from": "object-component@0.0.3",
-      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "from": "object.omit@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "from": "on-finished@>=2.3.0 <2.4.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
-    },
-    "once": {
-      "version": "1.4.0",
-      "from": "once@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "from": "optimist@>=0.6.1 <0.7.0",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
-    },
-    "options": {
-      "version": "0.0.6",
-      "from": "options@>=0.0.5",
-      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "from": "parse-glob@>=3.0.4 <4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"
-    },
-    "parse5": {
-      "version": "1.3.2",
-      "from": "parse5@1.3.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.3.2.tgz"
-    },
-    "parsejson": {
-      "version": "0.0.1",
-      "from": "parsejson@0.0.1",
-      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"
-    },
-    "parseqs": {
-      "version": "0.0.2",
-      "from": "parseqs@0.0.2",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"
-    },
-    "parseuri": {
-      "version": "0.0.4",
-      "from": "parseuri@0.0.4",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"
-    },
-    "parseurl": {
-      "version": "1.3.1",
-      "from": "parseurl@>=1.3.1 <1.4.0",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-    },
-    "portastic": {
-      "version": "1.0.1",
-      "from": "portastic@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/portastic/-/portastic-1.0.1.tgz",
-      "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "from": "commander@>=2.8.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-        }
-      }
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "from": "preserve@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "from": "process-nextick-args@>=1.0.6 <1.1.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
-    },
-    "punycode": {
-      "version": "1.3.2",
-      "from": "punycode@1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-    },
-    "q": {
-      "version": "1.4.1",
-      "from": "q@>=1.4.1 <1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
-    },
-    "qs": {
-      "version": "6.2.0",
-      "from": "qs@6.2.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "from": "querystring@0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-    },
-    "randomatic": {
-      "version": "1.1.5",
-      "from": "randomatic@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"
-    },
-    "raw-body": {
-      "version": "2.1.7",
-      "from": "raw-body@>=2.1.7 <2.2.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"
-    },
-    "readable-stream": {
-      "version": "2.2.2",
-      "from": "readable-stream@>=2.0.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"
-    },
-    "readdirp": {
-      "version": "2.1.0",
-      "from": "readdirp@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"
-    },
-    "reflect-metadata": {
-      "version": "0.1.8",
-      "from": "reflect-metadata@>=0.1.8 <0.2.0",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.8.tgz"
-    },
-    "regenerator-runtime": {
-      "version": "0.9.6",
-      "from": "regenerator-runtime@>=0.9.5 <0.10.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"
-    },
-    "regex-cache": {
-      "version": "0.4.3",
-      "from": "regex-cache@>=0.4.2 <0.5.0",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"
-    },
-    "repeat-element": {
-      "version": "1.1.2",
-      "from": "repeat-element@>=1.1.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "from": "repeat-string@>=1.5.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
-    },
-    "repeating": {
-      "version": "1.1.3",
-      "from": "repeating@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"
-    },
-    "request": {
-      "version": "2.55.0",
-      "from": "request@>=2.55.0 <2.56.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
-      "dependencies": {
-        "mime-db": {
-          "version": "1.12.0",
-          "from": "mime-db@>=1.12.0 <1.13.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-        },
-        "mime-types": {
-          "version": "2.0.14",
-          "from": "mime-types@>=2.0.1 <2.1.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"
-        },
-        "qs": {
-          "version": "2.4.2",
-          "from": "qs@>=2.4.0 <2.5.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz"
-        }
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "from": "requires-port@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
-    },
-    "resolve": {
-      "version": "1.1.7",
-      "from": "resolve@>=1.1.0 <1.2.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
-    },
-    "rimraf": {
-      "version": "2.5.4",
-      "from": "rimraf@>=2.3.3 <3.0.0",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-      "dependencies": {
-        "glob": {
-          "version": "7.1.1",
-          "from": "glob@>=7.0.5 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
-        }
-      }
-    },
-    "rxjs": {
-      "version": "5.0.3",
-      "from": "rxjs@>=5.0.1 <5.1.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.3.tgz"
-    },
-    "semver": {
-      "version": "4.3.6",
-      "from": "semver@>=4.3.3 <4.4.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-    },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "from": "set-immediate-shim@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
-    },
-    "setprototypeof": {
-      "version": "1.0.2",
-      "from": "setprototypeof@1.0.2",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"
-    },
-    "shelljs": {
-      "version": "0.5.3",
-      "from": "shelljs@0.5.3",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "from": "sigmund@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-    },
-    "sntp": {
-      "version": "1.0.9",
-      "from": "sntp@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-    },
-    "socket.io": {
-      "version": "1.4.8",
-      "from": "socket.io@1.4.8",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        }
-      }
-    },
-    "socket.io-adapter": {
-      "version": "0.4.0",
-      "from": "socket.io-adapter@0.4.0",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        },
-        "socket.io-parser": {
-          "version": "2.2.2",
-          "from": "socket.io-parser@2.2.2",
-          "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz",
-          "dependencies": {
-            "debug": {
-              "version": "0.7.4",
-              "from": "debug@0.7.4",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-            }
-          }
-        }
-      }
-    },
-    "socket.io-client": {
-      "version": "1.4.8",
-      "from": "socket.io-client@1.4.8",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz",
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.0",
-          "from": "component-emitter@1.2.0",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"
-        },
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        }
-      }
-    },
-    "socket.io-parser": {
-      "version": "2.2.6",
-      "from": "socket.io-parser@2.2.6",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "from": "debug@2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "json3": {
-          "version": "3.3.2",
-          "from": "json3@3.3.2",
-          "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"
-        },
-        "ms": {
-          "version": "0.7.1",
-          "from": "ms@0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-        }
-      }
-    },
-    "source-map": {
-      "version": "0.5.6",
-      "from": "source-map@>=0.5.3 <0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
-    },
-    "statuses": {
-      "version": "1.3.1",
-      "from": "statuses@>=1.3.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "from": "string_decoder@>=0.10.0 <0.11.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "from": "stringstream@>=0.0.4 <0.1.0",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "from": "strip-ansi@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "from": "supports-color@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-    },
-    "symbol-observable": {
-      "version": "1.0.4",
-      "from": "symbol-observable@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"
-    },
-    "tar-stream": {
-      "version": "1.1.5",
-      "from": "tar-stream@>=1.1.0 <1.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.5.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.33 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    },
-    "to-array": {
-      "version": "0.1.4",
-      "from": "to-array@0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"
-    },
-    "to-fast-properties": {
-      "version": "1.0.2",
-      "from": "to-fast-properties@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.2.tgz"
-    },
-    "to-iso-string": {
-      "version": "0.0.2",
-      "from": "to-iso-string@0.0.2",
-      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz"
-    },
-    "tough-cookie": {
-      "version": "2.3.2",
-      "from": "tough-cookie@>=0.12.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "from": "punycode@>=1.4.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
-        }
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.4.3",
-      "from": "tunnel-agent@>=0.4.0 <0.5.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-    },
-    "type-detect": {
-      "version": "1.0.0",
-      "from": "type-detect@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz"
-    },
-    "type-is": {
-      "version": "1.6.14",
-      "from": "type-is@>=1.6.13 <1.7.0",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"
-    },
-    "ultron": {
-      "version": "1.0.2",
-      "from": "ultron@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
-    },
-    "underscore.string": {
-      "version": "3.0.3",
-      "from": "underscore.string@>=3.0.3 <3.1.0",
-      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.0.3.tgz"
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "from": "unpipe@1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
-    },
-    "url": {
-      "version": "0.10.3",
-      "from": "url@0.10.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz"
-    },
-    "useragent": {
-      "version": "2.1.9",
-      "from": "useragent@>=2.1.6 <3.0.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz"
-    },
-    "utf8": {
-      "version": "2.1.0",
-      "from": "utf8@2.1.0",
-      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "from": "util-deprecate@>=1.0.1 <1.1.0",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-    },
-    "utils-merge": {
-      "version": "1.0.0",
-      "from": "utils-merge@1.0.0",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-    },
-    "vargs": {
-      "version": "0.1.0",
-      "from": "vargs@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "from": "void-elements@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
-    },
-    "wd": {
-      "version": "0.4.0",
-      "from": "wd@0.4.0",
-      "resolved": "https://registry.npmjs.org/wd/-/wd-0.4.0.tgz",
-      "dependencies": {
-        "lodash": {
-          "version": "3.9.3",
-          "from": "lodash@>=3.9.3 <3.10.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz"
-        }
-      }
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "from": "wordwrap@>=0.0.2 <0.1.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "from": "wrappy@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-    },
-    "ws": {
-      "version": "1.1.0",
-      "from": "ws@1.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz"
-    },
-    "xmlhttprequest-ssl": {
-      "version": "1.5.1",
-      "from": "xmlhttprequest-ssl@1.5.1",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "from": "xtend@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-    },
-    "yeast": {
-      "version": "0.1.2",
-      "from": "yeast@0.1.2",
-      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"
-    },
-    "zip-stream": {
-      "version": "0.5.2",
-      "from": "zip-stream@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.5.2.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "lodash": {
-          "version": "3.2.0",
-          "from": "lodash@>=3.2.0 <3.3.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.26 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        }
-      }
-    }
-  }
-}
diff --git a/tests/package.json b/tests/package.json
index 97e2f6153..a875f0522 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -26,17 +26,18 @@
   ],
   "homepage": "http://nativescript.org",
   "dependencies": {
-    "@angular/common": "~2.4.3",
-    "@angular/compiler": "~2.4.3",
-    "@angular/core": "~2.4.3",
-    "@angular/http": "~2.4.3",
-    "@angular/platform-browser": "~2.4.3",
-    "@angular/platform-browser-dynamic": "~2.4.3",
-    "@angular/router": "~3.4.3",
-    "nativescript-angular": "file:../nativescript-angular",
+    "@angular/common": "~4.0.0",
+    "@angular/compiler": "~4.0.0",
+    "@angular/core": "~4.0.0",
+    "@angular/http": "~4.0.0",
+    "@angular/platform-browser": "~4.0.0",
+    "@angular/platform-browser-dynamic": "~4.0.0",
+    "@angular/router": "~4.0.0",
+    "nativescript-angular": "../nativescript-angular",
     "nativescript-unit-test-runner": "^0.3.4",
-    "rxjs": "~5.0.1",
-    "tns-core-modules": "internal-preview"
+    "rxjs": "^5.2.0",
+    "tns-core-modules": "internal-preview",
+    "zone.js": "^0.8.2"
   },
   "devDependencies": {
     "babel-traverse": "6.8.0",
@@ -57,14 +58,15 @@
     "nativescript-dev-typescript": "^0.3.1",
     "socket.io": "1.4.8",
     "socket.io-client": "1.4.8",
+    "tslint": "^4.5.1",
     "typescript": "~2.2.0",
-    "wd": "0.4.0",
-    "zone.js": "^0.7.2"
+    "wd": "0.4.0"
   },
   "scripts": {
     "updateTests": "grunt updateTests",
     "appium-android": "tns build android && npm run run-appium-android",
     "run-appium-android": "nativescript-dev-appium android",
-    "appium-ios-simulator": "tns build ios && nativescript-dev-appium ios-simulator"
+    "appium-ios-simulator": "tns build ios && nativescript-dev-appium ios-simulator",
+    "tslint": "tslint --project tsconfig.json --config tslint.json"
   }
 }
diff --git a/tests/references.d.ts b/tests/references.d.ts
index 8f857a9d3..b14f3837d 100644
--- a/tests/references.d.ts
+++ b/tests/references.d.ts
@@ -1 +1 @@
-/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
\ No newline at end of file
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
index 1b964e752..7193bf4a1 100644
--- a/tests/tsconfig.json
+++ b/tests/tsconfig.json
@@ -2,9 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "target": "es5",
-        "inlineSourceMap": true,
         "experimentalDecorators": true,
-        "removeComments": false,
         "emitDecoratorMetadata": true,
         "noEmitHelpers": true,
         "noEmitOnError": true,
@@ -23,6 +21,7 @@
     },
     "exclude": [
         "node_modules",
-        "platforms"
+        "platforms",
+        "**/*.aot"
     ]
 }
\ No newline at end of file
diff --git a/tests/tslint.json b/tests/tslint.json
new file mode 100644
index 000000000..6cab565e9
--- /dev/null
+++ b/tests/tslint.json
@@ -0,0 +1,117 @@
+{
+  "rules":{
+   "no-any": false,
+    "no-inferrable-types": false,
+    "no-internal-module": true,
+    "no-var-requires": false,
+    "typedef": false,
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      },
+      {
+        "call-signature": "space",
+        "index-signature": "space",
+        "parameter": "space",
+        "property-declaration": "space",
+        "variable-declaration": "space"
+      }
+    ],
+
+    "ban": false,
+    "curly": true,
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-conditional-assignment": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-variable": true,
+    "no-empty": false,
+    "no-eval": true,
+    "no-null-keyword": false,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-switch-case-fall-through": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "radix": false,
+    "switch-default": true,
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "eofline": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "max-line-length": [
+      true,
+      120
+    ],
+    "no-require-imports": false,
+    "no-trailing-whitespace": true,
+    "object-literal-sort-keys": false,
+    "trailing-comma": [
+      true,
+      {
+        "multiline": false,
+        "singleline": "never"
+      }
+    ],
+
+    "align": false,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "interface-name": false,
+    "jsdoc-format": true,
+    "no-consecutive-blank-lines": [
+        true, 2
+    ],
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-finally",
+      "check-whitespace"
+    ],
+    "quotemark": [
+      true,
+      "double",
+      "avoid-escape"
+    ],
+    "semicolon": [true, "always"],
+    "variable-name": [
+      true,
+      "check-format",
+      "allow-leading-underscore",
+      "ban-keywords"
+    ],
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ]
+  }
+}