diff --git a/package-lock.json b/package-lock.json
index 8f3519ec..66c75d3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,81 +4,81 @@
     "lockfileVersion": 1,
     "dependencies": {
         "@angular/animations": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.7.tgz",
-            "integrity": "sha512-t/B0z2OYO+yy8SJKB1/evSNPvnLsl+AclhM1p21/NnETxQUqvct1KXeDM7nYDu5hmnGmuavhua8LDo6rN5zS+Q==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.9.tgz",
+            "integrity": "sha512-H/3fMs4PhYjKoA81II6D0PHifDrqlKet2u/EXzUBq3ehXby+N/0GBzqsBYwPeU5pTye7WPFfW+5sgoJpN8Ye6Q==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/cdk": {
-            "version": "5.2.3",
-            "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.3.tgz",
-            "integrity": "sha512-o95vQCJ1FpHLQj/ZfIrOya/rK0S7VwiY5vjEivpFnH25kHF5LNT4LTj6BOFkPbClMHTIM2wdKwWnuTfK0bg9WA==",
+            "version": "5.2.4",
+            "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.4.tgz",
+            "integrity": "sha1-wKQpqHENj+2xV/VG4hy0nUM19/c=",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/common": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.7.tgz",
-            "integrity": "sha512-TqsDMmPX1JlEH2QIneuAVzEO4ubzxLBAdV4XbKWDQKC/UfbWIIpSrSp2cIi85NV1tKkg0WAaodCIZ02NucHIHg==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.9.tgz",
+            "integrity": "sha512-g2hPcI0fnT4TV+Fd+1IohjuqBxPvxwyH9IzTn8PkU9X2M+F6cHCUvHxL1sWI2sF8pYcaHzVjq9WClym10X36Lg==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/compiler": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.7.tgz",
-            "integrity": "sha512-26RG+Dy+M/95OyNNqM+OAruarIPOmbndiaglz2dMrNYzenfbSgG/AoPlL5uCdSqZDiXgnlKnS2K6/ePWXDSKNw==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.9.tgz",
+            "integrity": "sha512-mN+ofInk8y/tk2TCJZx8RrGdOKdrfunoCair7tfDy4XoQJE90waGfaYWo07hYU+UYwLhrg19m2Czy6rIDciUJA==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/core": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.7.tgz",
-            "integrity": "sha512-DQuL6n7cjBfZmWX5RCV271g6PW9N8b93g2skWnM/zjm+BL9tfHPgvmsjMNB7QEHSxW8VBaaQ6gjj422O01A87g==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.9.tgz",
+            "integrity": "sha512-cvHBJGtasrIoARvbLFyHaOsiWKVwMNrrSTZLwrlyHP8oYzkDrE0qKGer6QCqyKt+51hF53cgWEffGzM/u/0wYg==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/forms": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.7.tgz",
-            "integrity": "sha512-43oLKdzMjMV/hOLpSTg8aOggcx+veTnPp/JN+KzMGo2qtbim5nk3fnuscWDeDOdkh8hPRPGarKxeFNEE9ZZSTg==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.9.tgz",
+            "integrity": "sha512-zyIOiZV/FAm1iVZWTk3Joz6Jt096hbhfDbBUrssmuiTKi9dU6rWG+Z4b88zStqulKe3HFVZkgdixWlminG8nKA==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/http": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.7.tgz",
-            "integrity": "sha512-048+tCbsNYc9xVvIn5/sOvO4fXVkbB5b1IRYRGiRYXpTz6+JWIm5AwOqZIOeVDgqgZHFf96QllXDcFbdNVDgSA==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.9.tgz",
+            "integrity": "sha512-DKjgIk+Dp0Xv1ieG8LawvUnL4dYZp1KroAq5cfKuO9EojP0zM3tUvBtw2vbPLsHYma7g7ZMjOoAbzVxtmTBZqw==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/platform-browser": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.7.tgz",
-            "integrity": "sha512-SdLx4F6tOy4/s3y1KZ/Z3YA6fiIrydaO2bry2FJglDxJh24p6TZIob+zC16N2MTuFW819KY5OlacNhc8aj6Yag==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.9.tgz",
+            "integrity": "sha512-P6iviRTuLsLRuqtZNOO0fd4cjTo8DWsDCecwntUlI08R3kH5qeqvqarTzlw/4oD+wBzZY6bfb89JyY+n5XbX3Q==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/platform-browser-dynamic": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.7.tgz",
-            "integrity": "sha512-95Rwf1JcGF/BI48k+VG2moLTVC863jPSjmHaGkz7cA9bi/QrRFGvFghl1qIm4Ezp3dj8CH8TE3TWB+1AmAg3AQ==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.9.tgz",
+            "integrity": "sha512-8C3MtyguJKDTT8FcHIRDlBxswcIdpfugOf4S2t94pVedCr4h9w2da/lcfwJKUISw1aKjfA77Sl8TDUhoS8ymmQ==",
             "requires": {
                 "tslib": "1.9.0"
             }
         },
         "@angular/router": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.7.tgz",
-            "integrity": "sha512-ppl0X7EfEgKYXIEPtdy8cOKj5KXuwCQ5Ila+IuGnSjKIRXt/olhBLJMprVl1VJgoxXj7z2i14U7kKaqSvGtpXw==",
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.9.tgz",
+            "integrity": "sha512-NtDbFK0EA1rfFc+5Dqd5mIv8E1Wcc5rDUnSty4cX2V+HxTEZvQ9DRdpO2Q0abWU5siXyqponuPHJzF08OVGyNA==",
             "requires": {
                 "tslib": "1.9.0"
             }
@@ -99,66 +99,145 @@
             }
         },
         "@firebase/app": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.4.tgz",
-            "integrity": "sha512-KXiEcFWDX2tW0kW8Vx8l9jUY5ykJkwxX59vrjSTUAZMdsvPAkCIHIw2xXm8laxZNgfeq4QV9gbt29k54Jana1w==",
+            "version": "0.1.10",
+            "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.10.tgz",
+            "integrity": "sha512-2GTXt3b2QZXkmx6/5nNJq+pEN/VTjAG55MFJS1WMoLVZkwKuNpWNk65QVyPaoL88x1iHtuLqAMFgJUOnhOg+Pw==",
             "requires": {
-                "@firebase/util": "0.1.4"
+                "@firebase/app-types": "0.1.2",
+                "@firebase/util": "0.1.10",
+                "tslib": "1.9.0"
             }
         },
