diff --git a/web/package-lock.json b/web/package-lock.json
index 5e66c720..3ed0069f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -10,14 +10,14 @@
             "integrity": "sha512-GRw7svOXDegavtxWifbGZlh7Q2JOOzzeQX4NwNMAOy/yr3UOvsmNqvKLdYNjzcUc0TlLrmwgyjUL8w2tXmxY6g=="
         },
         "@angular-devkit/build-optimizer": {
-            "version": "0.0.27",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.27.tgz",
-            "integrity": "sha512-Gr2qbWnclFGk0fz7FtarhrekJNq2O6l9PMzbS9waL2gdH+3q+PX7XPDYFIputp4nDPCfBJNE3vNiOoKy6lFxFA==",
+            "version": "0.0.32",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.32.tgz",
+            "integrity": "sha512-j09JdaFoRukEllfmH+TUJpe2ujUzTSj/szqYGHWVBilajwnNQh7f0A9v1R27mX+2di4x8tXuvaBgwvdEZBv32w==",
             "dev": true,
             "requires": {
                 "loader-utils": "1.1.0",
                 "source-map": "0.5.7",
-                "typescript": "2.4.1",
+                "typescript": "2.4.2",
                 "webpack-sources": "1.0.1"
             }
         },
@@ -31,21 +31,32 @@
             }
         },
         "@angular-devkit/schematics": {
-            "version": "0.0.33",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.33.tgz",
-            "integrity": "sha512-ritV72m4SMbN5b4eVqg7QDqG5ctBrt2oCljOd6AK6saYesoY/0ud8oBcMjFMkDETuFDAmC/XZZeqfmEuj160yg==",
+            "version": "0.0.35",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.35.tgz",
+            "integrity": "sha512-+qGUWhmMpHqHkYKMk1yKQDjXb/vqXGkzbMiRs/u5rSnlrH+/TzkCO0UsM7/p9WPcModuDxkf5FItpw/AgdcPeQ==",
             "dev": true,
             "requires": {
                 "@angular-devkit/core": "0.0.20",
                 "@ngtools/json-schema": "1.1.0",
                 "minimist": "1.2.0",
-                "rxjs": "5.4.3"
+                "rxjs": "5.5.2"
+            },
+            "dependencies": {
+                "rxjs": {
+                    "version": "5.5.2",
+                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+                    "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+                    "dev": true,
+                    "requires": {
+                        "symbol-observable": "1.0.4"
+                    }
+                }
             }
         },
         "@angular/animations": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.5.tgz",
-            "integrity": "sha1-WlpVHXV+WlVgCY9vhTXBAtk5VNc=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
+            "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
             "requires": {
                 "tslib": "1.8.0"
             }
@@ -59,21 +70,21 @@
             }
         },
         "@angular/cli": {
-            "version": "1.4.7",
-            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.4.7.tgz",
-            "integrity": "sha512-VJB95B49nh8LjJJDkHNAoklJIsKQ0Xvpu39q/yaicpuzVaSiOUgHO6SfQrW6RwN3uxLAWTREy+FMRtIv1UIXNw==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.5.0.tgz",
+            "integrity": "sha512-nCXvqNCdi+8aOU2v6EABZsMg5bB7iM+wfaoWKnu9M5fOW2Rm+7/3Y1gDQKyFkgXCzXdy3J/xpfmwT0gjmjlvIA==",
             "dev": true,
             "requires": {
-                "@angular-devkit/build-optimizer": "0.0.27",
-                "@angular-devkit/schematics": "0.0.33",
+                "@angular-devkit/build-optimizer": "0.0.32",
+                "@angular-devkit/schematics": "0.0.35",
                 "@ngtools/json-schema": "1.1.0",
-                "@ngtools/webpack": "1.7.4",
-                "@schematics/angular": "0.0.45",
+                "@ngtools/webpack": "1.8.0",
+                "@schematics/angular": "0.1.0",
                 "autoprefixer": "6.7.7",
-                "chalk": "2.1.0",
+                "chalk": "2.2.2",
                 "circular-dependency-plugin": "3.0.0",
                 "common-tags": "1.4.0",
-                "copy-webpack-plugin": "4.1.1",
+                "copy-webpack-plugin": "4.2.0",
                 "core-object": "3.1.5",
                 "css-loader": "0.28.4",
                 "cssnano": "3.10.0",
@@ -81,15 +92,15 @@
                 "ember-cli-string-utils": "1.1.0",
                 "exports-loader": "0.6.4",
                 "extract-text-webpack-plugin": "3.0.0",
-                "file-loader": "0.10.1",
+                "file-loader": "1.1.5",
                 "fs-extra": "4.0.2",
                 "glob": "7.1.2",
                 "html-webpack-plugin": "2.30.1",
                 "istanbul-instrumenter-loader": "2.0.0",
                 "karma-source-map-support": "1.2.0",
-                "less": "2.7.2",
+                "less": "2.7.3",
                 "less-loader": "4.0.5",
-                "license-webpack-plugin": "1.1.0",
+                "license-webpack-plugin": "1.1.1",
                 "lodash": "4.17.4",
                 "memory-fs": "0.4.1",
                 "node-modules-path": "1.0.1",
@@ -97,11 +108,12 @@
                 "nopt": "4.0.1",
                 "opn": "5.1.0",
                 "portfinder": "1.0.13",
+                "postcss-custom-properties": "6.2.0",
                 "postcss-loader": "1.3.3",
                 "postcss-url": "5.1.2",
                 "raw-loader": "0.5.1",
                 "resolve": "1.4.0",
-                "rxjs": "5.4.3",
+                "rxjs": "5.5.2",
                 "sass-loader": "6.0.6",
                 "semver": "5.4.1",
                 "silent-error": "1.1.0",
@@ -110,33 +122,41 @@
                 "style-loader": "0.13.2",
                 "stylus": "0.54.5",
                 "stylus-loader": "3.0.1",
-                "typescript": "2.4.1",
+                "uglifyjs-webpack-plugin": "1.0.0",
                 "url-loader": "0.6.2",
-                "webpack": "3.6.0",
+                "webpack": "3.8.1",
                 "webpack-concat-plugin": "1.4.0",
                 "webpack-dev-middleware": "1.12.0",
-                "webpack-dev-server": "2.7.1",
-                "webpack-merge": "4.1.0",
+                "webpack-dev-server": "2.9.3",
+                "webpack-merge": "4.1.1",
+                "webpack-sources": "1.0.1",
+                "webpack-subresource-integrity": "1.0.1",
                 "zone.js": "0.8.18"
             },
             "dependencies": {
                 "@ngtools/webpack": {
-                    "version": "1.7.4",
-                    "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.7.4.tgz",
-                    "integrity": "sha512-o0u1Oj1k1WEIamBNEncvXDWmUxCMDIlKrMFp4nIwh7bag4dndDShUVD1EinSpx1TvMjVbA42Z+7cIVmlq+240Q==",
+                    "version": "1.8.0",
+                    "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.8.0.tgz",
+                    "integrity": "sha512-QefALj8VUakHMI/Z/7RjyQR4UpAAfCXeoHqqD9+7Td3CZkuryyGQILqOSAg3d+cP+64iCwIb2jSKC+YAIy722Q==",
                     "dev": true,
                     "requires": {
+                        "chalk": "2.2.2",
                         "enhanced-resolve": "3.3.0",
                         "loader-utils": "1.1.0",
                         "magic-string": "0.22.4",
-                        "source-map": "0.5.7"
+                        "semver": "5.4.1",
+                        "source-map": "0.5.7",
+                        "tree-kill": "1.2.0"
                     }
                 },
                 "@schematics/angular": {
-                    "version": "0.0.45",
-                    "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.0.45.tgz",
-                    "integrity": "sha512-KBrXnyb4ZPgARWa3fMXlIY44sS1mB+TmCJ/wBw3Zn+/ME/rnGgFWvdWEQDUmMsj8LjZtZkQdY1GVqYeO3MIHfA==",
-                    "dev": true
+                    "version": "0.1.0",
+                    "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.1.0.tgz",
+                    "integrity": "sha512-+Yy72J55uImsROxwyyEMso+HJIvx7+ffT8o8HzdNOZyLg4jj7G/ZDiCsCmhRtTYOmOof4OqvF2VecJyXVi0oHA==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.0.20"
+                    }
                 },
                 "ansi-regex": {
                     "version": "3.0.0",
@@ -144,6 +164,15 @@
                     "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
                     "dev": true
                 },
+                "ansi-styles": {
+                    "version": "3.2.0",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+                    "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "1.9.0"
+                    }
+                },
                 "autoprefixer": {
                     "version": "6.7.7",
                     "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
@@ -164,6 +193,17 @@
                     "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
                     "dev": true
                 },
