diff --git a/packages/uhk-web/package-lock.json b/packages/uhk-web/package-lock.json
index 9c01a930..deb9e4e0 100644
--- a/packages/uhk-web/package-lock.json
+++ b/packages/uhk-web/package-lock.json
@@ -3,62 +3,83 @@
 	"lockfileVersion": 1,
 	"dependencies": {
 		"@angular-devkit/build-optimizer": {
-			"version": "0.0.13",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.13.tgz",
-			"integrity": "sha512-yEMkYU4YU8XlA5OauPhg22ZEWJ4X2VhiFKUwfeo4UWJ7lz4XWiuBJocrT5NHWqI1S0rOLpSixLXG9byvFMbavA==",
+			"version": "0.0.27",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.27.tgz",
+			"integrity": "sha512-Gr2qbWnclFGk0fz7FtarhrekJNq2O6l9PMzbS9waL2gdH+3q+PX7XPDYFIputp4nDPCfBJNE3vNiOoKy6lFxFA==",
 			"requires": {
 				"loader-utils": "1.1.0",
 				"source-map": "0.5.7",
-				"typescript": "2.4.2"
+				"typescript": "2.5.3",
+				"webpack-sources": "1.0.1"
+			}
+		},
+		"@angular-devkit/core": {
+			"version": "0.0.20",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.20.tgz",
+			"integrity": "sha512-lg5BvMxOfbVD//SOQvpq6TPIKTXYNMj0I9N/kfXbXkUGgiBGFLyFMf2fc+qNvDoa7lulKMPT8OJWS1YlGt93eg==",
+			"requires": {
+				"source-map": "0.5.7"
+			}
+		},
+		"@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==",
+			"requires": {
+				"@angular-devkit/core": "0.0.20",
+				"@ngtools/json-schema": "1.1.0",
+				"minimist": "1.2.0",
+				"rxjs": "5.4.3"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+				}
 			}
 		},
 		"@angular/animations": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.6.tgz",
-			"integrity": "sha1-v5KD7HyMmLMvVp2E3NoQiQ/cAmI=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.5.tgz",
+			"integrity": "sha1-WlpVHXV+WlVgCY9vhTXBAtk5VNc=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/cli": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.3.2.tgz",
-			"integrity": "sha512-VAZXI19PbhhUE/dJH5r6HT7502y0OXYzxhbGIagh/e7SNKnVV8KglVL4zfTfnsI8kmLrFFbAmPy7xomKO8Btkg==",
+			"version": "1.4.7",
+			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.4.7.tgz",
+			"integrity": "sha512-VJB95B49nh8LjJJDkHNAoklJIsKQ0Xvpu39q/yaicpuzVaSiOUgHO6SfQrW6RwN3uxLAWTREy+FMRtIv1UIXNw==",
 			"requires": {
-				"@angular-devkit/build-optimizer": "0.0.13",
+				"@angular-devkit/build-optimizer": "0.0.27",
+				"@angular-devkit/schematics": "0.0.33",
 				"@ngtools/json-schema": "1.1.0",
-				"@ngtools/webpack": "1.6.2",
+				"@ngtools/webpack": "1.7.4",
+				"@schematics/angular": "0.0.45",
 				"autoprefixer": "6.5.3",
 				"chalk": "2.1.0",
 				"circular-dependency-plugin": "3.0.0",
 				"common-tags": "1.4.0",
+				"copy-webpack-plugin": "4.1.1",
 				"core-object": "3.1.5",
 				"css-loader": "0.28.1",
 				"cssnano": "3.10.0",
 				"denodeify": "1.2.1",
-				"diff": "3.4.0",
-				"ember-cli-normalize-entity-name": "1.0.0",
 				"ember-cli-string-utils": "1.1.0",
 				"exports-loader": "0.6.3",
 				"extract-text-webpack-plugin": "3.0.0",
 				"file-loader": "0.10.0",
 				"fs-extra": "4.0.2",
-				"get-caller-file": "1.0.2",
 				"glob": "7.1.2",
-				"heimdalljs": "0.2.5",
-				"heimdalljs-logger": "0.1.9",
 				"html-webpack-plugin": "2.29.0",
-				"inflection": "1.12.0",
-				"inquirer": "3.3.0",
-				"isbinaryfile": "3.0.2",
 				"istanbul-instrumenter-loader": "2.0.0",
 				"karma-source-map-support": "1.2.0",
 				"less": "2.7.2",
 				"less-loader": "4.0.5",
-				"license-webpack-plugin": "0.5.1",
+				"license-webpack-plugin": "1.1.0",
 				"lodash": "4.17.4",
 				"memory-fs": "0.4.1",
-				"minimatch": "3.0.4",
 				"node-modules-path": "1.0.1",
 				"node-sass": "4.5.3",
 				"nopt": "4.0.1",
@@ -68,10 +89,8 @@
 				"postcss-url": "5.1.2",
 				"raw-loader": "0.5.1",
 				"resolve": "1.4.0",
-				"rsvp": "3.6.2",
 				"rxjs": "5.4.3",
 				"sass-loader": "6.0.3",
-				"script-loader": "0.7.0",
 				"semver": "5.4.1",
 				"silent-error": "1.1.0",
 				"source-map-loader": "0.2.0",
@@ -79,39 +98,451 @@
 				"style-loader": "0.13.1",
 				"stylus": "0.54.5",
 				"stylus-loader": "3.0.1",
-				"temp": "0.8.3",
-				"typescript": "2.4.2",
-				"url-loader": "0.5.7",
-				"walk-sync": "0.3.2",
-				"webpack": "3.4.1",
+				"typescript": "2.5.3",
+				"url-loader": "0.6.2",
+				"webpack": "3.6.0",
+				"webpack-concat-plugin": "1.4.0",
 				"webpack-dev-middleware": "1.12.0",
-				"webpack-dev-server": "2.5.1",
+				"webpack-dev-server": "2.7.1",
 				"webpack-merge": "4.1.0",
 				"zone.js": "0.8.14"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+				},