+        "@firebase/app-types": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.1.2.tgz",
+            "integrity": "sha512-bCIZGeMtP0ibrXNNaU214/1tRNw0jHnir/cfiAao1gjUyIS7RzOTQoH+zbwPJNEwUqJ0T3ykw/Tv4/khGqbVBg=="
+        },
         "@firebase/auth": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.3.0.tgz",
-            "integrity": "sha512-5H+VAmxHJxp5IB9uZO0L4/zMRve2jVuv+UILSUN4iqO3LpqZuhj4C9bBMEzo6Cj6M/lpEl2YZehKHGfIoE0cnQ=="
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.4.0.tgz",
+            "integrity": "sha512-+ocmny3Ja6WOrucmnu7iwedI0G3AqOMCSwqlC9cMpKPQubQhmOPogTD8GZsY4t/nkBxmcRTUjQWfV7UsNwY4+w==",
+            "requires": {
+                "@firebase/auth-types": "0.2.0"
+            }
+        },
+        "@firebase/auth-types": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.2.0.tgz",
+            "integrity": "sha512-3Ny3xP0DeeeFz92093PHyloIDSFhzajib0X6BZZkz3hS3c/qt+xvACTKpz1jHrQTQAhNL8fGBvO8LsZHrnDT0Q=="
         },
         "@firebase/database": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.1.5.tgz",
-            "integrity": "sha512-qC1DgBLXCqFjEbRpA5Jd31YkA5LaJ7t9Jod6SrzmFF4MJ0y9WcDZuj1yLwIz7/uJr89n9n/JQA5ItzCIET7cgw==",
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.2.1.tgz",
+            "integrity": "sha512-IxONy7MM+Vmnx7bupBujmUyaTqE0n9Jt5xW/2gyLRc9i2wOxNR0XDlJ3Oc12+bksW/zMXHJU1hNO1jxRmIKmsw==",
             "requires": {
-                "@firebase/util": "0.1.4",
-                "faye-websocket": "0.11.1"
+                "@firebase/database-types": "0.2.0",
+                "@firebase/logger": "0.1.0",
+                "@firebase/util": "0.1.10",
+                "faye-websocket": "0.11.1",
+                "tslib": "1.9.0"
             }
         },
+        "@firebase/database-types": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.2.0.tgz",
+            "integrity": "sha512-QFrxlLABVbZAVJqw1XNkSYZK22qPjpE3U5eM1SO7Htx69TrIgX7tb1/+BJnFkb3AKUD33tAr22Z4XVth5Ys46A=="
+        },
         "@firebase/firestore": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.2.1.tgz",
-            "integrity": "sha512-NBMEfDAk4QFOizJLB8Y3hHc9jDCFuYDa+RMPzlDWIKXsHWoQu3HOPWHv8H4CdeuNrIMIV0/7uGp5tAL5hpLPYg==",
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.3.6.tgz",
+            "integrity": "sha512-omMsncTflPW3Tm6Xbq/4u7lofkttN5yv12RslpQ+ts4BHSeWHan2KYToChup451ViC/8zqmSS8669vOQ5Y3YFg==",
+            "requires": {
+                "@firebase/firestore-types": "0.2.2",
+                "@firebase/logger": "0.1.0",
+                "@firebase/webchannel-wrapper": "0.2.6",
+                "grpc": "1.10.0",
+                "tslib": "1.9.0"
+            }
+        },
+        "@firebase/firestore-types": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-0.2.2.tgz",
+            "integrity": "sha512-yuC07Zi8p0myCQoU62O0fnGcNEcWZnKEGcQ1tj71Qh3E3Dw7qPJ75kXeeL95Bh1PHI0+TqAcDTEb9yVG9xIUVw=="
+        },
+        "@firebase/functions": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.1.0.tgz",
+            "integrity": "sha512-cZpD4NO8v84pbgR6Fk8+DW4KGLKltmu20+WF8lJQao7H3M+10QecCvOfaXanUjxjVZzCFXOJ3EIqoNLT/HQciQ==",
             "requires": {
-                "@firebase/webchannel-wrapper": "0.2.5",
-                "grpc": "1.9.1"
+                "@firebase/functions-types": "0.1.0",
+                "@firebase/messaging-types": "0.1.2",
+                "isomorphic-fetch": "2.2.1"
             }
         },
+        "@firebase/functions-types": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.1.0.tgz",
+            "integrity": "sha512-Mm0e1OJqLaGJoBxhKC/eYfSo+yE39GpR1fRszintKmW5VKf3JMgmLrHTs/lxvtg03RQXgjdqJIJnRGFic5Z4kg=="
+        },
+        "@firebase/logger": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.0.tgz",
+            "integrity": "sha512-/abxM9/l0V9WzNXvSonI2imVqORVhyCVS8yJ1O2rsRmNzw3FIPPIt0BuTvmCBH1oh1uDtZIn2Aar1p7zF69KWg=="
+        },
         "@firebase/messaging": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.1.5.tgz",
-            "integrity": "sha512-hfuytQhVcRU97O0shJ1erTcWURBBSMRvQ0eNjKBRVcZMAKfYusosrpMeI9Djzkc5SIdICI40eEpnYvaIe79lOg==",
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.2.2.tgz",
+            "integrity": "sha512-Xl0ZVF+OszdV1p0FM0haqkxXtSOoQyN7cMeoByN85qU2OCZ/+oe9KHkvvfpjV8yjysaZyhPr5GouX7x6iQW3Jg==",
             "requires": {
-                "@firebase/util": "0.1.4"
+                "@firebase/messaging-types": "0.1.2",
+                "@firebase/util": "0.1.10",
+                "tslib": "1.9.0"
             }
         },
+        "@firebase/messaging-types": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.1.2.tgz",
+            "integrity": "sha512-4Oycm2JiDaLp9jUy4O25gD/B9Hqdy11hGjSNE0rzhVox5d0e1RF08QCwVt9xpjtBLRgEpPLyD9dPeSu4YK0Y4Q=="
+        },
         "@firebase/polyfill": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.1.3.tgz",