+                "chalk": {
+                    "version": "2.2.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.2.tgz",
+                    "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "3.2.0",
+                        "escape-string-regexp": "1.0.5",
+                        "supports-color": "4.5.0"
+                    }
+                },
                 "cliui": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
@@ -181,6 +221,15 @@
                     "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
                     "dev": true
                 },
+                "debug": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
                 "extract-text-webpack-plugin": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz",
@@ -194,12 +243,13 @@
                     }
                 },
                 "file-loader": {
-                    "version": "0.10.1",
-                    "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.10.1.tgz",
-                    "integrity": "sha1-gVA0EZiR/GRB+1pkwRvJPCLd2EI=",
+                    "version": "1.1.5",
+                    "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz",
+                    "integrity": "sha512-RzGHDatcVNpGISTvCpfUfOGpYuSR7HSsSg87ki+wF6rw1Hm0RALPTiAdsxAq1UwLf0RRhbe22/eHK6nhXspiOQ==",
                     "dev": true,
                     "requires": {
-                        "loader-utils": "1.1.0"
+                        "loader-utils": "1.1.0",
+                        "schema-utils": "0.3.0"
                     }
                 },
                 "find-up": {
@@ -229,9 +279,9 @@
                     }
                 },
                 "license-webpack-plugin": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.1.0.tgz",
-                    "integrity": "sha512-4f0H9kk1y4BF8/y8V4p8pn/ZAoZaCsCnfJfoVvq5t+jkjWJKhSKzROdzeJPNDcZj/tSzJ4NkXjcH0hXaagxLJA==",
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.1.1.tgz",
+                    "integrity": "sha512-TjKOyiC0exqd4Idy/4M8/DETR22dXBZks387DuS5LbslxHiMRXGx/Q2F/j9IUtvEoH5uFvt72vRgk/G6f8j3Dg==",
                     "dev": true,
                     "requires": {
                         "ejs": "2.5.7"
@@ -305,6 +355,15 @@
                         "read-pkg": "2.0.0"
                     }
                 },
+                "rxjs": {
+                    "version": "5.5.2",
+                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+                    "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+                    "dev": true,
+                    "requires": {
+                        "symbol-observable": "1.0.4"
+                    }
+                },
                 "string-width": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -348,39 +407,47 @@
                     }
                 },
                 "supports-color": {
-                    "version": "4.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-                    "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+                    "version": "4.5.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+                    "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
                     "dev": true,
                     "requires": {
                         "has-flag": "2.0.0"
                     }
                 },