+				"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==",
+					"requires": {
+						"bluebird": "3.5.1",
+						"fs-extra": "4.0.2",
+						"glob": "7.1.2",
+						"is-glob": "4.0.0",
+						"loader-utils": "0.2.17",
+						"lodash": "4.17.4",
+						"minimatch": "3.0.4",
+						"node-dir": "0.1.17"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"requires": {
+						"websocket-driver": "0.7.0"
+					}
+				},
+				"find-up": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+					"requires": {
+						"locate-path": "2.0.0"
+					}
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+				},
+				"is-extglob": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"requires": {
+						"number-is-nan": "1.0.1"
+					}
+				},
+				"is-glob": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+					"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+					"requires": {
+						"is-extglob": "2.1.1"
+					}
+				},
+				"load-json-file": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+					"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+					"requires": {
+						"graceful-fs": "4.1.11",
+						"parse-json": "2.2.0",
+						"pify": "2.3.0",
+						"strip-bom": "3.0.0"
+					}
+				},
+				"loader-utils": {
+					"version": "0.2.17",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+					"integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+					"requires": {
+						"big.js": "3.2.0",
+						"emojis-list": "2.1.0",
+						"json5": "0.5.1",
+						"object-assign": "4.1.1"
+					}
+				},
+				"os-locale": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+					"requires": {
+						"execa": "0.7.0",
+						"lcid": "1.0.0",
+						"mem": "1.1.0"
+					}
+				},
+				"path-type": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+					"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+					"requires": {
+						"pify": "2.3.0"
+					}
+				},
+				"read-pkg": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+					"requires": {
+						"load-json-file": "2.0.0",
+						"normalize-package-data": "2.4.0",
+						"path-type": "2.0.0"
+					}
+				},
+				"read-pkg-up": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+					"requires": {
+						"find-up": "2.1.0",
+						"read-pkg": "2.0.0"
+					}
+				},
+				"sockjs-client": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+					"integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+					"requires": {
+						"debug": "2.6.9",
+						"eventsource": "0.1.6",
+						"faye-websocket": "0.11.1",
+						"inherits": "2.0.3",
+						"json3": "3.3.2",
+						"url-parse": "1.1.9"
+					}
+				},
+				"strip-bom": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+					"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+				},
+				"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==",
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				},
+				"url-loader": {
+					"version": "0.6.2",
+					"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
+					"integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==",
+					"requires": {
+						"loader-utils": "1.1.0",
+						"mime": "1.4.1",
+						"schema-utils": "0.3.0"
+					},
+					"dependencies": {
+						"loader-utils": {
+							"version": "1.1.0",
+							"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+							"integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+							"requires": {
+								"big.js": "3.2.0",
+								"emojis-list": "2.1.0",
+								"json5": "0.5.1"
+							}
+						}
+					}
+				},
+				"webpack": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz",
+					"integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==",
+					"requires": {
+						"acorn": "5.1.2",
+						"acorn-dynamic-import": "2.0.2",
+						"ajv": "5.2.3",
+						"ajv-keywords": "2.1.0",
+						"async": "2.5.0",
+						"enhanced-resolve": "3.4.1",
+						"escope": "3.6.0",
+						"interpret": "1.0.4",
+						"json-loader": "0.5.7",
+						"json5": "0.5.1",
+						"loader-runner": "2.3.0",
+						"loader-utils": "1.1.0",
+						"memory-fs": "0.4.1",
+						"mkdirp": "0.5.1",
+						"node-libs-browser": "2.0.0",
+						"source-map": "0.5.7",
+						"supports-color": "4.4.0",
+						"tapable": "0.2.8",
+						"uglifyjs-webpack-plugin": "0.4.6",
+						"watchpack": "1.4.0",
+						"webpack-sources": "1.0.1",
+						"yargs": "8.0.2"
+					},
+					"dependencies": {
+						"loader-utils": {
+							"version": "1.1.0",
+							"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+							"integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+							"requires": {
+								"big.js": "3.2.0",
+								"emojis-list": "2.1.0",
+								"json5": "0.5.1"
+							}
+						}
+					}
+				},
+				"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=",
+					"requires": {
+						"ansi-html": "0.0.7",
+						"bonjour": "3.5.0",
+						"chokidar": "1.7.0",
+						"compression": "1.7.1",
+						"connect-history-api-fallback": "1.3.0",
+						"del": "3.0.0",
+						"express": "4.16.1",
+						"html-entities": "1.2.1",
+						"http-proxy-middleware": "0.17.4",
+						"internal-ip": "1.2.0",
+						"ip": "1.1.5",
+						"loglevel": "1.5.1",
+						"opn": "4.0.2",
+						"portfinder": "1.0.13",
+						"selfsigned": "1.10.1",
+						"serve-index": "1.9.1",
+						"sockjs": "0.3.18",
+						"sockjs-client": "1.1.4",
+						"spdy": "3.4.7",
+						"strip-ansi": "3.0.1",
+						"supports-color": "3.2.3",
+						"webpack-dev-middleware": "1.12.0",
+						"yargs": "6.6.0"
+					},
+					"dependencies": {
+						"camelcase": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+							"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
+						},
+						"find-up": {
+							"version": "1.1.2",
+							"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+							"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+							"requires": {
+								"path-exists": "2.1.0",
+								"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="
+						},
+						"load-json-file": {
+							"version": "1.1.0",
+							"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+							"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+							"requires": {
+								"graceful-fs": "4.1.11",
+								"parse-json": "2.2.0",
+								"pify": "2.3.0",
+								"pinkie-promise": "2.0.1",
+								"strip-bom": "2.0.0"
+							}
+						},
+						"opn": {
+							"version": "4.0.2",
+							"resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
+							"integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
+							"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",
+							"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+							"requires": {
+								"lcid": "1.0.0"
+							}
+						},
+						"path-type": {
+							"version": "1.1.0",
+							"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+							"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+							"requires": {
+								"graceful-fs": "4.1.11",
+								"pify": "2.3.0",
+								"pinkie-promise": "2.0.1"
+							}
+						},
+						"read-pkg": {
+							"version": "1.1.0",
+							"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+							"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+							"requires": {
+								"load-json-file": "1.1.0",
+								"normalize-package-data": "2.4.0",
+								"path-type": "1.1.0"
+							}
+						},
+						"read-pkg-up": {
+							"version": "1.0.1",
+							"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+							"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+							"requires": {
+								"find-up": "1.1.2",
+								"read-pkg": "1.1.0"
+							}
+						},
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+							"requires": {
+								"code-point-at": "1.1.0",
+								"is-fullwidth-code-point": "1.0.0",
+								"strip-ansi": "3.0.1"
+							}
+						},
+						"strip-bom": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+							"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+							"requires": {
+								"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=",
+							"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",
+							"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+						},
+						"yargs": {
+							"version": "6.6.0",
+							"resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+							"integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+							"requires": {
+								"camelcase": "3.0.0",
+								"cliui": "3.2.0",
+								"decamelize": "1.2.0",
+								"get-caller-file": "1.0.2",
+								"os-locale": "1.4.0",
+								"read-pkg-up": "1.0.1",
+								"require-directory": "2.1.1",
+								"require-main-filename": "1.0.1",
+								"set-blocking": "2.0.0",
+								"string-width": "1.0.2",
+								"which-module": "1.0.0",
+								"y18n": "3.2.1",
+								"yargs-parser": "4.2.1"
+							}
+						},
+						"yargs-parser": {
+							"version": "4.2.1",
+							"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+							"integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+							"requires": {
+								"camelcase": "3.0.0"
+							}
+						}
+					}
+				},
+				"which-module": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+				},
+				"yargs": {
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+					"requires": {
+						"camelcase": "4.1.0",
+						"cliui": "3.2.0",
+						"decamelize": "1.2.0",
+						"get-caller-file": "1.0.2",
+						"os-locale": "2.1.0",
+						"read-pkg-up": "2.0.0",
+						"require-directory": "2.1.1",
+						"require-main-filename": "1.0.1",
+						"set-blocking": "2.0.0",
+						"string-width": "2.1.1",
+						"which-module": "2.0.0",
+						"y18n": "3.2.1",
+						"yargs-parser": "7.0.0"
+					}
+				},
+				"yargs-parser": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+					"requires": {
+						"camelcase": "4.1.0"
+					}
+				}
 			}
 		},
 		"@angular/common": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.6.tgz",