-            "integrity": "sha512-uPezgOJEuAZauqyWSsKqJN6UNssU6Ubldai/1GQjiQrEkQfQo2sOqzJ1iljHU4RBOVs5PrxoxLDFCG2RwFYO7A==",
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.0.tgz",
+            "integrity": "sha512-nE8LMXBhvWdHBlxtjkZkid8WzowBbxUC+mcYdsEbvx5A7hWswisFZO8XwoKnM1jYYSOpDrtxFmyqWBAc15DmRg==",
             "requires": {
-                "promise-polyfill": "6.1.0"
+                "promise-polyfill": "7.1.0",
+                "tslib": "1.9.0",
+                "whatwg-fetch": "2.0.3"
+            },
+            "dependencies": {
+                "promise-polyfill": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-7.1.0.tgz",
+                    "integrity": "sha512-P6NJ2wU/8fac44ENORsuqT8TiolKGB2u0fEClPtXezn7w5cmLIjM/7mhPlTebke2EPr6tmqZbXvnX0TxwykGrg=="
+                }
             }
         },
         "@firebase/storage": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.1.4.tgz",
-            "integrity": "sha512-ak17hYkVhHZ41SBXaLogNqx8eoVLnfziYMYgdq6ZmsqgUajnAh/Wqi7u4U/F5Cfgs+Bzgz5YxeN7GvjAyfAYmQ=="
+            "version": "0.1.8",
+            "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.1.8.tgz",
+            "integrity": "sha512-g0xYwJbgOuAaAJy5iAoEymS77m3oVqFh9IAF3A4LvqOC9q3v3ubSSYjpNHRPZstO68pMDKsNrqb2TcJgx92kSA==",
+            "requires": {
+                "@firebase/storage-types": "0.1.2",
+                "tslib": "1.9.0"
+            }
+        },
+        "@firebase/storage-types": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.1.2.tgz",
+            "integrity": "sha512-/nL93m2lIqzx4FajVnskn2YTDEj0ym53LCZegZpAPxm4GIkOQ8UhzzfHFfHJJCygb58xRszDkDuRlpJlakO4pA=="
         },
         "@firebase/util": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.1.4.tgz",
-            "integrity": "sha512-i/WaVzQ+lfK4dwGGGo9sr7/GaP9PDxtdAU6kwr3oluzf2ayeWBK/1q5owOq4GVxsgycJAqilFZKAssl1Q6kqpg=="
+            "version": "0.1.10",
+            "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.1.10.tgz",
+            "integrity": "sha512-XEogRfUQBZ4T37TMq/3ZbuiTdRAKX8hF3TgJglUZNCJf/6QnQ+jlupCuMAXBqCGfw2Mw0m2matoCUBWpsyevOA==",
+            "requires": {
+                "tslib": "1.9.0"
+            }
         },
         "@firebase/webchannel-wrapper": {
-            "version": "0.2.5",
-            "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.5.tgz",
-            "integrity": "sha512-eBx3KCUUkGgob/YoCPYaiXnqZvIqmv4q4jcE4A03GrspbSJl80ERccrXV7eN1DaHxmAPJuTwzvEVqbzHNDOI6Q=="
+            "version": "0.2.6",
+            "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.6.tgz",
+            "integrity": "sha512-Uv9ieuHVogIOOzpGmdjV3/0asMJPdssq2vrOYJ/UTlvekT6aGdv+sx2WWvIrGRWfFxWIkOxCqpqaGMYbhc88Pg=="
         },
         "@garlictech/deepstream-rxjs": {
             "version": "1.5.0",
@@ -167,11 +246,11 @@
             "requires": {
                 "@types/debug": "0.0.30",
                 "@types/jasmine": "2.8.6",
-                "@types/node": "8.9.4",
+                "@types/node": "8.9.5",
                 "@types/uuid": "3.4.3",
                 "debug": "3.1.0",
                 "deepstream.io-client-js": "2.3.0",
-                "rxjs": "5.5.6",
+                "rxjs": "5.5.7",
                 "tslint": "5.9.1",
                 "typescript": "2.7.2",
                 "uuid": "3.2.1"
@@ -207,29 +286,29 @@
             "integrity": "sha1-iCtGq6+i4ObYh8txobLC+j5tDcY="
         },
         "@ngrx/effects": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-5.1.0.tgz",
-            "integrity": "sha1-zvhFdrLQMz8ZGIrt/hVv0wG/9wo="
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-5.2.0.tgz",
+            "integrity": "sha1-qnYractv1GRNckoc7NJlyqQrrwk="
         },
         "@ngrx/entity": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-5.1.0.tgz",
-            "integrity": "sha1-J95TvRDH+TyC2KoWQjV8ZWV+FFk="
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-5.2.0.tgz",
+            "integrity": "sha1-aLkLMVm7RuxbLQ3j+gv06A6Uly0="
         },
         "@ngrx/router-store": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-5.0.1.tgz",
-            "integrity": "sha1-24cjJ7uVii6/KWc0yX3mhnLsYoo="
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-5.2.0.tgz",
+            "integrity": "sha1-v0sXTOGaNuuoIR/B3erx41rnQ2g="
         },
         "@ngrx/store": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-5.1.0.tgz",
-            "integrity": "sha1-2VcTHmIEHe7eBDUk/TANufqDXWg="
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-5.2.0.tgz",
+            "integrity": "sha1-Yn7XTJzZVGKTBIXZEqVXEXsjkD4="
         },
         "@ngrx/store-devtools": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-5.1.0.tgz",