-                "uglify-js": {
-                    "version": "2.8.29",
-                    "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-                    "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+                "uglify-es": {
+                    "version": "3.1.6",
+                    "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.6.tgz",
+                    "integrity": "sha512-7zyH8T4rT3/iLVzNI7Oa8hVQSlv280S8y2/a2EmvEObft3067rdUJJKjBspc70d0HUk1Og1V5Ny4UgZOlZ0hSg==",
                     "dev": true,
                     "requires": {
-                        "source-map": "0.5.7",
-                        "uglify-to-browserify": "1.0.2",
-                        "yargs": "3.10.0"
+                        "commander": "2.11.0",
+                        "source-map": "0.6.1"
                     },
                     "dependencies": {
-                        "yargs": {
-                            "version": "3.10.0",
-                            "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-                            "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-                            "dev": true,
-                            "requires": {
-                                "camelcase": "1.2.1",
-                                "cliui": "2.1.0",
-                                "decamelize": "1.2.0",
-                                "window-size": "0.1.0"
-                            }
+                        "source-map": {
+                            "version": "0.6.1",
+                            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                            "dev": true
                         }
                     }
                 },
+                "uglifyjs-webpack-plugin": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.0.0.tgz",
+                    "integrity": "sha512-23qmtiLm1X7O0XVSZ54W7XGHykPss+2lo3RYC9zSzK3DDT5W27woZpDFDKguDCnG1RIX8cDnmy5j+dtXxJCA/Q==",
+                    "dev": true,
+                    "requires": {
+                        "cacache": "10.0.0",
+                        "find-cache-dir": "1.0.0",
+                        "schema-utils": "0.3.0",
+                        "source-map": "0.5.7",
+                        "uglify-es": "3.1.6",
+                        "webpack-sources": "1.0.1",
+                        "worker-farm": "1.5.1"
+                    }
+                },
                 "url-loader": {
                     "version": "0.6.2",
                     "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
@@ -393,15 +460,15 @@
                     }
                 },
                 "webpack": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz",
-                    "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==",
+                    "version": "3.8.1",
+                    "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz",
+                    "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==",
                     "dev": true,
                     "requires": {
                         "acorn": "5.1.2",
                         "acorn-dynamic-import": "2.0.2",
                         "ajv": "5.2.3",
-                        "ajv-keywords": "2.1.0",
+                        "ajv-keywords": "2.1.1",
                         "async": "2.5.0",
                         "enhanced-resolve": "3.4.1",
                         "escope": "3.6.0",
@@ -414,7 +481,7 @@
                         "mkdirp": "0.5.1",
                         "node-libs-browser": "2.0.0",
                         "source-map": "0.5.7",
-                        "supports-color": "4.4.0",
+                        "supports-color": "4.5.0",
                         "tapable": "0.2.8",
                         "uglifyjs-webpack-plugin": "0.4.6",
                         "watchpack": "1.4.0",
@@ -423,9 +490,9 @@
                     },
                     "dependencies": {
                         "ajv-keywords": {
-                            "version": "2.1.0",
-                            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
-                            "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+                            "version": "2.1.1",
+                            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+                            "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
                             "dev": true
                         },
                         "enhanced-resolve": {
@@ -440,6 +507,31 @@
                                 "tapable": "0.2.8"
                             }
                         },
+                        "uglify-js": {
+                            "version": "2.8.29",
+                            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+                            "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+                            "dev": true,
+                            "requires": {
+                                "source-map": "0.5.7",
+                                "uglify-to-browserify": "1.0.2",
+                                "yargs": "3.10.0"
+                            },
+                            "dependencies": {
+                                "yargs": {
+                                    "version": "3.10.0",
+                                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+                                    "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+                                    "dev": true,
+                                    "requires": {
+                                        "camelcase": "1.2.1",
+                                        "cliui": "2.1.0",
+                                        "decamelize": "1.2.0",
+                                        "window-size": "0.1.0"
+                                    }
+                                }
+                            }
+                        },
                         "uglifyjs-webpack-plugin": {
                             "version": "0.4.6",
                             "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
@@ -467,24 +559,27 @@
                     }
                 },
                 "webpack-dev-server": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz",
-                    "integrity": "sha1-IVgPWgjNBlxxFEz29hw0W8pZqLg=",
+                    "version": "2.9.3",
+                    "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.3.tgz",
+                    "integrity": "sha512-bwq7sj452FRH+oVfgOA8xXKkLYPTNsYB4dQ0Jhz3ydjNJ9MvhpGJtehFW8Z0cEcwNkRRiF4aYbReiSGQ4pbS1w==",
                     "dev": true,
                     "requires": {
                         "ansi-html": "0.0.7",
+                        "array-includes": "3.0.3",
                         "bonjour": "3.5.0",
                         "chokidar": "1.7.0",
                         "compression": "1.7.1",
                         "connect-history-api-fallback": "1.4.0",
+                        "debug": "3.1.0",
                         "del": "3.0.0",
                         "express": "4.16.2",
                         "html-entities": "1.2.1",
                         "http-proxy-middleware": "0.17.4",
+                        "import-local": "0.1.1",
                         "internal-ip": "1.2.0",
                         "ip": "1.1.5",
                         "loglevel": "1.5.1",
-                        "opn": "4.0.2",
+                        "opn": "5.1.0",
                         "portfinder": "1.0.13",
                         "selfsigned": "1.10.1",
                         "serve-index": "1.9.1",
@@ -492,7 +587,7 @@
                         "sockjs-client": "1.1.4",
                         "spdy": "3.4.7",
                         "strip-ansi": "3.0.1",
-                        "supports-color": "3.2.3",
+                        "supports-color": "4.5.0",
                         "webpack-dev-middleware": "1.12.0",
                         "yargs": "6.6.0"
                     },
@@ -524,12 +619,6 @@
                                 "pinkie-promise": "2.0.1"
                             }
                         },
-                        "has-flag": {
-                            "version": "1.0.0",
-                            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-                            "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-                            "dev": true
-                        },
                         "load-json-file": {
                             "version": "1.1.0",
                             "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -543,16 +632,6 @@
                                 "strip-bom": "2.0.0"
                             }
                         },
-                        "opn": {
-                            "version": "4.0.2",
-                            "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
-                            "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
-                            "dev": true,
-                            "requires": {
-                                "object-assign": "4.1.1",
-                                "pinkie-promise": "2.0.1"
-                            }
-                        },
                         "os-locale": {
                             "version": "1.4.0",
                             "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -614,15 +693,6 @@
                                 "is-utf8": "0.2.1"
                             }
                         },