-			"integrity": "sha1-7TfpMHx1Bt2DR5fBps9nXlK1tu4=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.5.tgz",
+			"integrity": "sha1-vVF53JIq2/TD6m37Gec8uEn/3Dc=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/compiler": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.6.tgz",
-			"integrity": "sha1-vhcN8Ji3HoNczt8WjV+3sj5QRbg=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.5.tgz",
+			"integrity": "sha1-hyGlkQ8rtS8J4tQEytJk817eWQI=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/compiler-cli": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.6.tgz",
-			"integrity": "sha1-avpq72jdaB5hs5i+TWJw5choCxI=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.5.tgz",
+			"integrity": "sha1-YfoDNqzRogjF8cXG1N9nnpmVMkg=",
 			"requires": {
-				"@angular/tsc-wrapped": "4.3.6",
+				"@angular/tsc-wrapped": "4.4.5",
 				"minimist": "1.2.0",
 				"reflect-metadata": "0.1.10"
 			},
@@ -124,62 +555,62 @@
 			}
 		},
 		"@angular/core": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.6.tgz",
-			"integrity": "sha1-u6xj1o0Pe8s4nRKzQghlK+MofpY=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.5.tgz",
+			"integrity": "sha1-VKy8vaEXGfiDx4apBpdKvrEy8aA=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/forms": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.6.tgz",
-			"integrity": "sha1-DyDEWXwWoVJ0XXzZVVmFWgpcZoc=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.5.tgz",
+			"integrity": "sha1-6VUghiMqqyzh0I7xmLYiBOoTxDs=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/http": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.6.tgz",
-			"integrity": "sha1-Vjgn0afV6J47fYa3f7vTZ7LAhZE=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.5.tgz",
+			"integrity": "sha1-LHNe2EJAH8I1ZBkmjiiNzyOW6E8=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/language-service": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.3.6.tgz",
-			"integrity": "sha1-cc8tu0ZhVo89EqnA5LngQ++TvTo="
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-4.4.5.tgz",
+			"integrity": "sha1-zO8Tm40+FoSwGvo1xvvyFy4rtnY="
 		},
 		"@angular/platform-browser": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.6.tgz",