-            "integrity": "sha1-ffim2mUsx5IACtBYykByoy42KbE=",
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-5.2.0.tgz",
+            "integrity": "sha1-L/+RapqjSTdYJncrNZ27ZLnl1iI=",
             "dev": true
         },
         "@turf/along": {
@@ -1538,7 +1617,7 @@
             "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-1.9.4.tgz",
             "integrity": "sha512-DoigJorMGGIG9K4n980zz5g1XnvhDhNy7rk/0O8KCpFPpUZ9hyAgN0ZHXhbtIelxhJhMZxwMRe2soxx/Fhx4Hg==",
             "requires": {
-                "@types/geojson": "7946.0.1"
+                "@types/geojson": "7946.0.2"
             }
         },
         "@types/d3-hierarchy": {
@@ -1651,14 +1730,14 @@
             "integrity": "sha512-orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ=="
         },
         "@types/geojson": {
-            "version": "7946.0.1",
-            "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.1.tgz",
-            "integrity": "sha512-BXY6tH16Snp/ZdX6cFlBD8yfEArcZemzxEGciXkMmp1/tU76oyqkxJq91JQzT8SXWzRPwj//dw0/FdCSnnT8mw=="
+            "version": "7946.0.2",
+            "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.2.tgz",
+            "integrity": "sha512-JuRe9eeID7XvL7viIcFqIAAXDLfyRcImIWE/XjBIhrUZjxX5z4fLcF3QXS9zYnvIn8mmtW/7OxDV3XC8QMb7OA=="
         },
         "@types/googlemaps": {
-            "version": "3.30.7",
-            "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.7.tgz",
-            "integrity": "sha512-e79j7ip6zrkig0jr739oZB5e6L0CRK1Rafcnazd5Qpj9epiFnA1akRLH1iZrV5FLxrwpHYWekGp/DQqJS53pfQ=="
+            "version": "3.30.8",
+            "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.8.tgz",
+            "integrity": "sha512-VbV2KHWCqU4ei+qZmmFJOLepCQH5iT7OPpbrnpJxGbNgHsNg+fdNE0smUm+h3STcfcnZPTWTY3yRCNYIleDGYw=="
         },
         "@types/jasmine": {
             "version": "2.8.6",
@@ -1666,29 +1745,29 @@
             "integrity": "sha512-clg9raJTY0EOo5pVZKX3ZlMjlYzVU73L71q5OV1jhE2Uezb7oF94jh4CvwrW6wInquQAdhOxJz5VDF2TLUGmmA=="
         },
         "@types/jquery": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.0.tgz",
-            "integrity": "sha512-szaKV2OQgwxYTGTY6qd9eeBfGGCaP7n2OGit4JdbOcfGgc9VWjfhMhnu5AVNhIAu8WWDIB36q9dfPVba1fGeIQ==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.1.tgz",
+            "integrity": "sha512-N3h+rzN518yl2xKrW0o6KKdNmWZ+OwG6SoM5TBEQFF0tTv5wXPEsoOuYQ2Kt3/89XbcSZUJLdjiT/2c3BR/ApQ==",
             "dev": true
         },
         "@types/leaflet": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.2.5.tgz",
-            "integrity": "sha512-xaAcJeNIX0HV8IhpXXnSl7whm2wtgsxWLzXPj0+vMTk945VpaoDKfGsPCc5mQsqsxDaD8wV5ImVt42d/bx+qYw==",
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.2.6.tgz",
+            "integrity": "sha512-q/XnLjPZn0KQavfc5V3bq/EH7q0Pb5s3CeDxXmcvXwZ1+wSZTz5g5fdps4TX9EQ+wYprnu4U4s6ryq1mED2hXQ==",
             "requires": {
-                "@types/geojson": "7946.0.1"
+                "@types/geojson": "7946.0.2"
             }
         },
         "@types/lodash": {
-            "version": "4.14.104",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.104.tgz",
-            "integrity": "sha512-ufQcVg4daO8xQ5kopxRHanqFdL4AI7ondQkV+2f+7mz3gvp0LkBx2zBRC6hfs3T87mzQFmf5Fck7Fi145Ul6NQ==",
+            "version": "4.14.105",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.105.tgz",
+            "integrity": "sha512-LB5PKR4QNoDrgcl4H8JdhBMp9wHWp0OATkU9EHzuXKiutRwbvsyYmqPUaMSWmdCycJoKHtdAWh47/zSe/GZ1yA==",
             "dev": true
         },
         "@types/node": {
-            "version": "8.9.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.4.tgz",
-            "integrity": "sha512-dSvD36qnQs78G1BPsrZFdPpvLgMW/dnvr5+nTW2csMs5TiP9MOXrjUbnMZOEwnIuBklXtn7b6TPA2Cuq07bDHA=="
+            "version": "8.9.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
+            "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ=="
         },
         "@types/spin.js": {
             "version": "2.3.1",
@@ -1700,18 +1779,18 @@
             "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz",
             "integrity": "sha512-5fRLCYhLtDb3hMWqQyH10qtF+Ud2JnNCXTCZ+9ktNdCcgslcuXkDTkFcJNk++MT29yDntDnlF1+jD+uVGumsbw==",
             "requires": {
-                "@types/node": "8.9.4"
+                "@types/node": "8.9.5"
             }
         },
         "angular2-toaster": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/angular2-toaster/-/angular2-toaster-5.0.0.tgz",
-            "integrity": "sha512-iOoRQmkwh8URwQWg8myXoujUbrDhgxPprnB4uXmK8iGPngniMkRHH+0OFkFj6WU0J6i3t/HFjqp0tyh0wMlylw=="
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/angular2-toaster/-/angular2-toaster-5.0.1.tgz",
+            "integrity": "sha512-NtTAKfbFMvVtU7APpelMbq5BLqxstzbZ+70pAcrA629GSWMooD6Nwk36SSLpp0snaFkSygqUyE33/64iZLtdXg=="
         },
         "angularfire2": {
-            "version": "5.0.0-rc.4",
-            "resolved": "https://registry.npmjs.org/angularfire2/-/angularfire2-5.0.0-rc.4.tgz",
-            "integrity": "sha512-pmz0y2gwE+a79jiqysnpSUZm7FLXlM/1qQUITSw5Q64I1q8iztHmRWVTiUz+GqbZdkXDHmoNvcb7kgxBssaGdg=="
+            "version": "5.0.0-rc.6",
+            "resolved": "https://registry.npmjs.org/angularfire2/-/angularfire2-5.0.0-rc.6.tgz",
+            "integrity": "sha1-md/sr3/Z5peePAn03PfmdoqPkdE="
         },
         "ansi-regex": {
             "version": "2.1.1",
@@ -1723,6 +1802,11 @@
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
             "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
+        "ansicolors": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz",
+            "integrity": "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8="
+        },
         "app-root-path": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
@@ -1768,11 +1852,7 @@
             "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
         },
         "authentication-api-ngx": {
-            "version": "file:src/subrepos/authentication-api-ngx",
-            "requires": {
-                "angularfire2": "5.0.0-rc.4",
-                "firebase": "4.8.0"
-            }
+            "version": "file:src/subrepos/authentication-api-ngx"
         },
         "babel-code-frame": {
             "version": "6.26.0",
@@ -1816,12 +1896,13 @@
             "optional": true
         },
         "bl": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-            "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+            "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
             "optional": true,
             "requires": {
-                "readable-stream": "2.3.5"
+                "readable-stream": "2.3.5",
+                "safe-buffer": "5.1.1"
             }
         },
         "bootstrap": {
@@ -1843,6 +1924,11 @@
                 "concat-map": "0.0.1"
             }
         },