-                        "supports-color": {
-                            "version": "3.2.3",
-                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-                            "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-                            "dev": true,
-                            "requires": {
-                                "has-flag": "1.0.0"
-                            }
-                        },
                         "which-module": {
                             "version": "1.0.0",
                             "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
@@ -661,6 +731,15 @@
                         }
                     }
                 },
+                "webpack-subresource-integrity": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.1.tgz",
+                    "integrity": "sha1-H8CdRkl9pm5GdDoqUdLMOFucsO0=",
+                    "dev": true,
+                    "requires": {
+                        "webpack-core": "0.6.9"
+                    }
+                },
                 "which-module": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -752,77 +831,67 @@
             }
         },
         "@angular/common": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.5.tgz",
-            "integrity": "sha1-vVF53JIq2/TD6m37Gec8uEn/3Dc=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
+            "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
             "requires": {
                 "tslib": "1.8.0"
             }
         },
         "@angular/compiler": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.5.tgz",
-            "integrity": "sha1-hyGlkQ8rtS8J4tQEytJk817eWQI=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
+            "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
             "requires": {
                 "tslib": "1.8.0"
             }
         },
         "@angular/compiler-cli": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.5.tgz",
-            "integrity": "sha1-YfoDNqzRogjF8cXG1N9nnpmVMkg=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0.tgz",
+            "integrity": "sha1-Dsu5N9hKT43ZTwwqR7B9LkaUyFM=",
             "dev": true,
             "requires": {
-                "@angular/tsc-wrapped": "4.4.5",
+                "chokidar": "1.7.0",
                 "minimist": "1.2.0",
-                "reflect-metadata": "0.1.10"
+                "reflect-metadata": "0.1.10",
+                "tsickle": "0.24.1"
             },
             "dependencies": {
-                "@angular/tsc-wrapped": {
-                    "version": "4.4.5",
-                    "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.5.tgz",
-                    "integrity": "sha1-MKDLtDpmOqddyphIlL5IE3eN3Jw=",
+                "tsickle": {
+                    "version": "0.24.1",
+                    "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.24.1.tgz",
+                    "integrity": "sha512-XloFQZhVhgjpQsi3u2ORNRJvuID5sflOg6HfP093IqAbhE1+fIUXznULpdDwHgG4p+v8w78KdHruQtkWUKx5AQ==",
                     "dev": true,
                     "requires": {
-                        "tsickle": "0.21.6"
-                    },
-                    "dependencies": {
-                        "tsickle": {
-                            "version": "0.21.6",
-                            "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz",
-                            "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=",
-                            "dev": true,
-                            "requires": {
-                                "minimist": "1.2.0",
-                                "mkdirp": "0.5.1",
-                                "source-map": "0.5.7",
-                                "source-map-support": "0.4.18"
-                            }
-                        }
+                        "minimist": "1.2.0",
+                        "mkdirp": "0.5.1",
+                        "source-map": "0.5.7",
+                        "source-map-support": "0.4.18"
                     }
                 }
             }
         },
         "@angular/core": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.5.tgz",
-            "integrity": "sha1-VKy8vaEXGfiDx4apBpdKvrEy8aA=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
+            "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
             "requires": {
                 "tslib": "1.8.0"
             }
         },
         "@angular/forms": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.5.tgz",
-            "integrity": "sha1-6VUghiMqqyzh0I7xmLYiBOoTxDs=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
+            "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
             "requires": {
                 "tslib": "1.8.0"
             }
         },
         "@angular/http": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.5.tgz",
-            "integrity": "sha1-LHNe2EJAH8I1ZBkmjiiNzyOW6E8=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
+            "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
             "requires": {
                 "tslib": "1.8.0"
             }
@@ -836,25 +905,25 @@
             }
         },
         "@angular/platform-browser": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.5.tgz",
-            "integrity": "sha1-dOuRwLdYEm8m1T7lbHz0ZovZysU=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
+            "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
             "requires": {
                 "tslib": "1.8.0"
             }
         },
         "@angular/platform-browser-dynamic": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.5.tgz",
-            "integrity": "sha1-d029wdkPd12/HjGfbtQrJgYjth8=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
+            "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
             "requires": {
                 "tslib": "1.8.0"
             }
         },
         "@angular/router": {
-            "version": "4.4.5",
-            "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.5.tgz",
-            "integrity": "sha1-9zEwz0h9mjLMGYiv2llmX0Siiok=",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
+            "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
             "requires": {
                 "tslib": "1.8.0"
             }
@@ -1109,6 +1178,16 @@
             "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
             "dev": true
         },
+        "array-includes": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+            "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+            "dev": true,
+            "requires": {
+                "define-properties": "1.1.2",
+                "es-abstract": "1.9.0"
+            }
+        },
         "array-slice": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
@@ -1756,6 +1835,27 @@
             "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
             "dev": true
         },
+        "cacache": {
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.0.tgz",
+            "integrity": "sha512-s9h6I9NY3KcBjfuS28K6XNmrv/HNFSzlpVD6eYMXugZg3Y8jjI1lUzTeUMa0oKByCDtHfsIy5Ec7KgWRnC5gtg==",
+            "dev": true,
+            "requires": {
+                "bluebird": "3.5.1",
+                "chownr": "1.0.1",
+                "glob": "7.1.2",
+                "graceful-fs": "4.1.11",
+                "lru-cache": "4.1.1",
+                "mississippi": "1.3.0",
+                "mkdirp": "0.5.1",
+                "move-concurrently": "1.0.1",
+                "promise-inflight": "1.0.1",
+                "rimraf": "2.6.2",
+                "ssri": "5.0.0",
+                "unique-filename": "1.1.0",
+                "y18n": "3.2.1"
+            }
+        },
         "callsite": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
@@ -1920,6 +2020,12 @@
                 }
             }
         },
+        "chownr": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+            "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+            "dev": true
+        },
         "chromium-pickle-js": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
@@ -2127,6 +2233,12 @@
                 "babel-runtime": "6.26.0"
             }
         },