-			"integrity": "sha1-YVKx87eNAkb8XhUOL3ue1DN+O6Y=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.5.tgz",
+			"integrity": "sha1-dOuRwLdYEm8m1T7lbHz0ZovZysU=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/platform-browser-dynamic": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.6.tgz",
-			"integrity": "sha1-nqv4JvEZyY+Fwqlu3LGKsAtO+xw=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.5.tgz",
+			"integrity": "sha1-d029wdkPd12/HjGfbtQrJgYjth8=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/router": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.6.tgz",
-			"integrity": "sha1-ZAM+20/NoIoyPnUztKGCDA8o0TA=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.5.tgz",
+			"integrity": "sha1-9zEwz0h9mjLMGYiv2llmX0Siiok=",
 			"requires": {
-				"tslib": "1.7.1"
+				"tslib": "1.8.0"
 			}
 		},
 		"@angular/tsc-wrapped": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz",
-			"integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=",
+			"version": "4.4.5",
+			"resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.5.tgz",
+			"integrity": "sha1-MKDLtDpmOqddyphIlL5IE3eN3Jw=",
 			"requires": {
 				"tsickle": "0.21.6"
 			}
@@ -215,15 +646,21 @@
 			"integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI="
 		},
 		"@ngtools/webpack": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.6.2.tgz",