+        "buffer-from": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
+            "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
+        },
         "bufferutil": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.3.tgz",
@@ -1872,6 +1958,15 @@
             "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
             "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
         },
+        "cardinal": {
+            "version": "0.4.4",
+            "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-0.4.4.tgz",
+            "integrity": "sha1-ylu2iltRG5D+k7ms6km97lwyv+I=",
+            "requires": {
+                "ansicolors": "0.2.1",
+                "redeyed": "0.4.4"
+            }
+        },
         "chalk": {
             "version": "2.3.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
@@ -1941,7 +2036,7 @@
             "integrity": "sha1-r2XfNjTpmdmsAUgHNsNtPNL12tg=",
             "dev": true,
             "requires": {
-                "coffeescript": "2.2.2",
+                "coffeescript": "2.2.3",
                 "glob": "7.1.2",
                 "ignore": "3.3.7",
                 "optimist": "0.6.1",
@@ -1964,9 +2059,9 @@
             }
         },
         "coffeescript": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.2.2.tgz",
-            "integrity": "sha512-VJnQbuT/lUXFPeh9ZPwuqZjG216ngxE89vfj1a1hlAaCCVOb694kKXMVSMm9kLKTbkMQKc/dPs9ABjO2ghMMJQ==",
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.2.3.tgz",
+            "integrity": "sha512-J+qHBN+ltCtOsWcA4X7jDRgUf+e3HHIicGhMG7pCVe3/gv/rt/OhjAaTVvfg+Mkj8wf4oADZmw97RnyhzOk0cA==",
             "dev": true
         },
         "color-convert": {
@@ -1988,9 +2083,9 @@
             "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g="
         },
         "commander": {
-            "version": "2.14.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-            "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+            "version": "2.15.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+            "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="
         },
         "component-emitter2": {
             "version": "1.3.5",
@@ -2003,10 +2098,11 @@
             "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
         },
         "concat-stream": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz",
-            "integrity": "sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw==",
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+            "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
             "requires": {
+                "buffer-from": "1.0.0",
                 "inherits": "2.0.3",
                 "readable-stream": "2.3.5",
                 "typedarray": "0.0.6"
@@ -2100,6 +2196,16 @@
                 "d3-transition": "1.1.1",
                 "d3-voronoi": "1.1.2",
                 "d3-zoom": "1.7.1"
+            },
+            "dependencies": {
+                "d3-geo": {
+                    "version": "1.9.1",
+                    "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz",
+                    "integrity": "sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==",
+                    "requires": {
+                        "d3-array": "1.2.1"
+                    }
+                }
             }
         },
         "d3-array": {
@@ -2162,7 +2268,7 @@
             "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.8.tgz",
             "integrity": "sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==",
             "requires": {
-                "commander": "2.14.1",
+                "commander": "2.15.1",
                 "iconv-lite": "0.4.19",
                 "rw": "1.3.3"
             }
@@ -2189,9 +2295,9 @@
             "integrity": "sha512-zH9CfF/3C8zUI47nsiKfD0+AGDEuM8LwBIP7pBVpyR4l/sKkZqITmMtxRp04rwBrlshIZ17XeFAaovN3++wzkw=="
         },
         "d3-geo": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz",
-            "integrity": "sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==",
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.10.0.tgz",
+            "integrity": "sha512-VK/buVGgexthTTqGRNXQ/LSo3EbOFu4p2Pjud5drSIaEnOaF2moc8A3P7WEljEO1JEBEwbpAJjFWMuJiUtoBcw==",
             "requires": {
                 "d3-array": "1.2.1"
             }
@@ -2352,23 +2458,13 @@
         "deepstream-ngx": {
             "version": "file:src/subrepos/deepstream-ngx",
             "requires": {
-                "@angular/core": "5.2.7",
+                "@angular/core": "5.2.9",
                 "@garlictech/deepstream-rxjs": "1.5.0",
-                "@ngrx/effects": "5.1.0",
-                "@ngrx/store": "5.1.0",
+                "@ngrx/effects": "5.2.0",
+                "@ngrx/store": "5.2.0",
                 "ng2-logger": "1.0.12",
-                "rxjs": "5.5.6",
+                "rxjs": "5.5.7",
                 "source-map-support": "0.4.18"
-            },
-            "dependencies": {
-                "@ngrx/effects": {
-                    "version": "5.1.0",
-                    "bundled": true
-                },
-                "@ngrx/store": {
-                    "version": "5.1.0",
-                    "bundled": true
-                }
             }
         },
         "deepstream.io-client-js": {
@@ -2414,6 +2510,14 @@
             "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
             "dev": true
         },
+        "encoding": {
+            "version": "0.1.12",
+            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+            "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+            "requires": {
+                "iconv-lite": "0.4.19"
+            }
+        },
         "end-of-stream": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -2443,6 +2547,11 @@
             "integrity": "sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ==",
             "optional": true
         },
+        "expect.js": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.2.0.tgz",
+            "integrity": "sha1-EChTPSwcNj90pnlv9X7AUg3tK+E="
+        },
         "fastparse": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
@@ -2458,17 +2567,18 @@
             }
         },
         "firebase": {
-            "version": "4.8.0",
-            "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.8.0.tgz",
-            "integrity": "sha512-0H3vg1hWgP2d5QKw8JSBI5/J3OYgYObYYRqJP7hcQs7HEOCwQlkPafBW5vFXTAE9qYy9TnXfhOxCrKA9+R6ovQ==",
-            "requires": {
-                "@firebase/app": "0.1.4",
-                "@firebase/auth": "0.3.0",
-                "@firebase/database": "0.1.5",
-                "@firebase/firestore": "0.2.1",
-                "@firebase/messaging": "0.1.5",
-                "@firebase/polyfill": "0.1.3",
-                "@firebase/storage": "0.1.4",
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.12.0.tgz",
+            "integrity": "sha512-mH9KWOtpY8y/jL2P8Wf/YNDOi4jmnj2l7KgskPwKHVGEMOx8/pO8AilGbZfF69VGmAAJ321KfJEqJ5jNd4i4Gg==",
+            "requires": {
+                "@firebase/app": "0.1.10",
+                "@firebase/auth": "0.4.0",
+                "@firebase/database": "0.2.1",
+                "@firebase/firestore": "0.3.6",
+                "@firebase/functions": "0.1.0",
+                "@firebase/messaging": "0.2.2",
+                "@firebase/polyfill": "0.3.0",
+                "@firebase/storage": "0.1.8",
                 "dom-storage": "2.0.2",
                 "xmlhttprequest": "1.8.0"
             }
@@ -2518,13 +2628,14 @@
             }
         },
         "geojson-rewind": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/geojson-rewind/-/geojson-rewind-0.3.0.tgz",