+        "commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+            "dev": true
+        },
         "compare-version": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
@@ -2278,10 +2390,24 @@
             "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
             "dev": true
         },
+        "copy-concurrently": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+            "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+            "dev": true,
+            "requires": {
+                "aproba": "1.2.0",
+                "fs-write-stream-atomic": "1.0.10",
+                "iferr": "0.1.5",
+                "mkdirp": "0.5.1",
+                "rimraf": "2.6.2",
+                "run-queue": "1.0.3"
+            }
+        },
         "copy-webpack-plugin": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.1.1.tgz",
-            "integrity": "sha512-qcjV9uj5PFuKo9GDr0xYAZ3DwFA3ugwDcfbLHfiDrvnUx66Z7C4r00/ds856GaGb2cGHqLTwrGxwfvW+lgAQew==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.2.0.tgz",
+            "integrity": "sha512-eZERim02YjJcepLjrToQMapOoRLfiXewJi9zJON6xXNNJSUhkGzL1L/yFjOufS0KxsnWUzc2szg9t8ZaZKJXAg==",
             "dev": true,
             "requires": {
                 "bluebird": "3.5.1",
@@ -2641,6 +2767,12 @@
             "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
             "dev": true
         },
+        "cyclist": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+            "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+            "dev": true
+        },
         "d": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
@@ -2751,6 +2883,24 @@
                 "strip-bom": "2.0.0"
             }
         },
+        "define-properties": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+            "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+            "dev": true,
+            "requires": {
+                "foreach": "2.0.5",
+                "object-keys": "1.0.11"
+            },
+            "dependencies": {
+                "object-keys": {
+                    "version": "1.0.11",
+                    "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+                    "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+                    "dev": true
+                }
+            }
+        },
         "defined": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
@@ -2987,6 +3137,18 @@
                 "domelementtype": "1.3.0"
             }
         },
+        "duplexify": {
+            "version": "3.5.1",
+            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+            "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+            "dev": true,
+            "requires": {
+                "end-of-stream": "1.4.0",
+                "inherits": "2.0.3",
+                "readable-stream": "2.3.3",
+                "stream-shift": "1.0.0"
+            }
+        },
         "ecc-jsbn": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -3229,6 +3391,15 @@
             "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
             "dev": true
         },
+        "end-of-stream": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+            "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+            "dev": true,
+            "requires": {
+                "once": "1.4.0"
+            }
+        },
         "engine.io": {
             "version": "1.8.3",
             "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
@@ -3372,6 +3543,30 @@
                 "is-arrayish": "0.2.1"
             }
         },
+        "es-abstract": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz",
+            "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
+            "dev": true,
+            "requires": {
+                "es-to-primitive": "1.1.1",
+                "function-bind": "1.1.1",
+                "has": "1.0.1",
+                "is-callable": "1.1.3",
+                "is-regex": "1.0.4"
+            }
+        },
+        "es-to-primitive": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+            "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+            "dev": true,
+            "requires": {
+                "is-callable": "1.1.3",
+                "is-date-object": "1.0.1",
+                "is-symbol": "1.0.1"
+            }
+        },
         "es5-ext": {
             "version": "0.10.31",
             "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.31.tgz",
@@ -3886,6 +4081,17 @@
                 "unpipe": "1.0.0"
             }
         },
+        "find-cache-dir": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+            "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+            "dev": true,
+            "requires": {
+                "commondir": "1.0.1",
+                "make-dir": "1.1.0",
+                "pkg-dir": "2.0.0"
+            }
+        },
         "find-up": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
@@ -3902,6 +4108,16 @@
             "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
             "dev": true
         },
+        "flush-write-stream": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz",
+            "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=",
+            "dev": true,
+            "requires": {
+                "inherits": "2.0.3",
+                "readable-stream": "2.3.3"
+            }
+        },
         "for-in": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -3917,6 +4133,12 @@
                 "for-in": "1.0.2"
             }
         },
+        "foreach": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+            "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+            "dev": true
+        },
         "forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -3946,6 +4168,16 @@
             "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
             "dev": true
         },
+        "from2": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+            "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+            "dev": true,
+            "requires": {
+                "inherits": "2.0.3",
+                "readable-stream": "2.3.3"
+            }
+        },
         "fs-access": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
@@ -3966,6 +4198,18 @@
                 "universalify": "0.1.1"
             }
         },
+        "fs-write-stream-atomic": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+            "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "4.1.11",
+                "iferr": "0.1.5",
+                "imurmurhash": "0.1.4",
+                "readable-stream": "2.3.3"
+            }
+        },
         "fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -4672,6 +4916,12 @@
             "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
             "dev": true
         },
+        "iferr": {
+            "version": "0.1.5",
+            "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+            "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+            "dev": true
+        },
         "image-size": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -4688,6 +4938,22 @@
                 "xmldom": "0.1.27"
             }
         },
+        "import-local": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz",
+            "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=",
+            "dev": true,
+            "requires": {
+                "pkg-dir": "2.0.0",
+                "resolve-cwd": "2.0.0"
+            }
+        },
+        "imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+            "dev": true
+        },
         "in-publish": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
@@ -4815,6 +5081,18 @@
                 "builtin-modules": "1.1.1"
             }
         },
+        "is-callable": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+            "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
+            "dev": true
+        },
+        "is-date-object": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+            "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+            "dev": true
+        },
         "is-directory": {
             "version": "0.3.1",
             "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
@@ -4935,6 +5213,15 @@
             "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
             "dev": true
         },
+        "is-regex": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+            "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+            "dev": true,
+            "requires": {
+                "has": "1.0.1"
+            }
+        },
         "is-stream": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -4950,6 +5237,12 @@
                 "html-comment-regex": "1.1.1"
             }
         },