-			"integrity": "sha512-2s2kCCV3FQUC+MG69e+H5k7zELuVcQ0Gkl1ioqR25HOclxv0UGVY7jsmz9LRm/DanS5ORXQt4S82EFV1dY4w+A==",
+			"version": "1.7.4",
+			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.7.4.tgz",
+			"integrity": "sha512-o0u1Oj1k1WEIamBNEncvXDWmUxCMDIlKrMFp4nIwh7bag4dndDShUVD1EinSpx1TvMjVbA42Z+7cIVmlq+240Q==",
 			"requires": {
+				"enhanced-resolve": "3.4.1",
 				"loader-utils": "1.1.0",
 				"magic-string": "0.22.4",
 				"source-map": "0.5.7"
 			}
 		},
+		"@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=="
+		},
 		"@types/electron-devtools-installer": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/@types/electron-devtools-installer/-/electron-devtools-installer-2.0.2.tgz",
@@ -425,11 +862,6 @@
 			"resolved": "https://registry.npmjs.org/angular-notifier/-/angular-notifier-2.0.0.tgz",
 			"integrity": "sha1-ePp6XOYUkVYIQQyTM7TT3bMtbmM="
 		},
-		"ansi-escapes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
-			"integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ=="
-		},
 		"ansi-html": {
 			"version": "0.0.7",
 			"resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
@@ -1151,6 +1583,11 @@
 				"is-regex": "1.0.4"
 			}
 		},
+		"charenc": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+			"integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+		},
 		"chokidar": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -1221,19 +1658,6 @@
 				"source-map": "0.5.7"
 			}
 		},
-		"cli-cursor": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-			"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-			"requires": {
-				"restore-cursor": "2.0.0"
-			}
-		},
-		"cli-width": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
-		},
 		"cliui": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -1697,6 +2121,11 @@
 				"custom-event": "1.0.0"
 			}
 		},
+		"crypt": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+			"integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+		},
 		"cryptiles": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
@@ -2156,6 +2585,11 @@
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
 			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
 		},
+		"ejs": {
+			"version": "2.5.7",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
+			"integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo="
+		},
 		"electron-to-chromium": {
 			"version": "1.3.24",
 			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz",
@@ -2175,14 +2609,6 @@
 				"minimalistic-crypto-utils": "1.0.1"
 			}
 		},
-		"ember-cli-normalize-entity-name": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz",
-			"integrity": "sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=",
-			"requires": {
-				"silent-error": "1.1.0"
-			}
-		},
 		"ember-cli-string-utils": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz",
@@ -2298,11 +2724,6 @@
 				"tapable": "0.2.8"
 			}
 		},
-		"ensure-posix-path": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz",
-			"integrity": "sha1-pls+QtC3HPxYXrd0+ZQ8jZuRsMI="
-		},
 		"ent": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
@@ -2644,16 +3065,6 @@
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
 			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
 		},
-		"external-editor": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz",
-			"integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==",
-			"requires": {
-				"iconv-lite": "0.4.19",
-				"jschardet": "1.5.1",
-				"tmp": "0.0.33"
-			}
-		},
 		"extglob": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
@@ -2696,14 +3107,6 @@
 				"websocket-driver": "0.7.0"
 			}
 		},
-		"figures": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-			"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-			"requires": {
-				"escape-string-regexp": "1.0.5"
-			}
-		},
 		"file-loader": {
 			"version": "0.10.0",
 			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.10.0.tgz",
@@ -3939,30 +4342,6 @@
 			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
 			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
 		},