-            "integrity": "sha512-5dsjiZGk6p///Ju9kh7uGW+I74CZriHsxqBNPbIN4bbInfKmHwwM+f8fZ42fmpV5emeUYLTTC+GWs3EC1TMjNQ==",
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/geojson-rewind/-/geojson-rewind-0.3.1.tgz",
+            "integrity": "sha1-IiQHl8hHzC8MHTE+SqDJFa+n8p0=",
             "requires": {
                 "@mapbox/geojson-area": "0.2.2",
-                "concat-stream": "1.6.1",
-                "minimist": "1.2.0"
+                "concat-stream": "1.6.2",
+                "minimist": "1.2.0",
+                "sharkdown": "0.1.0"
             }
         },
         "get-closest": {
@@ -2557,9 +2668,9 @@
             "integrity": "sha1-wHWPKxdaSo0RDBq7H8TMOMEXbgY="
         },
         "grpc": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.9.1.tgz",
-            "integrity": "sha512-WNW3MWMuAoo63AwIlzFE3T0KzzvNBSvOkg67Hm8WhvHNkXFBlIk1QyJRE3Ocm0O5eIwS7JU8Ssota53QR1zllg==",
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.10.0.tgz",
+            "integrity": "sha512-g6Na2dgNusGvSM1ud4hwDaajNP4VSPQhGHnRXzbGNbQJIqGpJhRl7GRgYxTP8rYozqCx2NaT74UL37o8nb0GKA==",
             "requires": {
                 "lodash": "4.17.5",
                 "nan": "2.7.0",
@@ -2950,15 +3061,17 @@
                         "brace-expansion": "1.1.8"
                     }
                 },
-                "minimist": {
-                    "version": "0.0.8",
-                    "bundled": true
-                },
                 "mkdirp": {
                     "version": "0.5.1",
                     "bundled": true,
                     "requires": {
                         "minimist": "0.0.8"
+                    },
+                    "dependencies": {
+                        "minimist": {
+                            "version": "0.0.8",
+                            "bundled": true
+                        }
                     }
                 },
                 "ms": {
@@ -3280,8 +3393,8 @@
             "requires": {
                 "@turf/turf": "5.1.6",
                 "@types/d3": "4.13.0",
-                "@types/googlemaps": "3.30.7",
-                "@types/leaflet": "1.2.5",
+                "@types/googlemaps": "3.30.8",
+                "@types/leaflet": "1.2.6",
                 "@types/spin.js": "2.3.1",
                 "d3": "4.13.0",
                 "google-maps": "3.2.1",
@@ -3321,9 +3434,9 @@
             "optional": true
         },
         "http-parser-js": {
-            "version": "0.4.10",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-            "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q="
+            "version": "0.4.11",
+            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz",
+            "integrity": "sha512-QCR5O2AjjMW8Mo4HyI1ctFcv+O99j/0g367V3YoVnrNw5hkDvAWZD0lWGcc+F4yN3V55USPCVix4efb75HxFfA=="
         },
         "iconv-lite": {
             "version": "0.4.19",
@@ -3374,11 +3487,25 @@
                 "number-is-nan": "1.0.1"
             }
         },
+        "is-stream": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+        },
         "isarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
             "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
+        "isomorphic-fetch": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+            "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+            "requires": {
+                "node-fetch": "1.7.3",
+                "whatwg-fetch": "2.0.3"
+            }
+        },
         "jasmine-core": {
             "version": "2.99.1",
             "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
@@ -3584,6 +3711,15 @@
                 "semver": "5.5.0"
             }
         },
+        "node-fetch": {
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+            "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+            "requires": {
+                "encoding": "0.1.12",
+                "is-stream": "1.1.0"
+            }
+        },
         "noop-logger": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
@@ -3689,9 +3825,9 @@
             "integrity": "sha1-B1FR+lLjKVaIOmWs0Cx5S3pXtjw="
         },
         "popper.js": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.13.0.tgz",
-            "integrity": "sha1-4ef/ZcxD98+c8W8VEKdegfhPRWU="
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.1.tgz",
+            "integrity": "sha1-uIFeXNpvYvwgQuR2GGSfdYZuZ1M="
         },
         "prebuild-install": {
             "version": "2.3.0",
@@ -3708,7 +3844,7 @@
                 "npmlog": "4.1.2",
                 "os-homedir": "1.0.2",
                 "pump": "1.0.3",
-                "rc": "1.2.5",
+                "rc": "1.2.6",
                 "simple-get": "1.4.3",
                 "tar-fs": "1.16.0",
                 "tunnel-agent": "0.6.0",
@@ -3759,9 +3895,9 @@
             }
         },
         "rc": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz",
-            "integrity": "sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0=",
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
+            "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
             "optional": true,
             "requires": {
                 "deep-extend": "0.4.2",
@@ -3784,6 +3920,21 @@
                 "util-deprecate": "1.0.2"
             }
         },
+        "redeyed": {
+            "version": "0.4.4",
+            "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz",
+            "integrity": "sha1-N+mQpvKyGyoRwuakj9QTVpjLqX8=",
+            "requires": {
+                "esprima": "1.0.4"
+            },
+            "dependencies": {
+                "esprima": {
+                    "version": "1.0.4",
+                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+                    "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0="
+                }
+            }
+        },
         "regenerate": {
             "version": "1.3.3",
             "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
@@ -3823,9 +3974,9 @@
             "dev": true
         },
         "resolve": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-            "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz",
+            "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==",
             "requires": {
                 "path-parse": "1.0.5"
             }