+        "is-symbol": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+            "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+            "dev": true
+        },
         "is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -5525,9 +5818,9 @@
             }
         },
         "less": {
-            "version": "2.7.2",
-            "resolved": "https://registry.npmjs.org/less/-/less-2.7.2.tgz",
-            "integrity": "sha1-No1sxz4fsDmBGDKAkYdDxdz5s98=",
+            "version": "2.7.3",
+            "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
+            "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
             "dev": true,
             "requires": {
                 "errno": "0.1.4",
@@ -5536,8 +5829,170 @@
                 "mime": "1.4.1",
                 "mkdirp": "0.5.1",
                 "promise": "7.3.1",
-                "request": "2.83.0",
+                "request": "2.81.0",
                 "source-map": "0.5.7"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "4.11.8",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+                    "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "co": "4.6.0",
+                        "json-stable-stringify": "1.0.1"
+                    }
+                },
+                "assert-plus": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+                    "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+                    "dev": true,
+                    "optional": true
+                },
+                "aws-sign2": {
+                    "version": "0.6.0",
+                    "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+                    "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+                    "dev": true,
+                    "optional": true
+                },
+                "boom": {
+                    "version": "2.10.1",
+                    "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+                    "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+                    "dev": true,
+                    "requires": {
+                        "hoek": "2.16.3"
+                    }
+                },
+                "cryptiles": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+                    "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "boom": "2.10.1"
+                    }
+                },
+                "form-data": {
+                    "version": "2.1.4",
+                    "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+                    "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "asynckit": "0.4.0",
+                        "combined-stream": "1.0.5",
+                        "mime-types": "2.1.17"
+                    }
+                },
+                "har-schema": {
+                    "version": "1.0.5",
+                    "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+                    "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+                    "dev": true,
+                    "optional": true
+                },
+                "har-validator": {
+                    "version": "4.2.1",
+                    "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+                    "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ajv": "4.11.8",
+                        "har-schema": "1.0.5"
+                    }
+                },
+                "hawk": {
+                    "version": "3.1.3",
+                    "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+                    "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "boom": "2.10.1",
+                        "cryptiles": "2.0.5",
+                        "hoek": "2.16.3",
+                        "sntp": "1.0.9"
+                    }
+                },
+                "hoek": {
+                    "version": "2.16.3",
+                    "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+                    "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+                    "dev": true
+                },
+                "http-signature": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+                    "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "assert-plus": "0.2.0",
+                        "jsprim": "1.4.1",
+                        "sshpk": "1.13.1"
+                    }
+                },
+                "performance-now": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+                    "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+                    "dev": true,
+                    "optional": true
+                },
+                "qs": {
+                    "version": "6.4.0",
+                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+                    "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+                    "dev": true,
+                    "optional": true
+                },
+                "request": {
+                    "version": "2.81.0",
+                    "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+                    "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "aws-sign2": "0.6.0",
+                        "aws4": "1.6.0",
+                        "caseless": "0.12.0",
+                        "combined-stream": "1.0.5",
+                        "extend": "3.0.1",
+                        "forever-agent": "0.6.1",
+                        "form-data": "2.1.4",
+                        "har-validator": "4.2.1",
+                        "hawk": "3.1.3",
+                        "http-signature": "1.1.1",
+                        "is-typedarray": "1.0.0",
+                        "isstream": "0.1.2",
+                        "json-stringify-safe": "5.0.1",
+                        "mime-types": "2.1.17",
+                        "oauth-sign": "0.8.2",
+                        "performance-now": "0.2.0",
+                        "qs": "6.4.0",
+                        "safe-buffer": "5.1.1",
+                        "stringstream": "0.0.5",
+                        "tough-cookie": "2.3.3",
+                        "tunnel-agent": "0.6.0",
+                        "uuid": "3.1.0"
+                    }
+                },
+                "sntp": {
+                    "version": "1.0.9",
+                    "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+                    "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "hoek": "2.16.3"
+                    }
+                }
             }
         },
         "less-loader": {
@@ -5769,6 +6224,23 @@
                 "vlq": "0.2.3"
             }
         },
+        "make-dir": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
+            "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
+            "dev": true,
+            "requires": {
+                "pify": "3.0.0"
+            },
+            "dependencies": {
+                "pify": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+                    "dev": true
+                }
+            }
+        },
         "make-error": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz",
@@ -5976,6 +6448,24 @@
             "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
             "dev": true
         },
+        "mississippi": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz",
+            "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=",
+            "dev": true,
+            "requires": {
+                "concat-stream": "1.6.0",
+                "duplexify": "3.5.1",
+                "end-of-stream": "1.4.0",
+                "flush-write-stream": "1.0.2",
+                "from2": "2.3.0",
+                "parallel-transform": "1.1.0",
+                "pump": "1.0.2",
+                "pumpify": "1.3.5",
+                "stream-each": "1.2.2",
+                "through2": "2.0.3"
+            }
+        },
         "mixin-object": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
@@ -6052,6 +6542,20 @@
                 }
             }
         },
+        "move-concurrently": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+            "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+            "dev": true,
+            "requires": {
+                "aproba": "1.2.0",
+                "copy-concurrently": "1.0.5",
+                "fs-write-stream-atomic": "1.0.10",
+                "mkdirp": "0.5.1",
+                "rimraf": "2.6.2",
+                "run-queue": "1.0.3"
+            }
+        },
         "ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -6590,6 +7094,17 @@
             "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
             "dev": true
         },
+        "parallel-transform": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+            "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+            "dev": true,
+            "requires": {
+                "cyclist": "0.2.2",
+                "inherits": "2.0.3",
+                "readable-stream": "2.3.3"
+            }
+        },
         "param-case": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
@@ -6784,6 +7299,26 @@
                 "pinkie": "2.0.4"
             }
         },
+        "pkg-dir": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+            "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+            "dev": true,
+            "requires": {
+                "find-up": "2.1.0"
+            },
+            "dependencies": {
+                "find-up": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+                    "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+                    "dev": true,
+                    "requires": {
+                        "locate-path": "2.0.0"
+                    }
+                }
+            }
+        },
         "plist": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz",