-		"heimdalljs": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/heimdalljs/-/heimdalljs-0.2.5.tgz",
-			"integrity": "sha1-aqVDCO7nk7ZCz/nPlHgURfN3MKw=",
-			"requires": {
-				"rsvp": "3.2.1"
-			},
-			"dependencies": {
-				"rsvp": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz",
-					"integrity": "sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo="
-				}
-			}
-		},
-		"heimdalljs-logger": {
-			"version": "0.1.9",
-			"resolved": "https://registry.npmjs.org/heimdalljs-logger/-/heimdalljs-logger-0.1.9.tgz",
-			"integrity": "sha1-12raTkW3u294b8nAEKaOsuL68XY=",
-			"requires": {
-				"debug": "2.6.9",
-				"heimdalljs": "0.2.5"
-			}
-		},
 		"hmac-drbg": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -4236,11 +4615,6 @@
 			"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
 			"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
 		},
-		"inflection": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
-			"integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY="
-		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -4260,42 +4634,6 @@
 			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
 			"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
 		},
-		"inquirer": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-			"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-			"requires": {
-				"ansi-escapes": "3.0.0",
-				"chalk": "2.1.0",
-				"cli-cursor": "2.1.0",
-				"cli-width": "2.2.0",
-				"external-editor": "2.0.5",
-				"figures": "2.0.0",
-				"lodash": "4.17.4",
-				"mute-stream": "0.0.7",
-				"run-async": "2.3.0",
-				"rx-lite": "4.0.8",
-				"rx-lite-aggregates": "4.0.8",
-				"string-width": "2.1.1",
-				"strip-ansi": "4.0.0",
-				"through": "2.3.8"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"requires": {
-						"ansi-regex": "3.0.0"
-					}
-				}
-			}
-		},
 		"internal-ip": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
@@ -4812,11 +5150,6 @@
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
 			"optional": true
 		},
-		"jschardet": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz",
-			"integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A=="
-		},
 		"jsesc": {
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
@@ -5059,11 +5392,11 @@
 			}
 		},
 		"license-webpack-plugin": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-0.5.1.tgz",
-			"integrity": "sha1-aNivEDSGqcTrzt237V071h84O+Q=",
+			"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==",
 			"requires": {
-				"object-assign": "4.1.1"
+				"ejs": "2.5.7"
 			}
 		},
 		"load-json-file": {
@@ -5167,6 +5500,11 @@
 				}
 			}
 		},
+		"loglevel": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.5.1.tgz",
+			"integrity": "sha1-GJB4yUq5BT7iFaCs2/JCROoPZQI="
+		},
 		"longest": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -5226,19 +5564,21 @@
 			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
 			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
 		},
-		"matcher-collection": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
-			"integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
-			"requires": {
-				"minimatch": "3.0.4"
-			}
-		},
 		"math-expression-evaluator": {
 			"version": "1.2.17",
 			"resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
 			"integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw="
 		},
+		"md5": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+			"integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+			"requires": {
+				"charenc": "0.0.2",
+				"crypt": "0.0.2",
+				"is-buffer": "1.1.5"
+			}
+		},
 		"md5.js": {
 			"version": "1.3.4",
 			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
@@ -5462,11 +5802,6 @@
 			"resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
 			"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
 		},
-		"mute-stream": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-		},
 		"nan": {
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
@@ -6600,14 +6935,6 @@
 				"wrappy": "1.0.2"
 			}
 		},
-		"onetime": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-			"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-			"requires": {
-				"mimic-fn": "1.1.0"
-			}
-		},
 		"opn": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
@@ -8136,15 +8463,6 @@
 				"path-parse": "1.0.5"
 			}
 		},
-		"restore-cursor": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-			"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-			"requires": {
-				"onetime": "2.0.1",
-				"signal-exit": "3.0.2"
-			}
-		},
 		"right-align": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -8170,32 +8488,6 @@
 				"inherits": "2.0.3"
 			}
 		},
-		"rsvp": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-			"integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
-		},
-		"run-async": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-			"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-			"requires": {
-				"is-promise": "2.1.0"
-			}
-		},
-		"rx-lite": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-			"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
-		},
-		"rx-lite-aggregates": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-			"integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-			"requires": {
-				"rx-lite": "4.0.8"
-			}
-		},
 		"rxjs": {
 			"version": "5.4.3",
 			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
@@ -9108,22 +9400,6 @@
 				"inherits": "2.0.3"
 			}
 		},