@@ -3866,9 +4017,9 @@
             "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
         },
         "rxjs": {
-            "version": "5.5.6",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz",
-            "integrity": "sha512-v4Q5HDC0FHAQ7zcBX7T2IL6O5ltl1a2GX4ENjPXg6SjDY69Cmx9v4113C99a4wGF16ClPv5Z8mghuYorVkg/kg==",
+            "version": "5.5.7",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.7.tgz",
+            "integrity": "sha512-Hxo2ac8gRQjwjtKgukMIwBRbq5+KAeEV5hXM4obYBOAghev41bDQWgFH4svYiU9UnQ5kNww2LgfyBdevCd2HXA==",
             "requires": {
                 "symbol-observable": "1.0.1"
             }
@@ -3898,6 +4049,26 @@
             "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
             "optional": true
         },
+        "sharkdown": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/sharkdown/-/sharkdown-0.1.0.tgz",
+            "integrity": "sha1-YdT+Up510CRCEnzJI0NiJlCZIU8=",
+            "requires": {
+                "cardinal": "0.4.4",
+                "expect.js": "0.2.0",
+                "minimist": "0.0.5",
+                "split": "0.2.10",
+                "stream-spigot": "2.1.2",
+                "through": "2.3.8"
+            },
+            "dependencies": {
+                "minimist": {
+                    "version": "0.0.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
+                    "integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY="
+                }
+            }
+        },
         "signal-exit": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -3938,11 +4109,50 @@
             "resolved": "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz",
             "integrity": "sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho="
         },
+        "split": {
+            "version": "0.2.10",
+            "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+            "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=",
+            "requires": {
+                "through": "2.3.8"
+            }
+        },
         "sprintf-js": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
             "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
         },
+        "stream-spigot": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/stream-spigot/-/stream-spigot-2.1.2.tgz",
+            "integrity": "sha1-feFF6Bn43Q20UJDRPc9zqO08wDU=",
+            "requires": {
+                "readable-stream": "1.1.14"
+            },
+            "dependencies": {
+                "isarray": {
+                    "version": "0.0.1",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+                },
+                "readable-stream": {
+                    "version": "1.1.14",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                    "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+                    "requires": {
+                        "core-util-is": "1.0.2",
+                        "inherits": "2.0.3",
+                        "isarray": "0.0.1",
+                        "string_decoder": "0.10.31"
+                    }
+                },
+                "string_decoder": {
+                    "version": "0.10.31",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+                }
+            }
+        },
         "string-width": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -4003,7 +4213,7 @@
             "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
             "optional": true,
             "requires": {
-                "bl": "1.2.1",
+                "bl": "1.2.2",
                 "end-of-stream": "1.4.1",
                 "readable-stream": "2.3.5",
                 "xtend": "4.0.1"
@@ -4017,8 +4227,7 @@
         "through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-            "dev": true
+            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
         },
         "tinyqueue": {
             "version": "1.2.3",
@@ -4030,7 +4239,7 @@
             "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.0.0.tgz",
             "integrity": "sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=",
             "requires": {
-                "commander": "2.14.1"
+                "commander": "2.15.1"
             }
         },
         "topojson-server": {
@@ -4038,7 +4247,7 @@
             "resolved": "https://registry.npmjs.org/topojson-server/-/topojson-server-3.0.0.tgz",
             "integrity": "sha1-N4546Hw5cqe1vixdYENptrrmnF4=",
             "requires": {
-                "commander": "2.14.1"
+                "commander": "2.15.1"
             }
         },
         "tslib": {
@@ -4054,12 +4263,12 @@
                 "babel-code-frame": "6.26.0",
                 "builtin-modules": "1.1.1",
                 "chalk": "2.3.2",
-                "commander": "2.14.1",
+                "commander": "2.15.1",
                 "diff": "3.5.0",
                 "glob": "7.1.2",
                 "js-yaml": "3.11.0",
                 "minimatch": "3.0.4",
-                "resolve": "1.5.0",
+                "resolve": "1.6.0",
                 "semver": "5.5.0",
                 "tslib": "1.9.0",
                 "tsutils": "2.22.2"
@@ -4144,7 +4353,7 @@
             "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
             "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
             "requires": {
-                "http-parser-js": "0.4.10",
+                "http-parser-js": "0.4.11",
                 "websocket-extensions": "0.1.3"
             }
         },
@@ -4158,6 +4367,11 @@
             "resolved": "https://registry.npmjs.org/wgs84/-/wgs84-0.0.0.tgz",
             "integrity": "sha1-NP3FVZF7blfPKigu0ENxDASc3HY="
         },
+        "whatwg-fetch": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+            "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+        },
         "wide-align": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
diff --git a/package.json b/package.json
index a953cb77..86fdc489 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,10 @@
     "main": "dist/main.bundle.js",
     "module": "dist/lib/index.js",
     "typings": "dist/lib/index.d.ts",
-    "files": ["dist", "src"],
+    "files": [
+        "dist",
+        "src"
+    ],
     "license": "SEE LICENSE IN license.txt",
     "repository": {
         "type": "git",
@@ -15,8 +18,14 @@
         "email": "contact@garlictech.com",
         "url": "http://www.garlictech.com"
     },
-    "contributors": ["Zsolt R. Molnar <zsolt@zsoltmolnar.hu> (http://www.zsoltmolnar.hu)"],
-    "keywords": ["", "gtrack-admin-site", "garlictech"],
+    "contributors": [
+        "Zsolt R. Molnar <zsolt@zsoltmolnar.hu> (http://www.zsoltmolnar.hu)"
+    ],
+    "keywords": [
+        "",
+        "gtrack-admin-site",
+        "garlictech"
+    ],
     "engines": {
         "npm": ">=3.0.0",
         "node": ">=5.0.0"
@@ -65,6 +74,7 @@
         "@ngrx/store": "^5.1.0",
         "@turf/turf": "^5.1.3",
         "angular2-toaster": "^5.0.0",
+        "angularfire2": "^5.0.0-rc.6",
         "authentication-api-ngx": "file:src/subrepos/authentication-api-ngx",
         "bootstrap": "^4.0.0",
         "bootstrap-material-design": "^4.1.1",
@@ -72,18 +82,21 @@
         "d3-geo": "^1.9.1",
         "debug": "^3.0.0",
         "deepstream-ngx": "file:src/subrepos/deepstream-ngx",
+        "firebase": "^4.12.0",
         "font-awesome": "^4.7.0",
         "geojson-rewind": "^0.3.0",
         "gtrack-common-ngx": "file:src/subrepos/gtrack-common-ngx",
         "hammerjs": "^2.0.8",
         "intl": "^1.2.5",
         "jquery": "3.2.1",
+        "leaflet": "^1.3.1",
         "leaflet-routing-machine": "^3.2.8",
         "lodash": "^4.17.5",
         "lrm-graphhopper": "^1.2.0",
         "ng2-logger": "^1.0.12",
         "ngrx-store-freeze": "^0.2.1",
         "ngrx-store-logger": "^0.2.0",
+        "nouislider": "^11.0.3",
         "popper.js": "^1.13.0",
         "promise-polyfill": "^6.0.2",
         "rxjs": "^5.5.6",
@@ -116,4 +129,4 @@
     },
     "optionalDependencies": {},
     "peerDependencies": {}