@@ -6889,6 +7424,50 @@
                 "postcss-value-parser": "3.3.0"
             }
         },
+        "postcss-custom-properties": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz",
+            "integrity": "sha512-eNR2h9T9ciKMoQEORrPjH33XeN/nuvVuxArOKmHtsFbGbNss631tgTrKou3/pmjAZbA4QQkhLIkPQkIk3WW+8w==",
+            "dev": true,
+            "requires": {
+                "balanced-match": "1.0.0",
+                "postcss": "6.0.13"
+            },
+            "dependencies": {
+                "has-flag": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+                    "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+                    "dev": true
+                },
+                "postcss": {
+                    "version": "6.0.13",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+                    "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "2.1.0",
+                        "source-map": "0.6.1",
+                        "supports-color": "4.5.0"
+                    }
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "4.5.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+                    "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "2.0.0"
+                    }
+                }
+            }
+        },
         "postcss-discard-comments": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
@@ -7520,6 +8099,12 @@
                 "asap": "2.0.6"
             }
         },
+        "promise-inflight": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+            "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+            "dev": true
+        },
         "protractor": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz",
@@ -7626,6 +8211,27 @@
                 "randombytes": "2.0.5"
             }
         },
+        "pump": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+            "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+            "dev": true,
+            "requires": {
+                "end-of-stream": "1.4.0",
+                "once": "1.4.0"
+            }
+        },
+        "pumpify": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+            "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+            "dev": true,
+            "requires": {
+                "duplexify": "3.5.1",
+                "inherits": "2.0.3",
+                "pump": "1.0.2"
+            }
+        },
         "punycode": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -8050,6 +8656,21 @@
                 "path-parse": "1.0.5"
             }
         },
+        "resolve-cwd": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+            "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+            "dev": true,
+            "requires": {
+                "resolve-from": "3.0.0"
+            }
+        },
+        "resolve-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+            "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+            "dev": true
+        },
         "right-align": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -8078,6 +8699,15 @@
                 "inherits": "2.0.3"
             }
         },
+        "run-queue": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+            "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+            "dev": true,
+            "requires": {
+                "aproba": "1.2.0"
+            }
+        },
         "run-series": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz",
@@ -8085,9 +8715,9 @@
             "dev": true
         },
         "rxjs": {
-            "version": "5.4.3",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
-            "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==",
+            "version": "5.5.2",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+            "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
             "requires": {
                 "symbol-observable": "1.0.4"
             }
@@ -8732,6 +9362,15 @@
                 "tweetnacl": "0.14.5"
             }
         },
+        "ssri": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz",
+            "integrity": "sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "5.1.1"
+            }
+        },
         "statuses": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -8758,6 +9397,16 @@
                 "readable-stream": "2.3.3"
             }
         },
+        "stream-each": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
+            "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+            "dev": true,
+            "requires": {
+                "end-of-stream": "1.4.0",
+                "stream-shift": "1.0.0"
+            }
+        },
         "stream-http": {
             "version": "2.7.2",
             "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
@@ -8771,6 +9420,12 @@
                 "xtend": "4.0.1"
             }
         },
+        "stream-shift": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+            "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+            "dev": true
+        },
         "strict-uri-encode": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -9072,6 +9727,12 @@
             "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
             "dev": true
         },
+        "tree-kill": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+            "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
+            "dev": true
+        },
         "trim-newlines": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -9223,9 +9884,9 @@
             "dev": true
         },
         "typescript": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz",
-            "integrity": "sha1-w8yxbdqgsjFN4DHn5v7onlujRrw=",
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
+            "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
             "dev": true
         },
         "uglify-js": {
@@ -9271,6 +9932,24 @@
             "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
             "dev": true
         },
+        "unique-filename": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
+            "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+            "dev": true,
+            "requires": {
+                "unique-slug": "2.0.0"
+            }
+        },
+        "unique-slug": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
+            "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+            "dev": true,
+            "requires": {
+                "imurmurhash": "0.1.4"
+            }
+        },
         "universalify": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
@@ -9827,6 +10506,33 @@
                 }
             }
         },
+        "webpack-core": {
+            "version": "0.6.9",
+            "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+            "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+            "dev": true,
+            "requires": {
+                "source-list-map": "0.1.8",
+                "source-map": "0.4.4"
+            },
+            "dependencies": {
+                "source-list-map": {
+                    "version": "0.1.8",
+                    "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+                    "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.4.4",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                    "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+                    "dev": true,
+                    "requires": {
+                        "amdefine": "1.0.1"
+                    }
+                }
+            }
+        },
         "webpack-dev-server": {
             "version": "2.5.0",
             "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.5.0.tgz",
@@ -9941,9 +10647,9 @@
             }
         },
         "webpack-merge": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.0.tgz",
-            "integrity": "sha1-atciI7PguDflMeRZfBmfkJNhUR4=",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz",
+            "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==",
             "dev": true,
             "requires": {
                 "lodash": "4.17.4"
@@ -10022,6 +10728,16 @@
             "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
             "dev": true
         },
+        "worker-farm": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz",
+            "integrity": "sha512-T5NH6Wqsd8MwGD4AK8BBllUy6LmHaqjEOyo/YIUEegZui6/v5Bqde//3jwyE3PGiGYMmWi06exFBi5LNhhPFNw==",
+            "dev": true,
+            "requires": {
+                "errno": "0.1.4",
+                "xtend": "4.0.1"
+            }
+        },
         "wrap-ansi": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