-		"temp": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
-			"integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=",
-			"requires": {
-				"os-tmpdir": "1.0.2",
-				"rimraf": "2.2.8"
-			},
-			"dependencies": {
-				"rimraf": {
-					"version": "2.2.8",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-					"integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
-				}
-			}
-		},
 		"through": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -9290,9 +9566,9 @@
 			}
 		},
 		"tslib": {
-			"version": "1.7.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",
-			"integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw="
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz",
+			"integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg=="
 		},
 		"tty-browserify": {
 			"version": "0.0.0",
@@ -9323,9 +9599,9 @@
 			}
 		},
 		"typescript": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
-			"integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ="
+			"version": "2.5.3",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
+			"integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w=="
 		},
 		"uglify-js": {
 			"version": "3.1.3",
@@ -9603,15 +9879,6 @@
 			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
 			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
 		},
-		"walk-sync": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz",
-			"integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==",
-			"requires": {
-				"ensure-posix-path": "1.0.2",
-				"matcher-collection": "1.0.5"
-			}
-		},
 		"watchpack": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
@@ -9820,6 +10087,58 @@
 				}
 			}
 		},
+		"webpack-concat-plugin": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/webpack-concat-plugin/-/webpack-concat-plugin-1.4.0.tgz",
+			"integrity": "sha512-Ym9Qm5Sw9oXJYChNJk09I/yaXDaV3UDxsa07wcCvILzIeSJTnSUZjhS4y2YkULzgE8VHOv9X04KtlJPZGwXqMg==",
+			"requires": {
+				"md5": "2.2.1",
+				"uglify-js": "2.8.29"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+				},
+				"cliui": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+					"requires": {
+						"center-align": "0.1.3",
+						"right-align": "0.1.3",
+						"wordwrap": "0.0.2"
+					}
+				},
+				"uglify-js": {
+					"version": "2.8.29",
+					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+					"requires": {
+						"source-map": "0.5.7",
+						"uglify-to-browserify": "1.0.2",
+						"yargs": "3.10.0"
+					}
+				},
+				"wordwrap": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
+				},
+				"yargs": {
+					"version": "3.10.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+					"requires": {
+						"camelcase": "1.2.1",
+						"cliui": "2.1.0",
+						"decamelize": "1.2.0",
+						"window-size": "0.1.0"
+					}
+				}
+			}
+		},
 		"webpack-dev-middleware": {
 			"version": "1.12.0",
 			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
diff --git a/packages/uhk-web/package.json b/packages/uhk-web/package.json
index 08a02b4c..0c96724c 100644
--- a/packages/uhk-web/package.json
+++ b/packages/uhk-web/package.json
@@ -14,18 +14,18 @@
   },
   "private": true,
   "devDependencies": {
-    "@angular/animations": "4.3.6",
-    "@angular/cli": "1.3.2",
-    "@angular/common": "4.3.6",
-    "@angular/compiler": "4.3.6",
-    "@angular/compiler-cli": "4.3.6",
-    "@angular/core": "4.3.6",
-    "@angular/forms": "4.3.6",
-    "@angular/http": "4.3.6",
-    "@angular/language-service": "4.3.6",
-    "@angular/platform-browser": "4.3.6",
-    "@angular/platform-browser-dynamic": "4.3.6",
-    "@angular/router": "4.3.6",
+    "@angular/animations": "4.4.5",
+    "@angular/cli": "1.4.7",
+    "@angular/common": "4.4.5",
+    "@angular/compiler": "4.4.5",
+    "@angular/compiler-cli": "4.4.5",
+    "@angular/core": "4.4.5",
+    "@angular/forms": "4.4.5",
+    "@angular/http": "4.4.5",
+    "@angular/language-service": "4.4.5",
+    "@angular/platform-browser": "4.4.5",
+    "@angular/platform-browser-dynamic": "4.4.5",
+    "@angular/router": "4.4.5",
     "@ngrx/effects": "4.0.5",
     "@ngrx/router-store": "4.0.4",
     "@ngrx/store": "4.0.3",