-}
\ No newline at end of file
+}
diff --git a/src/deepstream-ngx/.setup.sh b/src/deepstream-ngx/.setup.sh
deleted file mode 100755
index 28616b0b..00000000
--- a/src/deepstream-ngx/.setup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export AWS_ACCESS_KEY_ID=AKIAJD77675POKBFJSTA
-export AWS_SECRET_ACCESS_KEY=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
-export NPM_TOKEN=4ce1647d-6182-4332-8c8d-da7bea64504c
-export DOCKER_PASSWORD=jQ03FWJGjF
-export FIREBASE_TOKEN=1/HR_CjevciR1IIs10Z5XxAFX5eDOQCBCesJc7WBkgfLI
-# export FIREBASE_TOKEN=1/53OVCWVAE1E4PQH4rG3Scuwt0eESIa7mn82f-j-x4Og
diff --git a/src/deepstream-ngx/.gitignore b/src/subrepos/deepstream-ngx/.gitignore
similarity index 100%
rename from src/deepstream-ngx/.gitignore
rename to src/subrepos/deepstream-ngx/.gitignore
diff --git a/src/deepstream-ngx/.gitrepo b/src/subrepos/deepstream-ngx/.gitrepo
similarity index 100%
rename from src/deepstream-ngx/.gitrepo
rename to src/subrepos/deepstream-ngx/.gitrepo
diff --git a/src/deepstream-ngx/.npmignore b/src/subrepos/deepstream-ngx/.npmignore
similarity index 100%
rename from src/deepstream-ngx/.npmignore
rename to src/subrepos/deepstream-ngx/.npmignore
diff --git a/src/deepstream-ngx/README.md b/src/subrepos/deepstream-ngx/README.md
similarity index 100%
rename from src/deepstream-ngx/README.md
rename to src/subrepos/deepstream-ngx/README.md
diff --git a/src/deepstream-ngx/index.ts b/src/subrepos/deepstream-ngx/index.ts
similarity index 100%
rename from src/deepstream-ngx/index.ts
rename to src/subrepos/deepstream-ngx/index.ts
diff --git a/src/deepstream-ngx/license.txt b/src/subrepos/deepstream-ngx/license.txt
similarity index 100%
rename from src/deepstream-ngx/license.txt
rename to src/subrepos/deepstream-ngx/license.txt
diff --git a/src/deepstream-ngx/package.json b/src/subrepos/deepstream-ngx/package.json
similarity index 100%
rename from src/deepstream-ngx/package.json
rename to src/subrepos/deepstream-ngx/package.json
diff --git a/src/deepstream-ngx/src/deepstream-service/index.ts b/src/subrepos/deepstream-ngx/src/deepstream-service/index.ts
similarity index 100%
rename from src/deepstream-ngx/src/deepstream-service/index.ts
rename to src/subrepos/deepstream-ngx/src/deepstream-service/index.ts
diff --git a/src/deepstream-ngx/src/lib/externals.ts b/src/subrepos/deepstream-ngx/src/lib/externals.ts
similarity index 100%
rename from src/deepstream-ngx/src/lib/externals.ts
rename to src/subrepos/deepstream-ngx/src/lib/externals.ts
diff --git a/src/deepstream-ngx/src/lib/index.ts b/src/subrepos/deepstream-ngx/src/lib/index.ts
similarity index 100%
rename from src/deepstream-ngx/src/lib/index.ts
rename to src/subrepos/deepstream-ngx/src/lib/index.ts
diff --git a/src/deepstream-ngx/src/log.ts b/src/subrepos/deepstream-ngx/src/log.ts
similarity index 100%
rename from src/deepstream-ngx/src/log.ts
rename to src/subrepos/deepstream-ngx/src/log.ts
diff --git a/src/deepstream-ngx/src/store/actions.ts b/src/subrepos/deepstream-ngx/src/store/actions.ts
similarity index 100%
rename from src/deepstream-ngx/src/store/actions.ts
rename to src/subrepos/deepstream-ngx/src/store/actions.ts
diff --git a/src/deepstream-ngx/src/store/effects.ts b/src/subrepos/deepstream-ngx/src/store/effects.ts
similarity index 100%
rename from src/deepstream-ngx/src/store/effects.ts
rename to src/subrepos/deepstream-ngx/src/store/effects.ts
diff --git a/src/deepstream-ngx/src/store/index.ts b/src/subrepos/deepstream-ngx/src/store/index.ts
similarity index 100%
rename from src/deepstream-ngx/src/store/index.ts
rename to src/subrepos/deepstream-ngx/src/store/index.ts
diff --git a/src/deepstream-ngx/src/store/reducer.ts b/src/subrepos/deepstream-ngx/src/store/reducer.ts
similarity index 100%
rename from src/deepstream-ngx/src/store/reducer.ts
rename to src/subrepos/deepstream-ngx/src/store/reducer.ts
diff --git a/src/deepstream-ngx/src/store/selectors.ts b/src/subrepos/deepstream-ngx/src/store/selectors.ts
similarity index 100%
rename from src/deepstream-ngx/src/store/selectors.ts
rename to src/subrepos/deepstream-ngx/src/store/selectors.ts
diff --git a/src/deepstream-ngx/src/store/state.ts b/src/subrepos/deepstream-ngx/src/store/state.ts
similarity index 100%
rename from src/deepstream-ngx/src/store/state.ts
rename to src/subrepos/deepstream-ngx/src/store/state.ts
diff --git a/src/deepstream-ngx/src/test/index.spec.ts b/src/subrepos/deepstream-ngx/src/test/index.spec.ts
similarity index 100%
rename from src/deepstream-ngx/src/test/index.spec.ts
rename to src/subrepos/deepstream-ngx/src/test/index.spec.ts