diff --git a/web/package.json b/web/package.json
index a04850a8..9e5b8487 100644
--- a/web/package.json
+++ b/web/package.json
@@ -47,28 +47,28 @@
     },
     "dependencies": {
         "@amcharts/amcharts3-angular": "^1.5.0",
-        "@angular/animations": "^4.4.5",
+        "@angular/animations": "^5.0.0",
         "@angular/cdk": "^2.0.0-beta.12",
-        "@angular/common": "4.4.5",
-        "@angular/compiler": "4.4.5",
-        "@angular/core": "4.4.5",
-        "@angular/forms": "4.4.5",
-        "@angular/http": "4.4.5",
+        "@angular/common": "5.0.0",
+        "@angular/compiler": "5.0.0",
+        "@angular/core": "5.0.0",
+        "@angular/forms": "5.0.0",
+        "@angular/http": "5.0.0",
         "@angular/material": "^2.0.0-beta.12",
-        "@angular/platform-browser": "4.4.5",
-        "@angular/platform-browser-dynamic": "4.4.5",
-        "@angular/router": "4.4.5",
+        "@angular/platform-browser": "5.0.0",
+        "@angular/platform-browser-dynamic": "5.0.0",
+        "@angular/router": "5.0.0",
         "@ngtools/webpack": "^1.7.4",
         "core-js": "2.4.1",
         "enhanced-resolve": "3.3.0",
         "extract-text-webpack-plugin": "^3.0.1",
         "html-webpack-plugin": "^2.30.1",
-        "rxjs": "^5.4.3",
+        "rxjs": "^5.5.0",
         "zone.js": "0.8.12"
     },
     "devDependencies": {
-        "@angular/cli": "^1.4.7",
-        "@angular/compiler-cli": "4.4.5",
+        "@angular/cli": "^1.5.0",
+        "@angular/compiler-cli": "5.0.0",
         "@types/bluebird": "3.5.8",
         "@types/core-js": "0.9.36",
         "@types/jasmine": "2.5.53",
@@ -111,7 +111,7 @@
         "stylus-loader": "3.0.1",
         "ts-node": "3.1.0",
         "tslint": "5.4.3",
-        "typescript": "2.4.1",
+        "typescript": "2.4.2",
         "url-loader": "0.5.9",
         "webdriver-manager": "12.0.6",
         "webpack": "3.3.0",
diff --git a/web/src/app/app.component.html b/web/src/app/app.component.html
index 9dcac19b..107e242c 100644
--- a/web/src/app/app.component.html
+++ b/web/src/app/app.component.html
@@ -12,9 +12,13 @@
                 <h3>Wallet</h3>
             </mat-list-item>
             <mat-list-item routerLink="trading" routerLinkActive="trading-highlight">
-                <mat-icon>history</mat-icon>&nbsp;
+                <mat-icon>add_shopping_cart</mat-icon>&nbsp;
                 <h3>Trading</h3>
             </mat-list-item>
+            <mat-list-item routerLink="history" routerLinkActive="history-highlight">
+                <mat-icon>history</mat-icon>&nbsp;
+                <h3>History</h3>
+            </mat-list-item>
             <mat-list-item routerLink="settings" routerLinkActive="settings-highlight">
                 <mat-icon>settings</mat-icon>&nbsp;
                 <h3>Settings</h3>
diff --git a/web/src/app/app.component.scss b/web/src/app/app.component.scss
index 98da567c..368fc631 100644
--- a/web/src/app/app.component.scss
+++ b/web/src/app/app.component.scss
@@ -21,7 +21,11 @@
 }
 
 .trading-highlight {
-    color: red !important;
+    color: orangered !important;
+}
+
+.history-highlight {
+    color: blue !important;
 }
 
 .wallet-highlight {
diff --git a/web/src/app/pages/settings/settings.component.html b/web/src/app/pages/settings/settings.component.html
index cbe0f0c7..b9284dd2 100644
--- a/web/src/app/pages/settings/settings.component.html
+++ b/web/src/app/pages/settings/settings.component.html
@@ -1,5 +1,5 @@
 <div class="loading-spinner" *ngIf="settings === null">
-    <mat-progress-spinner mode="indeterminate"></mat-progress-spinner>
+    <mat-progress-spinner color="accent" mode="indeterminate"></mat-progress-spinner>
 </div>
 <div *ngIf="settings !== null">
 
diff --git a/web/src/app/pages/wallet/wallet.component.html b/web/src/app/pages/wallet/wallet.component.html
index 9ee7db84..0e088f24 100644
--- a/web/src/app/pages/wallet/wallet.component.html
+++ b/web/src/app/pages/wallet/wallet.component.html
@@ -1,3 +1,6 @@
+<div class="loading-spinner" *ngIf="wallet === null">
+    <mat-progress-spinner color="accent" mode="indeterminate"></mat-progress-spinner>
+</div>
 <mat-accordion *ngIf="wallet !== null">
     <mat-expansion-panel [expanded]="true">
         <mat-expansion-panel-header>
diff --git a/web/src/app/pages/wallet/wallet.component.ts b/web/src/app/pages/wallet/wallet.component.ts
index 4064ca49..8b991740 100644
--- a/web/src/app/pages/wallet/wallet.component.ts
+++ b/web/src/app/pages/wallet/wallet.component.ts
@@ -22,6 +22,7 @@ export class WalletComponent implements OnInit {
   };
 
   constructor(private websocketHandler: WebsocketHandlerService) {
+    this.wallet= null;
     this.ws = websocketHandler;
     this.ws.messages.subscribe(msg => {
       if (msg.Event === 'GetPortfolio') {
diff --git a/web/src/app/shared/all-enabled-currency-tickers/all-enabled-currency-tickers.component.html b/web/src/app/shared/all-enabled-currency-tickers/all-enabled-currency-tickers.component.html
index 02e5627c..44883f83 100644
--- a/web/src/app/shared/all-enabled-currency-tickers/all-enabled-currency-tickers.component.html
+++ b/web/src/app/shared/all-enabled-currency-tickers/all-enabled-currency-tickers.component.html
@@ -1,5 +1,5 @@
 <div class="loading-spinner" *ngIf="tickerCards === null || tickerCards.length === 0">
-  <mat-progress-spinner mode="indeterminate"></mat-progress-spinner>
+  <mat-progress-spinner color="accent" mode="indeterminate"></mat-progress-spinner>
 </div>
 <mat-grid-list cols="4" rowHeight="4:3" >
     <mat-grid-tile *ngFor="let ticker of tickerCards">