From 409fe51c94f6c7b58c1017009298a1c7b3c1145b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 24 Aug 2017 22:00:26 -0300
Subject: [PATCH 001/244] Bump version to 0.59.0-rc.0

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 74 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 40e54c7a30c..218469205f9 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-develop
+ENV RC_VERSION 0.59.0-rc.0
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 6fec056fc80..ce23d592acf 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-develop"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.0"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index d22718a199b..028b6ca37d0 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-develop
+    RC_VERSION=0.59.0-rc.0
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 8863fd21a08..a7c21737df0 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,77 @@
+<a name="0.59.0-rc.0"></a>
+# 0.59.0-rc.0 (2017-08-25)
+
+
+### New Features
+
+- [#7636](https://github.com/RocketChat/Rocket.Chat/pull/7636) Add classes to notification menu so they can be hidden in css
+- [#7852](https://github.com/RocketChat/Rocket.Chat/pull/7852) Add markdown parser "marked"
+- [#7711](https://github.com/RocketChat/Rocket.Chat/pull/7711) Add room type as a class to the ul-group of rooms
+- [#6301](https://github.com/RocketChat/Rocket.Chat/pull/6301) Add tags to uploaded images using Google Cloud Vision API
+- [#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658) Add unread options for direct messages
+- [#5902](https://github.com/RocketChat/Rocket.Chat/pull/5902) Adds a Keyboard Shortcut option to the flextab
+- [#7614](https://github.com/RocketChat/Rocket.Chat/pull/7614) Allow ldap mapping of customFields
+- [#7817](https://github.com/RocketChat/Rocket.Chat/pull/7817) Audio Notification updated in sidebar
+- [#7350](https://github.com/RocketChat/Rocket.Chat/pull/7350) Automatically select the first channel
+- [#7853](https://github.com/RocketChat/Rocket.Chat/pull/7853) Create a standard for svg icons
+- [#7342](https://github.com/RocketChat/Rocket.Chat/pull/7342) Integrated personal email gateway (GSoC'17)
+- [#7830](https://github.com/RocketChat/Rocket.Chat/pull/7830) Option to block users to mention unknow users
+- [#6700](https://github.com/RocketChat/Rocket.Chat/pull/6700) Package to render issue numbers into links to an issue tracker.
+- [#7864](https://github.com/RocketChat/Rocket.Chat/pull/7864) Replace message cog for vertical menu
+- [#7565](https://github.com/RocketChat/Rocket.Chat/pull/7565) REST API endpoint to list all private groups (permission limited)
+- [#7643](https://github.com/RocketChat/Rocket.Chat/pull/7643) Rocket.Chat UI Redesign
+- [#7612](https://github.com/RocketChat/Rocket.Chat/pull/7612) Search users by fields defined by admin
+- [#7688](https://github.com/RocketChat/Rocket.Chat/pull/7688) Template to show Custom Fields in user info view
+
+
+### Bug Fixes
+
+- [#7854](https://github.com/RocketChat/Rocket.Chat/pull/7854) Add CSS support for Safari versions > 7
+- [#7456](https://github.com/RocketChat/Rocket.Chat/pull/7456) Csv importer: work with more problematic data
+- [#7815](https://github.com/RocketChat/Rocket.Chat/pull/7815) Dutch translations
+- [#7846](https://github.com/RocketChat/Rocket.Chat/pull/7846) Email message forward error
+- [#7673](https://github.com/RocketChat/Rocket.Chat/pull/7673) Example usage of unsubscribe.js
+- [#7855](https://github.com/RocketChat/Rocket.Chat/pull/7855) File upload on multi-instances using a path prefix
+- [#7656](https://github.com/RocketChat/Rocket.Chat/pull/7656) Fix avatar upload fail on Cordova app
+- [#7168](https://github.com/RocketChat/Rocket.Chat/pull/7168) Fix black background on transparent avatars
+- [#7814](https://github.com/RocketChat/Rocket.Chat/pull/7814) Fix Dutch translation
+- [#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629) Fix messagebox growth
+- [#7863](https://github.com/RocketChat/Rocket.Chat/pull/7863) Fix migration 100
+- [#7823](https://github.com/RocketChat/Rocket.Chat/pull/7823) Fix new-message button showing on search
+- [#7687](https://github.com/RocketChat/Rocket.Chat/pull/7687) Fix room load on first hit
+- [#7758](https://github.com/RocketChat/Rocket.Chat/pull/7758) Fixed function closure syntax allowing validation emails to be sent.
+- [#7825](https://github.com/RocketChat/Rocket.Chat/pull/7825) Google vision NSFW tag
+- [#7679](https://github.com/RocketChat/Rocket.Chat/pull/7679) Make link inside YouTube preview open in new tab
+- [#7644](https://github.com/RocketChat/Rocket.Chat/pull/7644) Markdown noopener/noreferrer: use correct HTML attribute
+- [#7721](https://github.com/RocketChat/Rocket.Chat/pull/7721) meteor-accounts-saml issue with ns0,ns1 namespaces, makes it compatible with pysaml2 lib
+- [#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652) Only use "File Uploaded" prefix on files
+- [#7809](https://github.com/RocketChat/Rocket.Chat/pull/7809) Remove redundant "do" in "Are you sure ...?" messages.
+- [#7672](https://github.com/RocketChat/Rocket.Chat/pull/7672) Remove references to non-existent tests
+- [#7748](https://github.com/RocketChat/Rocket.Chat/pull/7748) scroll on flex-tab
+- [#7779](https://github.com/RocketChat/Rocket.Chat/pull/7779) Settings not getting applied from Meteor.settings and process.env 
+- [#7778](https://github.com/RocketChat/Rocket.Chat/pull/7778) Update Snap links
+- [#7639](https://github.com/RocketChat/Rocket.Chat/pull/7639) Wrong email subject when "All Messages" setting enabled
+- [#7630](https://github.com/RocketChat/Rocket.Chat/pull/7630) Wrong render of snippet’s name
+
+
+<details>
+<summary>Others</summary>
+
+- [#7793](https://github.com/RocketChat/Rocket.Chat/pull/7793) Additions to the REST API
+- [#7625](https://github.com/RocketChat/Rocket.Chat/pull/7625) Bump version to 0.59.0-develop
+- [#7661](https://github.com/RocketChat/Rocket.Chat/pull/7661) Fix typo in generated URI
+- [#7728](https://github.com/RocketChat/Rocket.Chat/pull/7728) FIX: Error when starting local development environment
+- [#7803](https://github.com/RocketChat/Rocket.Chat/pull/7803) LingoHub based on develop
+- [#2](https://github.com/RocketChat/Rocket.Chat/pull/2) local update
+- [#7677](https://github.com/RocketChat/Rocket.Chat/pull/7677) Meteor packages and npm dependencies update
+- [#7865](https://github.com/RocketChat/Rocket.Chat/pull/7865) Mobile sidenav
+- [#7842](https://github.com/RocketChat/Rocket.Chat/pull/7842) npm deps update
+- [#7755](https://github.com/RocketChat/Rocket.Chat/pull/7755) npm deps update
+- [#7739](https://github.com/RocketChat/Rocket.Chat/pull/7739) Remove CircleCI
+</details>
+
+
+
 <a name="0.58.2"></a>
 ## 0.58.2 (2017-08-23)
 
diff --git a/package.json b/package.json
index 28b5585855b..9ebc279326f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-develop",
+	"version": "0.59.0-rc.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 73c93e95aea..a52cab4a83f 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-develop"
+	"version": "0.59.0-rc.0"
 }

From 777834526d69de9a01091f808140ed346984e1a0 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 25 Aug 2017 04:55:42 -0300
Subject: [PATCH 002/244] fix sidebar paddings (#7888)

---
 packages/rocketchat-livechat/client/stylesheets/livechat.less  | 3 ++-
 .../client/imports/components/sidebar/sidebar-account.css      | 3 ++-
 .../client/imports/components/sidebar/sidebar-item.css         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-livechat/client/stylesheets/livechat.less b/packages/rocketchat-livechat/client/stylesheets/livechat.less
index 9b5daf989d4..2a87a737a32 100644
--- a/packages/rocketchat-livechat/client/stylesheets/livechat.less
+++ b/packages/rocketchat-livechat/client/stylesheets/livechat.less
@@ -626,8 +626,9 @@
 
 .livechat-status {
 	float: right;
-	margin-right: 10px;
+	margin-right: 16px;
 	font-size: 20px;
+	line-height: 20px;
 	color: #9d9fa3;
 }
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 30d4be7234f..ff6f5cdfe97 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -102,7 +102,8 @@
 
 		position: relative;
 
-		padding: 10px 0 10px 10px;
+		margin-right: -9px;
+		padding: 0;
 
 		cursor: pointer;
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 1068095ce6d..9481fa95da5 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -50,7 +50,7 @@
 	}
 
 	& .badge {
-		margin: 0 8px 0 3px;
+		margin: 0 16px 0 3px;
 	}
 
 	&__icon {

From 5812d21a2a0e88c5cf4e26aba892b114eea89571 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Fri, 25 Aug 2017 03:16:27 -0300
Subject: [PATCH 003/244] Makes text action menu width based on content size
 (#7887)

---
 packages/rocketchat-theme/client/imports/components/popover.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 48df399702c..4a543f30e61 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -36,6 +36,8 @@
 
 		padding: var(--popover-padding);
 
+		white-space: nowrap;
+
 		cursor: default;
 
 		border-radius: var(--popover-radius);

From 7b3b93aafb45f9adf2e27dbc361c6241f299e741 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 25 Aug 2017 03:22:27 -0300
Subject: [PATCH 004/244] Fix livechat icon (#7886)

---
 packages/rocketchat-ui-master/public/icons.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index 5e84b60584d..79f12ea7328 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -25,7 +25,7 @@
     <symbol viewBox="0 0 20 20" id="icon-keyboard"><path d="M9.953 1.96a.409.409 0 0 0-.364.415v3.68H2.227C1.554 6.056 1 6.61 1 7.284v9.407c0 .672.554 1.227 1.227 1.227h15.542c.673 0 1.227-.555 1.227-1.227V7.283c0-.673-.554-1.227-1.227-1.227h-6.135a.409.409 0 1 0 0 .818h6.135a.4.4 0 0 1 .41.409v9.407a.4.4 0 0 1-.41.409H2.227a.4.4 0 0 1-.409-.41V7.284a.4.4 0 0 1 .409-.41h7.771a.409.409 0 0 0 .41-.408v-4.09a.409.409 0 0 0-.455-.416zM3.007 7.691a.409.409 0 0 0-.371.409v7.77c0 .227.183.41.409.41h13.906a.409.409 0 0 0 .41-.41v-7.77a.409.409 0 0 0-.41-.41H3.007zm.447.818H5.09v1.636H3.454V8.51zm2.454 0H7.34v1.636H5.908V8.51zm2.25 0h1.431v1.636H8.158V8.51zm2.25 0h1.43v1.636h-1.43V8.51zm2.249 0h1.431v1.636h-1.431V8.51zm2.25 0h1.635v4.499h-3.885v-2.045h1.84a.409.409 0 0 0 .41-.41V8.51zM3.453 10.964H5.09v2.045H3.454v-2.045zm2.454 0H7.34v2.045H5.908v-2.045zm2.25 0h1.431v2.045H8.158v-2.045zm2.25 0h1.43v2.045h-1.43v-2.045zm-6.954 2.863H5.09v1.636H3.454v-1.636zm2.454 0h8.18v1.636h-8.18v-1.636zm8.998 0h1.636v1.636h-1.636v-1.636z" fill-rule="nonzero" fill="currentColor"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-language"><path d="M18.778 11.018c-.562-1.536-2.13-2.453-4.195-2.453-.081 0-.159.001-.236.005l-.014-1.857 3.172-.546c.104-.017.12-.107.098-.208-.02-.1-.15-.795-.169-.878-.024-.118-.092-.115-.186-.098-.094.016-2.925.415-2.925.415l-.012-1.87c0-.113-.062-.143-.175-.141l-.922.014c-.095.002-.148.044-.146.134l.03 2.076s-2.755.474-2.83.489c-.075.012-.153.047-.136.128.017.081.171.985.187 1.055.017.072.065.116.17.096l2.631-.453.032 1.816a4.23 4.23 0 0 0-2.03 1.173 3.915 3.915 0 0 0-1.087 2.666c0 1.428.874 2.276 2.095 2.426 2.846.348 4.607-2.754 5.192-4.244.988 1.356.23 3.919-1.884 5.382-.039.026-.088.116-.03.187l.557.68c.072.086.186.053.23.02 2.26-1.556 3.295-4.063 2.583-6.014zm-6.648 2.87c-.87-.11-.85-.823-.85-1.308 0-.696.295-1.422.79-1.94a2.889 2.889 0 0 1 1.105-.72l.074 3.85c-.347.117-.72.166-1.119.117zm2.185-.498l.041-3.699c.076-.003.15-.009.227-.009.695 0 1.344.131 1.696.325.352.196-.92 2.442-1.964 3.383zM6.26 6.488a.176.176 0 0 0-.177-.13H4.328a.175.175 0 0 0-.174.13l-3.147 9.936c-.015.046-.01.069.056.069h1.56c.067 0 .089-.02.102-.065l.907-2.986H6.78l.907 2.986c.014.044.035.065.102.065h1.56c.065 0 .07-.023.056-.069-.012-.045-2.775-8.767-3.144-9.936zm-2.357 5.687L5.206 7.45l1.302 4.725H3.903z" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-linkedin"><path d="M17.714 1H2.282C1.575 1 1 1.583 1 2.298v15.404C1 18.417 1.575 19 2.282 19h15.432c.707 0 1.286-.583 1.286-1.298V2.298C19 1.583 18.421 1 17.714 1zM6.44 16.429H3.772v-8.59h2.672v8.59H6.44zM5.106 6.665a1.548 1.548 0 0 1 0-3.094 1.55 1.55 0 0 1 1.547 1.547c0 .856-.69 1.547-1.547 1.547zm11.335 9.764h-2.668V12.25c0-.996-.02-2.278-1.386-2.278-1.39 0-1.604 1.085-1.604 2.206v4.25H8.116v-8.59h2.559v1.174h.036c.358-.675 1.23-1.387 2.527-1.387 2.7 0 3.203 1.78 3.203 4.095v4.709z" /></symbol>
-    <symbol viewBox="0 0 20 20" id="icon-livechat"><g fill="none" fill-rule="evenodd"><path d="M9 14.917a3.333 3.333 0 0 1-3.333-3.334V8c.143-3.333 1.531-5 4.166-5C12.468 3 13.857 4.667 14 8" stroke="currentColor" stroke-width="1.5" /><path d="M4 8.167v2.166a1 1 0 0 0 1 1h.5a1 1 0 0 0 1-1V8.167a1 1 0 0 0-1-1H5a1 1 0 0 0-1 1zm4.167 6.666v.084a1 1 0 0 0 1 1H10.5a1 1 0 0 0 1-1v-.084a1 1 0 0 0-1-1H9.167a1 1 0 0 0-1 1zm5-6.666v2.166a1 1 0 0 0 1 1h.5a1 1 0 0 0 1-1V8.167a1 1 0 0 0-1-1h-.5a1 1 0 0 0-1 1z" fill="currentColor" /></g></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-livechat"><path d="M15.274 6.595c-.39-2.5-2.55-4.361-5.245-4.361-2.98 0-5.314 2.272-5.314 5.173v.262c-.001.016-.005.032-.005.05v5.121a2.577 2.577 0 0 1-2.397-2.563c0-.933.506-1.793 1.321-2.247a.572.572 0 0 0-.556-.999 3.717 3.717 0 0 0-1.908 3.246 3.718 3.718 0 0 0 3.714 3.714c.127 0 .256-.01.385-.023h.012c.019 0 .036-.003.054-.004h.004a.57.57 0 0 0 .514-.567V8.344c.002-.017.005-.033.005-.05v-.887c0-2.298 1.793-4.03 4.171-4.03S14.2 5.108 14.2 7.406v.237c-.003.024-.007.049-.007.075v5.519c-.001.015-.004.03-.004.044v1.286c0 .878-.614 1.491-1.492 1.491h-.77l-.016.002a1.49 1.49 0 0 0-1.388-.96h-.98a1.493 1.493 0 0 0-1.49 1.491c0 .823.668 1.49 1.49 1.491h.98c.606 0 1.126-.365 1.36-.886.015.002.029.006.045.006h.77c1.526 0 2.633-1.109 2.633-2.635v-.559a3.716 3.716 0 0 0 3.544-3.706 3.716 3.716 0 0 0-3.601-3.708zM10.523 16.94h-.98a.353.353 0 0 1-.347-.348c0-.189.16-.348.348-.348h.979c.188 0 .348.16.348.348 0 .189-.16.348-.348.348zm4.813-4.074V8.369c.003-.025.007-.05.007-.075v-.553a2.572 2.572 0 0 1 2.39 2.562c0 1.36-1.06 2.473-2.397 2.563z" fill-rule="nonzero" fill="currentColor"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-lock"><path d="M5 8h10v9H5zm2-3c0-1.657 1.347-3 3-3 1.657 0 3 1.347 3 3v3H7V5z" stroke="currentColor" stroke-width="1.5" fill="none" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-magnifier"><g transform="translate(3 3)" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><circle cx="5" cy="5" r="5" /><path d="M13 13L9 9" stroke-linecap="square" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-mail"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M3 3.75c-.69 0-1.25.56-1.25 1.25v10c0 .69.56 1.25 1.25 1.25h14c.69 0 1.25-.56 1.25-1.25V5c0-.69-.56-1.25-1.25-1.25H3z" /><path d="M16.074 7.064l-6.01 4.01-6.01-4.01" /></g></symbol>

From 3af70c01df00aad82cdc4cf614bda4c062b29be3 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Fri, 25 Aug 2017 03:00:53 -0300
Subject: [PATCH 005/244] Merge pull request #7885 from
 RocketChat/message-actions-alignment

[FIX] message actions over unread bar
---
 .../rocketchat-theme/client/imports/components/messages.css   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index d7a720955c4..9bda032ab66 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -86,3 +86,7 @@
 .messages-box .rc-popover__list {
 	padding: 0;
 }
+
+.first-unread .message-actions {
+	top: 18px;
+}

From 989b927eb0b960ce0c1333f2269634b44a8f3f88 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Fri, 25 Aug 2017 03:00:33 -0300
Subject: [PATCH 006/244] Merge pull request #7883 from
 RocketChat/fix-mobile-popover

[FIX] popover position on mobile
---
 .../client/imports/components/popover.css              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 4a543f30e61..854ecf2e96e 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -6,13 +6,17 @@
 		align-items: flex-start;
 	}
 	--rc-popover-open-mobile: {
-		top: initial;
 		position: fixed;
+		top: initial;
 		bottom: 0;
+		left: 0;
+
+		display: inline-block;
+
+		width: 100vw;
 		padding: 8px;
+
 		animation: dropup-show 0.5s cubic-bezier(0.45, 0.05, 0.55, 0.95);
-		width: 100vw;
-		display: inline-block;
 	}
 }
 

From 2988024fe43ef979e4cf58f4801bc742f5554906 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 25 Aug 2017 03:22:45 -0300
Subject: [PATCH 007/244] [FIX] hyperlink style on sidebar footer (#7882)

* Fix hyperlink style on sidebar footer

* fix a selector
---
 .../client/imports/components/sidebar/sidebar.css             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index 7caf194225d..081170ac328 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -50,6 +50,10 @@
 			max-width: 100%;
 			height: 100%;
 		}
+
+		& a:any-link {
+			color: var(--color-gray);
+		}
 	}
 
 	&__header {

From 19217f0f6b68223535e33eac0f8a97b87c8a62c1 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Fri, 25 Aug 2017 03:00:13 -0300
Subject: [PATCH 008/244] Merge pull request #7881 from
 RocketChat/fix-search-overlap

[FIX] search results position on sidebar
---
 .../client/imports/components/sidebar/rooms-list.css           | 2 +-
 packages/rocketchat-ui-message/client/popup/messagePopup.html  | 2 +-
 packages/rocketchat-ui-message/client/popup/messagePopup.js    | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 5e940cc37e5..ea7a770e1f5 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -31,7 +31,7 @@
 	&__toolbar-search {
 		position: absolute;
 		z-index: 1;
-		top: var(--sidebar-header-height);
+
 		left: 0;
 
 		overflow-y: auto;
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.html b/packages/rocketchat-ui-message/client/popup/messagePopup.html
index aed6f003e27..791dba7ce87 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopup.html
+++ b/packages/rocketchat-ui-message/client/popup/messagePopup.html
@@ -1,7 +1,7 @@
 <template name="messagePopup">
 	{{#if isOpen}}
 		{{#if sidebar}}
-			<ul class="rooms-list__list rooms-list__toolbar-search">
+			<ul class="rooms-list__list rooms-list__toolbar-search" style="top: {{sidebarHeaderHeight}}">
 				{{#each data}}
 						{{> Template.dynamic template=../template data=toolbarData }}
 				{{/each}}
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.js b/packages/rocketchat-ui-message/client/popup/messagePopup.js
index 420d2224e61..9b0726b8904 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopup.js
+++ b/packages/rocketchat-ui-message/client/popup/messagePopup.js
@@ -284,5 +284,8 @@ Template.messagePopup.helpers({
 	},
 	toolbarData() {
 		return {...Template.currentData(), toolbar: true};
+	},
+	sidebarHeaderHeight() {
+		return `${ document.querySelector('.sidebar__header').offsetHeight }px`;
 	}
 });

From 3309949f4f92160d84c7936944249d622e286754 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Fri, 25 Aug 2017 01:50:32 -0300
Subject: [PATCH 009/244] Adds default search text padding for emoji search and
 removes a console log (#7878)

---
 packages/rocketchat-emoji/client/emojiPicker.css    | 2 +-
 packages/rocketchat-emoji/client/lib/EmojiPicker.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/rocketchat-emoji/client/emojiPicker.css b/packages/rocketchat-emoji/client/emojiPicker.css
index dbb0b95964d..6e3b1d9f6c8 100644
--- a/packages/rocketchat-emoji/client/emojiPicker.css
+++ b/packages/rocketchat-emoji/client/emojiPicker.css
@@ -112,7 +112,7 @@
 
 			width: 100%;
 			height: 35px;
-			padding: 2px 8px;
+			padding: 0.5rem 1rem 0.5rem 2.25rem;
 
 			border-width: 1px;
 			border-style: solid;
diff --git a/packages/rocketchat-emoji/client/lib/EmojiPicker.js b/packages/rocketchat-emoji/client/lib/EmojiPicker.js
index 8caf962496e..12679be3b80 100644
--- a/packages/rocketchat-emoji/client/lib/EmojiPicker.js
+++ b/packages/rocketchat-emoji/client/lib/EmojiPicker.js
@@ -78,7 +78,6 @@ RocketChat.EmojiPicker = {
 		return $('.emoji-picker').css(cssProperties);
 	},
 	open(source, callback) {
-		console.log('open', source);
 		if (!this.initiated) {
 			this.init();
 		}

From a286fece0a323074a819d98add068304d390a6d0 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Fri, 25 Aug 2017 02:59:46 -0300
Subject: [PATCH 010/244] Merge pull request #7880 from
 RocketChat/fix-sidebar-alignments

[FIX] sidebar paddings
---
 .../client/imports/components/sidebar/rooms-list.css  | 11 +++++++++++
 .../imports/components/sidebar/sidebar-account.css    |  2 +-
 .../imports/components/sidebar/sidebar-item.css       |  9 +++++++--
 .../client/imports/components/sidebar/sidebar.css     |  9 ++++++---
 .../client/imports/components/sidebar/toolbar.css     |  7 ++++---
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index ea7a770e1f5..1231eefac4f 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -11,6 +11,7 @@
 
 	&__type {
 		margin-bottom: 0.5rem;
+		margin-left: calc(var(--sidebar-default-padding) - calc(var(--sidebar-default-padding) / 3));
 
 		color: var(--rooms-list-title-color);
 
@@ -18,6 +19,7 @@
 	}
 
 	&__empty-room {
+		margin-left: calc(var(--sidebar-default-padding) - calc(var(--sidebar-default-padding) / 3));
 
 		color: var(--rooms-list-empty-text-color);
 
@@ -43,3 +45,12 @@
 		background-color: var(--sidebar-background);
 	}
 }
+
+@media (width <= 400px) {
+	.rooms-list {
+		&__type,
+		&__empty-room {
+			margin-left: 0;
+		}
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index ff6f5cdfe97..2db3cbf0fb5 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -39,6 +39,7 @@
 		flex: 1;
 
 		max-width: 160px;
+		max-width: fit-content;
 		height: calc(var(--sidebar-account-username-size) + 0.1rem);
 		margin-bottom: 0.5rem;
 
@@ -147,7 +148,6 @@
 
 		&-username {
 			width: auto;
-			max-width: 160px;
 			margin: 0  0.65rem;
 
 			font-weight: var(--sidebar-small-account-username-weight);
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 9481fa95da5..1c70e77d4e9 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -1,11 +1,12 @@
 .sidebar-item {
-
 	position: relative;
 
 	display: flex;
 
 	height: var(--sidebar-item-height);
 
+	padding-left: calc(var(--sidebar-default-padding) - calc(var(--sidebar-default-padding) / 3));
+
 	cursor: pointer;
 
 	border-radius: var(--sidebar-item-radius);
@@ -55,6 +56,7 @@
 
 	&__icon {
 		margin: 0 auto;
+
 		font-size: 1.25rem;
 		fill: currentColor;
 	}
@@ -66,7 +68,7 @@
 
 	&__user-status {
 		position: absolute;
-		right: calc(100% + var(--sidebar-item-user-status-size));
+		left: 4px;
 
 		width: var(--sidebar-item-user-status-size);
 		height: var(--sidebar-item-user-status-size);
@@ -110,8 +112,11 @@
 
 @media (width <= 400px) {
 	.sidebar-item {
+		padding-left: 0;
+
 		&__user-status {
 			right: calc(100% + var(--sidebar-small-item-user-status-size));
+			left: auto;
 		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index 081170ac328..9609acbe9d7 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -65,9 +65,8 @@
 		display: none;
 	}
 
-	& .rooms-list,
-	& .unread-rooms {
-		padding: 0 var(--sidebar-default-padding) var(--sidebar-default-padding) var(--sidebar-default-padding);
+	& .rooms-list {
+		padding: 0 calc(var(--sidebar-default-padding) / 3);
 	}
 }
 
@@ -98,6 +97,10 @@
 			padding: 0 var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding);
 		}
 
+		&__footer {
+			display: none;
+		}
+
 		&:not(&--light) {
 			transform: translate3d(-100%, 0, 0);
 		}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index fbfd5d3623e..db7694c823d 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -29,8 +29,8 @@
 
 	&__icon {
 		&--plus {
-				font-size: 1.25rem;
-			}
+			font-size: 1.25rem;
+		}
 	}
 
 	& .rc-input {
@@ -69,8 +69,9 @@
 			}
 
 			&-svg--plus {
-				font-size: 1rem;
 				transform: rotate(45deg);
+
+				font-size: 1rem;
 			}
 		}
 	}

From 00a0d5ed9a53f7df76d75d91f2d72682fd966423 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 25 Aug 2017 07:42:07 -0300
Subject: [PATCH 011/244] Bump version to 0.59.0-rc.1

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 13 +++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 218469205f9..fff45334f28 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.0
+ENV RC_VERSION 0.59.0-rc.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index ce23d592acf..67d27751ce7 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.0"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.1"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 028b6ca37d0..29673b5a52a 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.0
+    RC_VERSION=0.59.0-rc.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index a7c21737df0..fe8e3e92147 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,16 @@
+<a name="0.59.0-rc.1"></a>
+# 0.59.0-rc.1 (2017-08-25)
+
+
+### Bug Fixes
+
+- [#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) message actions over unread bar
+- [#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) popover position on mobile
+- [#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) search results position on sidebar
+- [#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) sidebar paddings
+
+
+
 <a name="0.59.0-rc.0"></a>
 # 0.59.0-rc.0 (2017-08-25)
 
diff --git a/package.json b/package.json
index 9ebc279326f..ab2c6f0df69 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.0",
+	"version": "0.59.0-rc.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index a52cab4a83f..70ec681cccb 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.0"
+	"version": "0.59.0-rc.1"
 }

From c5ad8ba618e4b69ac327ce61952f4697c074386e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 25 Aug 2017 10:02:50 -0300
Subject: [PATCH 012/244] Merge pull request #7893 from
 RocketChat/hotfix/remove-window-rocketDebug

[FIX] Window exception when parsing Markdown on server
---
 packages/rocketchat-markdown/parser/original/code.js     | 4 ----
 packages/rocketchat-markdown/parser/original/markdown.js | 2 --
 packages/rocketchat-ui-master/client/main.js             | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/packages/rocketchat-markdown/parser/original/code.js b/packages/rocketchat-markdown/parser/original/code.js
index 1516a647c50..15ec3e81d7b 100644
--- a/packages/rocketchat-markdown/parser/original/code.js
+++ b/packages/rocketchat-markdown/parser/original/code.js
@@ -81,10 +81,6 @@ export const code = (message) => {
 
 		codeblocks(message);
 		inlinecode(message);
-
-		if (window && window.rocketDebug) {
-			console.log('Markdown', message);
-		}
 	}
 
 	return message;
diff --git a/packages/rocketchat-markdown/parser/original/markdown.js b/packages/rocketchat-markdown/parser/original/markdown.js
index 6e1a1142f08..268d79c2214 100644
--- a/packages/rocketchat-markdown/parser/original/markdown.js
+++ b/packages/rocketchat-markdown/parser/original/markdown.js
@@ -83,8 +83,6 @@ const parseNotEscaped = function(msg, message) {
 		return `<a href="${ _.escapeHTML(url) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer">${ _.escapeHTML(title) }</a>`;
 	});
 
-	if (typeof window !== 'undefined' && window !== null ? window.rocketDebug : undefined) { console.log('Markdown', msg); }
-
 	return msg;
 };
 
diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index 2a4c37cd8bb..4cc4e5eb5fe 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -178,9 +178,6 @@ Template.main.helpers({
 
 Template.main.events({
 	'click .burger'() {
-		if (window.rocketDebug) {
-			console.log('room click .burger');
-		}
 		return menu.toggle();
 	}
 });

From f73ab34874db8df7dd8f273e0e7cae3b4a781b77 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 25 Aug 2017 09:50:39 -0300
Subject: [PATCH 013/244] Merge pull request #7894 from
 RocketChat/remove-flex-tab-close

Hide flex-tab close button
---
 .../rocketchat-theme/client/imports/general/base_old.css    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 8e7b9bcc53f..48b880a2cfa 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3633,18 +3633,12 @@ body:not(.is-cordova) {
 				width: 21px;
 				height: 20px;
 
-				border-radius: 50%;
-
 				& i {
 					display: inline-block;
 
 					width: 18px;
 					height: 18px;
 
-					border-width: 1px;
-					border-style: solid;
-					border-radius: 50%;
-
 					font-size: 10px;
 				}
 			}

From 9f1b309b07ce237decdc45620378ec1f8eeb7843 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 25 Aug 2017 11:16:29 -0300
Subject: [PATCH 014/244] Merge pull request #7895 from
 RocketChat/hotifx/brk-realtime-api-notifications

[FIX] Remove break change in Realtime API
---
 client/notifications/notification.js                            | 2 +-
 .../rocketchat-lib/server/lib/sendNotificationsOnMessage.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/notifications/notification.js b/client/notifications/notification.js
index 7e176df7ddf..6adec5a6e03 100644
--- a/client/notifications/notification.js
+++ b/client/notifications/notification.js
@@ -7,7 +7,7 @@
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		if (Meteor.userId()) {
-			RocketChat.Notifications.onUser('desktopNotification', function(notification) {
+			RocketChat.Notifications.onUser('notification', function(notification) {
 
 				let openedRoomId = undefined;
 				if (['channel', 'group', 'direct'].includes(FlowRouter.getRouteName())) {
diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index fd1c7a6b91d..1083d18d76e 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -58,7 +58,7 @@ function notifyDesktopUser(userId, user, message, room, duration) {
 	if (room.t !== 'd' && room.name) {
 		title += ` @ #${ room.name }`;
 	}
-	RocketChat.Notifications.notifyUser(userId, 'desktopNotification', {
+	RocketChat.Notifications.notifyUser(userId, 'notification', {
 		title,
 		text: message.msg,
 		duration,

From 2345962d0cb493b2be1b5028aa85f47b904e4e1a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 25 Aug 2017 17:07:49 -0300
Subject: [PATCH 015/244] Merge pull request #7904 from
 RocketChat/fix-livechat-toggle

[FIX] Fix livechat toggle UI issue
---
 packages/rocketchat-livechat/client/stylesheets/livechat.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-livechat/client/stylesheets/livechat.less b/packages/rocketchat-livechat/client/stylesheets/livechat.less
index 2a87a737a32..651827f2d1f 100644
--- a/packages/rocketchat-livechat/client/stylesheets/livechat.less
+++ b/packages/rocketchat-livechat/client/stylesheets/livechat.less
@@ -628,7 +628,7 @@
 	float: right;
 	margin-right: 16px;
 	font-size: 20px;
-	line-height: 20px;
+	line-height: 18px;
 	color: #9d9fa3;
 }
 

From 617b3ae86c10b749d7e1ed07344a000723c03bd4 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 28 Aug 2017 10:42:03 -0300
Subject: [PATCH 016/244] Merge pull request #7912 from luizbills/patch-1

[FIX] Fix google play logo on repo README
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3431a885810..5dab76e0979 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron]
 [![Rocket.Chat on Apple AppStore](http://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8)
 
 ### Available from Google Play
-[![Rocket.Chat on Google Play](https://upload.wikimedia.org/wikipedia/commons/thumb/5/58/Google_Play_logo_2015.PNG/220px-Google_Play_logo_2015.PNG)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
+[![Rocket.Chat on Google Play](https://upload.wikimedia.org/wikipedia/commons/c/cd/Get_it_on_Google_play.svg)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
 
 Now compatible with all Android devices as old as version 4.0.x - [download here](https://rocket.chat/docs/developer-guides/mobile-apps/), even on BlackBerry Passport!
 

From a38ee46e9c4096bd61730a8da0dc54866fd15ef9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 28 Aug 2017 11:37:09 -0300
Subject: [PATCH 017/244] Bump version to 0.59.0-rc.2

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 20 ++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index fff45334f28..5887f7cd551 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.1
+ENV RC_VERSION 0.59.0-rc.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 67d27751ce7..872f18c0fb3 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.1"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.2"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 29673b5a52a..b1ff2364daa 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.1
+    RC_VERSION=0.59.0-rc.2
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index fe8e3e92147..269ed5dac5c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,23 @@
+<a name="0.59.0-rc.2"></a>
+# 0.59.0-rc.2 (2017-08-28)
+
+
+### Bug Fixes
+
+- [#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) Fix google play logo on repo README
+- [#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904) Fix livechat toggle UI issue
+- [#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895) Remove break change in Realtime API
+- [#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893) Window exception when parsing Markdown on server
+
+
+<details>
+<summary>Others</summary>
+
+- [#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) Hide flex-tab close button
+</details>
+
+
+
 <a name="0.59.0-rc.1"></a>
 # 0.59.0-rc.1 (2017-08-25)
 
diff --git a/package.json b/package.json
index ab2c6f0df69..df4e26ad656 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.1",
+	"version": "0.59.0-rc.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 70ec681cccb..7295ee35811 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.1"
+	"version": "0.59.0-rc.2"
 }

From 8c3910d8249beca894822e2d8c1930a07c568742 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 13:37:44 -0300
Subject: [PATCH 018/244] Merge pull request #7712 from
 seekingalpha/show-leader-on-first-load

[FIX] Show leader on first load
---
 packages/rocketchat-ui/client/views/app/room.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 6dcae11f496..ef9241126ea 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -509,10 +509,13 @@ Template.room.events({
 	},
 
 	'scroll .wrapper': _.throttle(function(e, t) {
-		if (e.target.scrollTop < lastScrollTop) {
-			t.hideLeaderHeader.set(false);
-		} else if (e.target.scrollTop > $('.room-leader').height()) {
-			t.hideLeaderHeader.set(true);
+		const $roomLeader = $('.room-leader');
+		if ($roomLeader.length) {
+			if (e.target.scrollTop < lastScrollTop) {
+				t.hideLeaderHeader.set(false);
+			} else if (t.isAtBottom(100) === false && e.target.scrollTop > $('.room-leader').height()) {
+				t.hideLeaderHeader.set(true);
+			}
 		}
 		lastScrollTop = e.target.scrollTop;
 

From f2aa86e0766f51b8864a3816e09121f41c3d986a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 13:36:27 -0300
Subject: [PATCH 019/244] Merge pull request #7909 from rafaelks/patch-1

[DOCS] Add native mobile app links into README and update button images
---
 README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5dab76e0979..7674e35ccfe 100644
--- a/README.md
+++ b/README.md
@@ -62,14 +62,16 @@ Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.ch
 Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
 
 
-# Mobile Apps
-### Available from the AppStore
-[![Rocket.Chat on Apple AppStore](http://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8)
+# Native Mobile Apps
+*Note: currently the native apps doesn't support all the features that web does. If you're looking for it, you should download the Cordova apps.*
 
-### Available from Google Play
-[![Rocket.Chat on Google Play](https://upload.wikimedia.org/wikipedia/commons/c/cd/Get_it_on_Google_play.svg)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
+[![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=chat.rocket.android)
 
-Now compatible with all Android devices as old as version 4.0.x - [download here](https://rocket.chat/docs/developer-guides/mobile-apps/), even on BlackBerry Passport!
+# Hybrid Mobile Apps (Cordova)
+
+[![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
+
+*Now compatible with all Android devices as old as version 4.0.x - [download here](https://rocket.chat/docs/developer-guides/mobile-apps/), even on BlackBerry Passport!*
 
 ### Also available as FirefoxOS app
 [![Firefox OS app now available](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/firefoxos.png)](https://rocket.chat/docs/installation/mobile-and-desktop-apps/#native-firefox-os-app)

From 641474a7825baaa1e5f618952a4f644bf24e120a Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 28 Aug 2017 19:40:38 -0300
Subject: [PATCH 020/244] Update BlackDuck URL (#7941)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7674e35ccfe..9ad68cfe992 100644
--- a/README.md
+++ b/README.md
@@ -328,7 +328,7 @@ Read about [how it all started](http://osdelivers.blackducksoftware.com/2016/06/
 ## Awards
 [![InfoWorld Bossie Awards 2016 - Best Open Source Applications](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/bossie.png)](http://www.infoworld.com/article/3122000/open-source-tools/bossie-awards-2016-the-best-open-source-applications.html#slide4)
 
-[![Black Duck Open Source Rookie of the Year for 2015](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/blackducksm.png)](https://info.blackducksoftware.com/OpenSourceRookies2015.html)
+[![Black Duck Open Source Rookie of the Year for 2015](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/blackducksm.png)](https://info.blackducksoftware.com/OpenSourceRookies2015)
 
 [![Softpedia 100% Free and Clean Award for 2017](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/softpedia.gif)](http://www.softpedia.com/get/Internet/Chat/Other-Chat-Tools/Rocket-Chat.shtml#status)
 

From 556859103c6d728e4d132562a0273c92802e5f7d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 14:57:13 -0300
Subject: [PATCH 021/244] Merge pull request #7942 from
 RocketChat/firefox-createchannel

[FIX] Create channel button on Firefox
---
 packages/rocketchat-theme/server/colors.less               | 4 ++--
 packages/rocketchat-ui/client/views/app/createChannel.html | 2 +-
 packages/rocketchat-ui/client/views/app/createChannel.js   | 1 +
 tests/pageobjects/side-nav.page.js                         | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-theme/server/colors.less b/packages/rocketchat-theme/server/colors.less
index f7f8beef457..1f381243b80 100755
--- a/packages/rocketchat-theme/server/colors.less
+++ b/packages/rocketchat-theme/server/colors.less
@@ -287,8 +287,8 @@ textarea {
 	background-color: mix(contrast(@content-background-color), @content-background-color, 20%);
 }
 
-input[type="button"],
-input[type="submit"] {
+.rc-old input[type="button"],
+.rc-old input[type="submit"] {
 	color: @primary-font-color;
 	background: mix(contrast(@content-background-color), @content-background-color, 10%);
 	border-color: mix(contrast(@content-background-color), @content-background-color, 10%);
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html
index 78059543069..2aab64dd795 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.html
+++ b/packages/rocketchat-ui/client/views/app/createChannel.html
@@ -77,7 +77,7 @@
 					</label>
 				</div>
 			</div>
-			<button class="rc-button rc-button--primary" type='submit' data-button="create" {{createIsDisabled}}>{{_ "Create"}}</button>
+			<input class="rc-button rc-button--primary" type="submit" data-button="create" {{createIsDisabled}} value="{{_ "Create"}}">
 		</form>
 	</section>
 </template>
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index 29116406355..f55ea97ebb8 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -155,6 +155,7 @@ Template.createChannel.events({
 				}
 				return;
 			}
+
 			if (!isPrivate) {
 				RocketChat.callbacks.run('aftercreateCombined', { _id: result.rid, name: result.name });
 			}
diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index 870ad7cfe91..d5fab67ecf0 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -5,7 +5,7 @@ class SideNav extends Page {
 	get channelType() { return browser.element('.create-channel__content .rc-switch__button'); }
 	get channelReadOnly() { return browser.elements('.create-channel__switches .rc-switch__button').value[1]; }
 	get channelName() { return browser.element('.create-channel__content input[name="name"]'); }
-	get saveChannelBtn() { return browser.element('.create-channel__content button[data-button="create"]'); }
+	get saveChannelBtn() { return browser.element('.create-channel__content [data-button="create"]'); }
 
 	// Account box
 	get accountBoxUserName() { return browser.element('.sidebar__account-username'); }
@@ -101,7 +101,7 @@ class SideNav extends Page {
 		this.channelName.setValue(channelName);
 
 		browser.waitUntil(function() {
-			return browser.isEnabled('.create-channel__content button[data-button="create"]');
+			return browser.isEnabled('.create-channel__content [data-button="create"]');
 		}, 5000);
 
 		this.channelType.waitForVisible(10000);

From fc3fd84697dc4205b19e9f085f94b12b7967c630 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 29 Aug 2017 23:38:06 -0300
Subject: [PATCH 022/244] Merge pull request #7943 from
 RocketChat/firefox-emoji

[FIX] Broken emoji picker on firefox
---
 packages/rocketchat-emoji/client/emojiButton.js     |  4 +---
 packages/rocketchat-ui-message/client/messageBox.js | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/rocketchat-emoji/client/emojiButton.js b/packages/rocketchat-emoji/client/emojiButton.js
index 454f602927c..6162ee9ca5c 100644
--- a/packages/rocketchat-emoji/client/emojiButton.js
+++ b/packages/rocketchat-emoji/client/emojiButton.js
@@ -14,9 +14,7 @@ Template.messageBox.events({
 				const caretPos = input.selectionStart;
 				const textAreaTxt = input.value;
 				input.focus();
-				if (document.execCommand) {
-					document.execCommand('insertText', false, emojiValue);
-				} else {
+				if (!document.execCommand || !document.execCommand('insertText', false, emojiValue)) {
 					input.value = textAreaTxt.substring(0, caretPos) + emojiValue + textAreaTxt.substring(caretPos);
 				}
 
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 9bde15d0c0e..5255d5f61f1 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -51,11 +51,10 @@ function applyMd(e, t) {
 			box.selectionStart = selectionStart - startPattern.length;
 			box.selectionEnd = selectionEnd + endPattern.length;
 
-			if (document.execCommand) {
-				document.execCommand('insertText', false, selectedText);
-			} else {
+			if (!document.execCommand || !document.execCommand('insertText', false, selectedText)) {
 				box.value = initText.substr(0, initText.length - startPattern.length) + selectedText + finalText.substr(endPattern.length);
 			}
+
 			box.selectionStart = selectionStart - startPattern.length;
 			box.selectionEnd = box.selectionStart + selectedText.length;
 			$(box).change();
@@ -68,11 +67,10 @@ function applyMd(e, t) {
 		apply pattern
 		restore selection
 	*/
-	if (document.execCommand) {
-		document.execCommand('insertText', false, this.pattern.replace('{{text}}', selectedText));
-	} else {
+	if (!document.execCommand || !document.execCommand('insertText', false, this.pattern.replace('{{text}}', selectedText))) {
 		box.value = initText + this.pattern.replace('{{text}}', selectedText) + finalText;
 	}
+
 	box.selectionStart = selectionStart + this.pattern.indexOf('{{text}}');
 	box.selectionEnd = box.selectionStart + selectedText.length;
 	$(box).change();

From faf4f1914cad0d19b77bce854c268a10b6ded4c2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 29 Aug 2017 23:36:40 -0300
Subject: [PATCH 023/244] Merge pull request #7945 from
 josiasds/fix-account-profile-placeholders

[FIX] Fix placeholders in account profile
---
 packages/rocketchat-ui-account/client/accountProfile.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index fcd17312608..f0bad64077a 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -99,7 +99,7 @@
 									<label class="rc-input__label">
 										<div class="rc-input__title">{{_ "Email"}}</div>
 										<div class="rc-input__wrapper">
-											<input name="email" type="text" class="rc-input__element" placeholder="Type channel name" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
+											<input name="email" type="text" class="rc-input__element" placeholder="Type email" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
 										</div>
 									</label>
 									{{# unless canChange}}
@@ -112,7 +112,7 @@
 									<label class="rc-input__label">
 										<div class="rc-input__title">{{_ "New_password"}}</div>
 										<div class="rc-input__wrapper">
-											<input name="password" type="password" class="rc-input__element" placeholder="Type channel name"  autocomplete="new-password" {{ifThenElse canChange '' 'disabled'}}>
+											<input name="password" type="password" class="rc-input__element" placeholder="Type new password"  autocomplete="new-password" {{ifThenElse canChange '' 'disabled'}}>
 										</div>
 									</label>
 									{{# unless canChange}}

From 5198b2b6abbc9e4b91ebee51886192a1584e5ea6 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 29 Aug 2017 23:44:36 -0300
Subject: [PATCH 024/244] Merge pull request #7948 from Lawri-van-Buel/develop

[FIX] Document README.md. Drupal repo out of date
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9ad68cfe992..b5a414fd2ac 100644
--- a/README.md
+++ b/README.md
@@ -281,7 +281,7 @@ It is a great solution for communities and companies wanting to privately host t
 - Audio calls
 - Multi-users Audio Conference
 - Screensharing
-- Drupal 7.x and 8.x Plug-in ([download](https://www.drupal.org/project/rocket_chat)  and [source code](https://github.com/jelhouss/rocket_chat) )
+- Drupal 7.x and 8.x Plug-in (both stable and development flavours) ([download](https://www.drupal.org/project/rocket_chat)  and [source code](https://git.drupal.org/project/rocket_chat.git) )
 - XMPP bridge ([try it](https://demo.rocket.chat/channel/general))
 - REST APIs
 - Remote Locations Video Monitoring

From fe978957d13bc052990e1ef3228a7d91dc7148e7 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 30 Aug 2017 00:39:21 -0300
Subject: [PATCH 025/244] Merge pull request #7953 from
 RocketChat/firefox-username

[FIX] username ellipsis on firefox
---
 .../client/imports/components/sidebar/sidebar-account.css        | 1 -
 .../client/imports/components/sidebar/sidebar.css                | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 2db3cbf0fb5..71b33c2a034 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -38,7 +38,6 @@
 		overflow: hidden;
 		flex: 1;
 
-		max-width: 160px;
 		max-width: fit-content;
 		height: calc(var(--sidebar-account-username-size) + 0.1rem);
 		margin-bottom: 0.5rem;
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index 9609acbe9d7..84488b1d5ae 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -7,6 +7,7 @@
 	flex: 0 0 var(--sidebar-width);
 
 	width: var(--sidebar-width);
+	max-width: var(--sidebar-width);
 
 	height: 100%;
 

From 68c25a3ea1332e661d69ecd21cf9a373d1db193e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 29 Aug 2017 23:36:17 -0300
Subject: [PATCH 026/244] Merge pull request #7954 from RocketChat/otr-buttons

[FIX] OTR buttons padding
---
 packages/rocketchat-otr/client/views/otrFlexTab.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-otr/client/views/otrFlexTab.html b/packages/rocketchat-otr/client/views/otrFlexTab.html
index 6671c45e7f0..e394b43cba6 100644
--- a/packages/rocketchat-otr/client/views/otrFlexTab.html
+++ b/packages/rocketchat-otr/client/views/otrFlexTab.html
@@ -8,8 +8,12 @@
 				<ul class="list clearfix">
 					{{#if userIsOnline}}
 						{{#if established}}
-							<button class="button refresh"><span>{{_ "Refresh_keys"}}</span></button>
-							<button class="button end"><span>{{_ "End_OTR"}}</span></button>
+							<div class="buttons-group">
+								<button class="button refresh"><span>{{_ "Refresh_keys"}}</span></button>
+							</div>
+							<div class="buttons-group">
+								<button class="button end"><span>{{_ "End_OTR"}}</span></button>
+							</div>
 						{{else}} {{#if establishing}}
 							{{_ "Please_wait_while_OTR_is_being_established"}}
 						{{else}}

From 5c582e3f009176141c3fa6fc6afa96d137fdac13 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 29 Aug 2017 23:35:38 -0300
Subject: [PATCH 027/244] Merge pull request #7960 from
 RocketChat/sidebar-colors

[FIX] status and active room colors on sidebar
---
 .../client/imports/components/sidebar/sidebar-item.css        | 4 ++--
 .../rocketchat-theme/client/imports/general/variables.css     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 1c70e77d4e9..0ce2156fd2e 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -13,7 +13,7 @@
 	align-items: center;
 
 	&--active {
-		background-color: var(--sidebar-item-active-background);
+		background-color: var(--color-dark-light);
 	}
 
 	&--darken {
@@ -88,7 +88,7 @@
 		}
 
 		&--offline {
-			background-color: var(--status-invisible);
+			background-color: var(--status-invisible-sidebar);
 		}
 	}
 
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index 750e8c43362..395bdcf0872 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -6,6 +6,7 @@
 	--color-darkest: #1f2329;
 	--color-dark: #2f343d;
 	--color-dark-medium: #414852;
+	--color-dark-light: #6c727a;
 	--color-gray: #9ea2a8;
 	--color-gray-medium: #cbced1;
 	--color-gray-light: #e1e5e8;
@@ -39,6 +40,7 @@
 	--status-away: var(--color-alert);
 	--status-busy: var(--color-error);
 	--status-invisible: var(--color-gray-medium);
+	--status-invisible-sidebar: var(--color-darkest);
 
 	/*
 	* Forms

From a691b2ead2c28f9b21c8d78f2655b130dd6b9a15 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 13:55:58 -0300
Subject: [PATCH 028/244] Merge pull request #7963 from
 RocketChat/fix-status-member-list

[FIX] Fix the status on the members list
---
 packages/rocketchat-theme/client/imports/general/base_old.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 48b880a2cfa..a0a11ea2186 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -4157,6 +4157,8 @@ body:not(.is-cordova) {
 
 			width: var(--user-image-square);
 			height: var(--user-image-square);
+
+			margin-left: 1rem;
 		}
 	}
 

From c974bdadde4ddd172fe5906b32797a7f94c4a8a1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 13:53:34 -0300
Subject: [PATCH 029/244] Merge pull request #7965 from
 RocketChat/hotfix/markdown-code-render

[FIX] Markdown being rendered in code tags
---
 package.json                                  |   8 +-
 .../parser/marked/marked.js                   |   1 +
 .../parser/original/markdown.js               |   2 +-
 .../parser/original/original.js               |   6 +-
 .../rocketchat-markdown/tests/client.mocks.js |  47 +++
 .../rocketchat-markdown/tests/client.tests.js | 292 ++++++++++++++++++
 6 files changed, 350 insertions(+), 6 deletions(-)
 create mode 100644 packages/rocketchat-markdown/tests/client.mocks.js
 create mode 100644 packages/rocketchat-markdown/tests/client.tests.js

diff --git a/package.json b/package.json
index df4e26ad656..76824ed411b 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
 			"packages/**/*.tests.js"
 		],
 		"files": [
+			"packages/**/*.mocks.js",
 			"packages/**/*.js",
 			"!packages/**/*.tests.js"
 		]
@@ -90,12 +91,16 @@
 		"chimp": "^0.49.1",
 		"conventional-changelog-cli": "^1.3.2",
 		"eslint": "^4.5.0",
+		"mock-require": "^2.0.2",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
+		"proxyquire": "^1.8.0",
 		"simple-git": "^1.75.0",
 		"stylelint": "^8.0.0",
 		"stylelint-order": "^0.6.0",
-		"supertest": "^3.0.0"
+		"supertest": "^3.0.0",
+		"underscore": "^1.5.2",
+		"underscore.string": "^3.3.4"
 	},
 	"dependencies": {
 		"@google-cloud/storage": "^1.2.1",
@@ -121,4 +126,3 @@
 		"wolfy87-eventemitter": "^5.2.2"
 	}
 }
-
diff --git a/packages/rocketchat-markdown/parser/marked/marked.js b/packages/rocketchat-markdown/parser/marked/marked.js
index 15fb3755a9d..5b8dbb200f3 100644
--- a/packages/rocketchat-markdown/parser/marked/marked.js
+++ b/packages/rocketchat-markdown/parser/marked/marked.js
@@ -1,3 +1,4 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
 import { Random } from 'meteor/random';
 import { _ } from 'meteor/underscore';
 import hljs from 'highlight.js';
diff --git a/packages/rocketchat-markdown/parser/original/markdown.js b/packages/rocketchat-markdown/parser/original/markdown.js
index 268d79c2214..5e49e2f2752 100644
--- a/packages/rocketchat-markdown/parser/original/markdown.js
+++ b/packages/rocketchat-markdown/parser/original/markdown.js
@@ -31,7 +31,7 @@ const parseNotEscaped = function(msg, message) {
 	msg = msg.replace(/(^|&gt;|[ >_~`])\*{1,2}([^\*\r\n]+)\*{1,2}([<_~`]|\B|\b|$)/gm, '$1<span class="copyonly">*</span><strong>$2</strong><span class="copyonly">*</span>$3');
 
 	// Support _text_ to make italics
-	msg = msg.replace(/(^|&gt;|[ >*~`])\_([^\_\r\n]+)\_([<*~`]|\B|\b|$)/gm, '$1<span class="copyonly">_</span><em>$2</em><span class="copyonly">_</span>$3');
+	msg = msg.replace(/(^|&gt;|[ >*~`])\_{1,2}([^\_\r\n]+)\_{1,2}([<*~`]|\B|\b|$)/gm, '$1<span class="copyonly">_</span><em>$2</em><span class="copyonly">_</span>$3');
 
 	// Support ~text~ to strike through text
 	msg = msg.replace(/(^|&gt;|[ >_*`])\~{1,2}([^~\r\n]+)\~{1,2}([<_*`]|\B|\b|$)/gm, '$1<span class="copyonly">~</span><strike>$2</strike><span class="copyonly">~</span>$3');
diff --git a/packages/rocketchat-markdown/parser/original/original.js b/packages/rocketchat-markdown/parser/original/original.js
index d03f41906b3..288f1f2d228 100644
--- a/packages/rocketchat-markdown/parser/original/original.js
+++ b/packages/rocketchat-markdown/parser/original/original.js
@@ -6,12 +6,12 @@ import { markdown } from './markdown.js';
 import { code } from './code.js';
 
 export const original = (message) => {
-	// Parse markdown
-	message = markdown(message);
-
 	// Parse markdown code
 	message = code(message);
 
+	// Parse markdown
+	message = markdown(message);
+
 	// Replace linebreak to br
 	message.html = message.html.replace(/\n/gm, '<br>');
 
diff --git a/packages/rocketchat-markdown/tests/client.mocks.js b/packages/rocketchat-markdown/tests/client.mocks.js
new file mode 100644
index 00000000000..0c39955210f
--- /dev/null
+++ b/packages/rocketchat-markdown/tests/client.mocks.js
@@ -0,0 +1,47 @@
+import mock from 'mock-require';
+import _ from 'underscore';
+import s from 'underscore.string';
+_.mixin(s.exports());
+
+mock('meteor/meteor', {
+	Meteor: {
+		absoluteUrl() {
+			return 'http://localhost:3000/';
+		}
+	}
+});
+
+mock('meteor/rocketchat:lib', {
+	RocketChat: {
+		settings: {
+			get(setting) {
+				switch (setting) {
+					case 'Markdown_SupportSchemesForLink':
+						return 'http,https';
+					case 'Markdown_Headers':
+					// case 'Markdown_Marked_GFM':
+					// case 'Markdown_Marked_Tables':
+					// case 'Markdown_Marked_Breaks':
+					// case 'Markdown_Marked_Pedantic':
+					// case 'Markdown_Marked_SmartLists':
+					// case 'Markdown_Marked_Smartypants':
+						return true;
+					default:
+						throw new Error(`Missing setting mock ${ setting }`);
+				}
+			}
+		}
+	}
+});
+
+mock('meteor/underscore', { _ });
+
+mock('meteor/random', {
+	Random: {
+		id() {
+			return Math.random();
+		}
+	}
+});
+
+global.s = s;
diff --git a/packages/rocketchat-markdown/tests/client.tests.js b/packages/rocketchat-markdown/tests/client.tests.js
new file mode 100644
index 00000000000..546e84a382b
--- /dev/null
+++ b/packages/rocketchat-markdown/tests/client.tests.js
@@ -0,0 +1,292 @@
+/* eslint-env mocha */
+import 'babel-polyfill';
+import assert from 'assert';
+import './client.mocks.js';
+import {original} from '../parser/original/original';
+// import {marked} from '../parser/marked/marked';
+
+const wrapper = (text, tag) => `<span class="copyonly">${ tag }</span>${ text }<span class="copyonly">${ tag }</span>`;
+const boldWrapper = text => wrapper(`<strong>${ text }</strong>`, '*');
+const italicWrapper = text => wrapper(`<em>${ text }</em>`, '_');
+const strikeWrapper = text => wrapper(`<strike>${ text }</strike>`, '~');
+const headerWrapper = (text, level) => `<h${ level }>${ text }</h${ level }>`;
+const quoteWrapper = text => `<blockquote class="background-transparent-darker-before"><span class="copyonly">&gt;</span>${ text }</blockquote>`;
+const linkWrapped = (link, title) => `<a href="${ link }" target="_blank" rel="noopener noreferrer">${ title }</a>`;
+const inlinecodeWrapper = text => wrapper(`<span><code class="code-colors inline">${ text }</code></span>`, '`');
+const codeWrapper = (text, lang) => `<pre><code class='code-colors hljs ${ lang }'><span class='copyonly'>\`\`\`<br></span>${ text }<span class='copyonly'><br>\`\`\`</span></code></pre>`;
+
+const bold = {
+	'*Hello*': boldWrapper('Hello'),
+	'**Hello**': boldWrapper('Hello'),
+	'**Hello*': boldWrapper('Hello'),
+	'*Hello**': boldWrapper('Hello'),
+	'Hello': 'Hello',
+	'*Hello': '*Hello',
+	'Hello*': 'Hello*',
+	'He*llo': 'He*llo',
+	'***Hello***': '***Hello***',
+	'***Hello**': '***Hello**',
+	'*Hello* this is dog': `${ boldWrapper('Hello') } this is dog`,
+	'Rocket cat says *Hello*': `Rocket cat says ${ boldWrapper('Hello') }`,
+	'He said *Hello* to her': `He said ${ boldWrapper('Hello') } to her`,
+	'**Hello** this is dog': `${ boldWrapper('Hello') } this is dog`,
+	'Rocket cat says **Hello**': `Rocket cat says ${ boldWrapper('Hello') }`,
+	'He said **Hello** to her': `He said ${ boldWrapper('Hello') } to her`
+};
+
+const italic = {
+	'_Hello_': italicWrapper('Hello'),
+	'__Hello__': italicWrapper('Hello'),
+	'__Hello_': italicWrapper('Hello'),
+	'_Hello__': italicWrapper('Hello'),
+	'Hello': 'Hello',
+	'_Hello': '_Hello',
+	'Hello_': 'Hello_',
+	'He_llo': 'He_llo',
+	'___Hello___': '___Hello___',
+	'___Hello__': '___Hello__',
+	'_Hello_ this is dog': `${ italicWrapper('Hello') } this is dog`,
+	'Rocket cat says _Hello_': `Rocket cat says ${ italicWrapper('Hello') }`,
+	'He said _Hello_ to her': `He said ${ italicWrapper('Hello') } to her`,
+	'__Hello__ this is dog': `${ italicWrapper('Hello') } this is dog`,
+	'Rocket cat says __Hello__': `Rocket cat says ${ italicWrapper('Hello') }`,
+	'He said __Hello__ to her': `He said ${ italicWrapper('Hello') } to her`
+};
+
+const strike = {
+	'~Hello~': strikeWrapper('Hello'),
+	'~~Hello~~': strikeWrapper('Hello'),
+	'~~Hello~': strikeWrapper('Hello'),
+	'~Hello~~': strikeWrapper('Hello'),
+	'Hello': 'Hello',
+	'~Hello': '~Hello',
+	'Hello~': 'Hello~',
+	'He~llo': 'He~llo',
+	'~~~Hello~~~': '~~~Hello~~~',
+	'~~~Hello~~': '~~~Hello~~',
+	'~Hello~ this is dog': `${ strikeWrapper('Hello') } this is dog`,
+	'Rocket cat says ~Hello~': `Rocket cat says ${ strikeWrapper('Hello') }`,
+	'He said ~Hello~ to her': `He said ${ strikeWrapper('Hello') } to her`,
+	'~~Hello~~ this is dog': `${ strikeWrapper('Hello') } this is dog`,
+	'Rocket cat says ~~Hello~~': `Rocket cat says ${ strikeWrapper('Hello') }`,
+	'He said ~~Hello~~ to her': `He said ${ strikeWrapper('Hello') } to her`
+};
+
+const headersLevel1 = {
+	'# Hello': headerWrapper('Hello', 1),
+	'# Rocket.Cat': headerWrapper('Rocket.Cat', 1),
+	'# Hi': headerWrapper('Hi', 1),
+	'# Hello this is dog': headerWrapper('Hello this is dog', 1),
+	'# Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 1),
+	'# He said Hello to her': headerWrapper('He said Hello to her', 1),
+	'#Hello': '#Hello',
+	'#Hello#': '#Hello#',
+	'He#llo': 'He#llo'
+};
+
+const headersLevel2 = {
+	'## Hello': headerWrapper('Hello', 2),
+	'## Rocket.Cat': headerWrapper('Rocket.Cat', 2),
+	'## Hi': headerWrapper('Hi', 2),
+	'## Hello this is dog': headerWrapper('Hello this is dog', 2),
+	'## Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 2),
+	'## He said Hello to her': headerWrapper('He said Hello to her', 2),
+	'##Hello': '##Hello',
+	'##Hello##': '##Hello##',
+	'He##llo': 'He##llo'
+};
+
+const headersLevel3 = {
+	'### Hello': headerWrapper('Hello', 3),
+	'### Rocket.Cat': headerWrapper('Rocket.Cat', 3),
+	'### Hi': headerWrapper('Hi', 3),
+	'### Hello this is dog': headerWrapper('Hello this is dog', 3),
+	'### Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 3),
+	'### He said Hello to her': headerWrapper('He said Hello to her', 3),
+	'###Hello': '###Hello',
+	'###Hello###': '###Hello###',
+	'He###llo': 'He###llo'
+};
+
+const headersLevel4 = {
+	'#### Hello': headerWrapper('Hello', 4),
+	'#### Rocket.Cat': headerWrapper('Rocket.Cat', 4),
+	'#### Hi': headerWrapper('Hi', 4),
+	'#### Hello this is dog': headerWrapper('Hello this is dog', 4),
+	'#### Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 4),
+	'#### He said Hello to her': headerWrapper('He said Hello to her', 4),
+	'####Hello': '####Hello',
+	'####Hello####': '####Hello####',
+	'He####llo': 'He####llo'
+};
+
+const quote = {
+	'&gt;Hello': quoteWrapper('Hello'),
+	'&gt;Rocket.Cat': quoteWrapper('Rocket.Cat'),
+	'&gt;Hi': quoteWrapper('Hi'),
+	'&gt; Hello this is dog': quoteWrapper(' Hello this is dog'),
+	'&gt; Rocket cat says Hello': quoteWrapper(' Rocket cat says Hello'),
+	'&gt; He said Hello to her': quoteWrapper(' He said Hello to her'),
+	'&gt; He said Hello to her ': quoteWrapper(' He said Hello to her '),
+	'&lt;Hello': '&lt;Hello',
+	'&lt;Rocket.Cat&gt;': '&lt;Rocket.Cat&gt;',
+	' &gt;Hi': ' &gt;Hi',
+	'Hello &gt; this is dog': 'Hello &gt; this is dog',
+	'Roc&gt;ket cat says Hello': 'Roc&gt;ket cat says Hello',
+	'He said Hello to her&gt;': 'He said Hello to her&gt;',
+	'>Hello': '>Hello',
+	'>Rocket.Cat': '>Rocket.Cat',
+	'>Hi': '>Hi',
+	'> Hello this is dog': '> Hello this is dog',
+	'> Rocket cat says Hello': '> Rocket cat says Hello',
+	'> He said Hello to her': '> He said Hello to her',
+	'<Hello': '<Hello',
+	'<Rocket.Cat>': '<Rocket.Cat>',
+	' >Hi': ' >Hi',
+	'Hello > this is dog': 'Hello > this is dog',
+	'Roc>ket cat says Hello': 'Roc>ket cat says Hello',
+	'He said Hello to her>': 'He said Hello to her>'
+};
+
+const link = {
+	'&lt;http://link|Text&gt;': linkWrapped('http://link', 'Text'),
+	'&lt;https://demo.rocket.chat/|Demo Site For Rocket.Chat&gt;': linkWrapped('https://demo.rocket.chat/', 'Demo Site For Rocket.Chat'),
+	'&lt;https://demo.rocket.chat/ | Demo Site For Rocket.Chat&gt;': linkWrapped('https://demo.rocket.chat/ ', ' Demo Site For Rocket.Chat'),
+	'&lt;https://rocket.chat/|Rocket.Chat Site&gt;': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
+	'&lt;https://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
+	'&lt;http://linkText&gt;': '&lt;http://linkText&gt;',
+	'&lt;https:demo.rocket.chat/ | Demo Site For Rocket.Chat&gt;': '&lt;https:demo.rocket.chat/ | Demo Site For Rocket.Chat&gt;',
+	'https://demo.rocket.chat/|Demo Site For Rocket.Chat': 'https://demo.rocket.chat/|Demo Site For Rocket.Chat',
+	'&lt;www.demo.rocket.chat/|Demo Site For Rocket.Chat&gt;': '&lt;www.demo.rocket.chat/|Demo Site For Rocket.Chat&gt;',
+	'&lt;htps://rocket.chat/|Rocket.Chat Site&gt;': '&lt;htps://rocket.chat/|Rocket.Chat Site&gt;',
+	'&lt;ttps://rocket.chat/|Rocket.Chat Site&gt;': '&lt;ttps://rocket.chat/|Rocket.Chat Site&gt;',
+	'&lt;tps://rocket.chat/|Rocket.Chat Site&gt;': '&lt;tps://rocket.chat/|Rocket.Chat Site&gt;',
+	'&lt;demo.rocket.chat/|Demo Site For Rocket.Chat&gt;': '&lt;demo.rocket.chat/|Demo Site For Rocket.Chat&gt;',
+	'&lt;htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;': '&lt;htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;',
+
+	'<http://link|Text>': linkWrapped('http://link', 'Text'),
+	'<https://demo.rocket.chat/|Demo Site For Rocket.Chat>': linkWrapped('https://demo.rocket.chat/', 'Demo Site For Rocket.Chat'),
+	'<https://demo.rocket.chat/ | Demo Site For Rocket.Chat>': linkWrapped('https://demo.rocket.chat/ ', ' Demo Site For Rocket.Chat'),
+	'<https://rocket.chat/|Rocket.Chat Site>': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
+	'<https://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
+	'<http://linkText>': '<http://linkText>',
+	'<https:demo.rocket.chat/ | Demo Site For Rocket.Chat>': '<https:demo.rocket.chat/ | Demo Site For Rocket.Chat>',
+	'<www.demo.rocket.chat/|Demo Site For Rocket.Chat>': '<www.demo.rocket.chat/|Demo Site For Rocket.Chat>',
+	'<htps://rocket.chat/|Rocket.Chat Site>': '<htps://rocket.chat/|Rocket.Chat Site>',
+	'<ttps://rocket.chat/|Rocket.Chat Site>': '<ttps://rocket.chat/|Rocket.Chat Site>',
+	'<tps://rocket.chat/|Rocket.Chat Site>': '<tps://rocket.chat/|Rocket.Chat Site>',
+	'<demo.rocket.chat/|Demo Site For Rocket.Chat>': '<demo.rocket.chat/|Demo Site For Rocket.Chat>',
+	'<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>': '<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>',
+
+	'[Text](http://link)': linkWrapped('http://link', 'Text'),
+	'[Demo Site For Rocket.Chat](https://demo.rocket.chat/)': linkWrapped('https://demo.rocket.chat/', 'Demo Site For Rocket.Chat'),
+	'[ Demo Site For Rocket.Chat](https://demo.rocket.chat/ )': linkWrapped('https://demo.rocket.chat/ ', ' Demo Site For Rocket.Chat'),
+	'[Rocket.Chat Site](https://rocket.chat/)': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
+	'[Testing Entry on Rocket.Chat Docs Site](https://rocket.chat/docs/developer-guides/testing/#testing)': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
+	'[](http://linkText)': '[](http://linkText)',
+	'[text]': '[text]',
+	'[Demo Site For Rocket.Chat](https:demo.rocket.chat/)': '[Demo Site For Rocket.Chat](https:demo.rocket.chat/)',
+	'[Demo Site For Rocket.Chat](www.demo.rocket.chat/)': '[Demo Site For Rocket.Chat](www.demo.rocket.chat/)',
+	'[Rocket.Chat Site](htps://rocket.chat/)': '[Rocket.Chat Site](htps://rocket.chat/)',
+	'[Rocket.Chat Site](ttps://rocket.chat/)': '[Rocket.Chat Site](ttps://rocket.chat/)',
+	'[Rocket.Chat Site](tps://rocket.chat/)': '[Rocket.Chat Site](tps://rocket.chat/)',
+	'[Demo Site For Rocket.Chat](demo.rocket.chat/)': '[Demo Site For Rocket.Chat](demo.rocket.chat/)',
+	'[Testing Entry on Rocket.Chat Docs Site](htts://rocket.chat/docs/developer-guides/testing/#testing)': '[Testing Entry on Rocket.Chat Docs Site](htts://rocket.chat/docs/developer-guides/testing/#testing)'
+};
+
+const inlinecode = {
+	'`code`': inlinecodeWrapper('code'),
+	'`code` begin': `${ inlinecodeWrapper('code') } begin`,
+	'End `code`': `End ${ inlinecodeWrapper('code') }`,
+	'Middle `code` middle': `Middle ${ inlinecodeWrapper('code') } middle`,
+	'`code`begin': `${ inlinecodeWrapper('code') }begin`,
+	'End`code`': 'End`code`',
+	'Middle`code`middle': 'Middle`code`middle'
+};
+
+const code = {
+	'```code```': codeWrapper('<span class="hljs-keyword">code</span>', 'clean'),
+	'```code': codeWrapper('<span class="hljs-selector-tag">code</span>\n', 'stylus'),
+	'```code\n': codeWrapper('<span class="hljs-selector-tag">code</span>\n\n', 'stylus'),
+	'```\ncode\n```': codeWrapper('\n<span class="hljs-selector-tag">code</span>\n', 'stylus'),
+	'```code\n```': codeWrapper('<span class="hljs-selector-tag">code</span>\n', 'stylus'),
+	'```\ncode```': codeWrapper('\n<span class="hljs-keyword">code</span>', 'clean'),
+	'```javascript\nvar a = \'log\';\nconsole.log(a);```': codeWrapper('<span class="hljs-keyword">var</span> a = <span class="hljs-string">\'log\'</span>;\n<span class="hljs-built_in">console</span>.log(a);', 'javascript'),
+	'```*code*```': codeWrapper('*<span class="hljs-meta">code</span>*', 'armasm'),
+	'```**code**```': codeWrapper('**<span class="hljs-meta">code</span>**', 'armasm'),
+	'```_code_```': codeWrapper('<span class="hljs-variable">_code_</span>', 'sqf'),
+	'```__code__```': codeWrapper('<span class="hljs-strong">__code__</span>', 'markdown')
+};
+
+const defaultObjectTest = (result, object, objectKey) => {
+	return assert.equal(result.html, object[objectKey]);
+};
+
+const testObject = (object, parser = original, test = defaultObjectTest) => {
+	Object.keys(object).forEach((objectKey) => {
+		describe(objectKey, () => {
+			const result = parser({html: objectKey});
+			it(`should be equal to ${ object[objectKey] }`, () => {
+				test(result, object, objectKey);
+			});
+		});
+	});
+};
+
+describe('Original', function() {
+	describe('Bold', () => testObject(bold));
+
+	describe('Italic', () => testObject(italic));
+
+	describe('Strike', () => testObject(strike));
+
+	describe('Headers', () => {
+		describe('Level 1', () => testObject(headersLevel1));
+
+		describe('Level 2', () => testObject(headersLevel2));
+
+		describe('Level 3', () => testObject(headersLevel3));
+
+		describe('Level 4', () => testObject(headersLevel4));
+	});
+
+	describe('Quote', () => testObject(quote));
+
+	describe('Link', () => testObject(link));
+
+	describe('Inline Code', () => testObject(inlinecode, undefined, (result, object, objectKey) => {
+		let html = result.html;
+		result.tokens.forEach((token) => {
+			html = html.replace(token.token, token.text);
+		});
+		assert.equal(html, object[objectKey]);
+	}));
+
+	describe('Code', () => testObject(code, undefined, (result, object, objectKey) => {
+		let html = result.html;
+		result.tokens.forEach((token) => {
+			html = html.replace(token.token, token.text);
+		});
+		assert.equal(html, object[objectKey]);
+	}));
+});
+
+// describe.only('Marked', function() {
+// 	describe('Bold', () => testObject(bold, marked));
+
+// 	describe('Italic', () => testObject(italic, marked));
+
+// 	describe('Strike', () => testObject(strike, marked));
+
+// 	describe('Headers', () => {
+// 		describe('Level 1', () => testObject(headersLevel1, marked));
+
+// 		describe('Level 2', () => testObject(headersLevel2, marked));
+
+// 		describe('Level 3', () => testObject(headersLevel3, marked));
+
+// 		describe('Level 4', () => testObject(headersLevel4, marked));
+// 	});
+
+// 	describe('Quote', () => testObject(quote, marked));
+// });

From 5c6d5142f93da8e02af0d6016579893d7d300371 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 30 Aug 2017 03:00:54 -0300
Subject: [PATCH 030/244] Merge pull request #7970 from
 RocketChat/padding-fixes

[FIX] Small alignment fixes
---
 .../client/imports/components/messages.css       |  2 +-
 .../components/sidebar/sidebar-account.css       |  2 +-
 .../client/imports/forms/input.css               |  4 ++--
 .../client/imports/general/base_old.css          | 16 +++++-----------
 .../client/imports/general/variables.css         |  2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 9bda032ab66..9050a20ad9d 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -22,7 +22,7 @@
 	}
 
 	&__label {
-		padding: 2px 10px;
+		padding: 2px 0;
 
 		cursor: pointer;
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 71b33c2a034..6962e7681d1 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -1,7 +1,7 @@
 .sidebar__account {
 	display: flex;
 
-	margin-bottom: 40px;
+	margin-bottom: 12px;
 	align-items: center;
 
 	&--lighten {
diff --git a/packages/rocketchat-theme/client/imports/forms/input.css b/packages/rocketchat-theme/client/imports/forms/input.css
index 9f455b68985..5a329176931 100644
--- a/packages/rocketchat-theme/client/imports/forms/input.css
+++ b/packages/rocketchat-theme/client/imports/forms/input.css
@@ -34,11 +34,11 @@
 		justify-content: center;
 
 		& + .rc-input__element {
-			padding: 0.75rem 1rem 0.75rem 3.25rem;
+			padding: 0.75rem 1rem 0.75rem 2.75rem;
 		}
 
 		& + .rc-input__element--small {
-			padding: 0.5rem 1rem 0.5rem 3.25rem;
+			padding: 0.5rem 1rem 0.5rem 2.75rem;
 		}
 
 		&--right {
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index a0a11ea2186..a893d50bc54 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3024,16 +3024,16 @@
 
 	& .thumb {
 		position: absolute;
-		left: 20px;
+		left: 24px;
 
 		display: block;
 
-		width: 40px;
-		height: 40px;
+		width: 36px;
+		height: 36px;
 
 		&:not(.thumb-small) .avatar {
-			width: 40px;
-			height: 40px;
+			width: 36px;
+			height: 36px;
 		}
 
 		&.thumb-small {
@@ -3124,10 +3124,6 @@
 			}
 		}
 
-		& .body {
-			margin-top: 0;
-		}
-
 		&:hover .edited {
 			display: none;
 		}
@@ -3158,8 +3154,6 @@
 	}
 
 	& .body {
-		margin-top: 2px;
-
 		transition: opacity 1s linear;
 
 		opacity: 1;
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index 395bdcf0872..316b8ceda96 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -252,7 +252,7 @@
 	--message-box-user-typing-color: var(--color-gray);
 	--message-box-user-typing-text-size: 0.75rem;
 	--message-box-user-typing-user-color: var(--color-dark);
-	--message-box-container-border-color: var(--color-gray-light);
+	--message-box-container-border-color: var(--color-gray-medium);
 	--message-box-container-border-width: var(--border);
 	--message-box-container-border-radius: var(--border-radius);
 	--message-box-editing-color: #fff5df;

From 45782422b97dd696d873b219c26f2b3207003ff3 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 30 Aug 2017 03:40:58 -0300
Subject: [PATCH 031/244] Merge pull request #7971 from
 RocketChat/padding-fixes

[FIX] Add padding on messages to allow space to the action buttons
---
 .../.npm/package/npm-shrinkwrap.json                      | 8 ++++----
 .../rocketchat-theme/client/imports/general/base_old.css  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 357fd38dda4..1b48096650d 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1243,8 +1243,8 @@
       "from": "methmeth@>=1.1.0 <2.0.0"
     },
     "mime": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz",
       "from": "mime@>=1.2.11 <2.0.0"
     },
     "mime-db": {
@@ -1268,8 +1268,8 @@
       "from": "modelo@>=4.2.0 <5.0.0"
     },
     "nan": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
       "from": "nan@>=2.0.0 <3.0.0"
     },
     "node-forge": {
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index a893d50bc54..19fd73985d2 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -2900,7 +2900,7 @@
 	position: relative;
 
 	min-height: 40px;
-	padding: 8px 20px 4px 70px;
+	padding: 8px 50px 4px 70px;
 
 	line-height: 20px;
 

From cbf9d902fdfe2480cf1ab2a61824f757bccad226 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 14:56:31 -0300
Subject: [PATCH 032/244] Merge pull request #7984 from
 RocketChat/hotfix/textarea-autofocus

[FIX] Chat box no longer auto-focuses when typing
---
 packages/rocketchat-ui-master/client/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index 4cc4e5eb5fe..902e3bbca8c 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -60,7 +60,7 @@ Template.body.onRendered(function() {
 		if (target.id === 'pswp') {
 			return;
 		}
-		const inputMessage = $('textarea.input-message');
+		const inputMessage = $('textarea.rc-message-box__textarea');
 		if (inputMessage.length === 0) {
 			return;
 		}

From 4f16adee407385e961414b44d0f9bb574865e2ca Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 17:53:23 -0300
Subject: [PATCH 033/244] Merge pull request #7986 from
 RocketChat/fix-textarea-firefox

[FIX] Textarea on firefox
---
 .../rocketchat-theme/client/imports/components/message-box.css   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index b6df6d66c05..6137a678148 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -97,6 +97,7 @@
 		width: 100%;
 		max-height: 155px;
 		padding: 0;
+		height: 15px;
 
 		resize: none;
 

From 6dbfad7d9a4e4fd7d5d94f426ed407a9145ffcc5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 29 Aug 2017 23:37:38 -0300
Subject: [PATCH 034/244] Merge pull request #7944 from RocketChat/fix-embedded

[FIX] Broken embedded view layout
---
 .../client/imports/components/message-box.css |  4 +++
 .../client/flexTabBar.html                    | 34 ++++++++++---------
 .../client/flexTabBar.js                      |  4 +++
 .../client/messageBox.html                    | 32 +++++++++--------
 .../client/messageBox.js                      |  3 ++
 5 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index 6137a678148..f3a63956d62 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -6,6 +6,10 @@
 
 	font-size: var(--message-box-text-size);
 
+	&--embedded {
+		padding: 12px;
+	}
+
 	&__toolbar-markdown {
 		position: absolute;
 		left: 0;
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.html b/packages/rocketchat-ui-flextab/client/flexTabBar.html
index a9987f0a6a4..e24363c1070 100644
--- a/packages/rocketchat-ui-flextab/client/flexTabBar.html
+++ b/packages/rocketchat-ui-flextab/client/flexTabBar.html
@@ -1,21 +1,23 @@
 <template name="flexTabBar">
-	<div class="flex-tab-container border-component-color {{opened}}">
-		<section class="flex-tab border-component-color">
-			<div class="content flex-tab__content">
-				<button class="close-flex-tab secondary-font-color">
-					<span class="secondary-background-color"><i class="icon-cancel"></i></span>
-				</button>
-				{{> Template.dynamic template=template data=flexData}}
-			</div>
-		</section>
-		<div class="flex-tab-bar content-background-color" role="toolbar">
-			{{#each buttons}}
-				<div class="tab-button {{active}} {{visible}} {{class}}" title="{{title}}">
-					<button aria-label="{{title}}">
-						{{> icon block="tab-button-icon" icon=icon }}
+	{{#unless embeddedVersion}}
+		<div class="flex-tab-container border-component-color {{opened}}">
+			<section class="flex-tab border-component-color">
+				<div class="content flex-tab__content">
+					<button class="close-flex-tab secondary-font-color">
+						<span class="secondary-background-color"><i class="icon-cancel"></i></span>
 					</button>
+					{{> Template.dynamic template=template data=flexData}}
 				</div>
-			{{/each}}
+			</section>
+			<div class="flex-tab-bar content-background-color" role="toolbar">
+				{{#each buttons}}
+					<div class="tab-button {{active}} {{visible}} {{class}}" title="{{title}}">
+						<button aria-label="{{title}}">
+							{{> icon block="tab-button-icon" icon=icon }}
+						</button>
+					</div>
+				{{/each}}
+			</div>
 		</div>
-	</div>
+	{{/unless}}
 </template>
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js
index d1de65a4dff..2d355813b5e 100644
--- a/packages/rocketchat-ui-flextab/client/flexTabBar.js
+++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js
@@ -35,6 +35,10 @@ Template.flexTabBar.helpers({
 		return Object.assign(Template.currentData().data || {}, {
 			tabBar: Template.instance().tabBar
 		});
+	},
+
+	embeddedVersion() {
+		return RocketChat.Layout.isEmbedded();
 	}
 });
 
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 989a17801dd..7d1984543f8 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -1,5 +1,5 @@
 <template name="messageBox">
-	<div class="rc-message-box rc-new">
+	<div class="rc-message-box rc-new {{#if embeddedVersion}}rc-message-box--embedded{{/if}}">
 		{{#if subscribed}}
 			{{#with usersTyping}}
 				<div class="rc-message-box__typing">
@@ -67,21 +67,23 @@
 
 					{{/if}}
 				</label>
-				{{#if showFormattingTips}}
-					<div class="rc-message-box__toolbar-markdown">
-						{{#each mdButtons}}
-							<button class="rc-message-box__toolbar-markdown-item rc-tooltip js-md" aria-label={{_ label}} data-link="{{link}}">
-								{{#if icon}}
-									{{> icon block="rc-message-box__toolbar-markdown-icon" icon=icon }}
-								{{else}}
-									{{#if link}}
-										<a href="{{link}}" target="_blank" class="rc-message-box__toolbar-markdown-link">{{label}}</a>
+				{{#unless embeddedVersion}}
+					{{#if showFormattingTips}}
+						<div class="rc-message-box__toolbar-markdown">
+							{{#each mdButtons}}
+								<button class="rc-message-box__toolbar-markdown-item rc-tooltip js-md" aria-label={{_ label}} data-link="{{link}}">
+									{{#if icon}}
+										{{> icon block="rc-message-box__toolbar-markdown-icon" icon=icon }}
+									{{else}}
+										{{#if link}}
+											<a href="{{link}}" target="_blank" class="rc-message-box__toolbar-markdown-link">{{label}}</a>
+										{{/if}}
 									{{/if}}
-								{{/if}}
-							</button>
-						{{/each}}
-					</div>
-				{{/if}}
+								</button>
+							{{/each}}
+						</div>
+					{{/if}}
+				{{/unless}}
 			{{else}}
 				<div class="stream-info">
 					{{#if isBlockedOrBlocker}}
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 5255d5f61f1..8b94325eee4 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -277,6 +277,9 @@ Template.messageBox.helpers({
 	},
 	sendIcon() {
 		return Template.instance().sendIcon.get();
+	},
+	embeddedVersion() {
+		return RocketChat.Layout.isEmbedded();
 	}
 });
 

From c49d86ae812a152187aebcbabb1bc09b2d53f847 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 29 Aug 2017 23:39:39 -0300
Subject: [PATCH 035/244] Merge pull request #7927 from
 aditya19496/sidepane-scrollbar-fix

[FIX] Double scroll on 'keyboard shortcuts' menu in sidepanel
---
 .../client/tabs/keyboardShortcuts.html        | 91 +++++++++----------
 1 file changed, 44 insertions(+), 47 deletions(-)

diff --git a/packages/rocketchat-ui-flextab/client/tabs/keyboardShortcuts.html b/packages/rocketchat-ui-flextab/client/tabs/keyboardShortcuts.html
index fc36833ffb8..b8d381321a4 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/keyboardShortcuts.html
+++ b/packages/rocketchat-ui-flextab/client/tabs/keyboardShortcuts.html
@@ -1,48 +1,45 @@
 <template name="keyboardShortcuts">
-    <div class="content">
-        <div class="title"><h2>{{_ "Keyboard_Shortcuts_Title"}}</h2></div>
-
-        <div class="section">
-            <h2>{{_ "Keyboard_Shortcuts_Open_Channel_Slash_User_Search"}}</h2>
-            <hr />
-            <div>{{{_ "Keyboard_Shortcuts_Keys_1"}}}</div>
-        </div>
-
-        <div class="section">
-            <h2>{{_ "Keyboard_Shortcuts_Edit_Previous_Message"}}</h2>
-            <hr />
-            <div>{{{_ "Keyboard_Shortcuts_Keys_2"}}}</div>
-        </div>
-
-        <div class="section">
-            <h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
-            <hr />
-            <div>{{{_ "Keyboard_Shortcuts_Keys_3"}}}</div>
-        </div>
-
-        <div class="section">
-            <h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
-            <hr />
-            <div>{{{_ "Keyboard_Shortcuts_Keys_4"}}}</div>
-        </div>
-
-        <div class="section">
-            <h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
-            <hr />
-            <div>{{{_ "Keyboard_Shortcuts_Keys_5"}}}</div>
-        </div>
-
-        <div class="section">
-            <h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
-            <hr />
-            <div>{{{_ "Keyboard_Shortcuts_Keys_6"}}}</div>
-        </div>
-
-        <div class="section">
-            <h2>{{_ "Keyboard_Shortcuts_New_Line_In_Message"}}</h2>
-            <hr />
-            <div>{{{_ "Keyboard_Shortcuts_Keys_7"}}}</div>
-        </div>
-
-    </div> <!-- content -->
-</template>
+    <div class="title"><h2>{{_ "Keyboard_Shortcuts_Title"}}</h2></div>
+
+    <div class="section">
+        <h2>{{_ "Keyboard_Shortcuts_Open_Channel_Slash_User_Search"}}</h2>
+        <hr />
+        <div>{{{_ "Keyboard_Shortcuts_Keys_1"}}}</div>
+    </div>
+
+    <div class="section">
+        <h2>{{_ "Keyboard_Shortcuts_Edit_Previous_Message"}}</h2>
+        <hr />
+        <div>{{{_ "Keyboard_Shortcuts_Keys_2"}}}</div>
+    </div>
+
+    <div class="section">
+        <h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
+        <hr />
+        <div>{{{_ "Keyboard_Shortcuts_Keys_3"}}}</div>
+    </div>
+
+    <div class="section">
+        <h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
+        <hr />
+        <div>{{{_ "Keyboard_Shortcuts_Keys_4"}}}</div>
+    </div>
+
+    <div class="section">
+        <h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
+        <hr />
+        <div>{{{_ "Keyboard_Shortcuts_Keys_5"}}}</div>
+    </div>
+
+    <div class="section">
+        <h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
+        <hr />
+        <div>{{{_ "Keyboard_Shortcuts_Keys_6"}}}</div>
+    </div>
+
+    <div class="section">
+        <h2>{{_ "Keyboard_Shortcuts_New_Line_In_Message"}}</h2>
+        <hr />
+        <div>{{{_ "Keyboard_Shortcuts_Keys_7"}}}</div>
+    </div>
+</template>
\ No newline at end of file

From eb2ffdeece8c0f32d37c356d39d148bbbdabf16e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 18:00:27 -0300
Subject: [PATCH 036/244] Merge pull request #7985 from
 RocketChat/text-area-mobile

[FIX] Text area buttons and layout on mobile
---
 .../.npm/package/npm-shrinkwrap.json          | 1301 +++++++----------
 .../rocketchat-lib/client/lib/roomExit.js     |    7 +-
 .../client/imports/components/message-box.css |   62 +-
 .../client/imports/general/variables.css      |    1 +
 .../client/messageBox.html                    |   91 +-
 .../client/messageBox.js                      |   22 +-
 .../startup/messageBoxActions.js              |   10 +-
 .../client/lib/textarea-autogrow.js           |    8 +-
 8 files changed, 715 insertions(+), 787 deletions(-)

diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 1b48096650d..788d7c87977 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -329,744 +329,581 @@
       "from": "graceful-fs@>=4.1.2 <5.0.0"
     },
     "grpc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.4.1.tgz",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.0.tgz",
       "from": "grpc@>=1.3.1 <2.0.0",
       "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+          "from": "abbrev@1"
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "from": "ajv@^4.9.1"
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "from": "ansi-regex@^2.0.0"
+        },
+        "aproba": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+          "from": "aproba@^1.0.3"
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+          "from": "are-we-there-yet@~1.1.2"
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "from": "asn1@~0.2.3"
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "from": "assert-plus@^0.2.0"
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "from": "asynckit@^0.4.0"
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "from": "aws-sign2@~0.6.0"
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "from": "aws4@^1.2.1"
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+          "from": "balanced-match@^1.0.0"
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+          "from": "bcrypt-pbkdf@^1.0.0"
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+          "from": "block-stream@*"
+        },
+        "boom": {
+          "version": "2.10.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+          "from": "boom@2.x.x"
+        },
+        "brace-expansion": {
+          "version": "1.1.8",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+          "from": "brace-expansion@^1.1.7"
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "from": "caseless@~0.12.0"
+        },
+        "co": {
+          "version": "4.6.0",
+          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "from": "co@^4.6.0"
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+          "from": "code-point-at@^1.0.0"
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+          "from": "combined-stream@~1.0.5"
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "from": "concat-map@0.0.1"
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+          "from": "console-control-strings@~1.1.0"
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "from": "core-util-is@~1.0.0"
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "from": "cryptiles@2.x.x"
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+          "from": "dashdash@^1.12.0",
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "from": "assert-plus@^1.0.0"
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "from": "debug@^2.2.0"
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+          "from": "deep-extend@~0.4.0"
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "from": "delayed-stream@~1.0.0"
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+          "from": "delegates@^1.0.0"
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+          "from": "ecc-jsbn@~0.1.1"
+        },
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "from": "extend@~3.0.0"
+        },
+        "extsprintf": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+          "from": "extsprintf@1.3.0"
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "from": "forever-agent@~0.6.1"
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "from": "form-data@~2.1.1"
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "from": "fs.realpath@^1.0.0"
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+          "from": "fstream@^1.0.2"
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+          "from": "fstream-ignore@^1.0.5"
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+          "from": "gauge@~2.7.3"
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+          "from": "getpass@^0.1.1",
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "from": "assert-plus@^1.0.0"
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "from": "glob@^7.0.5"
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "from": "graceful-fs@^4.1.2"
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+          "from": "har-schema@^1.0.5"
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "from": "har-validator@~4.2.1"
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+          "from": "has-unicode@^2.0.0"
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "from": "hawk@~3.1.3"
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "from": "hoek@2.x.x"
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "from": "http-signature@~1.1.0"
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "from": "inflight@^1.0.4"
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "from": "inherits@~2.0.3"
+        },
+        "ini": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+          "from": "ini@~1.3.0"
+        },
+        "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",
+          "from": "is-fullwidth-code-point@^1.0.0"
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "from": "is-typedarray@~1.0.0"
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "from": "isarray@~1.0.0"
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+          "from": "isstream@~0.1.2"
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "from": "jsbn@~0.1.0"
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+          "from": "json-schema@0.2.3"
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+          "from": "json-stable-stringify@^1.0.1"
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+          "from": "json-stringify-safe@~5.0.1"
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "from": "jsonify@~0.0.0"
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+          "from": "jsprim@^1.2.2",
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "from": "assert-plus@1.0.0"
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.29.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
+          "from": "mime-db@~1.29.0"
+        },
+        "mime-types": {
+          "version": "2.1.16",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
+          "from": "mime-types@~2.1.7"
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "from": "minimatch@^3.0.4"
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "from": "minimist@^1.2.0"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "from": "mkdirp@^0.5.1",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8"
+            }
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "from": "ms@2.0.0"
+        },
         "node-pre-gyp": {
           "version": "0.6.36",
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-          "from": "node-pre-gyp@0.6.36",
+          "from": "node-pre-gyp@0.6.36"
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "from": "nopt@^4.0.1"
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+          "from": "npmlog@^4.0.2"
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+          "from": "number-is-nan@^1.0.0"
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "from": "oauth-sign@~0.8.1"
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "from": "object-assign@^4.1.0"
+        },
+        "once": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "from": "once@^1.3.0"
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+          "from": "os-homedir@^1.0.0"
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+          "from": "os-tmpdir@^1.0.0"
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+          "from": "osenv@^0.1.4"
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+          "from": "path-is-absolute@^1.0.0"
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+          "from": "performance-now@^0.2.0"
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "from": "process-nextick-args@~1.0.6"
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "from": "punycode@^1.4.1"
+        },
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "from": "qs@~6.4.0"
+        },
+        "rc": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+          "from": "rc@^1.1.7"
+        },
+        "readable-stream": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+          "from": "readable-stream@^2.0.6"
+        },
+        "request": {
+          "version": "2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "from": "request@^2.81.0"
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+          "from": "rimraf@^2.6.1"
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "from": "safe-buffer@~5.1.1"
+        },
+        "semver": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+          "from": "semver@^5.3.0"
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+          "from": "set-blocking@~2.0.0"
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "from": "signal-exit@^3.0.0"
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "from": "sntp@1.x.x"
+        },
+        "sshpk": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+          "from": "sshpk@^1.7.0",
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "from": "assert-plus@^1.0.0"
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "from": "string-width@^1.0.1"
+        },
+        "string_decoder": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+          "from": "string_decoder@~1.0.3"
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "from": "stringstream@~0.0.4"
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "from": "strip-ansi@^3.0.1"
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "from": "strip-json-comments@~2.0.1"
+        },
+        "tar": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+          "from": "tar@^2.2.1"
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+          "from": "tar-pack@^3.4.0"
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+          "from": "tough-cookie@~2.3.0"
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "from": "tunnel-agent@^0.6.0"
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+          "from": "tweetnacl@~0.14.0"
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+          "from": "uid-number@^0.0.6"
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "from": "util-deprecate@~1.0.1"
+        },
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "from": "uuid@^3.0.0"
+        },
+        "verror": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+          "from": "verror@1.10.0",
           "dependencies": {
-            "mkdirp": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "from": "mkdirp@>=0.5.1 <0.6.0",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                  "from": "minimist@0.0.8"
-                }
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-              "from": "nopt@>=4.0.1 <5.0.0",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.1.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-                  "from": "abbrev@>=1.0.0 <2.0.0"
-                },
-                "osenv": {
-                  "version": "0.1.4",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-                  "from": "osenv@>=0.1.4 <0.2.0",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-                      "from": "os-homedir@>=1.0.0 <2.0.0"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0"
-                    }
-                  }
-                }
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-              "from": "npmlog@>=4.0.2 <5.0.0",
-              "dependencies": {
-                "are-we-there-yet": {
-                  "version": "1.1.4",
-                  "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-                  "from": "are-we-there-yet@>=1.1.2 <1.2.0",
-                  "dependencies": {
-                    "delegates": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-                      "from": "delegates@>=1.0.0 <2.0.0"
-                    },
-                    "readable-stream": {
-                      "version": "2.3.2",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
-                      "from": "readable-stream@>=2.0.6 <3.0.0",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-                          "from": "core-util-is@>=1.0.0 <1.1.0"
-                        },
-                        "inherits": {
-                          "version": "2.0.3",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                          "from": "inherits@>=2.0.3 <2.1.0"
-                        },
-                        "isarray": {
-                          "version": "1.0.0",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                          "from": "isarray@>=1.0.0 <1.1.0"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.7",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-                          "from": "process-nextick-args@>=1.0.6 <1.1.0"
-                        },
-                        "safe-buffer": {
-                          "version": "5.1.1",
-                          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-                          "from": "safe-buffer@>=5.1.0 <5.2.0"
-                        },
-                        "string_decoder": {
-                          "version": "1.0.3",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-                          "from": "string_decoder@>=1.0.0 <1.1.0"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0"
-                        }
-                      }
-                    }
-                  }
-                },
-                "console-control-strings": {
-                  "version": "1.1.0",
-                  "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-                  "from": "console-control-strings@>=1.1.0 <1.2.0"
-                },
-                "gauge": {
-                  "version": "2.7.4",
-                  "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-                  "from": "gauge@>=2.7.3 <2.8.0",
-                  "dependencies": {
-                    "aproba": {
-                      "version": "1.1.2",
-                      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-                      "from": "aproba@>=1.0.3 <2.0.0"
-                    },
-                    "has-unicode": {
-                      "version": "2.0.1",
-                      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-                      "from": "has-unicode@>=2.0.0 <3.0.0"
-                    },
-                    "object-assign": {
-                      "version": "4.1.1",
-                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-                      "from": "object-assign@>=4.1.0 <5.0.0"
-                    },
-                    "signal-exit": {
-                      "version": "3.0.2",
-                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-                      "from": "signal-exit@>=3.0.0 <4.0.0"
-                    },
-                    "string-width": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                      "from": "string-width@>=1.0.1 <2.0.0",
-                      "dependencies": {
-                        "code-point-at": {
-                          "version": "1.1.0",
-                          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-                          "from": "code-point-at@>=1.0.0 <2.0.0"
-                        },
-                        "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",
-                          "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-                          "dependencies": {
-                            "number-is-nan": {
-                              "version": "1.0.1",
-                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-                              "from": "number-is-nan@>=1.0.0 <2.0.0"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "strip-ansi": {
-                      "version": "3.0.1",
-                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                      "from": "strip-ansi@>=3.0.1 <4.0.0",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.1.1",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0"
-                        }
-                      }
-                    },
-                    "wide-align": {
-                      "version": "1.1.2",
-                      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-                      "from": "wide-align@>=1.1.0 <2.0.0"
-                    }
-                  }
-                },
-                "set-blocking": {
-                  "version": "2.0.0",
-                  "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-                  "from": "set-blocking@>=2.0.0 <2.1.0"
-                }
-              }
-            },
-            "rc": {
-              "version": "1.2.1",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-              "from": "rc@>=1.1.7 <2.0.0",
-              "dependencies": {
-                "deep-extend": {
-                  "version": "0.4.2",
-                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-                  "from": "deep-extend@>=0.4.0 <0.5.0"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-                  "from": "ini@>=1.3.0 <1.4.0"
-                },
-                "minimist": {
-                  "version": "1.2.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                  "from": "minimist@>=1.2.0 <2.0.0"
-                },
-                "strip-json-comments": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-                  "from": "strip-json-comments@>=2.0.1 <2.1.0"
-                }
-              }
-            },
-            "request": {
-              "version": "2.81.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-              "from": "request@>=2.81.0 <3.0.0",
-              "dependencies": {
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-                  "from": "aws-sign2@>=0.6.0 <0.7.0"
-                },
-                "aws4": {
-                  "version": "1.6.0",
-                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-                  "from": "aws4@>=1.2.1 <2.0.0"
-                },
-                "caseless": {
-                  "version": "0.12.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-                  "from": "caseless@>=0.12.0 <0.13.0"
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                  "from": "combined-stream@>=1.0.5 <1.1.0",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0"
-                    }
-                  }
-                },
-                "extend": {
-                  "version": "3.0.1",
-                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-                  "from": "extend@>=3.0.0 <3.1.0"
-                },
-                "forever-agent": {
-                  "version": "0.6.1",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-                  "from": "forever-agent@>=0.6.1 <0.7.0"
-                },
-                "form-data": {
-                  "version": "2.1.4",
-                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-                  "from": "form-data@>=2.1.1 <2.2.0",
-                  "dependencies": {
-                    "asynckit": {
-                      "version": "0.4.0",
-                      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-                      "from": "asynckit@>=0.4.0 <0.5.0"
-                    }
-                  }
-                },
-                "har-validator": {
-                  "version": "4.2.1",
-                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-                  "from": "har-validator@>=4.2.1 <4.3.0",
-                  "dependencies": {
-                    "ajv": {
-                      "version": "4.11.8",
-                      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-                      "from": "ajv@>=4.9.1 <5.0.0",
-                      "dependencies": {
-                        "co": {
-                          "version": "4.6.0",
-                          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-                          "from": "co@>=4.6.0 <5.0.0"
-                        },
-                        "json-stable-stringify": {
-                          "version": "1.0.1",
-                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-                          "from": "json-stable-stringify@>=1.0.1 <2.0.0",
-                          "dependencies": {
-                            "jsonify": {
-                              "version": "0.0.0",
-                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-                              "from": "jsonify@>=0.0.0 <0.1.0"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "har-schema": {
-                      "version": "1.0.5",
-                      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-                      "from": "har-schema@>=1.0.5 <2.0.0"
-                    }
-                  }
-                },
-                "hawk": {
-                  "version": "3.1.3",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-                  "from": "hawk@>=3.1.3 <3.2.0",
-                  "dependencies": {
-                    "boom": {
-                      "version": "2.10.1",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-                      "from": "boom@>=2.0.0 <3.0.0"
-                    },
-                    "cryptiles": {
-                      "version": "2.0.5",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-                      "from": "cryptiles@>=2.0.0 <3.0.0"
-                    },
-                    "hoek": {
-                      "version": "2.16.3",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-                      "from": "hoek@>=2.0.0 <3.0.0"
-                    },
-                    "sntp": {
-                      "version": "1.0.9",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-                      "from": "sntp@>=1.0.0 <2.0.0"
-                    }
-                  }
-                },
-                "http-signature": {
-                  "version": "1.1.1",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-                  "from": "http-signature@>=1.1.0 <1.2.0",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-                      "from": "assert-plus@>=0.2.0 <0.3.0"
-                    },
-                    "jsprim": {
-                      "version": "1.4.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-                      "from": "jsprim@>=1.2.2 <2.0.0",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                          "from": "assert-plus@1.0.0"
-                        },
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-                          "from": "extsprintf@1.0.2"
-                        },
-                        "json-schema": {
-                          "version": "0.2.3",
-                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-                          "from": "json-schema@0.2.3"
-                        },
-                        "verror": {
-                          "version": "1.3.6",
-                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-                          "from": "verror@1.3.6"
-                        }
-                      }
-                    },
-                    "sshpk": {
-                      "version": "1.13.1",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "dependencies": {
-                        "asn1": {
-                          "version": "0.2.3",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-                          "from": "asn1@>=0.2.3 <0.3.0"
-                        },
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                          "from": "assert-plus@>=1.0.0 <2.0.0"
-                        },
-                        "bcrypt-pbkdf": {
-                          "version": "1.0.1",
-                          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-                          "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0"
-                        },
-                        "dashdash": {
-                          "version": "1.14.1",
-                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-                          "from": "dashdash@>=1.12.0 <2.0.0"
-                        },
-                        "ecc-jsbn": {
-                          "version": "0.1.1",
-                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-                          "from": "ecc-jsbn@>=0.1.1 <0.2.0"
-                        },
-                        "getpass": {
-                          "version": "0.1.7",
-                          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-                          "from": "getpass@>=0.1.1 <0.2.0"
-                        },
-                        "jsbn": {
-                          "version": "0.1.1",
-                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-                          "from": "jsbn@>=0.1.0 <0.2.0"
-                        },
-                        "tweetnacl": {
-                          "version": "0.14.5",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-                          "from": "tweetnacl@>=0.14.0 <0.15.0"
-                        }
-                      }
-                    }
-                  }
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-                  "from": "is-typedarray@>=1.0.0 <1.1.0"
-                },
-                "isstream": {
-                  "version": "0.1.2",
-                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-                  "from": "isstream@>=0.1.2 <0.2.0"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-                  "from": "json-stringify-safe@>=5.0.1 <5.1.0"
-                },
-                "mime-types": {
-                  "version": "2.1.15",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-                  "from": "mime-types@>=2.1.7 <2.2.0",
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.27.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-                      "from": "mime-db@>=1.27.0 <1.28.0"
-                    }
-                  }
-                },
-                "oauth-sign": {
-                  "version": "0.8.2",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-                  "from": "oauth-sign@>=0.8.1 <0.9.0"
-                },
-                "performance-now": {
-                  "version": "0.2.0",
-                  "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-                  "from": "performance-now@>=0.2.0 <0.3.0"
-                },
-                "qs": {
-                  "version": "6.4.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-                  "from": "qs@>=6.4.0 <6.5.0"
-                },
-                "safe-buffer": {
-                  "version": "5.1.1",
-                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-                  "from": "safe-buffer@>=5.0.1 <6.0.0"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-                  "from": "stringstream@>=0.0.4 <0.1.0"
-                },
-                "tough-cookie": {
-                  "version": "2.3.2",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-                  "from": "tough-cookie@>=2.3.0 <2.4.0",
-                  "dependencies": {
-                    "punycode": {
-                      "version": "1.4.1",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                      "from": "punycode@>=1.4.1 <2.0.0"
-                    }
-                  }
-                },
-                "tunnel-agent": {
-                  "version": "0.6.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-                  "from": "tunnel-agent@>=0.6.0 <0.7.0"
-                },
-                "uuid": {
-                  "version": "3.1.0",
-                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-                  "from": "uuid@>=3.0.0 <4.0.0"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.6.1",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-              "from": "rimraf@>=2.6.1 <3.0.0",
-              "dependencies": {
-                "glob": {
-                  "version": "7.1.2",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-                  "from": "glob@>=7.0.5 <8.0.0",
-                  "dependencies": {
-                    "fs.realpath": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                      "from": "fs.realpath@>=1.0.0 <2.0.0"
-                    },
-                    "inflight": {
-                      "version": "1.0.6",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                          "from": "wrappy@>=1.0.0 <2.0.0"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "from": "inherits@>=2.0.0 <3.0.0"
-                    },
-                    "minimatch": {
-                      "version": "3.0.4",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-                      "from": "minimatch@>=3.0.0 <4.0.0",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.8",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-                          "from": "brace-expansion@>=1.1.7 <2.0.0",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "1.0.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-                              "from": "balanced-match@>=1.0.0 <2.0.0"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-                              "from": "concat-map@0.0.1"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.4.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                          "from": "wrappy@>=1.0.0 <2.0.0"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.1",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0"
-                    }
-                  }
-                }
-              }
-            },
-            "semver": {
-              "version": "5.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-              "from": "semver@>=5.3.0 <6.0.0"
-            },
-            "tar": {
-              "version": "2.2.1",
-              "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-              "from": "tar@>=2.2.1 <3.0.0",
-              "dependencies": {
-                "block-stream": {
-                  "version": "0.0.9",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-                  "from": "block-stream@*"
-                },
-                "fstream": {
-                  "version": "1.0.11",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-                  "from": "fstream@>=1.0.2 <2.0.0",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.3",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                  "from": "inherits@>=2.0.0 <3.0.0"
-                }
-              }
-            },
-            "tar-pack": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-              "from": "tar-pack@>=3.4.0 <4.0.0",
-              "dependencies": {
-                "debug": {
-                  "version": "2.6.8",
-                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-                  "from": "debug@>=2.2.0 <3.0.0",
-                  "dependencies": {
-                    "ms": {
-                      "version": "2.0.0",
-                      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                      "from": "ms@2.0.0"
-                    }
-                  }
-                },
-                "fstream": {
-                  "version": "1.0.11",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-                  "from": "fstream@>=1.0.10 <2.0.0",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0"
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "from": "inherits@>=2.0.0 <2.1.0"
-                    }
-                  }
-                },
-                "fstream-ignore": {
-                  "version": "1.0.5",
-                  "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-                  "from": "fstream-ignore@>=1.0.5 <2.0.0",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "from": "inherits@>=2.0.0 <3.0.0"
-                    },
-                    "minimatch": {
-                      "version": "3.0.4",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-                      "from": "minimatch@>=3.0.0 <4.0.0",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.8",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-                          "from": "brace-expansion@>=1.1.7 <2.0.0",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "1.0.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-                              "from": "balanced-match@>=1.0.0 <2.0.0"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-                              "from": "concat-map@0.0.1"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-                  "from": "once@>=1.0.0 <2.0.0",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                      "from": "wrappy@>=1.0.0 <2.0.0"
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.3.2",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
-                  "from": "readable-stream@>=2.1.4 <3.0.0",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-                      "from": "core-util-is@>=1.0.0 <1.1.0"
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "from": "inherits@>=2.0.3 <2.1.0"
-                    },
-                    "isarray": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                      "from": "isarray@>=1.0.0 <1.1.0"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.7",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-                      "from": "process-nextick-args@>=1.0.6 <1.1.0"
-                    },
-                    "safe-buffer": {
-                      "version": "5.1.1",
-                      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-                      "from": "safe-buffer@>=5.1.0 <5.2.0"
-                    },
-                    "string_decoder": {
-                      "version": "1.0.3",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-                      "from": "string_decoder@>=1.0.0 <1.1.0"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-                  "from": "uid-number@>=0.0.6 <0.0.7"
-                }
-              }
+            "assert-plus": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "from": "assert-plus@^1.0.0"
             }
           }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+          "from": "wide-align@^1.1.0"
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+          "from": "wrappy@1"
         }
       }
     },
@@ -1270,7 +1107,7 @@
     "nan": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "from": "nan@>=2.0.0 <3.0.0"
+      "from": "nan@>=2.6.2 <3.0.0"
     },
     "node-forge": {
       "version": "0.7.1",
@@ -1340,7 +1177,7 @@
     "protobufjs": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
-      "from": "protobufjs@>=5.0.0 <6.0.0"
+      "from": "protobufjs@>=5.0.2 <6.0.0"
     },
     "pump": {
       "version": "1.0.2",
diff --git a/packages/rocketchat-lib/client/lib/roomExit.js b/packages/rocketchat-lib/client/lib/roomExit.js
index 646b5fdcf2f..3b036d282e8 100644
--- a/packages/rocketchat-lib/client/lib/roomExit.js
+++ b/packages/rocketchat-lib/client/lib/roomExit.js
@@ -2,8 +2,11 @@
 this.roomExit = function() {
 	// 7370 - Close flex-tab when opening a room on mobile UI
 	if (window.matchMedia('(max-width: 500px)').matches) {
-		const templateData = Blaze.getData(document.querySelector('.flex-tab'));
-		templateData && templateData.tabBar && templateData.tabBar.close();
+		const flex = document.querySelector('.flex-tab');
+		if (flex) {
+			const templateData = Blaze.getData(flex);
+			templateData && templateData.tabBar && templateData.tabBar.close();
+		}
 	}
 	RocketChat.callbacks.run('roomExit');
 	BlazeLayout.render('main', {
diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index f3a63956d62..149883503d7 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -158,14 +158,21 @@
 			}
 		}
 	}
+
+	& [data-small] {
+		display: none;
+	}
 }
 
 @media (width <= 500px) {
 	.rc-message-box {
-		padding: 24px 0 0;
+		margin-top: 1rem;
+		padding: 0;
 
 		&__typing {
-			margin-left: 10px;
+			top: -1rem;
+
+			margin-left: 1rem;
 		}
 
 		&__toolbar-markdown {
@@ -175,8 +182,59 @@
 		&__container {
 			display: flex;
 
+			padding: var(--default-small-padding);
+			padding-bottom: calc(var(--default-small-padding) - 8px);
+
 			border-width: 0;
 			border-top-width: 1px;
+			flex-wrap: wrap;
+		}
+
+		& [data-desktop] {
+			display: none;
+		}
+
+		& [data-small] {
+			display: flex;
+		}
+
+		&__textarea {
+			flex: 1 0 100%;
+
+			margin-bottom: 10px;
+			order: 1;
+		}
+
+		&__action {
+			margin: 5px 10px;
+
+			font-size: 20px;
+		}
+
+		& [disabled] {
+			opacity: 0.4;
+		}
+
+		& .emoji-picker-icon {
+			width: initial;
+			padding-right: 10px;
+			order: 2;
+		}
+
+		&__action-label {
+			display: flex;
+			flex-direction: row;
+			flex: 1 1 auto;
+
+			font-size: 20px;
+			order: 3;
+		}
+
+		&__send {
+			flex: 0;
+
+			font-size: 20px;
+			order: 4;
 		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index 316b8ceda96..ee165463a83 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -41,6 +41,7 @@
 	--status-busy: var(--color-error);
 	--status-invisible: var(--color-gray-medium);
 	--status-invisible-sidebar: var(--color-darkest);
+	--default-small-padding: 1rem;
 
 	/*
 	* Forms
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 7d1984543f8..0107194b914 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -26,46 +26,18 @@
 						{{> icon block="rc-input__icon-svg" icon="emoji"}}
 					</div>
 					<textarea autofocus dir="auto" name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message autogrow-short"></textarea>
-					{{#if sendIcon}}
-						<div class="rc-message-box__icon js-send">
+					{{#unless disableSendIcon}}
+						<div class="rc-message-box__icon rc-message-box__send js-send" data-desktop>
 							{{> icon block="rc-input__icon-svg" icon="send"}}
 						</div>
 					{{else}}
-						<label class="rc-message-box__action-label" for="rc-message-box__action-input" data-popover="label">
-						<input id="rc-message-box__action-input" type="checkbox" class="rc-popover-anchor" data-popover="anchor">
-						<div class="rc-popover js-message-actions" data-popover="popover">
-							<div class="rc-popover__content">
-								{{# each column in columns }}
-									<div class="rc-popover__column">
-										{{#each group in column }}
-											<div class="rc-popover__column-wrapper">
-												<h3 class="rc-popover__title">{{_ group.name}}</h3>
-												<ul class="rc-popover__list">
-													{{#each group.actions }}
-														<li class="rc-popover__item" data-action="open" data-open="account">
-															<span class="rc-popover__icon">
-																{{#if icon}}
-																	{{> icon block="rc-popover__icon-element" icon=icon }}
-																{{/if}}
-															</span>
-															<span class="rc-popover__item-text">{{_ label}}</span>
-														</li>
-													{{/each}}
-												</ul>
-											</div>
-										{{/each}}
-									</div>
-								{{/each}}
-							</div>
-						</div>
-							{{#if columns}}
-								<div class="rc-message-box__icon">
-									{{> icon block="rc-input__icon-svg" icon="plus"}}
-								</div>
-							{{/if}}
-						</label>
-
-					{{/if}}
+						{{> messageBox__actions}}
+					{{/unless}}
+					{{# messageBox__actionsSmall}}
+						<span class="rc-message-box__send js-message-action js-send" {{disableSendIcon}} data-small>
+							{{> icon block="rc-message-box__action" icon="send"}}
+						</span>
+					{{/messageBox__actionsSmall}}
 				</label>
 				{{#unless embeddedVersion}}
 					{{#if showFormattingTips}}
@@ -118,3 +90,48 @@
 		{{/if}}
 	</div>
 </template>
+<template name="messageBox__actionsSmall">
+	<div class="js-message-actions rc-message-box__action-label" data-small>
+		{{# each actions }}
+			<span class="js-message-action">
+				{{> icon block="rc-message-box__action" icon=icon }}
+			</span>
+		{{/each}}
+	</div>
+	{{> Template.contentBlock}}
+</template>
+<template name="messageBox__actions">
+	<label class="rc-message-box__action-label" for="rc-message-box__action-input" data-popover="label" data-desktop>
+		<input id="rc-message-box__action-input" type="checkbox" class="rc-popover-anchor" data-popover="anchor">
+		<div class="rc-popover js-message-actions" data-popover="popover">
+			<div class="rc-popover__content">
+				{{# each column in columns }}
+					<div class="rc-popover__column">
+						{{#each group in column }}
+							<div class="rc-popover__column-wrapper">
+								<h3 class="rc-popover__title">{{_ group.name}}</h3>
+								<ul class="rc-popover__list">
+									{{#each group.actions }}
+										<li class="rc-popover__item" data-action="open" data-open="account">
+											{{#if icon}}
+												<span class="rc-popover__icon">
+													{{> icon block="rc-popover__icon-element" icon=icon }}
+												</span>
+											{{/if}}
+											<span class="rc-popover__item-text">{{_ label}}</span>
+										</li>
+									{{/each}}
+								</ul>
+							</div>
+						{{/each}}
+					</div>
+				{{/each}}
+			</div>
+		</div>
+		{{#if columns}}
+			<div class="rc-message-box__icon">
+				{{> icon block="rc-input__icon-svg" icon="plus"}}
+			</div>
+		{{/if}}
+	</label>
+</template>
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 8b94325eee4..94a272e627f 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -130,7 +130,11 @@ const markdownButtons = [
 	}
 ];
 
-Template.messageBox.helpers({
+const methods = {
+	actions() {
+		const groups = RocketChat.messageBox.actions.get();
+		return Object.keys(groups).reduce((ret, el) => ret.concat(groups[el]), []);
+	},
 	columns() {
 		const groups = RocketChat.messageBox.actions.get();
 		const sorted = Object.keys(groups).sort((a, b) => groups[b].length - groups[a].length);
@@ -153,7 +157,12 @@ Template.messageBox.helpers({
 		});
 
 		return columns;
-	},
+	}
+};
+
+Template.messageBox__actions.helpers(methods);
+Template.messageBox__actionsSmall.helpers(methods);
+Template.messageBox.helpers({
 	mdButtons() {
 		return markdownButtons.filter(button => !button.condition || button.condition());
 	},
@@ -275,8 +284,8 @@ Template.messageBox.helpers({
 	anonymousWrite() {
 		return (Meteor.userId() == null) && RocketChat.settings.get('Accounts_AllowAnonymousRead') === true && RocketChat.settings.get('Accounts_AllowAnonymousWrite') === true;
 	},
-	sendIcon() {
-		return Template.instance().sendIcon.get();
+	disableSendIcon() {
+		return !Template.instance().sendIcon.get() ? 'disabled' : '';
 	},
 	embeddedVersion() {
 		return RocketChat.Layout.isEmbedded();
@@ -334,8 +343,9 @@ function firefoxPasteUpload(fn) {
 }
 
 Template.messageBox.events({
-	'click .js-message-actions .rc-popover__item'(event, instance) {
-		this.action.apply(this, [{rid: Template.parentData()._id, messageBox: instance.find('.rc-message-box'), element: $(event.target).parent('.rc-popover__item')[0], event}]);
+	'click .js-message-actions .rc-popover__item, click .js-message-actions .js-message-action'(event, instance) {
+		const action = this.action || Template.parentData().action;
+		action.apply(this, [{rid: Template.parentData()._id, messageBox: instance.find('.rc-message-box'), element: event.currentTarget, event}]);
 	},
 	'click .join'(event) {
 		event.stopPropagation();
diff --git a/packages/rocketchat-ui-message/startup/messageBoxActions.js b/packages/rocketchat-ui-message/startup/messageBoxActions.js
index d0b55c12103..9f23d240874 100644
--- a/packages/rocketchat-ui-message/startup/messageBoxActions.js
+++ b/packages/rocketchat-ui-message/startup/messageBoxActions.js
@@ -5,7 +5,7 @@ import {VRecDialog} from 'meteor/rocketchat:ui-vrecord';
 
 RocketChat.messageBox.actions.add('Create_new', 'Video_message', {
 	icon: 'video',
-	condition: () => RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_VideoRecorderEnabled') && ((navigator.getUserMedia != null) || (navigator.webkitGetUserMedia != null)) && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/video\/webm|video\/\*/i)),
+	condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_VideoRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/video\/webm|video\/\*/i)),
 	action({messageBox}) {
 		return VRecDialog.opened ? VRecDialog.close() : VRecDialog.open(messageBox);
 	}
@@ -13,10 +13,10 @@ RocketChat.messageBox.actions.add('Create_new', 'Video_message', {
 
 RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
 	icon: 'mic',
-	condition: () => RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && ((navigator.getUserMedia != null) || (navigator.webkitGetUserMedia != null)) && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/wav|audio\/\*/i)),
+	condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/wav|audio\/\*/i)),
 	action({event, element}) {
 		event.preventDefault();
-		const icon = element.querySelector('.rc-popover__icon');
+		const icon = element;
 		if (chatMessages[RocketChat.openedRoom].recording) {
 			return AudioRecorder.stop(function(blob) {
 				icon.style.color = '';
@@ -31,10 +31,10 @@ RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
 				]);
 			});
 		}
-		icon.classList.add('pulse');
-		icon.style.color = 'red';
 		chatMessages[RocketChat.openedRoom].recording = true;
 		return AudioRecorder.start(function() {
+			icon.classList.add('pulse');
+			icon.style.color = 'red';
 		});
 	}
 });
diff --git a/packages/rocketchat-ui/client/lib/textarea-autogrow.js b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
index 26341c70004..b375bdcc28f 100644
--- a/packages/rocketchat-ui/client/lib/textarea-autogrow.js
+++ b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
@@ -10,7 +10,6 @@
 			var self = this;
 			var $self = $(self);
 			var minHeight = $self.height();
-			var noFlickerPad = $self.hasClass('autogrow-short') ? 0 : parseInt($self.css('lineHeight')) || 0;
 			var settings = $.extend({
 				preGrowCallback: null,
 				postGrowCallback: null
@@ -24,6 +23,9 @@
 			}
 
 			shadow.css({
+				position: 'absolute',
+				top: -10000,
+				left: -10000,
 				width: $self.width(),
 				fontSize: $self.css('fontSize'),
 				fontFamily: $self.css('fontFamily'),
@@ -54,9 +56,9 @@
 				}
 
 				shadow.css('width', $self.width());
-				shadow.html(val + (noFlickerPad === 0 ? '...' : '')); // Append '...' to resize pre-emptively.
+				shadow.html(val);
 
-				var newHeight = Math.max(shadow.height() + noFlickerPad + 1, minHeight);
+				var newHeight = Math.max(shadow.height() + 1, minHeight) + 1;
 				if (settings.preGrowCallback !== null) {
 					newHeight = settings.preGrowCallback($self, shadow, newHeight, minHeight);
 				}

From fcf6886d6bf8356af9c65a15f8f80784b3fa69f3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 30 Aug 2017 18:03:07 -0300
Subject: [PATCH 037/244] Bump version to 0.59.0-rc.3

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 26 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 5887f7cd551..6124d5c01f2 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.2
+ENV RC_VERSION 0.59.0-rc.3
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 872f18c0fb3..9dcdcfc8d9d 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.2"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.3"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index b1ff2364daa..43d2660bff1 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.2
+    RC_VERSION=0.59.0-rc.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 269ed5dac5c..ed9665518ef 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,29 @@
+<a name="0.59.0-rc.3"></a>
+# 0.59.0-rc.3 (2017-08-30)
+
+
+### Bug Fixes
+
+- [#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971) Add padding on messages to allow space to the action buttons
+- [#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) Broken embedded view layout
+- [#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) Broken emoji picker on firefox
+- [#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984) Chat box no longer auto-focuses when typing
+- [#7942](https://github.com/RocketChat/Rocket.Chat/pull/7942) Create channel button on Firefox
+- [#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) Document README.md. Drupal repo out of date
+- [#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) Double scroll on 'keyboard shortcuts' menu in sidepanel
+- [#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) Fix placeholders in account profile
+- [#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963) Fix the status on the members list
+- [#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965) Markdown being rendered in code tags
+- [#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) OTR buttons padding
+- [#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) Show leader on first load
+- [#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970) Small alignment fixes
+- [#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) status and active room colors on sidebar
+- [#7985](https://github.com/RocketChat/Rocket.Chat/pull/7985) Text area buttons and layout on mobile 
+- [#7986](https://github.com/RocketChat/Rocket.Chat/pull/7986) Textarea on firefox
+- [#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) username ellipsis on firefox
+
+
+
 <a name="0.59.0-rc.2"></a>
 # 0.59.0-rc.2 (2017-08-28)
 
diff --git a/package.json b/package.json
index 76824ed411b..d6a11576d80 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.2",
+	"version": "0.59.0-rc.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 7295ee35811..06dfa485d21 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.2"
+	"version": "0.59.0-rc.3"
 }

From 3439d735ecc7c6c52b2c55f899f683b1ff135293 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 5 Sep 2017 19:47:34 -0300
Subject: [PATCH 038/244] Merge pull request #7754 from
 RocketChat/fix-mentions-email-notification

[FIX] Fix email on mention
---
 packages/rocketchat-lib/server/lib/sendEmailOnMessage.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
index 2eea270ecb6..78b4c419e4b 100644
--- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
@@ -43,6 +43,9 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	if (room.t === 'd') {
 		usersToSendEmail[message.rid.replace(message.u._id, '')] = 'direct';
 	} else {
+		const isMentionAll = message.mentions.find((mention) => {
+			return mention._id === 'all';
+		});
 		RocketChat.models.Subscriptions.findWithSendEmailByRoomId(room._id).forEach((sub) => {
 			if (sub.disableNotifications) {
 				return delete usersToSendEmail[sub.u._id];
@@ -55,7 +58,11 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 					return mention._id === sub.u._id;
 				});
 
-				if (emailNotifications === 'mentions' || mentionedUser) {
+				if (emailNotifications === 'mentions' && (mentionedUser || isMentionAll)) {
+					const maxMembersForNotification = RocketChat.settings.get('Notifications_Max_Room_Members');
+					if (isMentionAll && maxMembersForNotification !== 0 && room.usernames.length > maxMembersForNotification) {
+						return;
+					}
 					return usersToSendEmail[sub.u._id] = 'mention';
 				}
 

From 7848a5a7acf2317a9d52701aae2b6a1d026748ac Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 2 Sep 2017 16:48:04 -0300
Subject: [PATCH 039/244] Merge pull request #7989 from Rzeszow/develop

[FIX][PL] Polish translation
---
 packages/rocketchat-i18n/i18n/pl.i18n.json | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json
index cef4bcc2e06..f5780fad3fc 100644
--- a/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -147,6 +147,7 @@
   "and": "i",
   "And_more": "I __length__ więcej",
   "Animals_and_Nature": "Fauna & Flora",
+  "Announcement": "Ogłoszenie",
   "API": "API",
   "API_Analytics": "Analytics",
   "API_Embed": "Osadź",
@@ -334,6 +335,24 @@
   "Desktop_Notifications_Enabled": "Powiadomienia na pulpicie są włączone",
   "Direct_message_someone": "Wyślij bezpośrednią wiadomość",
   "Direct_Messages": "Prywatne wiadomości",
+  "Direct_Reply": "Bezpośrednia odpowiedź",
+  "Direct_Reply_Debug": "Debuguj bezpośrednią odpowiedź",
+  "Direct_Reply_Debug_Description": "[Uwaga] Włączenie trybu debugowania wyświetli 'Zwykłym tekstem' twoje hasło w konsoli administracyjnej.",
+  "Direct_Reply_Delete": "Usuwanie przechwyconych wiadomości e-mail",
+  "Direct_Reply_Enable": "Włącz bezpośrednią odpowiedź",
+  "Direct_Reply_Frequency": "Częstotliwość sprawdzania poczty e-mail",
+  "Direct_Reply_Frequency_Description": "(w minutach, domyślnie/minimum 2)",
+  "Direct_Reply_Protocol": "Protokół bezpośredniej odpowiedzi",
+  "Direct_Reply_Host": "Odpowiedź Bezpośrednia Host",
+  "Direct_Reply_Port": "Odpowiedź Bezpośrednia Port",
+  "Direct_Reply_IgnoreTLS": "Ignoruj TLS",
+  "Direct_Reply_Username": "Nazwa użytkownika",
+  "Direct_Reply_Username_Description": "Proszę użyj absolutnego adresu e-mail, tagowanie nie jest dozwolone, bo byłoby nadpisane",
+  "Direct_Reply_Password": "Hasło",
+  "Direct_Reply_Separator": "Separator",
+  "Direct_Reply_Separator_Description": "[Zmiana tylko wtedy, gdy wiesz dokładnie, co robisz, zapoznaj się z dokumentami]<br/>Separator pomiędzy częścią bazową i znacznikiem wiadomości e-mail",
+  "Disable_Notifications": "Wyłącz powiadomienia",
+  "Disable_two-factor_authentication": "Wyłącz uwierzytelnianie dwuskładnikowe",
   "Display_offline_form": "Pokaż formularz nieaktywny",
   "Displays_action_text": "Wyświetla tekst akcji",
   "Do_you_want_to_change_to_s_question": "Czy chcesz zmienić na <strong>%s</strong>?",
@@ -517,6 +536,8 @@
   "Hide_Private_Warning": "Czy na pewno chcesz ukryć dyskusję z \"%s\"?",
   "Hide_room": "Ukryj pokój",
   "Hide_Room_Warning": "Czy na pewno chcesz ukryć pokój \" %s\"?",
+  "Hide_roles": "Ukryj role",
+  "Hide_Unread_Room_Status": "Ukryj nieprzeczytany stan pokoju",
   "Hide_usernames": "Ukrywanie nazw użytkowników",
   "Highlights": "Podświetlane słowa",
   "Highlights_How_To": "Aby otrzymywać powiadomienie, gdy ktoś wspomina słowo lub frazę, dodaj go tutaj. Można oddzielić słowa lub wyrażenia przecinkami. Podświetlane słowa nie są wrażliwe na wielkość liter.",
@@ -784,6 +805,8 @@
   "Meta_robots": "Roboty",
   "Min_length_is": "Minimalna długość to %s",
   "minutes": "minut",
+  "Mobile": "Powiadomnienia mobilne",
+  "Mobile_Notifications_Default_Alert": "Domyślne powiadomnienia mobilne",
   "Monday": "Poniedziałek",
   "Monitor_history_for_changes_on": "Sprawdź historię zmian na",
   "More_channels": "Więcej kanałów",
@@ -1199,10 +1222,14 @@
   "UI_DisplayRoles": "Pokaż role",
   "UI_Merge_Channels_Groups": "Scalanie prywatne grupy z kanałami",
   "Unarchive": "Przywróć",
+  "Unblock_User": "Odblokuj użytkownika",
   "Unmute_someone_in_room": "Anuluj wyciszenie osoby w pokoju",
   "Unmute_user": "Anuluj wyciszenie użytkownika",
   "Unnamed": "Anonimowy",
   "Unpin_Message": "Odepnij wiadomość",
+  "Unread_Count": "Liczba nieprzeczytanych",
+  "Unread_Count_DM": "Liczba nieprzeczytanych dla bezpośrednich wiadomości",
+  "Unread_Messages": "Nieprzeczytane wiadomości",
   "Unread_Rooms": "Nieprzeczytane pokoje",
   "Unread_Rooms_Mode": "Tryb nieprzeczytanych pokoi",
   "Unstar_Message": "Usuń oznaczenie",

From 28cfdf579e64da974cbeb7d4740a34f6732d6336 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 4 Sep 2017 10:11:34 -0300
Subject: [PATCH 040/244] Merge pull request #7998 from
 RocketChat/improvements/emoji-sort

[FIX] Recent emojis not updated when adding via text
---
 .../client/popup/messagePopupConfig.js        | 74 +++++++++++++------
 1 file changed, 52 insertions(+), 22 deletions(-)

diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
index cff8543cabf..2258629508b 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
+++ b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
@@ -88,6 +88,42 @@ const getUsersFromServerDelayed = _.throttle(getUsersFromServer, 500);
 
 const getRoomsFromServerDelayed = _.throttle(getRoomsFromServer, 500);
 
+const addEmojiToRecents = (emoji) => {
+	const pickerEl = $('.emoji-picker')[0];
+	if (pickerEl) {
+		const view = Blaze.getView(pickerEl);
+		if (view) {
+			Template._withTemplateInstanceFunc(view.templateInstance, () => {
+				RocketChat.EmojiPicker.addRecent(emoji.replace(/:/g, ''));
+			});
+		}
+	}
+};
+
+const emojiSort = (recents) => {
+	return (a, b) => {
+		let idA = a._id;
+		let idB = a._id;
+
+		if (recents.includes(a._id)) {
+			idA = recents.indexOf(a._id) + idA;
+		}
+		if (recents.includes(b._id)) {
+			idB = recents.indexOf(b._id) + idB;
+		}
+
+		if (idA < idB) {
+			return -1;
+		}
+
+		if (idA > idB) {
+			return 1;
+		}
+
+		return 0;
+	};
+};
+
 Template.messagePopupConfig.helpers({
 	popupUserConfig() {
 		const self = this;
@@ -273,11 +309,12 @@ Template.messagePopupConfig.helpers({
 				getFilter(collection, filter) {
 					const key = `:${ filter }`;
 
-					if (!RocketChat.emoji.packages.emojione || RocketChat.emoji.packages.emojione.asciiList[key] || filter.length < 2) {
+					if (!RocketChat.emoji.packages.emojione || RocketChat.emoji.packages.emojione.asciiList[key]) {
 						return [];
 					}
 
 					const regExp = new RegExp(`^${ RegExp.escape(key) }`, 'i');
+					const recents = RocketChat.EmojiPicker.getRecent().map(item => `:${ item }:`);
 					return Object.keys(collection).map(key => {
 						const value = collection[key];
 						return {
@@ -286,16 +323,12 @@ Template.messagePopupConfig.helpers({
 						};
 					})
 						.filter(obj => regExp.test(obj._id))
-						.slice(0, 10)
-						.sort(function(a, b) {
-							if (a._id < b._id) {
-								return -1;
-							}
-							if (a._id > b._id) {
-								return 1;
-							}
-							return 0;
-						});
+						.sort(emojiSort(recents))
+						.slice(0, 10);
+				},
+				getValue(_id) {
+					addEmojiToRecents(_id);
+					return _id;
 				}
 			};
 		}
@@ -314,11 +347,12 @@ Template.messagePopupConfig.helpers({
 				getFilter(collection, filter) {
 					const key = `${ filter }`;
 
-					if (!RocketChat.emoji.packages.emojione || RocketChat.emoji.packages.emojione.asciiList[key] || filter.length < 2) {
+					if (!RocketChat.emoji.packages.emojione || RocketChat.emoji.packages.emojione.asciiList[key]) {
 						return [];
 					}
 
 					const regExp = new RegExp(`^${ RegExp.escape(key) }`, 'i');
+					const recents = RocketChat.EmojiPicker.getRecent().map(item => `:${ item }:`);
 					return Object.keys(collection).map(key => {
 						const value = collection[key];
 						return {
@@ -327,16 +361,12 @@ Template.messagePopupConfig.helpers({
 						};
 					})
 						.filter(obj => regExp.test(obj._id))
-						.slice(0, 10)
-						.sort(function(a, b) {
-							if (a._id < b._id) {
-								return -1;
-							}
-							if (a._id > b._id) {
-								return 1;
-							}
-							return 0;
-						});
+						.sort(emojiSort(recents))
+						.slice(0, 10);
+				},
+				getValue(_id) {
+					addEmojiToRecents(_id);
+					return _id;
 				}
 			};
 		}

From 6016e05cf7ac5f2da8a5b61b3ada31f34a5b9e4e Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 2 Sep 2017 16:38:03 -0300
Subject: [PATCH 041/244] Merge pull request #8001 from
 RocketChat/hotfix/autotranslate-parse-error

[FIX] Error when translating message
---
 packages/rocketchat-autotranslate/server/autotranslate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
index f6579b8ab87..f157253838c 100644
--- a/packages/rocketchat-autotranslate/server/autotranslate.js
+++ b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -91,7 +91,7 @@ class AutoTranslate {
 		let count = message.tokens.length;
 
 		message.html = message.msg;
-		message = RocketChat.Markdown.parse(message);
+		message = RocketChat.Markdown.parseNotEscaped(message);
 		message.msg = message.html;
 
 		for (const tokenIndex in message.tokens) {

From 0b109f38c3d964c1eaa81925730e82ba82d181a0 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 2 Sep 2017 16:07:53 -0300
Subject: [PATCH 042/244] Merge pull request #8014 from
 alexbrazier/bugfix/scrollbar

[FIX] Hide scrollbar on login page if not necessary
---
 packages/rocketchat-theme/client/imports/general/base.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index d21239fae01..c7fd9e442b7 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -5,7 +5,7 @@
 }
 
 html {
-	overflow-y: scroll;
+	overflow-y: auto;
 
 	height: 100%;
 
@@ -101,4 +101,4 @@ button {
 	vertical-align: -0.15em;
 
   overflow: hidden;
-}
\ No newline at end of file
+}

From 4bf3990d50b975a8833a940fd3944fbd9dcb19ae Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 2 Sep 2017 16:17:51 -0300
Subject: [PATCH 043/244] Merge pull request #8017 from RocketChat/user-status

[FIX] room icon on header
---
 .../client/imports/components/main-content.css | 18 ++++++++++++++++++
 .../rocketchat-ui/client/views/app/room.html   |  4 +++-
 .../rocketchat-ui/client/views/app/room.js     |  9 ++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/main-content.css b/packages/rocketchat-theme/client/imports/components/main-content.css
index d231b8dff40..8372be1c522 100644
--- a/packages/rocketchat-theme/client/imports/components/main-content.css
+++ b/packages/rocketchat-theme/client/imports/components/main-content.css
@@ -9,6 +9,24 @@
 	height: 100%;
 }
 
+.messages-container .room-icon {
+	&.online {
+		color: var(--status-online);
+	}
+
+	&.away {
+		color: var(--status-away);
+	}
+
+	&.busy {
+		color: var(--status-busy);
+	}
+
+	&.offline {
+		color: var(--status-invisible);
+	}
+}
+
 @media (width <= 780px) {
 	.main-content {
 		position: fixed;
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
index cc520b850ed..02932e69777 100644
--- a/packages/rocketchat-ui/client/views/app/room.html
+++ b/packages/rocketchat-ui/client/views/app/room.html
@@ -14,7 +14,9 @@
 							{{#if showToggleFavorite}}
 								<a href="#favorite" class="toggle-favorite"><i class="{{favorite}}" aria-label="{{_ favoriteLabel}}"></i></a>
 							{{/if}}
-							<i class="{{roomIcon}} status-{{userStatus}}"></i>
+
+							{{> icon block="room-icon" icon=roomIcon classes=userStatus}}
+
 							<span class="room-title">{{roomName}}</span>
 							{{#if secondaryName}}
 								<span class="secondary-name">@{{secondaryName}}</span>
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index ef9241126ea..1d37dc85156 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -196,7 +196,14 @@ Template.room.helpers({
 		const roomData = Session.get(`roomData${ this._id }`);
 		if (!(roomData != null ? roomData.t : undefined)) { return ''; }
 
-		return RocketChat.roomTypes.getIcon(roomData != null ? roomData.t : undefined);
+		const roomIcon = RocketChat.roomTypes.getIcon(roomData != null ? roomData.t : undefined);
+
+		// Remove this 'codegueira' on header redesign
+		if (!roomIcon) {
+			return 'at';
+		}
+
+		return roomIcon;
 	},
 
 	userStatus() {

From ca4ce257e57450f2238164b951c2c34d135920a8 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 2 Sep 2017 16:06:16 -0300
Subject: [PATCH 044/244] Merge pull request #8018 from
 RocketChat/search-results-height

[FIX] search results height
---
 .../client/imports/components/sidebar/rooms-list.css        | 6 +++++-
 .../client/imports/components/sidebar/sidebar.css           | 1 -
 .../rocketchat-theme/client/imports/general/variables.css   | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 1231eefac4f..4fc2a652609 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -34,12 +34,12 @@
 		position: absolute;
 		z-index: 1;
 
+		bottom: var(--sidebar-footer-height);
 		left: 0;
 
 		overflow-y: auto;
 
 		width: 100%;
-		height: calc(100% - calc(var(--sidebar-header-height) + var(--sidebar-footer-height)));
 		padding: 0 8px;
 
 		background-color: var(--sidebar-background);
@@ -52,5 +52,9 @@
 		&__empty-room {
 			margin-left: 0;
 		}
+
+		&__toolbar-search {
+			bottom: 0;
+		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index 84488b1d5ae..5675d3c5b9c 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -58,7 +58,6 @@
 	}
 
 	&__header {
-		height: var(--sidebar-header-height);
 		padding: var(--sidebar-default-padding);
 	}
 
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index ee165463a83..ec77c769554 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -130,7 +130,6 @@
 	--sidebar-small-width: 90%;
 	--sidebar-background: var(--color-primary);
 	--sidebar-background-light: var(--color-gray-lightest);
-	--sidebar-header-height: 180px;
 	--sidebar-default-padding: 24px;
 	--sidebar-small-default-padding: 16px;
 	--sidebar-header-padding: var(--sidebar-default-padding);

From be6812e9a9e5361362c17446c59a616b11ffa5cf Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 4 Sep 2017 20:59:08 -0300
Subject: [PATCH 045/244] Merge pull request #8019 from
 RocketChat/messagebox-autogrow

[FIX] message-box autogrow
---
 .../client/imports/components/message-box.css          |  5 ++++-
 packages/rocketchat-ui/client/lib/textarea-autogrow.js | 10 ++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index 149883503d7..200b32f093f 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -85,6 +85,8 @@
 
 		cursor: text;
 
+		line-height: 20px;
+
 		transition: background-color 0.3s;
 
 		border-width: var(--message-box-container-border-width);
@@ -99,9 +101,10 @@
 
 	&__textarea {
 		width: 100%;
+		height: 15px;
 		max-height: 155px;
+
 		padding: 0;
-		height: 15px;
 
 		resize: none;
 
diff --git a/packages/rocketchat-ui/client/lib/textarea-autogrow.js b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
index b375bdcc28f..e158f1a6e10 100644
--- a/packages/rocketchat-ui/client/lib/textarea-autogrow.js
+++ b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
@@ -64,23 +64,17 @@
 				}
 
 				if(newHeight === $self[0].offsetHeight){
-					return;
+					return false;
 				}
 
 				if(maxHeight <= newHeight){
-					return;
+					newHeight = maxHeight;
 				}
 
-				$self.css('overflow-y', 'hidden');
-
 				$self.stop().animate( { height: newHeight }, { duration: 100, complete: ()=> {
 					$self.trigger('autogrow', []);
-					$self.css('overflow-y', '');
 				}});
 
-
-
-
 				$self.trigger('autogrow', []);
 
 				if (settings.postGrowCallback !== null) {

From ff6b4df38205df0e1b09916b58477c57de97119f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 4 Sep 2017 20:57:24 -0300
Subject: [PATCH 046/244] Merge pull request #8039 from
 RocketChat/fix-clipboard

[FIX] copy to clipboard and update clipboard.js library
---
 packages/rocketchat-ui-master/package.js           | 2 +-
 packages/rocketchat-ui-message/client/message.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js
index fde213665da..f75c8d54966 100644
--- a/packages/rocketchat-ui-master/package.js
+++ b/packages/rocketchat-ui-master/package.js
@@ -11,7 +11,7 @@ Package.describe({
 });
 
 Npm.depends({
-	clipboard: '1.6.1'
+	clipboard: '1.7.1'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/rocketchat-ui-message/client/message.html b/packages/rocketchat-ui-message/client/message.html
index 5a2b4a28a27..6f8cad08f06 100644
--- a/packages/rocketchat-ui-message/client/message.html
+++ b/packages/rocketchat-ui-message/client/message.html
@@ -80,7 +80,7 @@
 						<div class="rc-popover__column">
 							<ul class="rc-popover__list">
 								{{#each action in messageActionsMenu}}
-									<li class="rc-popover__item" data-message-action="{{action.id}}">
+									<li class="rc-popover__item {{action.classes}}" data-message-action="{{action.id}}">
 										{{#if action.icon}}
 											<span class="rc-popover__icon">
 												{{> icon block="rc-popover__icon-element" icon=action.icon}}

From 4957576aceefe277c97f652caa63f33b81544e1b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 5 Sep 2017 14:13:42 -0300
Subject: [PATCH 047/244] Merge pull request #8046 from
 RocketChat/prevent-autotranslate-race-condition

[FIX] Prevent autotranslate tokens race condition
---
 .../server/autotranslate.js                       | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
index f157253838c..f54cd2bdd30 100644
--- a/packages/rocketchat-autotranslate/server/autotranslate.js
+++ b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -15,6 +15,9 @@ class AutoTranslate {
 	}
 
 	tokenize(message) {
+		if (!message.tokens || !Array.isArray(message.tokens)) {
+			message.tokens = [];
+		}
 		message = this.tokenizeEmojis(message);
 		message = this.tokenizeCode(message);
 		message = this.tokenizeURLs(message);
@@ -23,9 +26,6 @@ class AutoTranslate {
 	}
 
 	tokenizeEmojis(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 		message.msg = message.msg.replace(/:[+\w\d]+:/g, function(match) {
 			const token = `<i class=notranslate>{${ count++ }}</i>`;
@@ -40,9 +40,6 @@ class AutoTranslate {
 	}
 
 	tokenizeURLs(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 
 		const schemes = RocketChat.settings.get('Markdown_SupportSchemesForLink').split(',').join('|');
@@ -85,9 +82,6 @@ class AutoTranslate {
 	}
 
 	tokenizeCode(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 
 		message.html = message.msg;
@@ -109,9 +103,6 @@ class AutoTranslate {
 	}
 
 	tokenizeMentions(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 
 		if (message.mentions && message.mentions.length > 0) {

From 678fe0b84c4dcd709b83a12ff62b2fbdc6eafc71 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 5 Sep 2017 19:54:08 -0300
Subject: [PATCH 048/244] Merge pull request #8048 from
 RocketChat/fix-invisible-leader

[FIX] Invisible leader bar on hover
---
 packages/rocketchat-theme/client/imports/general/base_old.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 19fd73985d2..1af8c5caeaf 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -5686,6 +5686,10 @@ body:not(.is-cordova) {
 
 	border-bottom: 1px solid;
 
+	&.message:hover {
+		background-color: #ffffff;
+	}
+
 	&.animated-hidden {
 		visibility: hidden;
 

From 7e398184530ceef5b88ce27e54fde94979494350 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 5 Sep 2017 14:10:14 -0300
Subject: [PATCH 049/244] Merge pull request #7988 from
 RocketChat/action=messages

[FIX] Vertical menu on flex-tab
# Conflicts:
#	packages/rocketchat-ui-master/public/icons.svg
---
 .../client/lib/actionButton.js                |  1 -
 .../.npm/package/npm-shrinkwrap.json          | 10 +--
 .../rocketchat-lib/client/MessageAction.js    | 13 ++--
 .../client/actionButton.js                    |  3 +-
 .../client/views/mentionsFlexTab.js           | 19 +-----
 .../client/actionButton.js                    |  1 -
 .../client/actionButton.js                    | 23 +++----
 .../client/views/pinnedMessages.js            | 19 +-----
 .../client/tabBar/views/snippetedMessages.js  |  2 +-
 .../client/actionButton.js                    |  6 +-
 .../client/views/starredMessages.js           | 19 +-----
 .../client/imports/components/popover.css     |  8 +++
 .../client/imports/general/base.css           |  8 ++-
 .../client/tabs/messageSearch.html            |  2 +-
 .../client/tabs/messageSearch.js              | 22 +------
 .../.npm/package/npm-shrinkwrap.json          | 18 +++---
 .../rocketchat-ui-master/public/icons.svg     |  6 +-
 .../rocketchat-ui-message/client/message.html | 62 ++++++++++---------
 .../rocketchat-ui-message/client/message.js   | 19 ++++--
 .../rocketchat-ui/client/views/app/room.js    | 23 -------
 20 files changed, 104 insertions(+), 180 deletions(-)

diff --git a/packages/rocketchat-autotranslate/client/lib/actionButton.js b/packages/rocketchat-autotranslate/client/lib/actionButton.js
index bf9b4a0f1a1..e8289f61dd8 100644
--- a/packages/rocketchat-autotranslate/client/lib/actionButton.js
+++ b/packages/rocketchat-autotranslate/client/lib/actionButton.js
@@ -12,7 +12,6 @@ Meteor.startup(function() {
 				action() {
 					const message = this._arguments[1];
 					const language = RocketChat.AutoTranslate.getLanguage(message.rid);
-					RocketChat.MessageAction.hideDropDown();
 					if ((!message.translations || !message.translations[language])) { //} && !_.find(message.attachments, attachment => { return attachment.translations && attachment.translations[language]; })) {
 						RocketChat.AutoTranslate.messageIdsToWait[message._id] = true;
 						RocketChat.models.Messages.update({ _id: message._id }, { $set: { autoTranslateFetching: true } });
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 788d7c87977..00561635dcd 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1085,13 +1085,13 @@
       "from": "mime@>=1.2.11 <2.0.0"
     },
     "mime-db": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-      "from": "mime-db@>=1.29.0 <1.30.0"
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "from": "mime-db@>=1.30.0 <1.31.0"
     },
     "mime-types": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "from": "mime-types@>=2.0.8 <3.0.0"
     },
     "minimatch": {
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 6663d2332e7..ad3b8557392 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -59,15 +59,14 @@ RocketChat.MessageAction = new class {
 	}
 
 	getButtons(message, context, group) {
-		const allButtons = _.toArray(this.buttons.get());
-		let allowedButtons = allButtons;
+		let allButtons = _.toArray(this.buttons.get());
 
 		if (group) {
-			allowedButtons = allowedButtons.filter(button => button.group === group);
+			allButtons = allButtons.filter(button => button.group === group);
 		}
 
 		if (message) {
-			allowedButtons = _.compact(_.map(allowedButtons, function(button) {
+			allButtons = _.compact(_.map(allButtons, function(button) {
 				if (button.context == null || button.context.includes(context)) {
 					if (button.condition == null || button.condition(message, context)) {
 						return button;
@@ -75,7 +74,7 @@ RocketChat.MessageAction = new class {
 				}
 			}));
 		}
-		return _.sortBy(allowedButtons, 'order');
+		return _.sortBy(allButtons, 'order');
 	}
 
 	resetButtons() {
@@ -96,10 +95,6 @@ RocketChat.MessageAction = new class {
 	closePopover() {
 		popover.close();
 	}
-
-	hideDropDown() {
-		$('.message-dropdown:visible').hide();
-	}
 };
 
 Meteor.startup(function() {
diff --git a/packages/rocketchat-mentions-flextab/client/actionButton.js b/packages/rocketchat-mentions-flextab/client/actionButton.js
index 7df9460e443..4e4528f4812 100644
--- a/packages/rocketchat-mentions-flextab/client/actionButton.js
+++ b/packages/rocketchat-mentions-flextab/client/actionButton.js
@@ -1,12 +1,11 @@
 Meteor.startup(function() {
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-message',
-		icon: 'right-hand',
+		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['mentions'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			if (window.matchMedia('(max-width: 500px)').matches) {
 				Template.instance().tabBar.close();
 			}
diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
index 5f5e3744e99..1419865acd3 100644
--- a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
+++ b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
@@ -19,9 +19,7 @@ Template.mentionsFlexTab.helpers({
 		});
 	},
 	message() {
-		return _.extend(this, {
-			customClass: 'mentions'
-		});
+		return _.extend(this, { customClass: 'mentions', actionContext: 'mentions'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();
@@ -42,21 +40,6 @@ Template.mentionsFlexTab.onCreated(function() {
 });
 
 Template.mentionsFlexTab.events({
-	'click .message-cog'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		const message_id = $(e.currentTarget).closest('.message').attr('id');
-		RocketChat.MessageAction.hideDropDown();
-		t.$(`\#${ message_id } .message-dropdown`).remove();
-		const message = MentionedMessage.findOne(message_id);
-		const actions = RocketChat.MessageAction.getButtons(message, 'mentions');
-		const el = Blaze.toHTMLWithData(Template.messageDropdown, {
-			actions
-		});
-		t.$(`\#${ message_id } .message-cog-container`).append(el);
-		const dropDown = t.$(`\#${ message_id } .message-dropdown`);
-		return dropDown.show();
-	},
 	'scroll .js-list': _.throttle(function(e, instance) {
 		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight && instance.hasMore.get()) {
 			return instance.limit.set(instance.limit.get() + 50);
diff --git a/packages/rocketchat-message-mark-as-unread/client/actionButton.js b/packages/rocketchat-message-mark-as-unread/client/actionButton.js
index 83aa1e5e151..41c63ef328d 100644
--- a/packages/rocketchat-message-mark-as-unread/client/actionButton.js
+++ b/packages/rocketchat-message-mark-as-unread/client/actionButton.js
@@ -6,7 +6,6 @@ Meteor.startup(() => {
 		context: ['message', 'message-mobile'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			return Meteor.call('unreadMessages', message, function(error) {
 				if (error) {
 					return handleError(error);
diff --git a/packages/rocketchat-message-pin/client/actionButton.js b/packages/rocketchat-message-pin/client/actionButton.js
index 6117a749430..02ff9b566a7 100644
--- a/packages/rocketchat-message-pin/client/actionButton.js
+++ b/packages/rocketchat-message-pin/client/actionButton.js
@@ -9,18 +9,17 @@ Meteor.startup(function() {
 		action() {
 			const message = this._arguments[1];
 			message.pinned = true;
-			return Meteor.call('pinMessage', message, function(error) {
+			Meteor.call('pinMessage', message, function(error) {
 				if (error) {
 					return handleError(error);
 				}
 			});
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
-				return false;
-			} else if (message.pinned || !RocketChat.settings.get('Message_AllowPinning')) {
+			if	(!RocketChat.settings.get('Message_AllowPinning') || message.pinned || !RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
+
 			return RocketChat.authz.hasAtLeastOnePermission('pin-message', message.rid);
 		},
 		order: 20,
@@ -35,18 +34,18 @@ Meteor.startup(function() {
 		action() {
 			const message = this._arguments[1];
 			message.pinned = false;
-			return Meteor.call('unpinMessage', message, function(error) {
+			Meteor.call('unpinMessage', message, function(error) {
 				if (error) {
 					return handleError(error);
 				}
 			});
 		},
 		condition(message) {
-			if ((RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) && (!message.pinned || !RocketChat.settings.get('Message_AllowPinning'))) {
+			if	(!RocketChat.settings.get('Message_AllowPinning') || !message.pinned || !RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
 
-			RocketChat.authz.hasAtLeastOnePermission('pin-message', message.rid);
+			return RocketChat.authz.hasAtLeastOnePermission('pin-message', message.rid);
 		},
 		order: 21,
 		group: 'menu'
@@ -54,19 +53,18 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-pin-message',
-		icon: 'right-hand',
+		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['pinned'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			if (window.matchMedia('(max-width: 500px)').matches) {
 				Template.instance().tabBar.close();
 			}
 			return RoomHistoryManager.getSurroundingMessages(message, 50);
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (!RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
 			return true;
@@ -77,18 +75,17 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'permalink-pinned',
-		icon: 'link',
+		icon: 'permalink',
 		label: 'Permalink',
 		classes: 'clipboard',
 		context: ['pinned'],
 		action(event) {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'));
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (!RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
 			return true;
diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.js b/packages/rocketchat-message-pin/client/views/pinnedMessages.js
index e3a24c4e08f..594d3e2efc3 100644
--- a/packages/rocketchat-message-pin/client/views/pinnedMessages.js
+++ b/packages/rocketchat-message-pin/client/views/pinnedMessages.js
@@ -19,9 +19,7 @@ Template.pinnedMessages.helpers({
 		});
 	},
 	message() {
-		return _.extend(this, {
-			customClass: 'pinned'
-		});
+		return _.extend(this, { customClass: 'pinned', actionContext: 'pinned'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();
@@ -44,21 +42,6 @@ Template.pinnedMessages.onCreated(function() {
 });
 
 Template.pinnedMessages.events({
-	'click .message-cog'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		const message_id = $(e.currentTarget).closest('.message').attr('id');
-		RocketChat.MessageAction.hideDropDown();
-		t.$(`\#${ message_id } .message-dropdown`).remove();
-		const message = PinnedMessage.findOne(message_id);
-		const actions = RocketChat.MessageAction.getButtons(message, 'pinned');
-		const el = Blaze.toHTMLWithData(Template.messageDropdown, {
-			actions
-		});
-		t.$(`\#${ message_id } .message-cog-container`).append(el);
-		const dropDown = t.$(`\#${ message_id } .message-dropdown`);
-		return dropDown.show();
-	},
 	'scroll .js-list': _.throttle(function(e, instance) {
 		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight && instance.hasMore.get()) {
 			return instance.limit.set(instance.limit.get() + 50);
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
index f6c72841fa3..3fdada28c98 100644
--- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
+++ b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
@@ -7,7 +7,7 @@ Template.snippetedMessages.helpers({
 		return SnippetedMessages.find({ snippeted: true, rid: this.rid }, { sort: { ts: -1 } });
 	},
 	message() {
-		return _.extend(this, { customClass: 'snippeted' });
+		return _.extend(this, { customClass: 'snippeted', actionContext: 'snippeted'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();
diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js
index 2f4bca05f23..1539e6f77b9 100644
--- a/packages/rocketchat-message-star/client/actionButton.js
+++ b/packages/rocketchat-message-star/client/actionButton.js
@@ -52,12 +52,11 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-star-message',
-		icon: 'right-hand',
+		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['starred'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			if (window.matchMedia('(max-width: 500px)').matches) {
 				Template.instance().tabBar.close();
 			}
@@ -75,13 +74,12 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'permalink-star',
-		icon: 'link',
+		icon: 'permalink',
 		label: 'Permalink',
 		classes: 'clipboard',
 		context: ['starred'],
 		action(event) {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'));
 		},
diff --git a/packages/rocketchat-message-star/client/views/starredMessages.js b/packages/rocketchat-message-star/client/views/starredMessages.js
index 80864c5ab2e..f898b857834 100644
--- a/packages/rocketchat-message-star/client/views/starredMessages.js
+++ b/packages/rocketchat-message-star/client/views/starredMessages.js
@@ -19,9 +19,7 @@ Template.starredMessages.helpers({
 		});
 	},
 	message() {
-		return _.extend(this, {
-			customClass: 'starred'
-		});
+		return _.extend(this, { customClass: 'starred', actionContext: 'starred'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();
@@ -43,21 +41,6 @@ Template.starredMessages.onCreated(function() {
 });
 
 Template.starredMessages.events({
-	'click .message-cog'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		const message_id = $(e.currentTarget).closest('.message').attr('id');
-		RocketChat.MessageAction.hideDropDown();
-		t.$(`\#${ message_id } .message-dropdown`).remove();
-		const message = StarredMessage.findOne(message_id);
-		const actions = RocketChat.MessageAction.getButtons(message, 'starred');
-		const el = Blaze.toHTMLWithData(Template.messageDropdown, {
-			actions
-		});
-		t.$(`\#${ message_id } .message-cog-container`).append(el);
-		const dropDown = t.$(`\#${ message_id } .message-dropdown`);
-		return dropDown.show();
-	},
 	'scroll .js-list': _.throttle(function(e, instance) {
 		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight) {
 			return instance.limit.set(instance.limit.get() + 50);
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 854ecf2e96e..5d8aeb9ff41 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -103,6 +103,10 @@
 
 	&__icon-element {
 		font-size: 18px;
+
+		&--star {
+			fill: none;
+		}
 	}
 
 	&__item-text {
@@ -118,6 +122,10 @@
 	}
 }
 
+[data-message-action="unstar-message"] .rc-popover__icon-element--star {
+	fill: currentColor;
+}
+
 @keyframes dropdown-show {
 	0% {
 		transform: translate(0, -2%);
diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index c7fd9e442b7..2970fad81b2 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -88,9 +88,15 @@ button {
 	}
 
 	& .tab-button-icon {
-		font-size: 1.125rem;
 		color: var(--color-dark-medium);
+
+		font-size: 1.125rem;
+
 		fill: var(--color-dark-medium);
+
+		&--star {
+			fill: none;
+		}
 	}
 }
 
diff --git a/packages/rocketchat-ui-flextab/client/tabs/messageSearch.html b/packages/rocketchat-ui-flextab/client/tabs/messageSearch.html
index 0cf132752cc..5f011e19b01 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/messageSearch.html
+++ b/packages/rocketchat-ui-flextab/client/tabs/messageSearch.html
@@ -23,7 +23,7 @@
 		<div class="flex-tab__result js-list">
 			<ul class="list clearfix">
 				{{#each searchResultMessages}}
-				{{#nrr nrrargs 'message' message}}{{/nrr}}
+					{{#nrr nrrargs 'message' message}}{{/nrr}}
 				{{/each}}
 			</ul>
 			{{#if hasMore}}
diff --git a/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js b/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js
index b2ddd5c78bf..c4a718c52ed 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js
@@ -1,14 +1,13 @@
 Meteor.startup(function() {
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-search-message',
-		icon: 'right-hand',
+		icon: 'jump',
 		label: 'Jump_to_message',
 		context: [
 			'search'
 		],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			if (window.matchMedia('(max-width: 500px)').matches) {
 				Template.instance().tabBar.close();
 			}
@@ -46,7 +45,7 @@ Template.messageSearch.helpers({
 	},
 
 	message() {
-		return _.extend(this, { customClass: 'search' });
+		return _.extend(this, { customClass: 'search', actionContext: 'search'});
 	}
 });
 
@@ -73,23 +72,6 @@ Template.messageSearch.events({
 		return t.search();
 	}, 500),
 
-	'click .message-cog'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		const message_id = $(e.currentTarget).closest('.message').attr('id');
-		const searchResult = t.searchResult.get();
-		RocketChat.MessageAction.hideDropDown();
-		t.$(`\#${ message_id } .message-dropdown`).remove();
-		if (searchResult) {
-			const message = _.findWhere(searchResult.messages, { _id: message_id });
-			const actions = RocketChat.MessageAction.getButtons(message, 'search');
-			const el = Blaze.toHTMLWithData(Template.messageDropdown, { actions });
-			t.$(`\#${ message_id } .message-cog-container`).append(el);
-			const dropDown = t.$(`\#${ message_id } .message-dropdown`);
-			return dropDown.show();
-		}
-	},
-
 	'click .load-more button'(e, t) {
 		t.limit.set(t.limit.get() + 20);
 		return t.search();
diff --git a/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
index 6a227016546..00d02c6b242 100644
--- a/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
@@ -1,19 +1,19 @@
 {
   "dependencies": {
     "clipboard": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.6.1.tgz",
-      "from": "clipboard@1.6.1"
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz",
+      "from": "clipboard@1.7.1"
     },
     "delegate": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.2.tgz",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz",
       "from": "delegate@>=3.1.2 <4.0.0"
     },
     "good-listener": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "from": "good-listener@>=1.2.0 <2.0.0"
+      "from": "good-listener@>=1.2.2 <2.0.0"
     },
     "select": {
       "version": "1.1.2",
@@ -21,9 +21,9 @@
       "from": "select@>=1.1.2 <2.0.0"
     },
     "tiny-emitter": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-1.2.0.tgz",
-      "from": "tiny-emitter@>=1.0.0 <2.0.0"
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
+      "from": "tiny-emitter@>=2.0.0 <3.0.0"
     }
   }
 }
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index 79f12ea7328..3dde382977a 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -45,7 +45,7 @@
     <symbol viewBox="0 0 20 20" id="icon-share"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M10 12.5V2.917" stroke-linecap="square" /><path d="M6.667 5.419l3.291-3.292L13.25 5.42m-.75 2.913H15V17.5H5V8.333h2.5" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-sign-out"><path d="M2.684 3h4.63c.232 0 .421.19.421.42v.282c0 .231-.19.42-.42.42H2.683a.563.563 0 0 0-.561.562v10.102c0 .309.252.562.56.562h4.631c.232 0 .421.189.421.42v.281c0 .232-.19.421-.42.421H2.683c-.93 0-1.684-.754-1.684-1.684V4.684A1.686 1.686 0 0 1 2.684 3zm9.787.684l-.25.25a.421.421 0 0 0 0 .595l4.63 4.61H7.034c-.231 0-.42.19-.42.42v.351c0 .232.189.421.42.421h9.819l-4.627 4.61a.421.421 0 0 0 0 .596l.25.249a.421.421 0 0 0 .595 0l5.77-5.753a.421.421 0 0 0 0-.596l-5.773-5.753a.421.421 0 0 0-.596 0z" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-snippet"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M5.833 13.88L1.953 10l3.88-3.88" /><path d="M11.941 2.756L8.06 17.244" stroke-linecap="square" /><path d="M14.167 6.12l3.88 3.88-3.88 3.88" /></g></symbol>
-    <symbol viewBox="0 0 20 20" id="icon-star"><path d="M10 15l-4.898 2.575.935-5.454-3.962-3.863 5.476-.796L10 2.5l2.45 4.962 5.475.796-3.962 3.863.935 5.454z" stroke-width="1.5" stroke="currentColor" fill="none" /></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-star"><path d="M10 15l-4.898 2.575.935-5.454-3.962-3.863 5.476-.796L10 2.5l2.45 4.962 5.475.796-3.962 3.863.935 5.454z" stroke-width="1.5" stroke="currentColor" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-strike"><g fill="none" fill-rule="evenodd"><path d="M5.775 13.259c.074.989.498 1.78 1.273 2.372.775.593 1.768.889 2.98.889 1.312 0 2.352-.311 3.122-.933.77-.621 1.155-1.458 1.155-2.51 0-.842-.258-1.511-.774-2.008-.516-.498-1.366-.894-2.551-1.19L9.782 9.56c-.788-.2-1.353-.442-1.694-.722a1.35 1.35 0 0 1-.512-1.095c0-.582.231-1.047.694-1.396.463-.35 1.075-.524 1.837-.524.714 0 1.3.165 1.758.496.457.33.736.79.837 1.377h1.436c-.058-.926-.46-1.685-1.206-2.278-.746-.592-1.672-.888-2.777-.888-1.212 0-2.189.3-2.932.9-.743.6-1.115 1.387-1.115 2.36 0 .815.235 1.467.706 1.957.471.489 1.225.866 2.262 1.13l1.468.381c.788.196 1.367.455 1.737.778.37.322.556.727.556 1.214 0 .566-.253 1.035-.758 1.408s-1.144.56-1.916.56c-.815 0-1.487-.178-2.016-.532-.529-.355-.838-.83-.928-1.428H5.775z" fill="currentColor" /><path d="M4.375 10h11.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-team"><path d="M5.5 16.08c0-2.838 3.375-2.27 3.375-3.405 0 0 .065-.754-.307-1.135-.464-.473-.818-1.041-.818-1.986C7.75 8.144 8.757 7 10 7s2.25 1.143 2.25 2.554c0 .932-.345 1.512-.829 1.986-.353.372-.296 1.135-.296 1.135 0 1.135 3.375.567 3.375 3.405 0 0-.896.67-4.5.67s-4.5-.67-4.5-.67zm-.386-3.104a17.84 17.84 0 0 1-1.134-.086c-1.735-.19-2.23-.56-2.23-.56 0-2.838 3.375-2.27 3.375-3.405 0 0 .065-.754-.307-1.135C4.354 7.317 4 6.749 4 5.804 4 4.394 5.007 3.25 6.25 3.25S8.5 4.393 8.5 5.804m6.386 7.172c.426-.02.803-.05 1.134-.086 1.735-.19 2.23-.56 2.23-.56 0-2.838-3.375-2.27-3.375-3.405 0 0-.065-.754.307-1.135.464-.473.818-1.041.818-1.986 0-1.41-1.007-2.554-2.25-2.554S11.5 4.393 11.5 5.804" stroke="currentColor" stroke-width="1.5" fill="none" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-trash"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M4 6h12l-1 12H5zm8-2.5a2 2 0 1 0-4 0" /><path d="M8 10v5m4-5v5" stroke-linecap="square" /><path d="M2.5 3.5h15" stroke-linecap="round" stroke-linejoin="round" /></g></symbol>
@@ -56,4 +56,8 @@
     <symbol viewBox="0 0 20 20" id="icon-video"><g stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><path d="M3 8h10v8H3zm10 2.376l4.048-1.314c.526-.171.952.137.952.69v4.494c0 .552-.426.862-.952.69L13 13.624v-3.247z" /><path d="M5.5 5h5" stroke-linecap="square" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-volume"><path d="M3 6.345h1.967S6.027 4 9 4v12c-2.874 0-4.033-2.345-4.033-2.345H3v-7.31zm10.106 7.081A6.968 6.968 0 0 0 14 10a6.968 6.968 0 0 0-.894-3.426m2.489 8.809A10.95 10.95 0 0 0 17 10c0-1.956-.51-3.792-1.405-5.383" stroke="currentColor" stroke-width="1.5" fill="none" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-warning"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M10 3l8 14H2z" /><path d="M10 9v5" stroke-linecap="square" /></g></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-checkmark-circled"><path d="M486.4 1024c-129.922 0-252.067-50.594-343.936-142.464s-142.464-214.014-142.464-343.936c0-129.923 50.595-252.067 142.464-343.936s214.013-142.464 343.936-142.464c129.922 0 252.067 50.595 343.936 142.464s142.464 214.014 142.464 343.936-50.594 252.067-142.464 343.936c-91.869 91.87-214.014 142.464-343.936 142.464zM486.4 102.4c-239.97 0-435.2 195.23-435.2 435.2s195.23 435.2 435.2 435.2 435.2-195.23 435.2-435.2-195.23-435.2-435.2-435.2z"></path><path d="M384 742.4c-6.552 0-13.102-2.499-18.102-7.499l-153.6-153.6c-9.997-9.997-9.997-26.206 0-36.203 9.998-9.997 26.206-9.997 36.205 0l135.498 135.498 340.299-340.298c9.997-9.997 26.206-9.997 36.203 0 9.998 9.998 9.998 26.206 0 36.205l-358.4 358.4c-5 4.998-11.55 7.498-18.102 7.498z"></path></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-cross-circled"><path d="M733.808 723.266l-208.874-185.666 208.874-185.667c10.566-9.394 11.518-25.574 2.126-36.141-9.394-10.566-25.574-11.522-36.142-2.126l-213.392 189.682-213.392-189.68c-10.568-9.392-26.749-8.44-36.141 2.126-9.394 10.566-8.442 26.749 2.126 36.141l208.874 185.666-208.875 185.666c-10.566 9.394-11.518 25.574-2.126 36.142 5.059 5.691 12.085 8.592 19.142 8.592 6.048 0 12.122-2.131 16.998-6.466l213.394-189.683 213.392 189.683c4.878 4.334 10.949 6.466 16.998 6.466 7.058 0 14.086-2.902 19.144-8.592 9.392-10.568 8.44-26.749-2.126-36.142z"></path><path d="M486.4 1024c-129.922 0-252.067-50.594-343.936-142.464s-142.464-214.014-142.464-343.936c0-129.923 50.595-252.067 142.464-343.936s214.013-142.464 343.936-142.464c129.922 0 252.067 50.595 343.936 142.464s142.464 214.014 142.464 343.936-50.594 252.067-142.464 343.936c-91.869 91.87-214.014 142.464-343.936 142.464zM486.4 102.4c-239.97 0-435.2 195.23-435.2 435.2s195.23 435.2 435.2 435.2 435.2-195.23 435.2-435.2-195.23-435.2-435.2-435.2z"></path></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-jump"><path d="M11.6 7.257V4L18 9.7l-6.4 5.7v-3.257S2 11.385 2 16c0-9.23 9.6-8.743 9.6-8.743z" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"/></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-flag"><path d="M12.928 6.063l3.263-3.77a.74.74 0 0 0 .112-.759.71.71 0 0 0-.647-.422H3.141v17.72h1.406v-7.876h11.11a.71.71 0 0 0 .646-.422.691.691 0 0 0-.112-.759l-3.263-3.713zM4.547 9.578V2.547h9.562l-2.643 3.065c-.225.254-.225.647 0 .929l2.643 3.065H4.547v-.028z" fill-rule="nonzero" fill="currentColor"/></symbol>
 </svg>
diff --git a/packages/rocketchat-ui-message/client/message.html b/packages/rocketchat-ui-message/client/message.html
index 6f8cad08f06..65bf1ae27b6 100644
--- a/packages/rocketchat-ui-message/client/message.html
+++ b/packages/rocketchat-ui-message/client/message.html
@@ -1,5 +1,5 @@
 <template name="message">
-	<li id="{{_id}}" class="message background-transparent-dark-hover {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
+	<li id="{{actionContext}}{{_id}}" class="message background-transparent-dark-hover {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
 		{{#if avatar}}
 			{{#if avatarFromUsername}}
 				<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</button>
@@ -63,36 +63,40 @@
 		</div>
 		{{#unless system}}
 			<div class="message-actions">
-				<div class="message-actions__buttons">
-					{{#each action in messageActions}}
-						<button class="message-actions__button" data-message-action="{{action.id}}">
-								{{> icon block="message-actions__button-icon" icon=action.icon}}
-						</button>
-					{{/each}}
-				</div>
-				<label class="message-actions__label" for="message-actions__menu--{{_id}}" data-popover="label">
-					{{> icon block="message-actions__menu" icon="menu"}}
-				</label>
-				<input id="message-actions__menu--{{_id}}" type="checkbox" class="rc-popover-anchor" data-popover="anchor">
-				<div class="rc-popover" data-popover="popover">
-				<div class="rc-popover__wrapper"></div>
-					<div class="rc-popover__content">
-						<div class="rc-popover__column">
-							<ul class="rc-popover__list">
-								{{#each action in messageActionsMenu}}
-									<li class="rc-popover__item {{action.classes}}" data-message-action="{{action.id}}">
-										{{#if action.icon}}
-											<span class="rc-popover__icon">
-												{{> icon block="rc-popover__icon-element" icon=action.icon}}
-											</span>
-										{{/if}}
-										<span class="rc-popover__item-text">{{_ action.label}}</span>
-									</li>
-								{{/each}}
-							</ul>
+				{{#if messageActions 'message'}}
+					<div class="message-actions__buttons">
+						{{#each action in messageActions 'message'}}
+							<button class="message-actions__button" data-message-action="{{action.id}}">
+									{{> icon block="message-actions__button-icon" icon=action.icon}}
+							</button>
+						{{/each}}
+					</div>
+				{{/if}}
+				{{#if messageActions 'menu'}}
+					<label class="message-actions__label" for="message-actions__menu--{{_id}}{{actionContext}}" data-popover="label">
+						{{> icon block="message-actions__menu" icon="menu"}}
+					</label>
+					<input id="message-actions__menu--{{_id}}{{actionContext}}" type="checkbox" class="rc-popover-anchor" data-popover="anchor">
+					<div class="rc-popover" data-popover="popover">
+					<div class="rc-popover__wrapper"></div>
+						<div class="rc-popover__content">
+							<div class="rc-popover__column">
+								<ul class="rc-popover__list">
+									{{#each action in messageActions 'menu'}}
+										<li class="rc-popover__item {{action.classes}}" data-message-action="{{action.id}}">
+											{{#if action.icon}}
+												<span class="rc-popover__icon">
+													{{> icon block="rc-popover__icon-element" icon=action.icon}}
+												</span>
+											{{/if}}
+											<span class="rc-popover__item-text">{{_ action.label}}</span>
+										</li>
+									{{/each}}
+								</ul>
+							</div>
 						</div>
 					</div>
-				</div>
+				{{/if}}
 			</div>
 		{{/unless}}
 		<ul class="actionLinks {{hideActionLinks}}">
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index 1c916422cd6..91ea4cce375 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -265,11 +265,19 @@ Template.message.helpers({
 			return 'hidden';
 		}
 	},
-	messageActions() {
-		return RocketChat.MessageAction.getButtons(Template.currentData(), 'message', 'message');
-	},
-	messageActionsMenu() {
-		return RocketChat.MessageAction.getButtons(Template.currentData(), 'message', 'menu');
+	messageActions(group) {
+		let messageGroup = group;
+		let context = this.actionContext;
+
+		if (!group) {
+			messageGroup = 'message';
+		}
+
+		if (!context) {
+			context = 'message';
+		}
+
+		return RocketChat.MessageAction.getButtons(Template.currentData(), context, messageGroup);
 	}
 });
 
@@ -295,7 +303,6 @@ Template.message.onCreated(function() {
 		} else if (msg.u && msg.u.username === RocketChat.settings.get('Chatops_Username')) {
 			msg.html = msg.msg;
 			msg = RocketChat.callbacks.run('renderMentions', msg);
-			// console.log JSON.stringify message
 			msg = msg.html;
 		} else {
 			msg = renderMessageBody(msg);
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 1d37dc85156..192f415cd52 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -540,29 +540,6 @@ Template.room.events({
 		return chatMessages[RocketChat.openedRoom].input.focus();
 	},
 
-	'click .message-cog'() {
-		const [, message] = this._arguments;
-		RocketChat.MessageAction.hideDropDown();
-
-		let dropDown = $(`.messages-box \#${ message._id } .message-dropdown`);
-
-		if (dropDown.length === 0) {
-			const actions = RocketChat.MessageAction.getButtons(message, 'message');
-
-			const el = Blaze.toHTMLWithData(Template.messageDropdown, { actions });
-
-			$(`.messages-box \#${ message._id } .message-cog-container`).append(el);
-
-			dropDown = $(`.messages-box \#${ message._id } .message-dropdown`);
-		}
-
-		return dropDown.show();
-	},
-
-	'click .message-dropdown-close'() {
-		return RocketChat.MessageAction.hideDropDown();
-	},
-
 	'click .message [data-message-action]'(e, t) {
 		const button = RocketChat.MessageAction.getButtonById(e.currentTarget.dataset.messageAction);
 		if ((button != null ? button.action : undefined) != null) {

From 4b60f88275b5849ad6474c084d006eaf2efd7a6f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 5 Sep 2017 20:00:20 -0300
Subject: [PATCH 050/244] Bump version to 0.59.0-rc.4

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 20 ++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 6124d5c01f2..5df3f40b313 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.3
+ENV RC_VERSION 0.59.0-rc.4
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 9dcdcfc8d9d..ad45d2f7328 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.3"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.4"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 43d2660bff1..5ec5722d05a 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.3
+    RC_VERSION=0.59.0-rc.4
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index ed9665518ef..d08a8b7a68c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,23 @@
+<a name="0.59.0-rc.4"></a>
+# 0.59.0-rc.4 (2017-09-05)
+
+
+### Bug Fixes
+
+- [#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) copy to clipboard and update clipboard.js library
+- [#8001](https://github.com/RocketChat/Rocket.Chat/pull/8001) Error when translating message
+- [#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754) Fix email on mention
+- [#8014](https://github.com/RocketChat/Rocket.Chat/pull/8014) Hide scrollbar on login page if not necessary
+- [#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048) Invisible leader bar on hover
+- [#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) message-box autogrow
+- [#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046) Prevent autotranslate tokens race condition
+- [#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998) Recent emojis not updated when adding via text
+- [#8017](https://github.com/RocketChat/Rocket.Chat/pull/8017) room icon on header
+- [#8018](https://github.com/RocketChat/Rocket.Chat/pull/8018) search results height
+- [#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) Vertical menu on flex-tab
+
+
+
 <a name="0.59.0-rc.3"></a>
 # 0.59.0-rc.3 (2017-08-30)
 
diff --git a/package.json b/package.json
index d6a11576d80..fc404665c01 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.3",
+	"version": "0.59.0-rc.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 06dfa485d21..02b079cc254 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.3"
+	"version": "0.59.0-rc.4"
 }

From 10119eaee062af43873ff0fcbfcccfc18076f26e Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Thu, 7 Sep 2017 21:28:31 -0300
Subject: [PATCH 051/244] Merge pull request #8047 from
 RocketChat/fix-scroll-on-texarea

[FIX] Scroll on messagebox
---
 .../rocketchat-theme/client/imports/components/message-box.css  | 1 +
 packages/rocketchat-ui/client/lib/textarea-autogrow.js          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index 200b32f093f..fcf18803583 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -102,6 +102,7 @@
 	&__textarea {
 		width: 100%;
 		height: 15px;
+		min-height: 21px;
 		max-height: 155px;
 
 		padding: 0;
diff --git a/packages/rocketchat-ui/client/lib/textarea-autogrow.js b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
index e158f1a6e10..ba65fb8ab79 100644
--- a/packages/rocketchat-ui/client/lib/textarea-autogrow.js
+++ b/packages/rocketchat-ui/client/lib/textarea-autogrow.js
@@ -64,7 +64,7 @@
 				}
 
 				if(newHeight === $self[0].offsetHeight){
-					return false;
+					return true;
 				}
 
 				if(maxHeight <= newHeight){

From 8ce943c195f2597ab5219e1416aab84b25b049ac Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 8 Sep 2017 13:38:29 -0300
Subject: [PATCH 052/244] Merge pull request #8054 from Kiran-Rao/patch-1

Remove unnecessary returns in cors common
---
 packages/rocketchat-cors/common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-cors/common.js b/packages/rocketchat-cors/common.js
index 7f79abf550f..3c90f3d1896 100644
--- a/packages/rocketchat-cors/common.js
+++ b/packages/rocketchat-cors/common.js
@@ -1,5 +1,5 @@
 Meteor.startup(function() {
-	return RocketChat.settings.onload('Force_SSL', function(key, value) {
-		return Meteor.absoluteUrl.defaultOptions.secure = value;
+	RocketChat.settings.onload('Force_SSL', function(key, value) {
+		Meteor.absoluteUrl.defaultOptions.secure = value;
 	});
 });

From b6034b6461ad99d82c6d09da9c07dd68e32d12bf Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 13 Sep 2017 19:56:11 -0300
Subject: [PATCH 053/244] Merge pull request #8059 from
 RocketChat/fix-default-email-notification

[FIX] Not sending email to mentioned users with unchanged preference
---
 .../server/lib/sendEmailOnMessage.js          | 62 +++++++++++++------
 .../server/models/Subscriptions.js            | 12 ++++
 2 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
index 78b4c419e4b..affb1844108 100644
--- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
@@ -43,34 +43,52 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	if (room.t === 'd') {
 		usersToSendEmail[message.rid.replace(message.u._id, '')] = 'direct';
 	} else {
-		const isMentionAll = message.mentions.find((mention) => {
-			return mention._id === 'all';
-		});
-		RocketChat.models.Subscriptions.findWithSendEmailByRoomId(room._id).forEach((sub) => {
+		let isMentionAll = message.mentions.find(mention => mention._id === 'all');
+
+		if (isMentionAll) {
+			const maxMembersForNotification = RocketChat.settings.get('Notifications_Max_Room_Members');
+			if (maxMembersForNotification !== 0 && room.usernames.length > maxMembersForNotification) {
+				isMentionAll = undefined;
+			}
+		}
+
+		let query;
+		if (isMentionAll) {
+			// Query all users in room limited by the max room members setting
+			query = RocketChat.models.Subscriptions.findByRoomId(room._id);
+		} else {
+			// Query only mentioned users, will be always a few users
+			const userIds = message.mentions.map(mention => mention._id);
+			query = RocketChat.models.Subscriptions.findByRoomIdAndUserIdsOrAllMessages(room._id, userIds);
+		}
+
+		query.forEach((sub) => {
 			if (sub.disableNotifications) {
 				return delete usersToSendEmail[sub.u._id];
 			}
 
 			const emailNotifications = sub.emailNotifications;
 
-			if (emailNotifications !== 'nothing') {
-				const mentionedUser = message.mentions.find((mention) => {
-					return mention._id === sub.u._id;
-				});
+			if (emailNotifications === 'nothing') {
+				return delete usersToSendEmail[sub.u._id];
+			}
 
-				if (emailNotifications === 'mentions' && (mentionedUser || isMentionAll)) {
-					const maxMembersForNotification = RocketChat.settings.get('Notifications_Max_Room_Members');
-					if (isMentionAll && maxMembersForNotification !== 0 && room.usernames.length > maxMembersForNotification) {
-						return;
-					}
-					return usersToSendEmail[sub.u._id] = 'mention';
-				}
+			const mentionedUser = isMentionAll || message.mentions.find(mention => mention._id === sub.u._id);
 
-				if (emailNotifications === 'all') {
-					return usersToSendEmail[sub.u._id] = 'all';
+			if (emailNotifications === 'default' || emailNotifications == null) {
+				if (mentionedUser) {
+					return usersToSendEmail[sub.u._id] = 'default';
 				}
+				return delete usersToSendEmail[sub.u._id];
+			}
+
+			if (emailNotifications === 'mentions' && mentionedUser) {
+				return usersToSendEmail[sub.u._id] = 'mention';
+			}
+
+			if (emailNotifications === 'all') {
+				return usersToSendEmail[sub.u._id] = 'all';
 			}
-			delete usersToSendEmail[sub.u._id];
 		});
 	}
 	const userIdsToSendEmail = Object.keys(usersToSendEmail);
@@ -93,8 +111,12 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 
 		if (usersOfMention && usersOfMention.length > 0) {
 			usersOfMention.forEach((user) => {
-				if (user.settings && user.settings.preferences && user.settings.preferences.emailNotificationMode && user.settings.preferences.emailNotificationMode === 'disabled' && usersToSendEmail[user._id] !== 'force') {
-					return;
+				if (usersToSendEmail[user._id] === 'default') {
+					if (!user.settings || !user.settings.preferences || !user.settings.preferences.emailNotificationMode || user.settings.preferences.emailNotificationMode === 'all') { //Mention/DM
+						usersToSendEmail[user._id] === 'mention';
+					} else {
+						return;
+					}
 				}
 
 				// Checks if user is in the room he/she is mentioned (unless it's public channel)
diff --git a/packages/rocketchat-lib/server/models/Subscriptions.js b/packages/rocketchat-lib/server/models/Subscriptions.js
index 667855282b4..d42bdb66990 100644
--- a/packages/rocketchat-lib/server/models/Subscriptions.js
+++ b/packages/rocketchat-lib/server/models/Subscriptions.js
@@ -157,6 +157,18 @@ class ModelSubscriptions extends RocketChat.models._Base {
 		return this.find(query);
 	}
 
+	findByRoomIdAndUserIdsOrAllMessages(roomId, userIds) {
+		const query = {
+			rid: roomId,
+			$or: [
+				{ 'u._id': { $in: userIds } },
+				{ emailNotifications: 'all' }
+			]
+		};
+
+		return this.find(query);
+	}
+
 	findUnreadByUserId(userId) {
 		const query = {
 			'u._id': userId,

From 74f85fd4ba5d417d59fb435b1b7da4ed5fb4a6f8 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 13 Sep 2017 19:32:19 -0300
Subject: [PATCH 054/244] Merge pull request #8099 from
 RocketChat/set-avatar-on-ldap-login

[FIX] Fix setting user avatar on LDAP login
---
 packages/rocketchat-ldap/server/sync.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 13e52e0795e..ead2ebebf1a 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -163,11 +163,13 @@ syncUserData = function syncUserData(user, ldapUser) {
 				type: 'image/jpeg'
 			};
 
-			fileStore.insert(file, rs, () => {
-				Meteor.setTimeout(function() {
-					RocketChat.models.Users.setAvatarOrigin(user._id, 'ldap');
-					RocketChat.Notifications.notifyLogged('updateAvatar', {username: user.username});
-				}, 500);
+			Meteor.runAsUser(user._id, () => {
+				fileStore.insert(file, rs, () => {
+					Meteor.setTimeout(function() {
+						RocketChat.models.Users.setAvatarOrigin(user._id, 'ldap');
+						RocketChat.Notifications.notifyLogged('updateAvatar', {username: user.username});
+					}, 500);
+				});
 			});
 		}
 	}

From eab15e96c87ec5a9056feb6af73ec862e0f1c183 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 14 Sep 2017 00:26:29 -0300
Subject: [PATCH 055/244] Merge pull request #8122 from
 RocketChat/hotifx/settings-description-fix

[FIX] Settings description not showing
---
 .../server/autotranslate.js                         |  2 +-
 packages/rocketchat-markdown/markdown.js            | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
index f54cd2bdd30..093cd200508 100644
--- a/packages/rocketchat-autotranslate/server/autotranslate.js
+++ b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -85,7 +85,7 @@ class AutoTranslate {
 		let count = message.tokens.length;
 
 		message.html = message.msg;
-		message = RocketChat.Markdown.parseNotEscaped(message);
+		message = RocketChat.Markdown.parseMessageNotEscaped(message);
 		message.msg = message.html;
 
 		for (const tokenIndex in message.tokens) {
diff --git a/packages/rocketchat-markdown/markdown.js b/packages/rocketchat-markdown/markdown.js
index b70aa359fc3..facb01fa343 100644
--- a/packages/rocketchat-markdown/markdown.js
+++ b/packages/rocketchat-markdown/markdown.js
@@ -19,10 +19,17 @@ class MarkdownClass {
 		const message = {
 			html: _.escapeHTML(text)
 		};
-		return this.parseNotEscaped(message).html;
+		return this.parseMessageNotEscaped(message).html;
 	}
 
-	parseNotEscaped(message) {
+	parseNotEscaped(text) {
+		const message = {
+			html: text
+		};
+		return this.parseMessageNotEscaped(message).html;
+	}
+
+	parseMessageNotEscaped(message) {
 		const parser = RocketChat.settings.get('Markdown_Parser');
 		if (typeof parsers[parser] === 'function') {
 			return parsers[parser](message);
@@ -37,7 +44,7 @@ RocketChat.Markdown = Markdown;
 // renderMessage already did html escape
 const MarkdownMessage = (message) => {
 	if (_.trim(message != null ? message.html : undefined)) {
-		message = Markdown.parseNotEscaped(message);
+		message = Markdown.parseMessageNotEscaped(message);
 	}
 
 	return message;

From 8643d35542ed14e80bda9fa9b165ef00eb7ba0e3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 13 Sep 2017 19:55:19 -0300
Subject: [PATCH 056/244] Merge pull request #8101 from
 RocketChat/dynamic-popover

[FIX] Dynamic popover
# Conflicts:
#	packages/rocketchat-ui-master/public/icons.svg
---
 .../rocketchat-lib/client/MessageAction.js    |  18 +--
 packages/rocketchat-lib/lib/messageBox.js     |  10 ++
 packages/rocketchat-reactions/client/init.js  |   2 +-
 .../client/imports/components/message-box.css |  43 +++---
 .../client/imports/components/messages.css    |  15 +-
 .../client/imports/components/popover.css     |  54 ++++---
 .../imports/components/sidebar/rooms-list.css |   2 +
 .../components/sidebar/sidebar-account.css    |  48 ++++++-
 .../components/sidebar/sidebar-item.css       |   8 ++
 .../imports/components/sidebar/sidebar.css    |   9 --
 .../imports/components/sidebar/toolbar.css    |  14 ++
 .../client/imports/general/base.css           |   7 +-
 .../client/imports/general/base_old.css       |  26 ++--
 .../client/imports/general/variables.css      |   2 +
 packages/rocketchat-ui-master/client/main.js  |   6 -
 .../rocketchat-ui-master/public/icons.svg     |   1 +
 .../rocketchat-ui-message/client/message.html |  26 +---
 .../rocketchat-ui-message/client/message.js   |   3 +
 .../client/messageBox.html                    |  34 +----
 .../client/messageBox.js                      |  62 ++++----
 .../startup/messageBoxActions.js              |   4 +
 .../client/accountBox.html                    |  63 +--------
 .../client/accountBox.js                      | 133 ++++++++++++------
 packages/rocketchat-ui/client/lib/popover.js  |  71 ----------
 .../client/views/app/popover.html             |  28 ++++
 .../rocketchat-ui/client/views/app/popover.js | 133 ++++++++++++++++++
 .../rocketchat-ui/client/views/app/room.js    |  41 +++++-
 packages/rocketchat-ui/package.js             |   3 +-
 .../end-to-end/ui/04-main-elements-render.js  |   2 +-
 tests/end-to-end/ui/06-messaging.js           |   2 +-
 tests/pageobjects/main-content.page.js        |  36 +++--
 tests/pageobjects/side-nav.page.js            |  16 +--
 32 files changed, 533 insertions(+), 389 deletions(-)
 delete mode 100644 packages/rocketchat-ui/client/lib/popover.js
 create mode 100644 packages/rocketchat-ui/client/views/app/popover.html
 create mode 100644 packages/rocketchat-ui/client/views/app/popover.js

diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index ad3b8557392..e73f3309bee 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -1,4 +1,4 @@
-/* globals popover chatMessages cordova */
+/* globals chatMessages cordova */
 
 import moment from 'moment';
 import toastr from 'toastr';
@@ -91,10 +91,6 @@ RocketChat.MessageAction = new class {
 		}
 		return `${ Meteor.absoluteUrl().replace(/\/$/, '') + routePath }?msg=${ msgId }`;
 	}
-
-	closePopover() {
-		popover.close();
-	}
 };
 
 Meteor.startup(function() {
@@ -120,7 +116,6 @@ Meteor.startup(function() {
 			input.value += text;
 			input.focus();
 			$(input).trigger('change').trigger('input');
-			RocketChat.MessageAction.closePopover();
 		},
 		condition(message) {
 			if (RocketChat.models.Subscriptions.findOne({rid: message.rid}) == null) {
@@ -138,10 +133,9 @@ Meteor.startup(function() {
 		icon: 'edit',
 		label: 'Edit',
 		context: ['message', 'message-mobile'],
-		action(e) {
-			const message = $(e.currentTarget).closest('.message')[0];
-			chatMessages[Session.get('openedRoom')].edit(message);
-			RocketChat.MessageAction.closePopover();
+		action() {
+			const messageId = this._arguments[1]._id;
+			chatMessages[Session.get('openedRoom')].edit(document.getElementById(messageId));
 		},
 		condition(message) {
 			if (RocketChat.models.Subscriptions.findOne({
@@ -181,7 +175,6 @@ Meteor.startup(function() {
 		context: ['message', 'message-mobile'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.closePopover();
 			chatMessages[Session.get('openedRoom')].confirmDeleteMsg(message);
 		},
 		condition(message) {
@@ -226,7 +219,6 @@ Meteor.startup(function() {
 		action(event) {
 			const message = this._arguments[1];
 			const permalink = RocketChat.MessageAction.getPermaLink(message._id);
-			RocketChat.MessageAction.closePopover();
 			if (Meteor.isCordova) {
 				cordova.plugins.clipboard.copy(permalink);
 			} else {
@@ -253,7 +245,6 @@ Meteor.startup(function() {
 		context: ['message', 'message-mobile'],
 		action(event) {
 			const message = this._arguments[1].msg;
-			RocketChat.MessageAction.closePopover();
 			if (Meteor.isCordova) {
 				cordova.plugins.clipboard.copy(message);
 			} else {
@@ -288,7 +279,6 @@ Meteor.startup(function() {
 			input.value += text;
 			input.focus();
 			$(input).trigger('change').trigger('input');
-			RocketChat.MessageAction.closePopoverreaction-message();
 		},
 		condition(message) {
 			if (RocketChat.models.Subscriptions.findOne({rid: message.rid}) == null) {
diff --git a/packages/rocketchat-lib/lib/messageBox.js b/packages/rocketchat-lib/lib/messageBox.js
index 1d0933842ac..9b5522eff81 100644
--- a/packages/rocketchat-lib/lib/messageBox.js
+++ b/packages/rocketchat-lib/lib/messageBox.js
@@ -47,4 +47,14 @@ RocketChat.messageBox.actions = new class {
 
 		return this.actions[group].filter(action => !action.condition || action.condition());
 	}
+
+	getById(id) {
+		const messageActions = this.actions;
+		let actions = [];
+		Object.keys(messageActions).forEach(function(action) {
+			actions = actions.concat(messageActions[action]);
+		});
+
+		return actions.filter(action => action.id === id);
+	}
 };
diff --git a/packages/rocketchat-reactions/client/init.js b/packages/rocketchat-reactions/client/init.js
index de0c61ad7cf..1a93a818569 100644
--- a/packages/rocketchat-reactions/client/init.js
+++ b/packages/rocketchat-reactions/client/init.js
@@ -1,5 +1,5 @@
 Template.room.events({
-	'click .add-reaction'(event) {
+	'click .add-reaction, click [data-message-action="reaction-message"]'(event) {
 		event.preventDefault();
 		event.stopPropagation();
 		const data = Blaze.getData(event.currentTarget);
diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index fcf18803583..ab9e171fb33 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -85,13 +85,13 @@
 
 		cursor: text;
 
-		line-height: 20px;
-
 		transition: background-color 0.3s;
 
 		border-width: var(--message-box-container-border-width);
 		border-color: var(--message-box-container-border-color);
 		border-radius: var(--message-box-container-border-radius);
+
+		line-height: 20px;
 		align-items: center;
 
 		&.editing {
@@ -138,29 +138,12 @@
 		}
 	}
 
-	&__action-label {
+	&__action-menu {
 		position: relative;
 
-		& #rc-message-box__action-input:checked ~ .rc-message-box__icon .rc-input__icon-svg {
+		&.active .rc-input__icon-svg--plus {
 			transform: rotate(135deg);
 		}
-
-		& .rc-popover {
-			right: 18px;
-			bottom: 30px;
-
-			&__column {
-				justify-content: space-between;
-			}
-
-			&__title {
-				text-transform: none;
-
-				color: var(--message-box-popover-title-text-color);
-
-				font-size: var(--message-box-popover-title-text-size);
-			}
-		}
 	}
 
 	& [data-small] {
@@ -242,3 +225,21 @@
 		}
 	}
 }
+
+.rc-popover--message-box {
+	& .rc-popover__divider {
+		display: none;
+	}
+
+	& .rc-popover__title {
+		text-transform: none;
+
+		color: var(--message-box-popover-title-text-color);
+
+		font-size: var(--message-box-popover-title-text-size);
+
+		&:not(:first-child) {
+			margin-top: var(--popover-column-padding);
+		}
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 9050a20ad9d..b316221e827 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -21,18 +21,18 @@
 		}
 	}
 
-	&__label {
+	&__menu {
 		padding: 2px 0;
 
 		cursor: pointer;
 
-		&:hover {
-			color: var(--color-button-primary);
+		&:hover &-icon {
+			fill: var(--color-button-primary);
 		}
-	}
 
-	&__menu {
-		fill: currentColor;
+		&-icon {
+			fill: currentColor;
+		}
 	}
 }
 
@@ -56,10 +56,11 @@
 		display: block;
 
 		visibility: hidden;
-		opacity: 0;
 
 		width: 0;
 		height: 0;
+
+		opacity: 0;
 	}
 
 	& .rc-popover {
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 5d8aeb9ff41..1120245de5e 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -20,29 +20,30 @@
 	}
 }
 
-.rc-popover-anchor {
-	display: none;
-
-	&:checked + .rc-popover {
-		@apply --rc-popover-open;
-	}
-}
-
 .rc-popover {
-	position: absolute;
+	position: fixed;
 	z-index: 9999;
 
+	top: 0;
+	left: 0;
+
 	display: none;
-	will-change: transform;
+
+	width: 100vw;
+	height: 100vh;
 
 	&__content {
+		position: absolute;
+
 		display: flex;
 
 		padding: var(--popover-padding);
 
+		animation: dropdown-show 0.1s cubic-bezier(0.45, 0.05, 0.55, 0.95);
+
 		white-space: nowrap;
 
-		cursor: default;
+		opacity: 0;
 
 		border-radius: var(--popover-radius);
 		background-color: var(--popover-background);
@@ -119,6 +120,10 @@
 		margin: 1rem 0;
 
 		background: var(--popover-divider-color);
+
+		&:last-child {
+			display: none;
+		}
 	}
 }
 
@@ -126,6 +131,21 @@
 	fill: currentColor;
 }
 
+@media (width <= 400px) {
+	.rc-popover {
+		& .rc-popover__content {
+			top: initial !important;
+			bottom: 0;
+			left: 0 !important;
+
+			width: calc(100vw - 16px) !important;
+			margin: 8px !important;
+
+			animation: dropup-show 0.3s cubic-bezier(0.45, 0.05, 0.55, 0.95);
+		}
+	}
+}
+
 @keyframes dropdown-show {
 	0% {
 		transform: translate(0, -2%);
@@ -153,15 +173,3 @@
 		opacity: 1;
 	}
 }
-
-@media (width <= 400px) {
-	.rc-popover {
-		&-anchor:checked + .rc-popover {
-			@apply --rc-popover-open-mobile;
-		}
-
-		&--show {
-			@apply --rc-popover-open-mobile;
-		}
-	}
-}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 4fc2a652609..b2ea7764e72 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -55,6 +55,8 @@
 
 		&__toolbar-search {
 			bottom: 0;
+
+			padding: 0 var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding);
 		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 6962e7681d1..21d020efb86 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -1,9 +1,18 @@
 .sidebar__account {
 	display: flex;
 
-	margin-bottom: 12px;
+	margin: calc(var(--sidebar-default-padding) / 2) 0;
+
+	padding: calc(var(--sidebar-default-padding) / 2) var(--sidebar-default-padding);
+
 	align-items: center;
 
+	&.active:hover {
+		cursor: pointer;
+
+		background-color: var(--sidebar-background-hover);
+	}
+
 	&--lighten {
 		& .sidebar__account-username {
 			color: var(--sidebar-account-username-color-darker);
@@ -34,7 +43,6 @@
 	}
 
 	&-username {
-
 		overflow: hidden;
 		flex: 1;
 
@@ -53,7 +61,6 @@
 
 	&-visual-status {
 		max-width: 124px;
-		margin-right: 8px;
 
 		user-select: none;
 
@@ -129,6 +136,7 @@
 @media (width <= 400px) {
 	.sidebar__account {
 		margin: 0 0 5px;
+		padding: 5px var(--sidebar-small-default-padding);
 
 		&-thumb {
 
@@ -163,3 +171,37 @@
 		}
 	}
 }
+
+.rc-popover--account {
+	& [data-type="set-state"] {
+		& .rc-icon {
+			font-size: var(--sidebar-account-status-bullet-size);
+		}
+
+		&.rc-popover__item {
+			&--online {
+				& .rc-icon {
+					color: var(--status-online);
+				}
+			}
+
+			&--away {
+				& .rc-icon {
+					color: var(--status-away);
+				}
+			}
+
+			&--busy {
+				& .rc-icon {
+					color: var(--status-busy);
+				}
+			}
+
+			&--offline {
+				& .rc-icon {
+					color: var(--status-invisible);
+				}
+			}
+		}
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 0ce2156fd2e..69e92697b09 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -68,11 +68,15 @@
 
 	&__user-status {
 		position: absolute;
+
+		top: 50%;
 		left: 4px;
 
 		width: var(--sidebar-item-user-status-size);
 		height: var(--sidebar-item-user-status-size);
 
+		transform: translateY(-50%);
+
 		border-radius: var(--sidebar-item-user-status-radius);
 
 		&--online {
@@ -114,6 +118,10 @@
 	.sidebar-item {
 		padding-left: 0;
 
+		& .badge {
+			margin: 0 0 0 3px;
+		}
+
 		&__user-status {
 			right: calc(100% + var(--sidebar-small-item-user-status-size));
 			left: auto;
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index 5675d3c5b9c..104b0f1fae2 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -57,10 +57,6 @@
 		}
 	}
 
-	&__header {
-		padding: var(--sidebar-default-padding);
-	}
-
 	& .unread-rooms {
 		display: none;
 	}
@@ -87,11 +83,6 @@
 
 		width: var(--sidebar-small-width);
 
-		&__header {
-			height: auto;
-			padding: var(--sidebar-small-default-padding);
-		}
-
 		& .unread-rooms,
 		& .rooms-list {
 			padding: 0 var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding);
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index db7694c823d..0eb1f136a9e 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -1,4 +1,6 @@
 .toolbar {
+	padding: 0 var(--sidebar-default-padding) var(--sidebar-default-padding);
+
 	&__wrapper {
 		display: flex;
 
@@ -29,6 +31,12 @@
 
 	&__icon {
 		&--plus {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+
+			transform: translate(-50%, -50%);
+
 			font-size: 1.25rem;
 		}
 	}
@@ -88,3 +96,9 @@
 		font-size: 1rem;
 	}
 }
+
+@media (width <= 400px) {
+	.toolbar {
+		padding: 0 var(--sidebar-small-default-padding) var(--sidebar-small-default-padding);
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index 2970fad81b2..3cf4e4b2b3a 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -101,10 +101,11 @@ button {
 }
 
 .rc-icon {
+
+	overflow: hidden;
+
 	width: 1em;
-  height: 1em;
+	height: 1em;
 
 	vertical-align: -0.15em;
-
-  overflow: hidden;
 }
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 1af8c5caeaf..d5d378fb839 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3236,8 +3236,8 @@
 			overflow: auto;
 
 			& tr {
-				background-color: #ffffff;
 				border-top: 1px solid #cccccc;
+				background-color: #ffffff;
 
 				&:nth-child(2n) {
 					background-color: #f6f8fa;
@@ -3250,6 +3250,7 @@
 				& th,
 				& td {
 					padding: 6px 13px;
+
 					border: 1px solid #dddddd;
 				}
 			}
@@ -3257,10 +3258,11 @@
 
 		& > hr {
 			height: 3px;
-			padding: 0;
 			margin: 12px 0;
-			background-color: #e7e7e7;
+			padding: 0;
+
 			border: 0;
+			background-color: #e7e7e7;
 		}
 	}
 
@@ -3276,17 +3278,20 @@
 }
 
 .rc-old .image-labels {
-	margin: 5px 0 25px;
 	display: flex;
+
+	margin: 5px 0 25px;
 	flex-wrap: wrap;
 }
 
 .rc-old .image-label {
+	margin-top: 5px;
+	margin-right: 5px;
 	padding: 9px 4px;
+
 	border-radius: 2px;
+
 	font-size: 12px;
-	margin-right: 5px;
-	margin-top: 5px;
 
 	&:last-child {
 		margin-right: 0;
@@ -3537,11 +3542,12 @@ body:not(.is-cordova) {
 			}
 
 			& .section {
+				margin: 20px;
+				padding: 20px;
+
 				border: 1px solid #dddddd;
 				border-radius: 4px;
 				background-color: #ffffff;
-				padding: 20px;
-				margin: 20px;
 			}
 
 			& > .animated {
@@ -5188,18 +5194,20 @@ body:not(.is-cordova) {
 	&__content {
 		display: flex;
 		flex-direction: column;
+
 		height: 100%;
 		padding: 20px;
 	}
 
 	&__header {
 		flex: 0 0 auto;
+
 		padding-bottom: 10px;
 	}
 
 	&__result {
+		overflow-y: auto;
 		flex: 1 1 auto;
-    overflow-y: auto;
 	}
 
 	& .message-cog-container {
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index ec77c769554..65442b56314 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -129,7 +129,9 @@
 	--sidebar-width: 280px;
 	--sidebar-small-width: 90%;
 	--sidebar-background: var(--color-primary);
+	--sidebar-background-hover: var(--color-dark-medium);
 	--sidebar-background-light: var(--color-gray-lightest);
+	--sidebar-background-light-hover: var(--color-gray-light);
 	--sidebar-default-padding: 24px;
 	--sidebar-small-default-padding: 16px;
 	--sidebar-header-padding: var(--sidebar-default-padding);
diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index 902e3bbca8c..f784ab6cbc0 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -68,8 +68,6 @@ Template.body.onRendered(function() {
 	});
 
 	$(document.body).on('click', function(e) {
-		const target = $(e.target);
-
 		if (e.target.tagName === 'A') {
 			const link = e.currentTarget;
 			if (link.origin === s.rtrim(Meteor.absoluteUrl(), '/') && /msg=([a-zA-Z0-9]+)/.test(link.search)) {
@@ -83,10 +81,6 @@ Template.body.onRendered(function() {
 				return FlowRouter.go(link.pathname + link.search, null, FlowRouter.current().queryParams);
 			}
 		}
-
-		if ([...target[0].classList].includes('rc-popover') || target.closest('[data-popover="label"], [data-popover="popover"]').length === 0 && target.data('popover') !== 'anchor') {
-			$('[data-popover="anchor"]:checked').prop('checked', false);
-		}
 	});
 
 	Tracker.autorun(function(c) {
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index 3dde382977a..9307d5af1fd 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -60,4 +60,5 @@
     <symbol viewBox="0 0 20 20" id="icon-cross-circled"><path d="M733.808 723.266l-208.874-185.666 208.874-185.667c10.566-9.394 11.518-25.574 2.126-36.141-9.394-10.566-25.574-11.522-36.142-2.126l-213.392 189.682-213.392-189.68c-10.568-9.392-26.749-8.44-36.141 2.126-9.394 10.566-8.442 26.749 2.126 36.141l208.874 185.666-208.875 185.666c-10.566 9.394-11.518 25.574-2.126 36.142 5.059 5.691 12.085 8.592 19.142 8.592 6.048 0 12.122-2.131 16.998-6.466l213.394-189.683 213.392 189.683c4.878 4.334 10.949 6.466 16.998 6.466 7.058 0 14.086-2.902 19.144-8.592 9.392-10.568 8.44-26.749-2.126-36.142z"></path><path d="M486.4 1024c-129.922 0-252.067-50.594-343.936-142.464s-142.464-214.014-142.464-343.936c0-129.923 50.595-252.067 142.464-343.936s214.013-142.464 343.936-142.464c129.922 0 252.067 50.595 343.936 142.464s142.464 214.014 142.464 343.936-50.594 252.067-142.464 343.936c-91.869 91.87-214.014 142.464-343.936 142.464zM486.4 102.4c-239.97 0-435.2 195.23-435.2 435.2s195.23 435.2 435.2 435.2 435.2-195.23 435.2-435.2-195.23-435.2-435.2-435.2z"></path></symbol>
     <symbol viewBox="0 0 20 20" id="icon-jump"><path d="M11.6 7.257V4L18 9.7l-6.4 5.7v-3.257S2 11.385 2 16c0-9.23 9.6-8.743 9.6-8.743z" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-flag"><path d="M12.928 6.063l3.263-3.77a.74.74 0 0 0 .112-.759.71.71 0 0 0-.647-.422H3.141v17.72h1.406v-7.876h11.11a.71.71 0 0 0 .646-.422.691.691 0 0 0-.112-.759l-3.263-3.713zM4.547 9.578V2.547h9.562l-2.643 3.065c-.225.254-.225.647 0 .929l2.643 3.065H4.547v-.028z" fill-rule="nonzero" fill="currentColor"/></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-circle"><circle cx="10" cy="10" r="9" fill="currentColor" fill-rule="evenodd"/></symbol>
 </svg>
diff --git a/packages/rocketchat-ui-message/client/message.html b/packages/rocketchat-ui-message/client/message.html
index 65bf1ae27b6..e871bc1b232 100644
--- a/packages/rocketchat-ui-message/client/message.html
+++ b/packages/rocketchat-ui-message/client/message.html
@@ -1,5 +1,5 @@
 <template name="message">
-	<li id="{{actionContext}}{{_id}}" class="message background-transparent-dark-hover {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
+	<li id="{{_id}}" data-context={{actionContext}} class="message background-transparent-dark-hover {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
 		{{#if avatar}}
 			{{#if avatarFromUsername}}
 				<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</button>
@@ -73,28 +73,8 @@
 					</div>
 				{{/if}}
 				{{#if messageActions 'menu'}}
-					<label class="message-actions__label" for="message-actions__menu--{{_id}}{{actionContext}}" data-popover="label">
-						{{> icon block="message-actions__menu" icon="menu"}}
-					</label>
-					<input id="message-actions__menu--{{_id}}{{actionContext}}" type="checkbox" class="rc-popover-anchor" data-popover="anchor">
-					<div class="rc-popover" data-popover="popover">
-					<div class="rc-popover__wrapper"></div>
-						<div class="rc-popover__content">
-							<div class="rc-popover__column">
-								<ul class="rc-popover__list">
-									{{#each action in messageActions 'menu'}}
-										<li class="rc-popover__item {{action.classes}}" data-message-action="{{action.id}}">
-											{{#if action.icon}}
-												<span class="rc-popover__icon">
-													{{> icon block="rc-popover__icon-element" icon=action.icon}}
-												</span>
-											{{/if}}
-											<span class="rc-popover__item-text">{{_ action.label}}</span>
-										</li>
-									{{/each}}
-								</ul>
-							</div>
-						</div>
+					<div class="message-actions__menu">
+						{{> icon block="message-actions__menu-icon" icon="menu"}}
 					</div>
 				{{/if}}
 			</div>
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index 91ea4cce375..cd142696d30 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -265,6 +265,9 @@ Template.message.helpers({
 			return 'hidden';
 		}
 	},
+	actionContext() {
+		return this.actionContext;
+	},
 	messageActions(group) {
 		let messageGroup = group;
 		let context = this.actionContext;
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 0107194b914..e506486f4ed 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -92,7 +92,7 @@
 </template>
 <template name="messageBox__actionsSmall">
 	<div class="js-message-actions rc-message-box__action-label" data-small>
-		{{# each actions }}
+		{{#each actions }}
 			<span class="js-message-action">
 				{{> icon block="rc-message-box__action" icon=icon }}
 			</span>
@@ -101,37 +101,11 @@
 	{{> Template.contentBlock}}
 </template>
 <template name="messageBox__actions">
-	<label class="rc-message-box__action-label" for="rc-message-box__action-input" data-popover="label" data-desktop>
-		<input id="rc-message-box__action-input" type="checkbox" class="rc-popover-anchor" data-popover="anchor">
-		<div class="rc-popover js-message-actions" data-popover="popover">
-			<div class="rc-popover__content">
-				{{# each column in columns }}
-					<div class="rc-popover__column">
-						{{#each group in column }}
-							<div class="rc-popover__column-wrapper">
-								<h3 class="rc-popover__title">{{_ group.name}}</h3>
-								<ul class="rc-popover__list">
-									{{#each group.actions }}
-										<li class="rc-popover__item" data-action="open" data-open="account">
-											{{#if icon}}
-												<span class="rc-popover__icon">
-													{{> icon block="rc-popover__icon-element" icon=icon }}
-												</span>
-											{{/if}}
-											<span class="rc-popover__item-text">{{_ label}}</span>
-										</li>
-									{{/each}}
-								</ul>
-							</div>
-						{{/each}}
-					</div>
-				{{/each}}
-			</div>
-		</div>
-		{{#if columns}}
+	<div class="rc-message-box__action-menu" data-desktop>
+		{{#if actions}}
 			<div class="rc-message-box__icon">
 				{{> icon block="rc-input__icon-svg" icon="plus"}}
 			</div>
 		{{/if}}
-	</label>
+	</div>
 </template>
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 94a272e627f..056c18daff7 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -1,4 +1,4 @@
-/* globals fileUpload KonchatNotification chatMessages */
+/* globals fileUpload KonchatNotification chatMessages popover */
 import toastr from 'toastr';
 import moment from 'moment';
 
@@ -134,29 +134,6 @@ const methods = {
 	actions() {
 		const groups = RocketChat.messageBox.actions.get();
 		return Object.keys(groups).reduce((ret, el) => ret.concat(groups[el]), []);
-	},
-	columns() {
-		const groups = RocketChat.messageBox.actions.get();
-		const sorted = Object.keys(groups).sort((a, b) => groups[b].length - groups[a].length);
-		const totalColumn = sorted.reduce((total, key) => total + groups[key].length, 0);
-		const totalPerColumn = Math.ceil(totalColumn / 2);
-		const columns = [];
-
-		let counter = 0;
-		let index = 0;
-		sorted.forEach(key => {
-			const actions = groups[key];
-			columns[index] = columns[index] || [];
-			counter += actions.length;
-			columns[index].push({name: key, actions});
-
-			if (counter > totalPerColumn) {
-				counter = 0;
-				index++;
-			}
-		});
-
-		return columns;
 	}
 };
 
@@ -445,8 +422,43 @@ Template.messageBox.events({
 	},
 	'click .js-md'(e, t) {
 		applyMd.apply(this, [e, t]);
-	}
+	},
+	'click .rc-message-box__action-menu'(e) {
+		const groups = RocketChat.messageBox.actions.get();
 
+		const config = {
+			popoverClass: 'message-box',
+			columns: [
+				{
+					groups: Object.keys(groups).map(group => {
+						const items = [];
+						groups[group].forEach(item => {
+							items.push({
+								icon: item.icon,
+								name: t(item.label),
+								type: 'messagebox-action',
+								id: item.id
+							});
+						});
+						return {
+							title: t(group),
+							items
+						};
+					})
+				}
+			],
+			mousePosition: {
+				x: document.querySelector('.rc-message-box__textarea').getBoundingClientRect().right + 10,
+				y: document.querySelector('.rc-message-box__textarea').getBoundingClientRect().top
+			},
+			data: {
+				rid: this._id
+			},
+			activeElement: e.currentTarget
+		};
+
+		popover.open(config);
+	}
 });
 
 Template.messageBox.onRendered(function() {
diff --git a/packages/rocketchat-ui-message/startup/messageBoxActions.js b/packages/rocketchat-ui-message/startup/messageBoxActions.js
index 9f23d240874..4a115fe7b76 100644
--- a/packages/rocketchat-ui-message/startup/messageBoxActions.js
+++ b/packages/rocketchat-ui-message/startup/messageBoxActions.js
@@ -4,6 +4,7 @@ import mime from 'mime-type/with-db';
 import {VRecDialog} from 'meteor/rocketchat:ui-vrecord';
 
 RocketChat.messageBox.actions.add('Create_new', 'Video_message', {
+	id: 'video-message',
 	icon: 'video',
 	condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_VideoRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/video\/webm|video\/\*/i)),
 	action({messageBox}) {
@@ -12,6 +13,7 @@ RocketChat.messageBox.actions.add('Create_new', 'Video_message', {
 });
 
 RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
+	id: 'audio-message',
 	icon: 'mic',
 	condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/wav|audio\/\*/i)),
 	action({event, element}) {
@@ -41,6 +43,7 @@ RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
 
 
 RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
+	id: 'file-upload',
 	icon: 'computer',
 	condition: () => RocketChat.settings.get('FileUpload_Enabled'),
 	action() {
@@ -73,6 +76,7 @@ RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
 });
 
 RocketChat.messageBox.actions.add('Share', 'My_location', {
+	id: 'share-location',
 	icon: 'map-pin',
 	condition: () => RocketChat.Geolocation.get() !== false,
 	action({rid}) {
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.html b/packages/rocketchat-ui-sidenav/client/accountBox.html
index 3953ddcc1a8..36f5a8246d4 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.html
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.html
@@ -1,5 +1,5 @@
 <template name="accountBox">
-	<div class="sidebar__account {{#if lighten}}sidebar__account--lighten{{/if}}" aria-label="{{_ "Account"}}" role="region">
+	<div class="sidebar__account {{#if lighten}}sidebar__account--lighten{{/if}} {{#unless isAnonymous}}active{{/unless}}" aria-label="{{_ "Account"}}" role="region">
 		{{#with myUserInfo}}
 			{{#if username}}
 				<div class="sidebar__account-thumb" data-status='{{visualStatus}}'>
@@ -13,67 +13,8 @@
 					</div>
 				</div>
 				{{#unless isAnonymous}}
-					<label class="sidebar__account-label" for="sidebar__account-menu{{../modifier}}" data-popover="label">
+					<label class="sidebar__account-label">
 						{{> icon block="sidebar__account-menu" icon="menu"}}
-						<input id="sidebar__account-menu{{../modifier}}" type="checkbox" class="rc-popover-anchor" data-popover="anchor" {{isAnonymous}}>
-						<div class="rc-popover" data-popover="popover">
-							<div class="rc-popover__content">
-								<div class="rc-popover__column">
-									<h3 class="rc-popover__title">{{_ "User"}}</h3>
-									<ul class="rc-popover__list">
-										<li class="rc-popover__item" data-status="online" data-action="set-state">
-											<div class="sidebar__account-status-bullet sidebar__account-status-bullet--online rc-popover__item-icon"></div>
-											<span class="rc-popover__item-text">{{_ "Online"}}</span>
-										</li>
-										<li class="rc-popover__item" data-status="away" data-action="set-state">
-											<div class="sidebar__account-status-bullet sidebar__account-status-bullet--away rc-popover__item-icon"></div>
-											<span class="rc-popover__item-text">{{_ "Away" context="male"}}</span>
-										</li>
-										<li class="rc-popover__item" data-status="busy" data-action="set-state">
-											<div class="sidebar__account-status-bullet sidebar__account-status-bullet--busy rc-popover__item-icon"></div>
-											<span class="rc-popover__item-text">{{_ "Busy" context="male"}}</span>
-										</li>
-										<li class="rc-popover__item" data-status="offline" data-action="set-state">
-											<div class="sidebar__account-status-bullet sidebar__account-status-bullet--invisible rc-popover__item-icon"></div>
-											<span class="rc-popover__item-text">{{_ "Invisible"}}</span>
-										</li>
-									</ul>
-									<span class="rc-popover__divider"></span>
-									<ul class="rc-popover__list">
-										{{#each registeredMenus}}
-											<li class="rc-popover__item" data-action="open">
-												{{#if icon}}
-													<span class="rc-popover__icon">
-														{{> icon block="rc-popover__icon-element" icon=icon }}
-													</span>
-												{{/if}}
-												<span class="rc-popover__item-text">{{name}}</span>
-											</li>
-										{{/each}}
-										{{#if showAdminOption}}
-											<li class="rc-popover__item" data-action="open" data-open="administration">
-												<span class="rc-popover__icon">
-													{{> icon block="rc-popover__icon-element" icon="customize"}}
-												</span>
-												<span class="rc-popover__item-text">{{_ "Administration"}}</span>
-											</li>
-										{{/if}}
-										<li class="rc-popover__item" data-action="open" data-open="account">
-											<span class="rc-popover__icon">
-												{{> icon block="rc-popover__icon-element" icon="user"}}
-											</span>
-											<span class="rc-popover__item-text">{{_ "My_Account"}}</span>
-										</li>
-										<li class="rc-popover__item" data-action="open" data-open="logout">
-											<span class="rc-popover__icon">
-												{{> icon block="rc-popover__icon-element" icon="sign-out"}}
-											</span>
-											<span class="rc-popover__item-text">{{_ "Logout"}}</span>
-										</li>
-									</ul>
-								</div>
-							</div>
-						</div>
 					</label>
 				{{/unless}}
 			{{/if}}
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js
index f932240889f..4ce10ac67b1 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.js
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.js
@@ -1,3 +1,5 @@
+/* globals popover */
+
 Template.accountBox.helpers({
 	myUserInfo() {
 		if (Meteor.user() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
@@ -26,14 +28,6 @@ Template.accountBox.helpers({
 		};
 	},
 
-	showAdminOption() {
-		return RocketChat.authz.hasAtLeastOnePermission(['view-statistics', 'view-room-administration', 'view-user-administration', 'view-privileged-setting' ]) || (RocketChat.AdminBox.getOptions().length > 0);
-	},
-
-	registeredMenus() {
-		return AccountBox.getItems();
-	},
-
 	isAnonymous() {
 		if (Meteor.user() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
 			return 'disabled';
@@ -42,48 +36,95 @@ Template.accountBox.helpers({
 });
 
 Template.accountBox.events({
-	'click [data-action="set-state"]'(e) {
-		e.preventDefault();
-		AccountBox.setStatus(e.currentTarget.dataset.status);
-		$('[data-popover="anchor"]:checked').prop('checked', false);
-		RocketChat.callbacks.run('userStatusManuallySet', e.currentTarget.dataset.status);
-	},
-
-	'click [data-action="open"]'(e) {
-		e.preventDefault();
-		$('[data-popover="anchor"]:checked').prop('checked', false);
+	'click .sidebar__account.active'() {
+		let adminOption;
+		if (RocketChat.authz.hasAtLeastOnePermission(['view-statistics', 'view-room-administration', 'view-user-administration', 'view-privileged-setting' ]) || (RocketChat.AdminBox.getOptions().length > 0)) {
+			adminOption = {
+				icon: 'customize',
+				name: t('Administration'),
+				type: 'open',
+				id: 'administration'
+			};
+		}
 
-		const open = e.currentTarget.dataset.open;
+		const accountBox = document.querySelector('.sidebar__account');
 
-		switch (open) {
-			case 'account':
-				SideNav.setFlex('accountFlex');
-				SideNav.openFlex();
-				FlowRouter.go('account');
-				break;
-			case 'logout':
-				const user = Meteor.user();
-				Meteor.logout(() => {
-					RocketChat.callbacks.run('afterLogoutCleanUp', user);
-					Meteor.call('logoutCleanUp', user);
-					FlowRouter.go('home');
-				});
-				break;
-			case 'administration':
-				SideNav.setFlex('adminFlex');
-				SideNav.openFlex();
-				FlowRouter.go('admin-info');
-				break;
-		}
+		const config = {
+			popoverClass: 'account',
+			columns: [
+				{
+					groups: [
+						{
+							title: t('User'),
+							items: [
+								{
+									icon: 'circle',
+									name: t('Online'),
+									type: 'set-state',
+									id: 'online',
+									class: 'online'
+								},
+								{
+									icon: 'circle',
+									name: t('Away'),
+									type: 'set-state',
+									id: 'away',
+									class: 'away'
+								},
+								{
+									icon: 'circle',
+									name: t('Busy'),
+									type: 'set-state',
+									id: 'busy',
+									class: 'busy'
+								},
+								{
+									icon: 'circle',
+									name: t('Invisible'),
+									type: 'set-state',
+									id: 'offline',
+									class: 'offline'
+								}
+							]
+						},
+						{
+							items: AccountBox.getItems().map(item => {
+								return {
+									icon: item.icon,
+									name: t(item.name),
+									type: 'open',
+									id: item.name
+								};
+							}).concat([
+								adminOption,
+								{
+									icon: 'user',
+									name: t('My_Account'),
+									type: 'open',
+									id: 'account'
+								},
+								{
+									icon: 'sign-out',
+									name: t('Logout'),
+									type: 'open',
+									id: 'logout'
+								}
+							])
+						}
 
-		if (this.href) {
-			FlowRouter.go(this.href);
-		}
+					]
+				}
+			],
+			position: {
+				top: accountBox.offsetHeight + parseInt(getComputedStyle(accountBox)['padding-bottom'].replace('px', '')),
+				left: parseInt(getComputedStyle(accountBox)['padding-left'].replace('px', ''))
+			},
+			customCSSProperties: {
+				width: `${ accountBox.offsetWidth - parseInt(getComputedStyle(accountBox)['padding-left'].replace('px', '')) * 2 }px`
+			}
+		};
 
-		if (this.sideNav != null) {
-			SideNav.setFlex(this.sideNav);
-			SideNav.openFlex();
-		}
+		popover.open(config);
 	}
 });
 
diff --git a/packages/rocketchat-ui/client/lib/popover.js b/packages/rocketchat-ui/client/lib/popover.js
deleted file mode 100644
index decb18e3e30..00000000000
--- a/packages/rocketchat-ui/client/lib/popover.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* globals popover */
-
-this.popover = {
-	close() {
-		document.querySelectorAll('[data-popover="anchor"]:checked').forEach((checkbox) => {
-			checkbox.checked = false;
-		});
-	}
-};
-
-function preventDefault(e) {
-	e = e || window.event;
-	if (e.preventDefault) {
-		e.preventDefault();
-	}
-	e.returnValue = false;
-}
-
-function enableWindowScroll() {
-	if (window.removeEventListener) {
-		window.removeEventListener('DOMMouseScroll', preventDefault, false);
-	}
-	window.onmousewheel = document.onmousewheel = null;
-	window.onwheel = null;
-}
-
-function disableWindowScroll() {
-	if (window.addEventListener) {
-		window.addEventListener('DOMMouseScroll', preventDefault, false);
-	}
-	window.onwheel = preventDefault;
-}
-
-$(document).on('click', function(e) {
-	const element = $(e.target);
-	if ($(element).parents('.message').length) {
-		if ($(element).data('popover') === 'label' || $(element).data('popover') === 'anchor') {
-			disableWindowScroll();
-
-			$(element).parents('.message').addClass('active');
-
-			const popover = $(element).siblings('.rc-popover');
-			const popoverContent = popover.children('.rc-popover__content');
-			setTimeout(function() {
-				const popoverWidth = popoverContent.outerWidth();
-				const popoverHeight = popoverContent.outerHeight();
-				const popoverHeightHalf = popoverContent.outerHeight() / 2;
-				const pointer = $(e.target).offset().top - $('.messages-container header').outerHeight();
-				const roomHeight = $('.messages-box').outerHeight();
-
-				let top;
-				if (pointer + popoverHeightHalf > roomHeight) {
-					top = popoverHeight - (roomHeight - pointer);
-				} else if (popoverHeightHalf < pointer) {
-					top = popoverHeightHalf;
-				} else {
-					top = pointer - 10;
-				}
-
-				popover.css({
-					top: -top,
-					right: popoverWidth + 30
-				});
-			}, 100);
-		} else if ($(element).hasClass('rc-popover__wrapper') || $(element).hasClass('rc-popover__item-text') || $(element).hasClass('rc-popover__icon-element')) {
-			enableWindowScroll();
-			$(element).parents('.message').removeClass('active');
-			popover.close();
-		}
-	}
-});
diff --git a/packages/rocketchat-ui/client/views/app/popover.html b/packages/rocketchat-ui/client/views/app/popover.html
new file mode 100644
index 00000000000..3bb07ae5419
--- /dev/null
+++ b/packages/rocketchat-ui/client/views/app/popover.html
@@ -0,0 +1,28 @@
+<template name="popover">
+	<div class="rc-popover rc-popover--{{popoverClass}}" data-popover="popover" style="display:block;">
+		<div class="rc-popover__content">
+			{{#each column in columns}}
+				<div class="rc-popover__column">
+					{{#each group in column.groups}}
+						{{#if group.title}}
+							<h3 class="rc-popover__title">{{group.title}}</h3>
+						{{/if}}
+						<ul class="rc-popover__list">
+							{{#each item in group.items}}
+							<li class="rc-popover__item rc-popover__item--{{item.class}}" data-type={{item.type}} data-id={{item.id}} >
+									{{#if item.icon}}
+										<span class="rc-popover__icon">
+											{{> icon block="rc-popover__icon-element" icon=item.icon }}
+										</span>
+									{{/if}}
+									<span class="rc-popover__item-text">{{item.name}}</span>
+								</li>
+							{{/each}}
+						</ul>
+						<span class="rc-popover__divider"></span>
+					{{/each}}
+				</div>
+			{{/each}}
+		</div>
+	</div>
+</template>
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
new file mode 100644
index 00000000000..5a55b200e43
--- /dev/null
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -0,0 +1,133 @@
+/* globals popover */
+
+this.popover = {
+	renderedPopover: null,
+	open(config) {
+		this.renderedPopover = Blaze.renderWithData(Template.popover, config, document.body);
+	},
+	close() {
+		Blaze.remove(this.renderedPopover);
+
+		const activeElement = this.renderedPopover.dataVar.curValue.activeElement;
+		if (activeElement) {
+			$(activeElement).removeClass('active');
+		}
+	}
+};
+
+Template.popover.onRendered(function() {
+	$('.rc-popover').click(function(e) {
+		if (e.currentTarget === e.target) {
+			popover.close();
+		}
+	});
+
+	const activeElement = this.data.activeElement;
+	const popoverContent = this.firstNode.children[0];
+	const position = this.data.position;
+	const customCSSProperties = this.data.customCSSProperties;
+
+	if (position) {
+		popoverContent.style.top = `${ position.top }px`;
+		popoverContent.style.left = `${ position.left }px`;
+	} else {
+		const popoverWidth = popoverContent.offsetWidth;
+		const popoverHeight = popoverContent.offsetHeight;
+		const popoverHeightHalf = popoverHeight / 2;
+		const windowWidth = window.innerWidth;
+		const windowHeight = window.innerHeight;
+		const mousePosition = this.data.mousePosition;
+
+		let top;
+		if (mousePosition.y <= popoverHeight) {
+			top = 10;
+		} else if (mousePosition.y + popoverHeightHalf > windowHeight) {
+			top = windowHeight - popoverHeight - 10;
+		} else {
+			top = mousePosition.y - popoverHeightHalf;
+		}
+
+		let right;
+		if (mousePosition.x + popoverWidth >= windowWidth) {
+			right = mousePosition.x - popoverWidth;
+		} else if (mousePosition.x <= popoverWidth) {
+			right = 10;
+		} else if (mousePosition.x <= windowWidth / 2) {
+			right = mousePosition.x;
+		} else {
+			right = mousePosition.x - popoverWidth;
+		}
+
+		popoverContent.style.top = `${ top }px`;
+		popoverContent.style.left = `${ right }px`;
+	}
+
+	if (customCSSProperties) {
+		Object.keys(customCSSProperties).forEach(function(property) {
+			popoverContent.style[property] = customCSSProperties[property];
+		});
+	}
+
+	if (activeElement) {
+		$(activeElement).addClass('active');
+	}
+
+	popoverContent.style.opacity = 1;
+});
+
+Template.popover.events({
+	'click [data-type="messagebox-action"]'(event, t) {
+		const action = RocketChat.messageBox.actions.getById(event.currentTarget.dataset.id);
+		if ((action[0] != null ? action[0].action : undefined) != null) {
+			action[0].action({rid: t.data.data.rid, messageBox: document.querySelector('.rc-message-box'), element: event.currentTarget, event});
+			popover.close();
+		}
+	},
+	'click [data-type="message-action"]'(e, t) {
+		const button = RocketChat.MessageAction.getButtonById(e.currentTarget.dataset.id);
+		if ((button != null ? button.action : undefined) != null) {
+			button.action.call(t.data.data, e, t.data.instance);
+			popover.close();
+		}
+	},
+	'click [data-type="set-state"]'(e) {
+		AccountBox.setStatus(e.currentTarget.dataset.id);
+		RocketChat.callbacks.run('userStatusManuallySet', e.currentTarget.dataset.status);
+		popover.close();
+	},
+	'click [data-type="open"]'(e) {
+		const open = e.currentTarget.dataset.id;
+
+		switch (open) {
+			case 'account':
+				SideNav.setFlex('accountFlex');
+				SideNav.openFlex();
+				FlowRouter.go('account');
+				break;
+			case 'logout':
+				const user = Meteor.user();
+				Meteor.logout(() => {
+					RocketChat.callbacks.run('afterLogoutCleanUp', user);
+					Meteor.call('logoutCleanUp', user);
+					FlowRouter.go('home');
+				});
+				break;
+			case 'administration':
+				SideNav.setFlex('adminFlex');
+				SideNav.openFlex();
+				FlowRouter.go('admin-info');
+				break;
+		}
+
+		if (this.href) {
+			FlowRouter.go(this.href);
+		}
+
+		if (this.sideNav != null) {
+			SideNav.setFlex(this.sideNav);
+			SideNav.openFlex();
+		}
+
+		popover.close();
+	}
+});
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 192f415cd52..2eddc2d540e 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -539,13 +539,42 @@ Template.room.events({
 		Template.instance().atBottom = true;
 		return chatMessages[RocketChat.openedRoom].input.focus();
 	},
-
-	'click .message [data-message-action]'(e, t) {
-		const button = RocketChat.MessageAction.getButtonById(e.currentTarget.dataset.messageAction);
-		if ((button != null ? button.action : undefined) != null) {
-			popover.close();
-			button.action.call(this, e, t);
+	'click .message-actions__menu'(e, i) {
+		let context = $(e.target).parents('.message').data('context');
+		if (!context) {
+			context = 'message';
 		}
+
+		const [, message] = this._arguments;
+		const items = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
+			return {
+				icon: item.icon,
+				name: t(item.label),
+				type: 'message-action',
+				id: item.id
+			};
+		});
+
+		const config = {
+			columns: [
+				{
+					groups: [
+						{
+							items
+						}
+					]
+				}
+			],
+			instance: i,
+			data: this,
+			mousePosition: {
+				x: e.clientX,
+				y: e.clientY
+			},
+			activeElement: $(e.currentTarget).parents('.message')[0]
+		};
+
+		popover.open(config);
 	},
 
 	'click .mention-link'(e, instance) {
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 67525d5e89b..1dc4bc14e5b 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -47,7 +47,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/lib/msgTyping.js', 'client');
 	api.addFiles('client/lib/notification.js', 'client');
 	api.addFiles('client/lib/parentTemplate.js', 'client');
-	api.addFiles('client/lib/popover.js', 'client');
 	api.addFiles('client/lib/readMessages.js', 'client');
 	api.addFiles('client/lib/rocket.js', 'client');
 	api.addFiles('client/lib/RoomHistoryManager.js', 'client');
@@ -95,6 +94,7 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/userSearch.html', 'client');
 	api.addFiles('client/views/app/videoCall/videoButtons.html', 'client');
 	api.addFiles('client/views/app/videoCall/videoCall.html', 'client');
+	api.addFiles('client/views/app/popover.html', 'client');
 	api.addFiles('client/views/app/photoswipe.html', 'client');
 
 	api.addFiles('client/views/cmsPage.js', 'client');
@@ -112,6 +112,7 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/secretURL.js', 'client');
 	api.addFiles('client/views/app/videoCall/videoButtons.js', 'client');
 	api.addFiles('client/views/app/videoCall/videoCall.js', 'client');
+	api.addFiles('client/views/app/popover.js', 'client');
 	api.addFiles('client/views/app/photoswipe.js', 'client');
 
 	api.addFiles('client/components/icon.html', 'client');
diff --git a/tests/end-to-end/ui/04-main-elements-render.js b/tests/end-to-end/ui/04-main-elements-render.js
index ac084f11e45..516d3cfb5d1 100644
--- a/tests/end-to-end/ui/04-main-elements-render.js
+++ b/tests/end-to-end/ui/04-main-elements-render.js
@@ -91,7 +91,7 @@ describe('[Main Elements Render]', function() {
 			});
 
 			after(() => {
-				sideNav.accountMenu.click();
+				mainContent.popoverWrapper.click();
 			});
 
 			it('it should show online button', () => {
diff --git a/tests/end-to-end/ui/06-messaging.js b/tests/end-to-end/ui/06-messaging.js
index 82c766fcde5..9f97b1c3ec4 100644
--- a/tests/end-to-end/ui/06-messaging.js
+++ b/tests/end-to-end/ui/06-messaging.js
@@ -105,7 +105,7 @@ function messageActionsTest() {
 			});
 
 			after(() => {
-				mainContent.closeMessageActionMenu();
+				mainContent.popoverWrapper.click();
 			});
 
 			it('it should show the message action menu', () => {
diff --git a/tests/pageobjects/main-content.page.js b/tests/pageobjects/main-content.page.js
index d5dd2998adc..9ce677645db 100644
--- a/tests/pageobjects/main-content.page.js
+++ b/tests/pageobjects/main-content.page.js
@@ -32,20 +32,19 @@ class MainContent extends Page {
 	get lastMessageUserTag() { return browser.element('.message:last-child .role-tag'); }
 	get lastMessageImg() { return browser.element('.message:last-child .attachment-image img'); }
 	get lastMessageTextAttachment() { return browser.element('.message:last-child .attachment-text'); }
-	get messageOptionsBtn() { return browser.element('.message:last-child .message-actions__label'); }
-	get messageReply() { return browser.element('.message:last-child .rc-popover [data-message-action=reply-message]'); }
-	get messageActionMenu() { return browser.element('.message:last-child .rc-popover'); }
-	get messageActionMenuWrapper() { return browser.element('.message:last-child .rc-popover__wrapper'); }
-	get messageEdit() { return browser.element('.message:last-child .rc-popover [data-message-action=edit-message]'); }
-	get messageDelete() { return browser.element('.message:last-child .rc-popover [data-message-action=delete-message]'); }
-	get messagePermalink() { return browser.element('.message:last-child .rc-popover [data-message-action=permalink]'); }
-	get messageCopy() { return browser.element('.message:last-child .rc-popover [data-message-action=copy]'); }
-	get messageQuote() { return browser.element('.message:last-child .rc-popover [data-message-action=quote-message]'); }
-	get messageStar() { return browser.element('.message:last-child .rc-popover [data-message-action=star-message]'); }
-	get messageUnread() { return browser.element('.message:last-child .rc-popover [data-message-action=mark-message-as-unread]'); }
-	// get messageReaction() { return browser.element('.message:last-child .rc-popover [data-message-action=reaction-message]'); }
-	get messagePin() { return browser.element('.message:last-child .rc-popover [data-message-action=pin-message]'); }
-	// get messageClose() { return browser.element('.message:last-child .rc-popover [data-message-action=rc-popover-close]'); }
+	get messageOptionsBtn() { return browser.element('.message:last-child .message-actions__menu'); }
+	get messageActionMenu() { return browser.element('.rc-popover__content'); }
+	get messageReply() { return browser.element('[data-id="reply-message"][data-type="message-action"]'); }
+	get messageEdit() { return browser.element('[data-id="edit-message"][data-type="message-action"]'); }
+	get messageDelete() { return browser.element('[data-id="delete-message"][data-type="message-action"]'); }
+	get messagePermalink() { return browser.element('[data-id="permalink"][data-type="message-action"]'); }
+	get messageCopy() { return browser.element('[data-id="copy"][data-type="message-action"]'); }
+	get messageQuote() { return browser.element('[data-id="quote-message"][data-type="message-action"]'); }
+	get messageStar() { return browser.element('[data-id="star-message"][data-type="message-action"]'); }
+	get messageUnread() { return browser.element('[data-id="mark-message-as-unread"][data-type="message-action"]'); }
+	// get messageReaction() { return browser.element('.message-actions__button[data-message-action="reaction-message"]'); }
+	get messagePin() { return browser.element('[data-id="pin-message"][data-type="message-action"]'); }
+	// get messageClose() { return browser.element('[data-id="rc-popover-close"][data-type="message-action"]'); }
 
 	// Emojis
 	get emojiPickerMainScreen() { return browser.element('.emoji-picker'); }
@@ -66,6 +65,9 @@ class MainContent extends Page {
 	get emojiGrinning() { return browser.element('.emoji-picker .emoji-grinning'); }
 	get emojiSmile() { return browser.element('.emoji-picker .emoji-smile'); }
 
+	// Popover
+	get popoverWrapper() { return browser.element('.rc-popover'); }
+
 	// Sends a message and wait for the message to equal the text sent
 	sendMessage(text) {
 		this.setTextToInput(text);
@@ -124,12 +126,6 @@ class MainContent extends Page {
 		browser.pause(100);
 	}
 
-	closeMessageActionMenu() {
-		browser.moveToObject(this.messageActionMenu.selector, -30, -30);
-		browser.buttonPress(0);
-		this.messageActionMenu.waitForVisible(5000, true);
-	}
-
 	setLanguageToEnglish() {
 		this.settingLanguageSelect.click();
 		this.settingLanguageEnglish.click();
diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index d5fab67ecf0..6a7ca954b12 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -10,15 +10,15 @@ class SideNav extends Page {
 	// Account box
 	get accountBoxUserName() { return browser.element('.sidebar__account-username'); }
 	get accountBoxUserAvatar() { return browser.element('.sidebar__account .avatar-image'); }
-	get accountMenu() { return browser.element('.sidebar__account-menu'); }
+	get accountMenu() { return browser.element('.sidebar__account'); }
 	get popOverContent() { return browser.element('.rc-popover__content'); }
-	get statusOnline() { return browser.element('[data-status="online"]'); }
-	get statusAway() { return browser.element('[data-status="away"]'); }
-	get statusBusy() { return browser.element('[data-status="busy"]'); }
-	get statusOffline() { return browser.element('[data-status="offline"]'); }
-	get account() { return browser.element('[data-open="account"]'); }
-	get admin() { return browser.element('[data-open="administration"]'); }
-	get logout() { return browser.element('[data-open="logout"]'); }
+	get statusOnline() { return browser.element('[data-id="online"]'); }
+	get statusAway() { return browser.element('[data-id="away"]'); }
+	get statusBusy() { return browser.element('[data-id="busy"]'); }
+	get statusOffline() { return browser.element('[data-id="offline"]'); }
+	get account() { return browser.element('[data-id="account"][data-type="open"]'); }
+	get admin() { return browser.element('[data-id="administration"][data-type="open"]'); }
+	get logout() { return browser.element('[data-id="logout"][data-type="open"]'); }
 	get sideNavBar() { return browser.element('.sidebar'); }
 
 	// Toolbar

From cf69af65d297b16c74f24ce2e2d30c75482dc644 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 14 Sep 2017 00:56:46 -0300
Subject: [PATCH 057/244] Merge pull request #8112 from RocketChat/rtl

[FIX] RTL
---
 .../client/views/sideNav/livechatFlex.html    |  2 +-
 .../client/imports/components/flex-nav.css    |  4 +++
 .../client/imports/components/popover.css     |  1 +
 .../imports/components/sidebar/rooms-list.css | 24 +++++++++++---
 .../components/sidebar/sidebar-account.css    | 17 +++++++---
 .../components/sidebar/sidebar-item.css       | 33 ++++++++++++++-----
 .../imports/components/sidebar/sidebar.css    | 24 +++++++-------
 .../imports/components/sidebar/toolbar.css    |  7 +++-
 .../client/imports/general/rtl.css            |  2 --
 .../client/accountFlex.html                   |  2 +-
 .../rocketchat-ui-admin/client/adminFlex.html |  2 +-
 .../client/roomList.html                      |  2 +-
 .../client/sidebarItem.html                   |  7 ++--
 packages/rocketchat-ui/client/lib/menu.js     | 20 ++++++-----
 14 files changed, 100 insertions(+), 47 deletions(-)

diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
index 9a1b64628f9..e49d9b3d7f1 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
@@ -1,5 +1,5 @@
 <template name="livechatFlex">
-	<aside class="sidebar sidebar--light" role="navigation">
+	<aside class="sidebar-light" role="navigation">
 		<header class="sidebar__header">
 			{{> accountBox lighten=true modifier="--livechat"}}
 			<button class="sidebar-flex__back-button" data-action="back">
diff --git a/packages/rocketchat-theme/client/imports/components/flex-nav.css b/packages/rocketchat-theme/client/imports/components/flex-nav.css
index 9a82dd6102c..c521fc6a49b 100644
--- a/packages/rocketchat-theme/client/imports/components/flex-nav.css
+++ b/packages/rocketchat-theme/client/imports/components/flex-nav.css
@@ -16,3 +16,7 @@
 		transform: translate3d(-100%, 0, 0);
 	}
 }
+
+.rtl .flex-nav.animated-hidden {
+	transform: translate3d(200%, 0, 0);
+}
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 1120245de5e..0e47a9ea32f 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -8,6 +8,7 @@
 	--rc-popover-open-mobile: {
 		position: fixed;
 		top: initial;
+		right: 0;
 		bottom: 0;
 		left: 0;
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index b2ea7764e72..7598b92b280 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -1,5 +1,7 @@
+
+
 .rooms-list {
-	overflow-y: auto;
+	overflow-y: scroll;
 
 	height: 100%;
 
@@ -10,12 +12,20 @@
 	}
 
 	&__type {
-		margin-bottom: 0.5rem;
-		margin-left: calc(var(--sidebar-default-padding) - calc(var(--sidebar-default-padding) / 3));
+		display: flex;
+
+		flex-direction: row;
+
+		padding: 0 var(--sidebar-default-padding) 0.5rem var(--sidebar-default-padding);
 
 		color: var(--rooms-list-title-color);
 
 		font-size: var(--rooms-list-title-text-size);
+		align-items: center;
+
+		&-text {
+			margin: 0 8px;
+		}
 	}
 
 	&__empty-room {
@@ -27,7 +37,7 @@
 	}
 
 	& .badge {
-		margin-left: 8px;
+		margin: 0 4px;
 	}
 
 	&__toolbar-search {
@@ -47,12 +57,18 @@
 }
 
 @media (width <= 400px) {
+	padding: 0 calc(var(--sidebar-small-default-padding) - 4px);
+
 	.rooms-list {
 		&__type,
 		&__empty-room {
 			margin-left: 0;
 		}
 
+		&__type {
+			padding: 0 calc(var(--sidebar-small-default-padding) - 4px) 0.5rem calc(var(--sidebar-small-default-padding) - 4px);
+		}
+
 		&__toolbar-search {
 			bottom: 0;
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 21d020efb86..f51e5280fa6 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -29,6 +29,7 @@
 
 		width: var(--sidebar-account-thumb-size);
 		height: var(--sidebar-account-thumb-size);
+		margin: 0 0.5rem;
 	}
 
 	&-data {
@@ -39,7 +40,7 @@
 		flex-direction: column;
 		flex: 1;
 
-		margin-left: 1rem;
+		margin: 0 0.5rem;
 	}
 
 	&-username {
@@ -61,6 +62,7 @@
 
 	&-visual-status {
 		max-width: 124px;
+		margin-right: 8px;
 
 		user-select: none;
 
@@ -70,6 +72,8 @@
 	&-status {
 		display: flex;
 
+		margin: 0 -0.25rem;
+
 		color: var(--sidebar-account-status-color);
 
 		align-items: center;
@@ -80,7 +84,7 @@
 
 		width: var(--sidebar-account-status-bullet-size);
 		height: var(--sidebar-account-status-bullet-size);
-		margin: 0.25rem 0.5rem 0.25rem 0;
+		margin: 0.25rem;
 
 		border-radius: var(--sidebar-account-status-bullet-radius);
 
@@ -109,7 +113,6 @@
 
 		position: relative;
 
-		margin-right: -9px;
 		padding: 0;
 
 		cursor: pointer;
@@ -133,10 +136,14 @@
 	}
 }
 
+.rtl .sidebar__account .rc-popover {
+	right: 0;
+	left: initial;
+}
+
 @media (width <= 400px) {
 	.sidebar__account {
 		margin: 0 0 5px;
-		padding: 5px var(--sidebar-small-default-padding);
 
 		&-thumb {
 
@@ -155,7 +162,7 @@
 
 		&-username {
 			width: auto;
-			margin: 0  0.65rem;
+			margin: 0 0.65rem;
 
 			font-weight: var(--sidebar-small-account-username-weight);
 		}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 69e92697b09..4f558766ec0 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -1,3 +1,7 @@
+.rtl .sidebar-item {
+	margin: 0 8px 0 0;
+}
+
 .sidebar-item {
 	position: relative;
 
@@ -5,7 +9,9 @@
 
 	height: var(--sidebar-item-height);
 
-	padding-left: calc(var(--sidebar-default-padding) - calc(var(--sidebar-default-padding) / 3));
+	margin: 0 0 0 8px;
+
+	padding: 0 calc(var(--sidebar-default-padding) - 8px);
 
 	cursor: pointer;
 
@@ -39,10 +45,11 @@
 		overflow: hidden;
 		flex: 1;
 
+		margin: 0 -4px;
+
 		color: var(--sidebar-item-text-color);
 
 		font-size: 1rem;
-		line-height: var(--sidebar-item-height);
 		align-items: center;
 
 		&--active {
@@ -55,8 +62,6 @@
 	}
 
 	&__icon {
-		margin: 0 auto;
-
 		font-size: 1.25rem;
 		fill: currentColor;
 	}
@@ -100,12 +105,16 @@
 		display: flex;
 		flex: 0 0 var(--sidebar-item-thumb-size);
 
-		margin-right: 6px;
+		margin: 0 4px;
+
 		align-items: center;
 	}
 
 	&__name {
 		overflow: hidden;
+		flex: 1;
+
+		margin: 0 4px;
 
 		white-space: nowrap;
 		text-overflow: ellipsis;
@@ -114,17 +123,25 @@
 	}
 }
 
+.rtl .sidebar-item__user-status {
+	right: 4px;
+	left: initial;
+}
+
 @media (width <= 400px) {
 	.sidebar-item {
-		padding-left: 0;
+		padding: 0 calc(var(--sidebar-small-default-padding) - 8px);
 
 		& .badge {
 			margin: 0 0 0 3px;
 		}
 
 		&__user-status {
-			right: calc(100% + var(--sidebar-small-item-user-status-size));
-			left: auto;
+			left: 0;
 		}
 	}
+
+	.rtl .sidebar-item__user-status {
+		right: 0;
+	}
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index 104b0f1fae2..be8f8e403b2 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -17,9 +17,11 @@
 
 	background-color: var(--sidebar-background);
 
-	&--light {
+	&-light {
 		position: absolute;
 
+		width: 100%;
+
 		height: 100%;
 
 		background-color: var(--sidebar-background-light);
@@ -60,14 +62,10 @@
 	& .unread-rooms {
 		display: none;
 	}
-
-	& .rooms-list {
-		padding: 0 calc(var(--sidebar-default-padding) / 3);
-	}
 }
 
 @media (width < 780px) {
-	.sidebar:not(.sidebar--light) {
+	.sidebar:not(.sidebar-light) {
 		user-select: none;
 		transform: translate3d(calc(var(--sidebar-width) * -1), 0, 0);
 		-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
@@ -75,6 +73,10 @@
 		-webkit-user-drag: none;
 		will-change: transform;
 	}
+
+	.rtl .sidebar {
+		transform: translate3d(200%, 0, 0);
+	}
 }
 
 @media (width <= 400px) {
@@ -82,11 +84,7 @@
 		flex: 0 0 var(--sidebar-small-width);
 
 		width: var(--sidebar-small-width);
-
-		& .unread-rooms,
-		& .rooms-list {
-			padding: 0 var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding)  var(--sidebar-small-default-padding);
-		}
+		max-width: var(--sidebar-small-width);
 
 		&__footer {
 			display: none;
@@ -96,4 +94,8 @@
 			transform: translate3d(-100%, 0, 0);
 		}
 	}
+
+	.rtl .sidebar {
+		transform: translate3d(200%, 0, 0);
+	}
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index 0eb1f136a9e..5f0e9e2725a 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -2,8 +2,11 @@
 	padding: 0 var(--sidebar-default-padding) var(--sidebar-default-padding);
 
 	&__wrapper {
+
 		display: flex;
 
+		margin: 0 -0.25rem;
+
 		color: var(--toolbar-placeholder-color);
 	}
 
@@ -42,6 +45,8 @@
 	}
 
 	& .rc-input {
+		margin: 0 0.25rem;
+
 		&__wrapper {
 			padding: 0;
 
@@ -85,7 +90,7 @@
 	}
 
 	& .rc-button {
-		margin-left: 0.5rem;
+		margin: 0 0.25rem;
 
 		color: var(--color-gray);
 		border-color: #414852;
diff --git a/packages/rocketchat-theme/client/imports/general/rtl.css b/packages/rocketchat-theme/client/imports/general/rtl.css
index 17b6ee534a9..34b2d19d48f 100644
--- a/packages/rocketchat-theme/client/imports/general/rtl.css
+++ b/packages/rocketchat-theme/client/imports/general/rtl.css
@@ -212,7 +212,6 @@
 	}
 
 	& .main-content {
-		right: var(--rooms-box-width);
 		left: 0;
 
 		transition: left 0.25s cubic-bezier(0.5, 0, 0.1, 1);
@@ -771,7 +770,6 @@
 
 	@media (width <= 1100px) {
 		& #rocket-chat .flex-opened {
-			right: var(--rooms-box-width);
 			left: 0;
 
 			& .flex-tab {
diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html
index 64447abf8c7..2571bda5e8b 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.html
+++ b/packages/rocketchat-ui-account/client/accountFlex.html
@@ -1,5 +1,5 @@
 <template name="accountFlex">
-	<aside class="sidebar sidebar--light" role="navigation">
+	<aside class="sidebar-light" role="navigation">
 		<header class="sidebar__header">
 			{{> accountBox lighten=true modifier="--account" }}
 			<button class="sidebar-flex__back-button" data-action="back">
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.html b/packages/rocketchat-ui-admin/client/adminFlex.html
index 20d35974426..b31088c1721 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.html
+++ b/packages/rocketchat-ui-admin/client/adminFlex.html
@@ -1,5 +1,5 @@
 <template name="adminFlex">
-	<aside class="sidebar sidebar--light" role="navigation">
+	<aside class="sidebar-light" role="navigation">
 		<header class="sidebar__header">
 			{{> accountBox lighten=true modifier="--admin"}}
 			<button class="sidebar-flex__back-button" data-action="back">
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.html b/packages/rocketchat-ui-sidenav/client/roomList.html
index bcb37d1b7aa..a7c4a21a7a6 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.html
+++ b/packages/rocketchat-ui-sidenav/client/roomList.html
@@ -5,7 +5,7 @@
 		{{#with rooms}}
 			{{#if shouldAppear .. .}}
 					<h3 class="rooms-list__type">
-						{{_ ../label}}
+						<div class="rooms-list__type-text">{{_ ../label}}</div>
 						{{#with count}}
 							{{#if .}}
 								<span class="badge">{{.}}</span>
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 1229ece43d3..4d62bdaec76 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -16,10 +16,9 @@
 				{{/if}}
 			</div>
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
-		</a>
-
-		{{#if unread}}
+			{{#if unread}}
 			<span class="badge badge--unread">{{unread}}</span>
-		{{/if}}
+			{{/if}}
+		</a>
 	</li>
 </template>
diff --git a/packages/rocketchat-ui/client/lib/menu.js b/packages/rocketchat-ui/client/lib/menu.js
index c99acbb8379..0876b9e426f 100644
--- a/packages/rocketchat-ui/client/lib/menu.js
+++ b/packages/rocketchat-ui/client/lib/menu.js
@@ -109,19 +109,23 @@ this.menu = new class extends EventEmitter {
 					this.diff = 0;
 				}
 			}
-			if (map((this.diff / sideNavW), 0, 1, -.1, .8) > 0) {
-				this.sidebar.css('box-shadow', '0 0 15px 1px rgba(0,0,0,.3)');
-				// this.sidebarWrap.css('z-index', '9998');
-				this.translate(this.diff);
-			}
+			// if (map((this.diff / sideNavW), 0, 1, -.1, .8) > 0) {
+			this.sidebar.css('box-shadow', '0 0 15px 1px rgba(0,0,0,.3)');
+			// this.sidebarWrap.css('z-index', '9998');
+			this.translate(this.diff);
+			// }
 		}
 	}
 	translate(diff, width = sideNavW) {
+		if (diff === undefined) {
+			diff = this.isRtl ? -1 * sideNavW : sideNavW;
+		}
 		this.sidebarWrap.css('width', '100%');
 		this.wrapper.css('overflow', 'hidden');
 		this.sidebarWrap.css('background-color', '#000');
-		this.sidebarWrap.css('opacity', map((diff / width), 0, 1, -.1, .8).toFixed(2));
-		this.sidebar.css('transform', `translate3d(${ (diff - sideNavW).toFixed(3) }px, 0 , 0`);
+		this.sidebarWrap.css('opacity', map((Math.abs(diff) / width), 0, 1, -.1, .8).toFixed(2));
+		console.log(sideNavW, diff);
+		this.isRtl ? this.sidebar.css('transform', `translate3d(${ (sideNavW + diff).toFixed(3) }px, 0 , 0)`) : this.sidebar.css('transform', `translate3d(${ (diff - sideNavW).toFixed(3) }px, 0 , 0)`);
 	}
 	touchend() {
 		const [max, min] = [sideNavW * .76, sideNavW * .24];
@@ -173,7 +177,7 @@ this.menu = new class extends EventEmitter {
 		this.on('open', ignore(() => {
 			this.sidebar.css('box-shadow', '0 0 15px 1px rgba(0,0,0,.3)');
 			// this.sidebarWrap.css('z-index', '9998');
-			this.translate(sideNavW);
+			this.translate();
 		}));
 		this.mainContent = $('.main-content');
 

From c75d029b164094b632c6570d7ff0502a217dd1ba Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 14 Sep 2017 01:01:28 -0300
Subject: [PATCH 058/244] Bump version to 0.59.0-rc.5

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 22 ++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 5df3f40b313..b939dcbbea7 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.4
+ENV RC_VERSION 0.59.0-rc.5
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index ad45d2f7328..fae6f51c587 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.4"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.5"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 5ec5722d05a..f04e332ac69 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.4
+    RC_VERSION=0.59.0-rc.5
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index d08a8b7a68c..2027506ede4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,25 @@
+<a name="0.59.0-rc.5"></a>
+# 0.59.0-rc.5 (2017-09-14)
+
+
+### Bug Fixes
+
+- [#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) Dynamic popover
+- [#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099) Fix setting user avatar on LDAP login
+- [#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059) Not sending email to mentioned users with unchanged preference
+- [#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112) RTL
+- [#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047) Scroll on messagebox
+- [#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122) Settings description not showing
+
+
+<details>
+<summary>Others</summary>
+
+- [#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) Remove unnecessary returns in cors common
+</details>
+
+
+
 <a name="0.59.0-rc.4"></a>
 # 0.59.0-rc.4 (2017-09-05)
 
diff --git a/package.json b/package.json
index fc404665c01..9fb603390ad 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.4",
+	"version": "0.59.0-rc.5",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 02b079cc254..4db7f2e86ea 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.4"
+	"version": "0.59.0-rc.5"
 }

From 11af5f135f3909c6b4b5294d59601d9c654b45f1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 14 Sep 2017 16:22:43 -0300
Subject: [PATCH 059/244] Merge pull request #8073 from RocketChat/meteor-1.5.2

[NEW] Upgrade to meteor 1.5.2
---
 .meteor/packages                              |    6 +-
 .meteor/release                               |    2 +-
 .meteor/versions                              |   25 +-
 package-lock.json                             | 8142 +++--------------
 package.json                                  |   22 +-
 .../rocketchat-livechat/app/.meteor/packages  |   10 +-
 .../rocketchat-livechat/app/.meteor/release   |    2 +-
 .../rocketchat-livechat/app/.meteor/versions  |   23 +-
 .../rocketchat-livechat/app/package-lock.json |  752 ++
 9 files changed, 2232 insertions(+), 6752 deletions(-)
 create mode 100644 packages/rocketchat-livechat/app/package-lock.json

diff --git a/.meteor/packages b/.meteor/packages
index 401f80ab468..1baeab932de 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -13,8 +13,8 @@ accounts-twitter@1.3.0
 blaze-html-templates
 check@1.2.5
 ddp-rate-limiter@1.0.7
-ecmascript@0.8.1
-ejson@1.0.13
+ecmascript@0.8.2
+ejson@1.0.14
 email@1.2.3
 fastclick@1.0.13
 http@1.2.12
@@ -23,7 +23,7 @@ less@2.7.9
 logging@1.1.17
 meteor-base@1.1.0
 mobile-experience@1.0.4
-mongo@1.1.19
+mongo@1.2.0
 random@1.0.10
 rate-limit@1.0.8
 reactive-dict@1.1.9
diff --git a/.meteor/release b/.meteor/release
index 1e7fc5b564c..47c31abcf45 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.1
+METEOR@1.5.2
diff --git a/.meteor/versions b/.meteor/versions
index 63ec00a995d..56584e33d72 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.1
+accounts-base@1.3.2
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0
@@ -9,14 +9,14 @@ accounts-twitter@1.3.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.6
 autoupdate@1.3.12
-babel-compiler@6.19.4
+babel-compiler@6.20.0
 babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.1.1
+boilerplate-generator@1.2.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
@@ -26,7 +26,7 @@ coffeescript@1.12.7_1
 coffeescript-compiler@1.12.7_1
 dandv:caret-position@2.1.1
 ddp@1.3.0
-ddp-client@2.0.0
+ddp-client@2.1.0
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
 ddp-server@2.0.0
@@ -40,7 +40,7 @@ ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
 edgee:slingshot@0.7.1
-ejson@1.0.13
+ejson@1.0.14
 email@1.2.3
 emojione:emojione@2.2.6
 facebook-oauth@1.3.2
@@ -83,15 +83,16 @@ meteorhacks:inject-initial@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.1
-minimongo@1.2.1
+minifier-js@2.1.3
+minimongo@1.3.0
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
 mobile-experience@1.0.4
 mobile-status-bar@1.0.14
-modules@0.9.4
+modules@0.10.0
 modules-runtime@0.8.0
-mongo@1.1.22
+mongo@1.2.0
+mongo-dev-server@1.0.1
 mongo-id@1.0.6
 mongo-livedata@1.0.12
 mrt:reactive-store@0.0.1
@@ -107,9 +108,9 @@ observe-sequence@1.0.16
 ordered-dict@1.0.9
 ostrio:cookies@2.2.2
 pauli:accounts-linkedin@2.1.3
-pauli:linkedin-oauth@1.1.0
+pauli:linkedin-oauth@1.2.0
 percolate:synced-cron@1.3.2
-promise@0.8.9
+promise@0.9.0
 raix:eventemitter@0.1.3
 raix:eventstate@0.0.4
 raix:handlebar-helpers@0.2.5
@@ -253,7 +254,7 @@ ui@1.0.13
 underscore@1.0.10
 underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.17
+webapp@1.3.18
 webapp-hashing@1.0.9
 yasaricli:slugify@0.0.7
 yasinuslu:blaze-meta@0.3.3
diff --git a/package-lock.json b/package-lock.json
index c5d92e94b49..516cfc5322a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,274 +1,138 @@
 {
 	"name": "Rocket.Chat",
-	"version": "0.57.0-develop",
+	"version": "0.59.0-develop",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
 		"@google-cloud/common": {
-			"version": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.3.tgz",
-			"integrity": "sha1-1z7j+lEfKf+8xEZniYaFcJ6f7Iw=",
-			"requires": {
-				"array-uniq": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-				"arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-				"concat-stream": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-				"create-error-class": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-				"duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
-				"ent": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+			"version": "0.13.5",
+			"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.5.tgz",
+			"integrity": "sha1-uQWZ8pzpV7NmreqNfAw/NZPZgco=",
+			"requires": {
+				"array-uniq": "1.0.3",
+				"arrify": "1.0.1",
+				"concat-stream": "1.6.0",
+				"create-error-class": "3.0.2",
+				"duplexify": "3.5.1",
+				"ent": "2.2.0",
 				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"google-auto-auth": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.6.1.tgz",
-				"is": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-				"log-driver": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-				"methmeth": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-				"modelo": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-				"retry-request": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
-				"split-array-stream": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
-				"stream-events": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-				"string-format-obj": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
-			},
-			"dependencies": {
-				"concat-stream": {
-					"version": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-					"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-					"requires": {
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-						"typedarray": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-					}
-				}
+				"google-auto-auth": "0.7.2",
+				"is": "3.2.1",
+				"log-driver": "1.2.5",
+				"methmeth": "1.1.0",
+				"modelo": "4.2.0",
+				"request": "2.81.0",
+				"retry-request": "2.0.5",
+				"split-array-stream": "1.0.3",
+				"stream-events": "1.0.2",
+				"string-format-obj": "1.1.0",
+				"through2": "2.0.3"
 			}
 		},
 		"@google-cloud/storage": {
-			"version": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.1.1.tgz",
-			"integrity": "sha1-ZZC1zm53lVbJzHBDvWRJ1rwHgd4=",
-			"requires": {
-				"@google-cloud/common": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.3.tgz",
-				"arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-				"async": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-				"concat-stream": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
-				"create-error-class": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-				"duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
+			"integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
+			"requires": {
+				"@google-cloud/common": "0.13.5",
+				"arrify": "1.0.1",
+				"async": "2.5.0",
+				"concat-stream": "1.6.0",
+				"create-error-class": "3.0.2",
+				"duplexify": "3.5.1",
 				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"gcs-resumable-upload": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.7.7.tgz",
-				"hash-stream-validation": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-				"is": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-				"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-				"pumpify": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-				"stream-events": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-				"string-format-obj": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
+				"gcs-resumable-upload": "0.8.1",
+				"hash-stream-validation": "0.2.1",
+				"is": "3.2.1",
+				"mime-types": "2.1.17",
+				"once": "1.4.0",
+				"pumpify": "1.3.5",
+				"stream-events": "1.0.2",
+				"string-format-obj": "1.1.0",
+				"through2": "2.0.3"
 			},
 			"dependencies": {
-				"async": {
-					"version": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-					"integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
 					"requires": {
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+						"mime-db": "1.30.0"
 					}
 				}
 			}
 		},
 		"abbrev": {
-			"version": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
 			"integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
 		},
-		"acorn": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
-			"integrity": "sha1-U/4WERH5EquZnuiHqQoLxSgi/XU=",
-			"dev": true
-		},
-		"acorn-jsx": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-			"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-			"dev": true,
-			"requires": {
-				"acorn": "3.3.0"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-					"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-					"dev": true
-				}
-			}
-		},
-		"add-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
-			"integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-			"dev": true
-		},
 		"addressparser": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
 			"integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
 		},
-		"adm-zip": {
-			"version": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
-			"integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=",
-			"dev": true
-		},
-		"agent-base": {
-			"version": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.0.tgz",
-			"integrity": "sha1-GTRV5DR7ymsFhHy4HpObsyVEbag=",
-			"dev": true,
-			"requires": {
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
-					"integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
-					"dev": true
-				}
-			}
-		},
 		"ajv": {
-			"version": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+			"version": "4.11.8",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
 			"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
 			"requires": {
-				"co": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-				"json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
-			}
-		},
-		"align-text": {
-			"version": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-			"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-			"dev": true,
-			"requires": {
-				"kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-				"longest": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-				"repeat-string": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
+				"co": "4.6.0",
+				"json-stable-stringify": "1.0.1"
 			}
 		},
-		"amdefine": {
-			"version": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-			"dev": true
-		},
-		"ansi-escapes": {
-			"version": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-			"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-			"dev": true
-		},
 		"ansi-regex": {
 			"version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
 			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
 		},
 		"ansi-styles": {
 			"version": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-		},
-		"any-promise": {
-			"version": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz",
-			"integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=",
+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
 			"dev": true
 		},
-		"anymatch": {
-			"version": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-			"integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
-			"dev": true,
-			"requires": {
-				"arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-				"micromatch": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
-			}
-		},
 		"aproba": {
-			"version": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
-			"integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+			"integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw=="
 		},
-		"archiver": {
-			"version": "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz",
-			"integrity": "sha1-TyGU1tj5nfP1MeaIHxTxXVX6ryI=",
-			"dev": true,
+		"are-we-there-yet": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+			"integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
 			"requires": {
-				"archiver-utils": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-				"async": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-				"buffer-crc32": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-				"tar-stream": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
-				"walkdir": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
-				"zip-stream": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.1.tgz"
+				"delegates": "1.0.0",
+				"readable-stream": "2.3.3"
 			},
 			"dependencies": {
-				"async": {
-					"version": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-					"integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
-					"dev": true,
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"requires": {
+						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
 					"requires": {
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+						"safe-buffer": "5.1.1"
 					}
 				}
 			}
 		},
-		"archiver-utils": {
-			"version": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-			"integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
-			"dev": true,
-			"requires": {
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"lazystream": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
-			}
-		},
-		"are-we-there-yet": {
-			"version": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-			"integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-			"requires": {
-				"delegates": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
-			}
-		},
-		"argparse": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-			"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-			}
-		},
-		"arr-diff": {
-			"version": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-			"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-			"dev": true,
-			"requires": {
-				"arr-flatten": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz"
-			}
-		},
-		"arr-flatten": {
-			"version": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz",
-			"integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=",
-			"dev": true
-		},
-		"array-differ": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-			"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-			"dev": true
-		},
-		"array-find-index": {
-			"version": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-			"dev": true
-		},
-		"array-ify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-			"integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
-			"dev": true
-		},
 		"array-includes": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
@@ -278,83 +142,48 @@
 				"es-abstract": "1.7.0"
 			}
 		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-			"dev": true,
-			"requires": {
-				"array-uniq": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
-			}
-		},
 		"array-uniq": {
-			"version": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
 			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
 		},
-		"array-unique": {
-			"version": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-			"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-			"dev": true
-		},
 		"arrify": {
-			"version": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
 			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
 		},
 		"asn1": {
-			"version": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
 			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
 		},
 		"assert-plus": {
-			"version": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
 			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
 		},
-		"assertion-error": {
-			"version": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
-			"integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
-			"dev": true
-		},
 		"async": {
-			"version": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-			"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-			"dev": true
-		},
-		"async-each": {
-			"version": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-			"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-			"dev": true
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+			"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+			"requires": {
+				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+			}
 		},
 		"asynckit": {
 			"version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
 			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
 		},
-		"atob": {
-			"version": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-			"integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
-			"dev": true
-		},
-		"autoprefixer": {
-			"version": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-			"integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
-			"dev": true,
-			"requires": {
-				"browserslist": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-				"caniuse-db": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000674.tgz",
-				"normalize-range": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-				"num2fraction": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
-			}
-		},
 		"aws-sdk": {
-			"version": "2.88.0",
-			"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.88.0.tgz",
-			"integrity": "sha1-G7C8PYyN7GLdAgyPIFay33pe1pY=",
+			"version": "2.111.0",
+			"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.111.0.tgz",
+			"integrity": "sha1-qDTOE/9ECzSOReBHyNx71pbxsm0=",
 			"requires": {
 				"buffer": "4.9.1",
 				"crypto-browserify": "1.0.9",
 				"events": "1.1.1",
 				"jmespath": "0.15.0",
-				"querystring": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+				"querystring": "0.2.0",
 				"sax": "1.2.1",
 				"url": "0.10.3",
 				"uuid": "3.0.1",
@@ -362,20 +191,6 @@
 				"xmlbuilder": "4.2.1"
 			},
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-				},
-				"url": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-					"integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-					"requires": {
-						"punycode": "1.3.2",
-						"querystring": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-					}
-				},
 				"uuid": {
 					"version": "3.0.1",
 					"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
@@ -384,11 +199,13 @@
 			}
 		},
 		"aws-sign2": {
-			"version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
 			"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
 		},
 		"aws4": {
-			"version": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
 			"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
 		},
 		"babel-code-frame": {
@@ -411,7 +228,7 @@
 				"babel-helpers": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
 				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
 				"babel-register": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
@@ -445,7 +262,7 @@
 			"dev": true,
 			"requires": {
 				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
 				"detect-indent": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
 				"jsesc": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -459,7 +276,7 @@
 			"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
@@ -470,7 +287,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-explode-assignable-expression": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
@@ -479,7 +296,7 @@
 			"integrity": "sha1-CteRfjPI11HmRtrKTnfMGTd9LLw=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
 				"esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
 			}
@@ -490,7 +307,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-hoist-variables": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
@@ -501,7 +318,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
 				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
 			}
@@ -511,7 +328,7 @@
 			"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
@@ -522,7 +339,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-bindify-decorators": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
@@ -533,7 +350,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-get-function-arity": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
@@ -544,7 +361,7 @@
 			"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
@@ -553,7 +370,7 @@
 			"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
@@ -562,7 +379,7 @@
 			"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
@@ -571,7 +388,7 @@
 			"integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
 				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
 			}
@@ -582,7 +399,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
@@ -595,7 +412,7 @@
 			"requires": {
 				"babel-helper-optimise-call-expression": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
 				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
@@ -606,7 +423,7 @@
 			"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
 			}
 		},
@@ -615,7 +432,7 @@
 			"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-mocha-es6-compiler": {
@@ -645,7 +462,7 @@
 			"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-syntax-async-functions": {
@@ -725,7 +542,7 @@
 			"requires": {
 				"babel-helper-remap-async-to-generator": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
 				"babel-plugin-syntax-async-generators": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-async-to-generator": {
@@ -735,7 +552,7 @@
 			"requires": {
 				"babel-helper-remap-async-to-generator": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
 				"babel-plugin-syntax-async-functions": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-class-constructor-call": {
@@ -744,7 +561,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-class-constructor-call": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
 			}
 		},
@@ -755,7 +572,7 @@
 			"requires": {
 				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
 				"babel-plugin-syntax-class-properties": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
 			}
 		},
@@ -766,7 +583,7 @@
 			"requires": {
 				"babel-helper-explode-class": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
 				"babel-plugin-syntax-decorators": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
@@ -777,7 +594,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-do-expressions": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-arrow-functions": {
@@ -785,7 +602,7 @@
 			"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-block-scoped-functions": {
@@ -793,7 +610,7 @@
 			"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-block-scoping": {
@@ -801,7 +618,7 @@
 			"integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
@@ -818,7 +635,7 @@
 				"babel-helper-optimise-call-expression": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
 				"babel-helper-replace-supers": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
 				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
@@ -829,7 +646,7 @@
 			"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
 			}
 		},
@@ -838,7 +655,7 @@
 			"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-for-of": {
@@ -846,7 +663,7 @@
 			"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-function-name": {
@@ -855,7 +672,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
@@ -864,7 +681,7 @@
 			"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-modules-commonjs": {
@@ -873,7 +690,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-transform-strict-mode": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
@@ -884,7 +701,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-replace-supers": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-parameters": {
@@ -894,7 +711,7 @@
 			"requires": {
 				"babel-helper-call-delegate": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
 				"babel-helper-get-function-arity": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
@@ -905,7 +722,7 @@
 			"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
@@ -914,7 +731,7 @@
 			"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-sticky-regex": {
@@ -923,7 +740,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-regex": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
@@ -932,7 +749,7 @@
 			"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-typeof-symbol": {
@@ -940,7 +757,7 @@
 			"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-es2015-unicode-regex": {
@@ -949,7 +766,7 @@
 			"dev": true,
 			"requires": {
 				"babel-helper-regex": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"regexpu-core": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz"
 			}
 		},
@@ -960,7 +777,7 @@
 			"requires": {
 				"babel-helper-builder-binary-assignment-operator-visitor": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
 				"babel-plugin-syntax-exponentiation-operator": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-export-extensions": {
@@ -969,7 +786,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-export-extensions": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-flow-strip-types": {
@@ -978,7 +795,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-flow": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-function-bind": {
@@ -987,7 +804,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-function-bind": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-object-rest-spread": {
@@ -996,7 +813,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-object-rest-spread": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-react-display-name": {
@@ -1004,7 +821,7 @@
 			"integrity": "sha1-Q5iRDDWEQdxM7xh4cmTQQS7Tazc=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-react-jsx": {
@@ -1014,7 +831,7 @@
 			"requires": {
 				"babel-helper-builder-react-jsx": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz",
 				"babel-plugin-syntax-jsx": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-react-jsx-source": {
@@ -1023,7 +840,7 @@
 			"dev": true,
 			"requires": {
 				"babel-plugin-syntax-jsx": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-regenerator": {
@@ -1034,33 +851,15 @@
 				"regenerator-transform": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz"
 			}
 		},
-		"babel-plugin-transform-runtime": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
-			"integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
-			}
-		},
 		"babel-plugin-transform-strict-mode": {
 			"version": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
 			"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
 			}
 		},
-		"babel-polyfill": {
-			"version": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
-			"integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-				"core-js": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-				"regenerator-runtime": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"
-			}
-		},
 		"babel-preset-es2015": {
 			"version": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
 			"integrity": "sha1-l9zn7ykuGMubK3VF2AxZPCjZUX8=",
@@ -1150,7 +949,7 @@
 			"dev": true,
 			"requires": {
 				"babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"core-js": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
 				"home-or-tmp": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
 				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -1168,7 +967,7 @@
 						"babel-helpers": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
 						"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
 						"babel-register": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-						"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+						"babel-runtime": "6.26.0",
 						"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
 						"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 						"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
@@ -1192,11 +991,24 @@
 			}
 		},
 		"babel-runtime": {
-			"version": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-			"integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
+			"version": "6.26.0",
+			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+			"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
 			"requires": {
-				"core-js": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-				"regenerator-runtime": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"
+				"core-js": "2.5.1",
+				"regenerator-runtime": "0.11.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+				},
+				"regenerator-runtime": {
+					"version": "0.11.0",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+					"integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+				}
 			}
 		},
 		"babel-template": {
@@ -1204,7 +1016,7 @@
 			"integrity": "sha1-BK5RTx+Ts6JTfyoPYKWkX7gwgzM=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
 				"babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
@@ -1218,7 +1030,7 @@
 			"requires": {
 				"babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
 				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
 				"babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
 				"debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
@@ -1232,7 +1044,7 @@
 			"integrity": "sha1-oTaHncFbNga9oNkMH8dDBML/CXU=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
 				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
 				"to-fast-properties": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"
@@ -1250,88 +1062,50 @@
 		"base64-js": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-			"integrity": "sha1-qRlH2h9KUW6jjltOwOw3c2deCIY="
+			"integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
 		},
 		"base64url": {
-			"version": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
 			"integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
 		},
 		"bcrypt": {
-			"version": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz",
-			"integrity": "sha1-0F/F0iMXPg4o7DgcDwDMJf+vJzY=",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
+			"integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
 			"requires": {
-				"bindings": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz",
-				"nan": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz",
-				"node-pre-gyp": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"
+				"nan": "2.6.2",
+				"node-pre-gyp": "0.6.36"
 			}
 		},
 		"bcrypt-pbkdf": {
-			"version": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
 			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
 			"optional": true,
 			"requires": {
-				"tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+				"tweetnacl": "0.14.5"
 			}
 		},
-		"binary-extensions": {
-			"version": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
-			"integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
-			"dev": true
-		},
-		"bindings": {
-			"version": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz",
-			"integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE="
-		},
 		"bintrees": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
 			"integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
 		},
-		"bl": {
-			"version": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-			"integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-					"integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				}
-			}
-		},
 		"block-stream": {
-			"version": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+			"version": "0.0.9",
+			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
 			"requires": {
 				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
 			}
 		},
-		"bluebird": {
-			"version": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-			"integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
-			"dev": true
-		},
 		"boom": {
-			"version": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
 			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
 			"requires": {
-				"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+				"hoek": "2.16.3"
 			}
 		},
 		"brace-expansion": {
@@ -1342,30 +1116,6 @@
 				"concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
 			}
 		},
-		"braces": {
-			"version": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-			"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-			"dev": true,
-			"requires": {
-				"expand-range": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-				"preserve": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-				"repeat-element": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
-			}
-		},
-		"browser-stdout": {
-			"version": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-			"dev": true
-		},
-		"browserslist": {
-			"version": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-			"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-			"dev": true,
-			"requires": {
-				"caniuse-db": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000674.tgz",
-				"electron-to-chromium": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz"
-			}
-		},
 		"buffer": {
 			"version": "4.9.1",
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -1376,120 +1126,34 @@
 				"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
 			}
 		},
-		"buffer-crc32": {
-			"version": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-			"dev": true
-		},
 		"buffer-equal": {
-			"version": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
 			"integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
 		},
 		"buffer-equal-constant-time": {
-			"version": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
 			"integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
 		},
 		"buffer-shims": {
 			"version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
 			"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
 		},
-		"builtin-modules": {
-			"version": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-			"dev": true
-		},
-		"caller-path": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-			"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-			"dev": true,
-			"requires": {
-				"callsites": "0.2.0"
-			}
-		},
-		"callsites": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-			"integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-			"dev": true
-		},
-		"camel-case": {
-			"version": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-			"integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-			"dev": true,
-			"requires": {
-				"no-case": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
-				"upper-case": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz"
-			}
-		},
-		"camelcase": {
-			"version": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-			"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-			"dev": true
-		},
-		"camelcase-keys": {
-			"version": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-			"dev": true,
-			"requires": {
-				"camelcase": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-				"map-obj": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
-			}
-		},
-		"caniuse-api": {
-			"version": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-			"integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-			"dev": true,
-			"requires": {
-				"browserslist": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-				"caniuse-db": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000674.tgz",
-				"lodash.memoize": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-				"lodash.uniq": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
-			}
-		},
-		"caniuse-db": {
-			"version": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000674.tgz",
-			"integrity": "sha1-146ZoykTQfU4MOlq0vEpIblxXo0=",
-			"dev": true
-		},
 		"capture-stack-trace": {
-			"version": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
 			"integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
 		},
 		"caseless": {
-			"version": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
 		},
-		"center-align": {
-			"version": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-			"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-			"dev": true,
-			"requires": {
-				"align-text": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-				"lazy-cache": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
-			}
-		},
-		"chai": {
-			"version": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
-			"integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
-			"dev": true,
-			"requires": {
-				"assertion-error": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
-				"deep-eql": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-				"type-detect": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz"
-			}
-		},
-		"chai-as-promised": {
-			"version": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-6.0.0.tgz",
-			"integrity": "sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY=",
-			"dev": true,
-			"requires": {
-				"check-error": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
-			}
-		},
 		"chalk": {
 			"version": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+			"dev": true,
 			"requires": {
 				"ansi-styles": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
 				"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1498,799 +1162,738 @@
 				"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
 			}
 		},
-		"check-error": {
-			"version": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-			"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-			"dev": true
+		"co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
 		},
-		"child-process-debug": {
-			"version": "https://registry.npmjs.org/child-process-debug/-/child-process-debug-0.0.7.tgz",
-			"integrity": "sha1-VOEfuBw7b5Spa2MfrKk+0a9/itA=",
-			"dev": true
+		"code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
-		"chimp": {
-			"version": "https://registry.npmjs.org/chimp/-/chimp-0.49.0.tgz",
-			"integrity": "sha1-8P5aBSSmMO+a9MvcOFIyfrgH4Pg=",
-			"dev": true,
+		"codemirror": {
+			"version": "5.29.0",
+			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.29.0.tgz",
+			"integrity": "sha512-nlG9m0YQ0gFhdEdnKDG+XJRB/bW+K6M9Axs01+LScjVamWtd4dEwgyohf/r4voW1efnGi6U6hHHvDQ9tt9BtoA=="
+		},
+		"combined-stream": {
+			"version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
 			"requires": {
-				"async": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-				"babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.9.1.tgz",
-				"babel-plugin-transform-runtime": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
-				"babel-polyfill": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
-				"babel-preset-es2015": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
-				"babel-preset-stage-2": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
-				"babel-register": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-				"bluebird": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-				"chai": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
-				"chai-as-promised": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-6.0.0.tgz",
-				"child-process-debug": "https://registry.npmjs.org/child-process-debug/-/child-process-debug-0.0.7.tgz",
-				"chokidar": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
-				"chromedriver": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.29.0.tgz",
-				"colors": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-				"commander": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-				"cucumber": "git://github.com/xolvio/cucumber-js.git#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
-				"deep-extend": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-				"exit": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-				"fibers": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-				"freeport": "https://registry.npmjs.org/freeport/-/freeport-1.0.5.tgz",
-				"fs-extra": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
-				"glob": "git://github.com/lucetius/node-glob.git#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
-				"hapi": "https://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
-				"jasmine": "https://registry.npmjs.org/jasmine/-/jasmine-2.6.0.tgz",
-				"loglevel": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz",
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-				"mocha": "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz",
-				"phantomjs-prebuilt": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz",
-				"progress": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-				"requestretry": "https://registry.npmjs.org/requestretry/-/requestretry-1.5.0.tgz",
-				"saucelabs": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.4.0.tgz",
-				"selenium-standalone": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-5.11.2.tgz",
-				"underscore": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-				"xolvio-ddp": "https://registry.npmjs.org/xolvio-ddp/-/xolvio-ddp-0.12.3.tgz",
-				"xolvio-jasmine-expect": "https://registry.npmjs.org/xolvio-jasmine-expect/-/xolvio-jasmine-expect-1.1.0.tgz",
-				"xolvio-sync-webdriverio": "https://registry.npmjs.org/xolvio-sync-webdriverio/-/xolvio-sync-webdriverio-9.0.1.tgz"
+				"delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+			}
+		},
+		"component-emitter": {
+			"version": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+			"dev": true
+		},
+		"concat-map": {
+			"version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+		},
+		"concat-stream": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+			"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+			"requires": {
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"readable-stream": "2.3.3",
+				"typedarray": "0.0.6"
 			},
 			"dependencies": {
-				"cucumber": {
-					"version": "git://github.com/xolvio/cucumber-js.git#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
-					"dev": true,
-					"requires": {
-						"camel-case": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-						"cli-table": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-						"co": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-						"colors": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-						"commander": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-						"duration": "https://registry.npmjs.org/duration/-/duration-0.2.0.tgz",
-						"fibers": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-						"figures": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-						"gherkin": "https://registry.npmjs.org/gherkin/-/gherkin-4.0.0.tgz",
-						"glob": "git://github.com/lucetius/node-glob.git#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
-						"is-generator": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-						"meteor-promise": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.4.tgz",
-						"stack-chain": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
-						"stacktrace-js": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-1.3.1.tgz"
-					}
-				},
-				"glob": {
-					"version": "git://github.com/lucetius/node-glob.git#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
-					"dev": true,
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 					"requires": {
-						"fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "https://registry.npmjs.org/once/-/once-1.3.0.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
 					}
 				},
-				"minimist": {
-					"version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 				},
-				"once": {
-					"version": "https://registry.npmjs.org/once/-/once-1.3.0.tgz",
-					"integrity": "sha1-FRr4a/wfCMS58H0GqyUP/L61ZYE=",
-					"dev": true
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
 				}
 			}
 		},
-		"chokidar": {
-			"version": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
-			"integrity": "sha1-L0RHq16W5Q+z14n9kNTHLg5McMI=",
-			"dev": true,
+		"configstore": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+			"integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
 			"requires": {
-				"anymatch": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-				"async-each": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-				"glob-parent": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"is-binary-path": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-				"is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-				"readdirp": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"
+				"dot-prop": "4.2.0",
+				"graceful-fs": "4.1.11",
+				"make-dir": "1.0.0",
+				"unique-string": "1.0.0",
+				"write-file-atomic": "2.3.0",
+				"xdg-basedir": "3.0.0"
 			}
 		},
-		"chromedriver": {
-			"version": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.29.0.tgz",
-			"integrity": "sha1-4/2LPAjc4lYrgO8bC4Rll2WdDMM=",
-			"dev": true,
-			"requires": {
-				"adm-zip": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
-				"kew": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
-			}
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
 		},
-		"circular-json": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
-			"integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=",
+		"convert-source-map": {
+			"version": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+			"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
 			"dev": true
 		},
-		"cli-cursor": {
-			"version": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-			"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-			"dev": true,
+		"cookiejar": {
+			"version": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
+			"integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
+			"dev": true
+		},
+		"core-js": {
+			"version": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+			"integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
+			"dev": true
+		},
+		"core-util-is": {
+			"version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+		},
+		"create-error-class": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+			"integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
 			"requires": {
-				"restore-cursor": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"
+				"capture-stack-trace": "1.0.0"
 			}
 		},
-		"cli-table": {
-			"version": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-			"integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
-			"dev": true,
+		"cryptiles": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
 			"requires": {
-				"colors": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-			},
-			"dependencies": {
-				"colors": {
-					"version": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-					"integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-					"dev": true
-				}
+				"boom": "2.10.1"
 			}
 		},
-		"cli-width": {
-			"version": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
-			"integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=",
-			"dev": true
+		"crypto-browserify": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz",
+			"integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA="
 		},
-		"cliui": {
-			"version": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-			"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-			"dev": true,
+		"crypto-random-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+			"integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+		},
+		"dashdash": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
 			"requires": {
-				"center-align": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-				"right-align": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-				"wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+				"assert-plus": "1.0.0"
 			},
 			"dependencies": {
-				"wordwrap": {
-					"version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
 				}
 			}
 		},
-		"clone": {
-			"version": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-			"integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-			"dev": true
-		},
-		"clone-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
-			"integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
+		"debug": {
+			"version": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+			"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
 			"dev": true,
 			"requires": {
-				"is-regexp": "1.0.0",
-				"is-supported-regexp-flag": "1.0.0"
+				"ms": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
 			}
 		},
-		"co": {
-			"version": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-		},
-		"code-point-at": {
-			"version": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-		},
-		"codemirror": {
-			"version": "5.28.0",
-			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.28.0.tgz",
-			"integrity": "sha1-KXjZKA1nE1Gk9XN9BrvWgaD9b4M="
-		},
-		"color": {
-			"version": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-			"integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-			"dev": true,
-			"requires": {
-				"clone": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-				"color-convert": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-				"color-string": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"
-			}
+		"deep-extend": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+			"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
 		},
-		"color-convert": {
-			"version": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-			"integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
-			"dev": true,
+		"define-properties": {
+			"version": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+			"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
 			"requires": {
-				"color-name": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"
+				"foreach": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+				"object-keys": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"
 			}
 		},
-		"color-diff": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz",
-			"integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=",
-			"dev": true
+		"delayed-stream": {
+			"version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
 		},
-		"color-name": {
-			"version": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz",
-			"integrity": "sha1-XIq3K2S9IhXWF66VWeuxSEdc+Y0=",
-			"dev": true
+		"delegates": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
 		},
-		"color-string": {
-			"version": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-			"integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+		"detect-indent": {
+			"version": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+			"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
 			"dev": true,
 			"requires": {
-				"color-name": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"
+				"repeating": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
 			}
 		},
-		"colorguard": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz",
-			"integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=",
-			"dev": true,
+		"dom-serializer": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
 			"requires": {
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"color-diff": "0.1.7",
-				"log-symbols": "1.0.2",
-				"object-assign": "4.1.1",
-				"pipetteur": "2.0.3",
-				"plur": "2.1.2",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-reporter": "1.4.1",
-				"text-table": "0.2.0",
-				"yargs": "1.3.3"
+				"domelementtype": "1.1.3",
+				"entities": "1.1.1"
 			},
 			"dependencies": {
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				},
-				"postcss-reporter": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-					"integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-						"log-symbols": "1.0.2",
-						"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-					}
-				},
-				"yargs": {
-					"version": "1.3.3",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-					"integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
-					"dev": true
+				"domelementtype": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
 				}
 			}
 		},
-		"colors": {
-			"version": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-			"dev": true
-		},
-		"combined-stream": {
-			"version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-			"requires": {
-				"delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-			}
+		"domelementtype": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
 		},
-		"commander": {
-			"version": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-			"integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+		"domhandler": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
+			"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
 			"requires": {
-				"graceful-readlink": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+				"domelementtype": "1.3.0"
 			}
 		},
-		"compare-func": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
-			"integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
-			"dev": true,
+		"domutils": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
+			"integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
 			"requires": {
-				"array-ify": "1.0.0",
-				"dot-prop": "3.0.0"
+				"dom-serializer": "0.1.0",
+				"domelementtype": "1.3.0"
 			}
 		},
-		"complex.js": {
-			"version": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.1.tgz",
-			"integrity": "sha1-6pDHoFrs6vOjdtLA9qeEIXJ9aHk=",
-			"dev": true
-		},
-		"component-emitter": {
-			"version": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-			"dev": true
-		},
-		"compress-commons": {
-			"version": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz",
-			"integrity": "sha1-WFhwku8g03y1i68AARLJJ4/3O58=",
-			"dev": true,
+		"dot-prop": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+			"integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
 			"requires": {
-				"buffer-crc32": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-				"crc32-stream": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
-				"normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
+				"is-obj": "1.0.1"
 			}
 		},
-		"concat-map": {
-			"version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"concat-stream": {
-			"version": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
-			"integrity": "sha1-U/fUPFHF5D+ByP3QMyHGMb5o1hE=",
+		"duplexify": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+			"integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
 			"requires": {
+				"end-of-stream": "1.4.0",
 				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-				"typedarray": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+				"readable-stream": "2.3.3",
+				"stream-shift": "1.0.0"
 			},
 			"dependencies": {
 				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-					"integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 					"requires": {
 						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
 						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
 					}
 				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
 				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-				}
-			}
-		},
-		"configstore": {
-			"version": "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz",
-			"integrity": "sha1-Rd+QcHPibfoc9LLVL1tgVF6qEdE=",
-			"requires": {
-				"dot-prop": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz",
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"make-dir": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-				"unique-string": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-				"write-file-atomic": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz",
-				"xdg-basedir": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"
-			},
-			"dependencies": {
-				"dot-prop": {
-					"version": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz",
-					"integrity": "sha1-qEk/C3te7sglJbXHWH+n3nyoWcE=",
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
 					"requires": {
-						"is-obj": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"
+						"safe-buffer": "5.1.1"
 					}
 				}
 			}
 		},
-		"console-control-strings": {
-			"version": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"conventional-changelog": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.3.tgz",
-			"integrity": "sha1-JigweKw4wJTfKvFgSwpGu8AWXE0=",
-			"dev": true,
-			"requires": {
-				"conventional-changelog-angular": "1.3.3",
-				"conventional-changelog-atom": "0.1.0",
-				"conventional-changelog-codemirror": "0.1.0",
-				"conventional-changelog-core": "1.8.0",
-				"conventional-changelog-ember": "0.2.5",
-				"conventional-changelog-eslint": "0.1.0",
-				"conventional-changelog-express": "0.1.0",
-				"conventional-changelog-jquery": "0.1.0",
-				"conventional-changelog-jscs": "0.1.0",
-				"conventional-changelog-jshint": "0.1.0"
-			}
-		},
-		"conventional-changelog-angular": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.3.3.tgz",
-			"integrity": "sha1-586AeoXdR1DhtBf3ZgRUl1EeByY=",
-			"dev": true,
+		"ecc-jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+			"optional": true,
 			"requires": {
-				"compare-func": "1.3.2",
-				"github-url-from-git": "1.5.0",
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"jsbn": "0.1.1"
 			}
 		},
-		"conventional-changelog-atom": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.0.tgz",
-			"integrity": "sha1-Z6R8ZqQrL4kJ7xWHyZia4d5zC5I=",
-			"dev": true,
+		"ecdsa-sig-formatter": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+			"integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
 			"requires": {
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"base64url": "2.0.0",
+				"safe-buffer": "5.1.1"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
 			}
 		},
-		"conventional-changelog-cli": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.1.tgz",
-			"integrity": "sha1-HNWp264l/7X/5nr+8eE26s7v0tU=",
-			"dev": true,
+		"emailreplyparser": {
+			"version": "0.0.5",
+			"resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
+			"integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
+		},
+		"end-of-stream": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+			"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
 			"requires": {
-				"add-stream": "1.0.0",
-				"conventional-changelog": "1.1.3",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-				"tempfile": "1.1.1"
+				"once": "1.4.0"
 			}
 		},
-		"conventional-changelog-codemirror": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz",
-			"integrity": "sha1-dXelkdv5tTjnoVCn7mL2WihyszQ=",
-			"dev": true,
-			"requires": {
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
-			}
+		"ent": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+			"integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
 		},
-		"conventional-changelog-core": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.8.0.tgz",
-			"integrity": "sha1-l3hItBbK8V+wnyCxKmLUDvFFuVc=",
-			"dev": true,
+		"entities": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+		},
+		"es-abstract": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
+			"integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
 			"requires": {
-				"conventional-changelog-writer": "1.4.1",
-				"conventional-commits-parser": "1.3.0",
-				"dateformat": "1.0.12",
-				"get-pkg-repo": "1.3.0",
-				"git-raw-commits": "1.2.0",
-				"git-remote-origin-url": "2.0.0",
-				"git-semver-tags": "1.2.0",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"normalize-package-data": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-				"read-pkg": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-				"read-pkg-up": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
+				"es-to-primitive": "1.1.1",
+				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
+				"is-callable": "1.1.3",
+				"is-regex": "1.0.4"
 			}
 		},
-		"conventional-changelog-ember": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.5.tgz",
-			"integrity": "sha1-ziHVz4PNXr4F0j/fIy2IRPS1ak8=",
-			"dev": true,
+		"es-to-primitive": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+			"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
 			"requires": {
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"is-callable": "1.1.3",
+				"is-date-object": "1.0.1",
+				"is-symbol": "1.0.1"
 			}
 		},
-		"conventional-changelog-eslint": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz",
-			"integrity": "sha1-pSQR6ZngUBzlALhWsKZD0DMJB+I=",
-			"dev": true,
+		"escape-string-regexp": {
+			"version": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+		},
+		"esutils": {
+			"version": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+			"dev": true
+		},
+		"events": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+		},
+		"extend": {
+			"version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		},
+		"file-type": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-6.1.0.tgz",
+			"integrity": "sha1-Wn26mBOPoKvsevxD5amgsqrHKfE="
+		},
+		"foreach": {
+			"version": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+		},
+		"forever-agent": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+		},
+		"form-data": {
+			"version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
 			"requires": {
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
 			}
 		},
-		"conventional-changelog-express": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz",
-			"integrity": "sha1-VcbIQcgRliA2wDe9vZZKVK4xD84=",
-			"dev": true,
+		"formidable": {
+			"version": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
+			"integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
+			"dev": true
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+		},
+		"fstream": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
 			"requires": {
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"graceful-fs": "4.1.11",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+				"rimraf": "2.6.1"
 			}
 		},
-		"conventional-changelog-jquery": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz",
-			"integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
-			"dev": true,
+		"fstream-ignore": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+			"integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
 			"requires": {
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"fstream": "1.0.11",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
 			}
 		},
-		"conventional-changelog-jscs": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz",
-			"integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
-			"dev": true,
+		"function-bind": {
+			"version": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
+			"integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E="
+		},
+		"gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 			"requires": {
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"aproba": "1.1.2",
+				"console-control-strings": "1.1.0",
+				"has-unicode": "2.0.1",
+				"object-assign": "4.1.1",
+				"signal-exit": "3.0.2",
+				"string-width": "1.0.2",
+				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+				"wide-align": "1.1.2"
 			}
 		},
-		"conventional-changelog-jshint": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz",
-			"integrity": "sha1-AMq46aMxdIer2UxNhGcTQpGNKgc=",
-			"dev": true,
+		"gcp-metadata": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.0.tgz",
+			"integrity": "sha512-puqMtZV/eukdfsafq0tir21+/k9hPbN9FRhgeN7NwtvEJQaviJoZOOlh1+dBeWgsRSYwAqcEVh63grU7a6bJyw==",
 			"requires": {
-				"compare-func": "1.3.2",
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+				"retry-request": "3.0.0"
+			},
+			"dependencies": {
+				"retry-request": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
+					"integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
+					"requires": {
+						"request": "2.81.0",
+						"through2": "2.0.3"
+					}
+				}
 			}
 		},
-		"conventional-changelog-writer": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz",
-			"integrity": "sha1-P0y00APrtWmJ0w00WJO1KkNjnI4=",
-			"dev": true,
+		"gcs-resumable-upload": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.1.tgz",
+			"integrity": "sha512-Ps/yvSzdNL41oiRzSE8UgjcW8hdNQNyMqdsDSmCAn+fwWG8Sg5TR2CqSPchkMiYQQDqN7WWkheTEd0w1hfn/dw==",
 			"requires": {
-				"compare-func": "1.3.2",
-				"conventional-commits-filter": "1.0.0",
-				"dateformat": "1.0.12",
-				"handlebars": "4.0.10",
-				"json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-				"split": "1.0.0",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
+				"buffer-equal": "1.0.0",
+				"configstore": "3.1.1",
+				"google-auto-auth": "0.7.2",
+				"pumpify": "1.3.5",
+				"request": "2.81.0",
+				"stream-events": "1.0.2",
+				"through2": "2.0.3"
 			}
 		},
-		"conventional-commits-filter": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz",
-			"integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=",
-			"dev": true,
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
 			"requires": {
-				"is-subset": "0.1.1",
-				"modify-values": "1.0.0"
+				"assert-plus": "1.0.0"
+			},
+			"dependencies": {
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+				}
 			}
 		},
-		"conventional-commits-parser": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz",
-			"integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=",
-			"dev": true,
+		"glob": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
 			"requires": {
-				"is-text-path": "1.0.1",
-				"JSONStream": "1.3.1",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-				"split2": "2.1.1",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-				"trim-off-newlines": "1.0.1"
+				"fs.realpath": "1.0.0",
+				"inflight": "1.0.6",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+				"once": "1.4.0",
+				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
 			}
 		},
-		"convert-source-map": {
-			"version": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-			"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+		"globals": {
+			"version": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
+			"integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY=",
 			"dev": true
 		},
-		"cookiejar": {
-			"version": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
-			"integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
-			"dev": true
+		"google-auth-library": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+			"integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+			"requires": {
+				"gtoken": "1.2.2",
+				"jws": "3.1.4",
+				"lodash.noop": "3.0.1",
+				"request": "2.81.0"
+			}
 		},
-		"core-js": {
-			"version": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-			"integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
+		"google-auto-auth": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+			"integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+			"requires": {
+				"async": "2.5.0",
+				"gcp-metadata": "0.3.0",
+				"google-auth-library": "0.10.0",
+				"request": "2.81.0"
+			}
 		},
-		"core-util-is": {
-			"version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+		"google-p12-pem": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+			"integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+			"requires": {
+				"node-forge": "0.7.1"
+			}
 		},
-		"cosmiconfig": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.1.tgz",
-			"integrity": "sha512-17m9pl5cD9jhPUHqaxSA4fyoiAQJUG7V3CQDxCF7gWzGYeUY0YEnLQdQyOEKjEPVv0yGbdCfdfJMq6SphRiRjw==",
-			"dev": true,
+		"graceful-fs": {
+			"version": "4.1.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+		},
+		"gtoken": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
+			"integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
 			"requires": {
-				"is-directory": "0.3.1",
-				"js-yaml": "3.9.0",
-				"minimist": "1.2.0",
-				"object-assign": "4.1.1",
-				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-				"parse-json": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-				"require-from-string": "1.2.1"
+				"google-p12-pem": "0.1.2",
+				"jws": "3.1.4",
+				"mime": "1.4.0",
+				"request": "2.81.0"
 			},
 			"dependencies": {
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
+				"mime": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz",
+					"integrity": "sha512-n9ChLv77+QQEapYz8lV+rIZAW3HhAPW2CXnzb1GN5uMkuczshwvkW7XPsbzU0ZQN3sP47Er2KVkp2p3KyqZKSQ=="
 				}
 			}
 		},
-		"crc": {
-			"version": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
-			"integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms=",
-			"dev": true
+		"har-schema": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+			"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
 		},
-		"crc32-stream": {
-			"version": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
-			"integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
-			"dev": true,
+		"har-validator": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+			"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
 			"requires": {
-				"crc": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
+				"ajv": "4.11.8",
+				"har-schema": "1.0.5"
 			}
 		},
-		"create-error-class": {
-			"version": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-			"integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+		"has": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+			"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
 			"requires": {
-				"capture-stack-trace": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"
+				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"
 			}
 		},
-		"cross-spawn": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-			"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+		"has-ansi": {
+			"version": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
 			"dev": true,
 			"requires": {
-				"lru-cache": "4.1.1",
-				"shebang-command": "1.2.0",
-				"which": "https://registry.npmjs.org/which/-/which-1.2.14.tgz"
+				"ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
 			}
 		},
-		"cryptiles": {
-			"version": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		},
+		"hash-stream-validation": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+			"integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
 			"requires": {
-				"boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+				"through2": "2.0.3"
 			}
 		},
-		"crypto-browserify": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz",
-			"integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA="
+		"hawk": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+			"requires": {
+				"boom": "2.10.1",
+				"cryptiles": "2.0.5",
+				"hoek": "2.16.3",
+				"sntp": "1.0.9"
+			}
 		},
-		"crypto-random-string": {
-			"version": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-			"integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+		"he": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
+		},
+		"highlight.js": {
+			"version": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+			"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
+		},
+		"hoek": {
+			"version": "2.16.3",
+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
 		},
-		"css": {
-			"version": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-			"integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
+		"home-or-tmp": {
+			"version": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+			"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
 			"dev": true,
 			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-				"source-map-resolve": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-				"urix": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
+				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+			}
+		},
+		"html-to-text": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.1.0.tgz",
+			"integrity": "sha1-fwfvIXPloEQecxXBkgE6AKUtXko=",
+			"requires": {
+				"he": "1.1.1",
+				"htmlparser2": "3.9.2",
+				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+				"underscore": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+				"underscore.string": "3.3.4"
 			},
 			"dependencies": {
-				"source-map": {
-					"version": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-					"dev": true,
+				"underscore.string": {
+					"version": "3.3.4",
+					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
+					"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
 					"requires": {
-						"amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
+						"sprintf-js": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
 					}
 				}
 			}
 		},
-		"css-color-function": {
-			"version": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.0.tgz",
-			"integrity": "sha1-csdnuvl48BuKipT0Lxe6XSKndvw=",
-			"dev": true,
+		"htmlparser2": {
+			"version": "3.9.2",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
 			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
-				"color": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-				"debug": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-				"rgb": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
-					"integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
-					"dev": true
-				},
-				"debug": {
-					"version": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-					"integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=",
-					"dev": true
-				}
-			}
-		},
-		"css-color-names": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz",
-			"integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=",
-			"dev": true
-		},
-		"css-parse": {
-			"version": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-			"integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-			"dev": true,
-			"requires": {
-				"css": "https://registry.npmjs.org/css/-/css-2.2.1.tgz"
-			}
-		},
-		"css-rule-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-			"integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
-			"dev": true,
-			"requires": {
-				"css-tokenize": "1.0.1",
-				"duplexer2": "0.0.2",
-				"ldjson-stream": "1.2.1",
-				"through2": "0.6.5"
+				"domelementtype": "1.3.0",
+				"domhandler": "2.4.1",
+				"domutils": "1.6.2",
+				"entities": "1.1.1",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"readable-stream": "2.3.3"
 			},
 			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
 				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 					"requires": {
 						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
+						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
 					}
 				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
 					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+						"safe-buffer": "5.1.1"
 					}
 				}
 			}
 		},
-		"css-tokenize": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-			"integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
-			"dev": true,
+		"http-signature": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
 			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "1.1.14"
+				"assert-plus": "0.2.0",
+				"jsprim": "1.4.1",
+				"sshpk": "1.13.1"
+			}
+		},
+		"ieee754": {
+			"version": "1.1.8",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+			"integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+		},
+		"imap": {
+			"version": "0.8.19",
+			"resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
+			"integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
+			"requires": {
+				"readable-stream": "1.1.14",
+				"utf7": "1.0.2"
 			},
 			"dependencies": {
 				"isarray": {
 					"version": "0.0.1",
 					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
+					"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=",
-					"dev": true,
 					"requires": {
 						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
@@ -2301,4123 +1904,540 @@
 				"string_decoder": {
 					"version": "0.10.31",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
 				}
 			}
 		},
-		"css-value": {
-			"version": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-			"integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
-			"dev": true
-		},
-		"ctype": {
-			"version": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-			"integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
-			"dev": true
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
 		},
-		"currently-unhandled": {
-			"version": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-			"dev": true,
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 			"requires": {
-				"array-find-index": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"
+				"once": "1.4.0",
+				"wrappy": "1.0.2"
 			}
 		},
-		"d": {
-			"version": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
-			"integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
-			"dev": true,
+		"inherits": {
+			"version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+		},
+		"inherits-ex": {
+			"version": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.1.8.tgz",
+			"integrity": "sha1-9wmppZxYqT3f4B01MOZyR7rim+M=",
 			"requires": {
-				"es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz"
+				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
 			}
 		},
-		"dargs": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
-			"integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
+		"ini": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+			"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+		},
+		"invariant": {
+			"version": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+			"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
 			"dev": true,
 			"requires": {
-				"number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+				"loose-envify": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"
 			}
 		},
-		"dashdash": {
-			"version": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"requires": {
-				"assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
+		"is": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
+		},
+		"is-callable": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+			"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
+		},
+		"is-date-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
 		},
-		"dateformat": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-			"integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+		"is-finite": {
+			"version": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+			"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
 			"dev": true,
 			"requires": {
-				"get-stdin": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"
+				"number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
 			}
 		},
-		"ddp-ejson": {
-			"version": "https://registry.npmjs.org/ddp-ejson/-/ddp-ejson-0.8.1-3.tgz",
-			"integrity": "sha1-6dZ0Zqt4m9dOfZcHSjbiQGkO7sI=",
-			"dev": true,
+		"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": {
-				"ddp-underscore-patched": "https://registry.npmjs.org/ddp-underscore-patched/-/ddp-underscore-patched-0.8.1-2.tgz"
+				"number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
 			}
 		},
-		"ddp-underscore-patched": {
-			"version": "https://registry.npmjs.org/ddp-underscore-patched/-/ddp-underscore-patched-0.8.1-2.tgz",
-			"integrity": "sha1-ZaQU6fIuxagqoWOG40NmtI/Ozx0=",
-			"dev": true
+		"is-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
 		},
-		"debug": {
-			"version": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-			"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+		"is-regex": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
 			"requires": {
-				"ms": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+				"has": "1.0.1"
 			}
 		},
-		"decamelize": {
-			"version": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-			"dev": true
+		"is-stream-ended": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
+			"integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
 		},
-		"decimal.js": {
-			"version": "https://registry.npmjs.org/decimal.js/-/decimal.js-7.1.1.tgz",
-			"integrity": "sha1-GtytfXDXqRxCbXVvHrZWbDvmy88=",
-			"dev": true
+		"is-symbol": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+			"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
 		},
-		"deep-eql": {
-			"version": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-			"integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
-			"dev": true,
-			"requires": {
-				"type-detect": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"
-			},
-			"dependencies": {
-				"type-detect": {
-					"version": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
-					"integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
-					"dev": true
-				}
-			}
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
-		"deep-extend": {
-			"version": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-			"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+		"isarray": {
+			"version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
-		"deep-is": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
 		},
-		"deepmerge": {
-			"version": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
-			"integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
-			"dev": true
+		"jmespath": {
+			"version": "0.15.0",
+			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+			"integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
 		},
-		"define-properties": {
-			"version": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-			"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-			"requires": {
-				"foreach": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-				"object-keys": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"
-			}
+		"jquery": {
+			"version": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
+			"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
 		},
-		"del": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-			"integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-			"dev": true,
-			"requires": {
-				"globby": "5.0.0",
-				"is-path-cwd": "1.0.0",
-				"is-path-in-cwd": "1.0.0",
-				"object-assign": "4.1.1",
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-				"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-				"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
-			},
-			"dependencies": {
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				}
-			}
+		"js-tokens": {
+			"version": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
+			"integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=",
+			"dev": true
 		},
-		"delayed-stream": {
-			"version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+			"optional": true
 		},
-		"delegates": {
-			"version": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+		"jsesc": {
+			"version": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+			"dev": true
 		},
-		"detect-indent": {
-			"version": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-			"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-			"dev": true,
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+		},
+		"json-stable-stringify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
 			"requires": {
-				"repeating": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
+				"jsonify": "0.0.0"
 			}
 		},
-		"diff": {
-			"version": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+		},
+		"json5": {
+			"version": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
+			"integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
 			"dev": true
 		},
-		"doctrine": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-			"integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
-			"dev": true,
-			"requires": {
-				"esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-				"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-			}
+		"jsonify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
 		},
-		"doiuse": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz",
-			"integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
-			"dev": true,
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
 			"requires": {
-				"browserslist": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-				"caniuse-db": "1.0.30000704",
-				"css-rule-stream": "1.1.0",
-				"duplexer2": "0.0.2",
-				"jsonfilter": "1.1.2",
-				"ldjson-stream": "1.2.1",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"multimatch": "2.1.0",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"source-map": "0.4.4",
-				"through2": "0.6.5",
-				"yargs": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
 			},
 			"dependencies": {
-				"caniuse-db": {
-					"version": "1.0.30000704",
-					"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000704.tgz",
-					"integrity": "sha1-jFqm/tgFjmXHDywfXWP3CIZQcFw=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-					"dev": true,
-					"requires": {
-						"amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-					}
-				}
-			}
-		},
-		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-			"requires": {
-				"domelementtype": "1.1.3",
-				"entities": "1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
-				}
-			}
-		},
-		"domelementtype": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
-		},
-		"domhandler": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-			"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-			"requires": {
-				"domelementtype": "1.3.0"
-			}
-		},
-		"domutils": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
-			"integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
-			"requires": {
-				"dom-serializer": "0.1.0",
-				"domelementtype": "1.3.0"
-			}
-		},
-		"dot-prop": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
-			"integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
-			"dev": true,
-			"requires": {
-				"is-obj": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"
-			}
-		},
-		"duplexer": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-			"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-			"dev": true
-		},
-		"duplexer2": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-			"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-			"dev": true,
-			"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=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"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=",
-					"dev": true
-				}
-			}
-		},
-		"duplexify": {
-			"version": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
-			"integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
-			"requires": {
-				"end-of-stream": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-				"stream-shift": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"
-			},
-			"dependencies": {
-				"end-of-stream": {
-					"version": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-					"integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
-					"requires": {
-						"once": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
-					}
-				},
-				"once": {
-					"version": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-					"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-					"requires": {
-						"wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-					}
-				}
-			}
-		},
-		"duration": {
-			"version": "https://registry.npmjs.org/duration/-/duration-0.2.0.tgz",
-			"integrity": "sha1-X5xN+q//ZV3phhEu/iXFl43YUUY=",
-			"dev": true,
-			"requires": {
-				"d": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
-				"es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz"
-			}
-		},
-		"ecc-jsbn": {
-			"version": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-			"optional": true,
-			"requires": {
-				"jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
-			}
-		},
-		"ecdsa-sig-formatter": {
-			"version": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-			"integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-			"requires": {
-				"base64url": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
-			}
-		},
-		"ejs": {
-			"version": "https://registry.npmjs.org/ejs/-/ejs-2.5.6.tgz",
-			"integrity": "sha1-R5Y2v6P+Ox3r1SCH8KyyBLTxnIg=",
-			"dev": true
-		},
-		"electron-to-chromium": {
-			"version": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz",
-			"integrity": "sha1-GzperObgh7teJXoQCwy/6Bsokfw=",
-			"dev": true
-		},
-		"emailreplyparser": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
-			"integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
-		},
-		"end-of-stream": {
-			"version": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-			"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-			"requires": {
-				"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-			}
-		},
-		"ent": {
-			"version": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-			"integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
-		},
-		"entities": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-		},
-		"error-ex": {
-			"version": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-			"integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-			"dev": true,
-			"requires": {
-				"is-arrayish": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-			}
-		},
-		"error-stack-parser": {
-			"version": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
-			"integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
-			"dev": true,
-			"requires": {
-				"stackframe": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz"
-			}
-		},
-		"es-abstract": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
-			"integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
-			"requires": {
-				"es-to-primitive": "1.1.1",
-				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-				"is-callable": "1.1.3",
-				"is-regex": "1.0.4"
-			}
-		},
-		"es-to-primitive": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-			"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-			"requires": {
-				"is-callable": "1.1.3",
-				"is-date-object": "1.0.1",
-				"is-symbol": "1.0.1"
-			}
-		},
-		"es5-ext": {
-			"version": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz",
-			"integrity": "sha1-Gacl+eUdAwC7wejoIRCf2dr1WSU=",
-			"dev": true,
-			"requires": {
-				"es6-iterator": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
-				"es6-symbol": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"
-			}
-		},
-		"es6-iterator": {
-			"version": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
-			"integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
-			"dev": true,
-			"requires": {
-				"d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-				"es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz",
-				"es6-symbol": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"
-			},
-			"dependencies": {
-				"d": {
-					"version": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-					"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-					"dev": true,
-					"requires": {
-						"es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz"
-					}
-				}
-			}
-		},
-		"es6-promise": {
-			"version": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
-			"integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI=",
-			"dev": true
-		},
-		"es6-symbol": {
-			"version": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-			"dev": true,
-			"requires": {
-				"d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-				"es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz"
-			},
-			"dependencies": {
-				"d": {
-					"version": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-					"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-					"dev": true,
-					"requires": {
-						"es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz"
-					}
-				}
-			}
-		},
-		"escape-string-regexp": {
-			"version": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-		},
-		"eslint": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.3.0.tgz",
-			"integrity": "sha1-/NfJY3a780yF7mftABKimWQrEI8=",
-			"dev": true,
-			"requires": {
-				"ajv": "5.2.2",
-				"babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"concat-stream": "1.6.0",
-				"cross-spawn": "5.1.0",
-				"debug": "2.6.8",
-				"doctrine": "2.0.0",
-				"eslint-scope": "3.7.1",
-				"espree": "3.4.3",
-				"esquery": "1.0.0",
-				"estraverse": "4.2.0",
-				"esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-				"file-entry-cache": "2.0.0",
-				"functional-red-black-tree": "1.0.1",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"globals": "9.18.0",
-				"ignore": "3.3.3",
-				"imurmurhash": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-				"inquirer": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
-				"is-resolvable": "1.0.0",
-				"js-yaml": "3.9.0",
-				"json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-				"levn": "0.3.0",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"natural-compare": "1.4.0",
-				"optionator": "0.8.2",
-				"path-is-inside": "1.0.2",
-				"pluralize": "4.0.0",
-				"progress": "2.0.0",
-				"require-uncached": "1.0.3",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-				"strip-json-comments": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-				"table": "4.0.1",
-				"text-table": "0.2.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.2.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-					"integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
-					"dev": true,
-					"requires": {
-						"co": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-						"fast-deep-equal": "1.0.0",
-						"json-schema-traverse": "0.3.1",
-						"json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
-					}
-				},
-				"concat-stream": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-					"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-					"dev": true,
-					"requires": {
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"readable-stream": "2.3.3",
-						"typedarray": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-					}
-				},
-				"debug": {
-					"version": "2.6.8",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"globals": {
-					"version": "9.18.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-					"integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"progress": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-					"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"eslint-scope": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-			"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
-			"dev": true,
-			"requires": {
-				"esrecurse": "4.2.0",
-				"estraverse": "4.2.0"
-			}
-		},
-		"espree": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz",
-			"integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=",
-			"dev": true,
-			"requires": {
-				"acorn": "5.1.1",
-				"acorn-jsx": "3.0.1"
-			}
-		},
-		"esprima": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-			"integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
-			"dev": true
-		},
-		"esquery": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-			"integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-			"dev": true,
-			"requires": {
-				"estraverse": "4.2.0"
-			}
-		},
-		"esrecurse": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-			"integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
-			"dev": true,
-			"requires": {
-				"estraverse": "4.2.0",
-				"object-assign": "4.1.1"
-			},
-			"dependencies": {
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				}
-			}
-		},
-		"estraverse": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-			"dev": true
-		},
-		"esutils": {
-			"version": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-			"dev": true
-		},
-		"events": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-		},
-		"execall": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
-			"integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
-			"dev": true,
-			"requires": {
-				"clone-regexp": "1.0.0"
-			}
-		},
-		"exit": {
-			"version": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-brackets": {
-			"version": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-			"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-			"dev": true,
-			"requires": {
-				"is-posix-bracket": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"
-			}
-		},
-		"expand-range": {
-			"version": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"
-			}
-		},
-		"extend": {
-			"version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-		},
-		"external-editor": {
-			"version": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz",
-			"integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=",
-			"dev": true,
-			"requires": {
-				"iconv-lite": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz",
-				"jschardet": "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz",
-				"tmp": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"
-			}
-		},
-		"extglob": {
-			"version": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-			"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-			}
-		},
-		"extract-zip": {
-			"version": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
-			"integrity": "sha1-ksz22B73Cp+kwXRxFMzvbYaIpsQ=",
-			"dev": true,
-			"requires": {
-				"concat-stream": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
-				"debug": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-				"yauzl": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-					"integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-					"dev": true,
-					"requires": {
-						"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-					}
-				}
-			}
-		},
-		"extsprintf": {
-			"version": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-			"integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
-		},
-		"fast-deep-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-			"integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-			"dev": true
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
-		},
-		"faye-websocket": {
-			"version": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz",
-			"integrity": "sha1-iFk0x57/sECVSeDAo4Ae0XpAza0=",
-			"dev": true,
-			"requires": {
-				"websocket-driver": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"
-			}
-		},
-		"fd-slicer": {
-			"version": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-			"dev": true,
-			"requires": {
-				"pend": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
-			}
-		},
-		"fg-lodash": {
-			"version": "https://registry.npmjs.org/fg-lodash/-/fg-lodash-0.0.2.tgz",
-			"integrity": "sha1-mINSU39CfaavIiEpu2OsyknmL6M=",
-			"dev": true,
-			"requires": {
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-				"underscore.string": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-					"integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
-					"dev": true
-				}
-			}
-		},
-		"fibers": {
-			"version": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-			"integrity": "sha1-IvA5yPGLhWGQ+75N7PBWFUwerpw=",
-			"dev": true
-		},
-		"figures": {
-			"version": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-			"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-				"object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-			}
-		},
-		"file-entry-cache": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-			"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-			"dev": true,
-			"requires": {
-				"flat-cache": "1.2.2",
-				"object-assign": "4.1.1"
-			},
-			"dependencies": {
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				}
-			}
-		},
-		"file-type": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-			"integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY="
-		},
-		"filename-regex": {
-			"version": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
-		"fill-range": {
-			"version": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-			"dev": true,
-			"requires": {
-				"is-number": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-				"isobject": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-				"randomatic": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz",
-				"repeat-element": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-				"repeat-string": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
-			}
-		},
-		"find-up": {
-			"version": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-			"dev": true,
-			"requires": {
-				"path-exists": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-				"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-			},
-			"dependencies": {
-				"path-exists": {
-					"version": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"dev": true,
-					"requires": {
-						"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-					}
-				}
-			}
-		},
-		"flat-cache": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
-			"integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
-			"dev": true,
-			"requires": {
-				"circular-json": "0.3.1",
-				"del": "2.2.2",
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"write": "0.2.1"
-			}
-		},
-		"flatten": {
-			"version": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-			"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-			"dev": true
-		},
-		"for-in": {
-			"version": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true
-		},
-		"for-own": {
-			"version": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-			"dev": true,
-			"requires": {
-				"for-in": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
-			}
-		},
-		"foreach": {
-			"version": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-		},
-		"forever-agent": {
-			"version": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-		},
-		"form-data": {
-			"version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-			"requires": {
-				"asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
-			}
-		},
-		"formidable": {
-			"version": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
-			"integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
-			"dev": true
-		},
-		"fraction.js": {
-			"version": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.0.tgz",
-			"integrity": "sha1-c5dOL4tR73CVNtYkzJB4Liu2EnQ=",
-			"dev": true
-		},
-		"freeport": {
-			"version": "https://registry.npmjs.org/freeport/-/freeport-1.0.5.tgz",
-			"integrity": "sha1-JV6KuEFwwzuoXZkOghrl9KGpvF0=",
-			"dev": true
-		},
-		"fs-extra": {
-			"version": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
-			"integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"jsonfile": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-				"klaw": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
-			}
-		},
-		"fs.realpath": {
-			"version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-		},
-		"fstream": {
-			"version": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
-			}
-		},
-		"fstream-ignore": {
-			"version": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-			"integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-			"requires": {
-				"fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-			}
-		},
-		"function-bind": {
-			"version": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-			"integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E="
-		},
-		"functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
-		"gather-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
-			"integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
-			"dev": true
-		},
-		"gauge": {
-			"version": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-			"requires": {
-				"aproba": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
-				"console-control-strings": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-				"has-unicode": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-				"object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-				"signal-exit": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-				"string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-				"wide-align": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"
-			}
-		},
-		"gaze": {
-			"version": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
-			"integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-			"dev": true,
-			"requires": {
-				"globule": "https://registry.npmjs.org/globule/-/globule-1.1.0.tgz"
-			}
-		},
-		"gcp-metadata": {
-			"version": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.1.0.tgz",
-			"integrity": "sha1-q+IfHqMk3Qs0o/BsqBdj+x7uN9k=",
-			"requires": {
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"retry-request": "https://registry.npmjs.org/retry-request/-/retry-request-1.3.2.tgz"
-			},
-			"dependencies": {
-				"caseless": {
-					"version": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-					"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
-				},
-				"har-validator": {
-					"version": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-					"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"commander": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-						"is-my-json-valid": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-						"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-					}
-				},
-				"node-uuid": {
-					"version": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-					"integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
-				},
-				"qs": {
-					"version": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-					"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw="
-				},
-				"request": {
-					"version": "https://registry.npmjs.org/request/-/request-2.76.0.tgz",
-					"integrity": "sha1-vkRQWv73A2CgQ2lVEGvjlF2VVg4=",
-					"requires": {
-						"aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-						"aws4": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-						"caseless": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-						"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-						"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-						"forever-agent": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-						"form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-						"har-validator": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-						"hawk": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-						"http-signature": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-						"is-typedarray": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-						"isstream": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-						"json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-						"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-						"node-uuid": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-						"oauth-sign": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-						"qs": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-						"stringstream": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-						"tough-cookie": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-						"tunnel-agent": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-					}
-				},
-				"retry-request": {
-					"version": "https://registry.npmjs.org/retry-request/-/retry-request-1.3.2.tgz",
-					"integrity": "sha1-Wa0k5x+K4/MS1fe0vPRnpeWle9Y=",
-					"requires": {
-						"request": "https://registry.npmjs.org/request/-/request-2.76.0.tgz",
-						"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
-					}
-				},
-				"tunnel-agent": {
-					"version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
-				}
-			}
-		},
-		"gcs-resumable-upload": {
-			"version": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.7.7.tgz",
-			"integrity": "sha1-2clyWvlwu8hsvwr+8kBtwizpGGQ=",
-			"requires": {
-				"buffer-equal": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-				"configstore": "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz",
-				"google-auto-auth": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.6.1.tgz",
-				"pumpify": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-				"stream-events": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
-			}
-		},
-		"generate-function": {
-			"version": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-			"integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
-		},
-		"generate-object-property": {
-			"version": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-			"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-			"requires": {
-				"is-property": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-			}
-		},
-		"get-pkg-repo": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.3.0.tgz",
-			"integrity": "sha1-Q8a0wEi3XdYE/FOI7ezeVX9jNd8=",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-				"normalize-package-data": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
-				"parse-github-repo-url": "1.4.0",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
-			}
-		},
-		"get-stdin": {
-			"version": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-			"dev": true
-		},
-		"getpass": {
-			"version": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"gherkin": {
-			"version": "https://registry.npmjs.org/gherkin/-/gherkin-4.0.0.tgz",
-			"integrity": "sha1-edzgTRIj6kO0hip2vlzo+JwSwyw=",
-			"dev": true
-		},
-		"git-raw-commits": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz",
-			"integrity": "sha1-DzqL/ZmuDy2LkiTViJKXXppS0Dw=",
-			"dev": true,
-			"requires": {
-				"dargs": "4.1.0",
-				"lodash.template": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-				"split2": "2.1.1",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
-			}
-		},
-		"git-remote-origin-url": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-			"integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-			"dev": true,
-			"requires": {
-				"gitconfiglocal": "1.0.0",
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-			}
-		},
-		"git-semver-tags": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.0.tgz",
-			"integrity": "sha1-sx/QLIq1eL1sm1ysyl4cZMEXesE=",
-			"dev": true,
-			"requires": {
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
-			}
-		},
-		"gitconfiglocal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-			"integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
-			"dev": true,
-			"requires": {
-				"ini": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-			}
-		},
-		"github-url-from-git": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz",
-			"integrity": "sha1-+YX+3MCpqledyI16/waNVcxiUaA=",
-			"dev": true
-		},
-		"glob": {
-			"version": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-			"requires": {
-				"fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-				"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-			}
-		},
-		"glob-base": {
-			"version": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-				"is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-			}
-		},
-		"glob-parent": {
-			"version": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-			"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-			"dev": true,
-			"requires": {
-				"is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-			}
-		},
-		"globals": {
-			"version": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
-			"integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY=",
-			"dev": true
-		},
-		"globby": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-			"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-			"dev": true,
-			"requires": {
-				"array-union": "1.0.2",
-				"arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"object-assign": "4.1.1",
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-				"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-			},
-			"dependencies": {
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				}
-			}
-		},
-		"globjoin": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-			"dev": true
-		},
-		"globule": {
-			"version": "https://registry.npmjs.org/globule/-/globule-1.1.0.tgz",
-			"integrity": "sha1-xJNS5NwYPYWJPuglOF65lLtt9F8=",
-			"dev": true,
-			"requires": {
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz",
-					"integrity": "sha1-0iyaxmAojzhD4Wun0rXQbMon13c=",
-					"dev": true
-				}
-			}
-		},
-		"gonzales-pe": {
-			"version": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.0.3.tgz",
-			"integrity": "sha1-NhSOGOJnGE+/3JKa8o8prZ+/l0Y=",
-			"dev": true,
-			"requires": {
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
-					"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
-					"dev": true
-				}
-			}
-		},
-		"google-auth-library": {
-			"version": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-			"integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-			"requires": {
-				"gtoken": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-				"jws": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-				"lodash.noop": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
-			}
-		},
-		"google-auto-auth": {
-			"version": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.6.1.tgz",
-			"integrity": "sha1-wF2CDpRUc57PKKiJLuqz0WJPLLM=",
-			"requires": {
-				"async": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-				"gcp-metadata": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.1.0.tgz",
-				"google-auth-library": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-				"object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
-			},
-			"dependencies": {
-				"async": {
-					"version": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-					"integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
-					"requires": {
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-					}
-				},
-				"object-assign": {
-					"version": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-					"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
-				}
-			}
-		},
-		"google-p12-pem": {
-			"version": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-			"integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-			"requires": {
-				"node-forge": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz"
-			}
-		},
-		"graceful-fs": {
-			"version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-		},
-		"graceful-readlink": {
-			"version": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-			"integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-		},
-		"growl": {
-			"version": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-			"dev": true
-		},
-		"gtoken": {
-			"version": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-			"integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
-			"requires": {
-				"google-p12-pem": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-				"jws": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-				"mime": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
-			}
-		},
-		"handlebars": {
-			"version": "4.0.10",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-			"integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-			"dev": true,
-			"requires": {
-				"async": "1.5.2",
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-				"source-map": "0.4.4",
-				"uglify-js": "2.8.28"
-			},
-			"dependencies": {
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-					"dev": true,
-					"requires": {
-						"amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
-					}
-				}
-			}
-		},
-		"hapi": {
-			"version": "https://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
-			"integrity": "sha1-h+N6Bum0meiXkOLcERqpZotuYX8=",
-			"dev": true,
-			"requires": {
-				"accept": "https://registry.npmjs.org/accept/-/accept-1.0.0.tgz",
-				"ammo": "https://registry.npmjs.org/ammo/-/ammo-1.0.0.tgz",
-				"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-				"call": "https://registry.npmjs.org/call/-/call-2.0.1.tgz",
-				"catbox": "https://registry.npmjs.org/catbox/-/catbox-4.3.0.tgz",
-				"catbox-memory": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-1.1.1.tgz",
-				"cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz",
-				"h2o2": "https://registry.npmjs.org/h2o2/-/h2o2-4.0.1.tgz",
-				"heavy": "https://registry.npmjs.org/heavy/-/heavy-3.0.0.tgz",
-				"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-				"inert": "https://registry.npmjs.org/inert/-/inert-2.1.5.tgz",
-				"iron": "https://registry.npmjs.org/iron/-/iron-2.1.2.tgz",
-				"items": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
-				"joi": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
-				"kilt": "https://registry.npmjs.org/kilt/-/kilt-1.1.1.tgz",
-				"mimos": "https://registry.npmjs.org/mimos/-/mimos-2.0.2.tgz",
-				"peekaboo": "https://registry.npmjs.org/peekaboo/-/peekaboo-1.0.0.tgz",
-				"qs": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
-				"shot": "https://registry.npmjs.org/shot/-/shot-1.5.3.tgz",
-				"statehood": "https://registry.npmjs.org/statehood/-/statehood-2.1.1.tgz",
-				"subtext": "https://registry.npmjs.org/subtext/-/subtext-1.1.1.tgz",
-				"topo": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz",
-				"vision": "https://registry.npmjs.org/vision/-/vision-2.0.1.tgz"
-			},
-			"dependencies": {
-				"accept": {
-					"version": "https://registry.npmjs.org/accept/-/accept-1.0.0.tgz",
-					"integrity": "sha1-g++IOWi4WkDFARYEKCoiD/AeYq0=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"ammo": {
-					"version": "https://registry.npmjs.org/ammo/-/ammo-1.0.0.tgz",
-					"integrity": "sha1-4FlIG/aAhzj66G1GT3L6DBLWeoU=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"boom": {
-					"version": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-					"integrity": "sha1-2tYo2Jf3/S4yzIIZfxMweXHPg1Q=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"call": {
-					"version": "https://registry.npmjs.org/call/-/call-2.0.1.tgz",
-					"integrity": "sha1-SbQnCZQ96JoyJYqpEbWHUeI3eg4=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"catbox": {
-					"version": "https://registry.npmjs.org/catbox/-/catbox-4.3.0.tgz",
-					"integrity": "sha1-IiN3vWfxKRrA4l0AAC0GWp3385o=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"joi": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz"
-					}
-				},
-				"catbox-memory": {
-					"version": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-1.1.1.tgz",
-					"integrity": "sha1-QqUvgLye+nJmAeltQBYDNhJIGig=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"cryptiles": {
-					"version": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz",
-					"integrity": "sha1-CeoXdbnhx95+YKmdQqtvCM4aEoU=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz"
-					}
-				},
-				"h2o2": {
-					"version": "https://registry.npmjs.org/h2o2/-/h2o2-4.0.1.tgz",
-					"integrity": "sha1-eg4rztHZcXjsVs48ykjgxW3un40=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"joi": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
-						"wreck": "https://registry.npmjs.org/wreck/-/wreck-5.6.1.tgz"
-					},
-					"dependencies": {
-						"wreck": {
-							"version": "https://registry.npmjs.org/wreck/-/wreck-5.6.1.tgz",
-							"integrity": "sha1-r/ADBAATiJ11YZtccYcN0qjdBpo=",
-							"dev": true,
-							"requires": {
-								"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-								"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-							}
-						}
-					}
-				},
-				"heavy": {
-					"version": "https://registry.npmjs.org/heavy/-/heavy-3.0.0.tgz",
-					"integrity": "sha1-/QEIdiExYy+IVIontVQSws9SKwA=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"joi": "https://registry.npmjs.org/joi/-/joi-5.1.0.tgz"
-					},
-					"dependencies": {
-						"joi": {
-							"version": "https://registry.npmjs.org/joi/-/joi-5.1.0.tgz",
-							"integrity": "sha1-FSrQfbjunGQBmX/1/SwSiWBwv1g=",
-							"dev": true,
-							"requires": {
-								"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-								"isemail": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-								"moment": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-								"topo": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz"
-							}
-						}
-					}
-				},
-				"hoek": {
-					"version": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-					"integrity": "sha1-gSEWkfUqWoNa5J7b8eickANHaqQ=",
-					"dev": true
-				},
-				"inert": {
-					"version": "https://registry.npmjs.org/inert/-/inert-2.1.5.tgz",
-					"integrity": "sha1-eybZTEHGLAPsHU726LRe1WuDSFk=",
-					"dev": true,
-					"requires": {
-						"ammo": "https://registry.npmjs.org/ammo/-/ammo-1.0.0.tgz",
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"items": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
-						"joi": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
-						"lru-cache": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
-							"integrity": "sha1-JnUZDM0bBwHsL2UqTQ09QA12wN0=",
-							"dev": true
-						}
-					}
-				},
-				"iron": {
-					"version": "https://registry.npmjs.org/iron/-/iron-2.1.2.tgz",
-					"integrity": "sha1-WR2RiiVAdTxEbY5DfNzwz6gBEU8=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"items": {
-					"version": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
-					"integrity": "sha1-rZ1VhAsimGDLPRYLMidMLUvZ4mI=",
-					"dev": true
-				},
-				"joi": {
-					"version": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
-					"integrity": "sha1-9Q9CRTVgBo5jg9oVrC0w3Xzra24=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"isemail": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz",
-						"moment": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz",
-						"topo": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz"
-					},
-					"dependencies": {
-						"isemail": {
-							"version": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz",
-							"integrity": "sha1-4Mj23D9HCX53dzlcaJYnGqJWw7U=",
-							"dev": true
-						},
-						"moment": {
-							"version": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz",
-							"integrity": "sha1-CruZ8wf2UhgwjGk17+KcV7Ggon8=",
-							"dev": true
-						}
-					}
-				},
-				"kilt": {
-					"version": "https://registry.npmjs.org/kilt/-/kilt-1.1.1.tgz",
-					"integrity": "sha1-d7SmFjyn+lshN6iMFzNCFuwj1ds=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"mimos": {
-					"version": "https://registry.npmjs.org/mimos/-/mimos-2.0.2.tgz",
-					"integrity": "sha1-wyQXF+dblZkr54esfdbbGptTmx4=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz"
-					},
-					"dependencies": {
-						"mime-db": {
-							"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz",
-							"integrity": "sha1-1WHxC27mbbUflK5leilRp0IX7YM=",
-							"dev": true
-						}
-					}
-				},
-				"peekaboo": {
-					"version": "https://registry.npmjs.org/peekaboo/-/peekaboo-1.0.0.tgz",
-					"integrity": "sha1-wNspJq1lTSygH3ymUKtFkadk/EI=",
-					"dev": true
-				},
-				"qs": {
-					"version": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
-					"integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=",
-					"dev": true
-				},
-				"shot": {
-					"version": "https://registry.npmjs.org/shot/-/shot-1.5.3.tgz",
-					"integrity": "sha1-SGEHREO8VHLCNRthpGtOrsAH9Xo=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"statehood": {
-					"version": "https://registry.npmjs.org/statehood/-/statehood-2.1.1.tgz",
-					"integrity": "sha1-AfFwtmxeklqvZ5qdMiulkYb8AAk=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"iron": "https://registry.npmjs.org/iron/-/iron-2.1.2.tgz",
-						"items": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
-						"joi": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz"
-					}
-				},
-				"subtext": {
-					"version": "https://registry.npmjs.org/subtext/-/subtext-1.1.1.tgz",
-					"integrity": "sha1-DJGCWuZdUXhVWT2DHjPvdaKEFWs=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"content": "https://registry.npmjs.org/content/-/content-1.0.1.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"pez": "https://registry.npmjs.org/pez/-/pez-1.0.0.tgz",
-						"qs": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
-						"wreck": "https://registry.npmjs.org/wreck/-/wreck-6.0.0.tgz"
-					},
-					"dependencies": {
-						"content": {
-							"version": "https://registry.npmjs.org/content/-/content-1.0.1.tgz",
-							"integrity": "sha1-gD60s7eJVGD9jGnGhMd1RmmvG6E=",
-							"dev": true,
-							"requires": {
-								"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-								"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-							}
-						},
-						"pez": {
-							"version": "https://registry.npmjs.org/pez/-/pez-1.0.0.tgz",
-							"integrity": "sha1-hEMYpc5wku7d/6KV4YB5rHefoBg=",
-							"dev": true,
-							"requires": {
-								"b64": "https://registry.npmjs.org/b64/-/b64-2.0.0.tgz",
-								"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-								"content": "https://registry.npmjs.org/content/-/content-1.0.1.tgz",
-								"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-								"nigel": "https://registry.npmjs.org/nigel/-/nigel-1.0.1.tgz"
-							},
-							"dependencies": {
-								"b64": {
-									"version": "https://registry.npmjs.org/b64/-/b64-2.0.0.tgz",
-									"integrity": "sha1-tZlbJPR+v9nxMQF6bntdZHVvtvM=",
-									"dev": true,
-									"requires": {
-										"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-									}
-								},
-								"nigel": {
-									"version": "https://registry.npmjs.org/nigel/-/nigel-1.0.1.tgz",
-									"integrity": "sha1-RjmJr4gSePuqHTzJOCPb0XtDYKE=",
-									"dev": true,
-									"requires": {
-										"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-										"vise": "https://registry.npmjs.org/vise/-/vise-1.0.0.tgz"
-									},
-									"dependencies": {
-										"vise": {
-											"version": "https://registry.npmjs.org/vise/-/vise-1.0.0.tgz",
-											"integrity": "sha1-KDRb5N5aNB4V/SgW/Z6j5zA+jfM=",
-											"dev": true,
-											"requires": {
-												"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				},
-				"topo": {
-					"version": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz",
-					"integrity": "sha1-QhV8N8HeTTeIPM3R1skChHqGDbk=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				},
-				"vision": {
-					"version": "https://registry.npmjs.org/vision/-/vision-2.0.1.tgz",
-					"integrity": "sha1-0BIlW6buQm0GlqNOHfMy/sVeZzw=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-						"items": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
-						"joi": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz"
-					}
-				},
-				"wreck": {
-					"version": "https://registry.npmjs.org/wreck/-/wreck-6.0.0.tgz",
-					"integrity": "sha1-T0CGaWHl14rOBPMqa38x8/PFFjg=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
-					}
-				}
-			}
-		},
-		"har-schema": {
-			"version": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-			"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
-		},
-		"har-validator": {
-			"version": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-			"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-			"requires": {
-				"ajv": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-				"har-schema": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"
-			}
-		},
-		"has": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-			"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-			"requires": {
-				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"
-			}
-		},
-		"has-ansi": {
-			"version": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"requires": {
-				"ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
-			}
-		},
-		"has-flag": {
-			"version": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-			"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-			"dev": true
-		},
-		"has-unicode": {
-			"version": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-		},
-		"hash-stream-validation": {
-			"version": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-			"integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
-			"requires": {
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
-			}
-		},
-		"hasha": {
-			"version": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
-			"integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
-			"dev": true,
-			"requires": {
-				"is-stream": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-				"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-			}
-		},
-		"hawk": {
-			"version": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-			"requires": {
-				"boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-				"cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-				"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-				"sntp": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-			}
-		},
-		"he": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
-		},
-		"highlight.js": {
-			"version": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
-			"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
-		},
-		"hoek": {
-			"version": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-		},
-		"home-or-tmp": {
-			"version": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-			"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-			"dev": true,
-			"requires": {
-				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-			}
-		},
-		"hosted-git-info": {
-			"version": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
-			"integrity": "sha1-AHa59GonBQbduq6lZJaJdGBhKmc=",
-			"dev": true
-		},
-		"html-tags": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-			"integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
-			"dev": true
-		},
-		"html-to-text": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.1.0.tgz",
-			"integrity": "sha1-fwfvIXPloEQecxXBkgE6AKUtXko=",
-			"requires": {
-				"he": "1.1.1",
-				"htmlparser2": "3.9.2",
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-				"underscore": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-				"underscore.string": "3.3.4"
-			},
-			"dependencies": {
-				"underscore.string": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
-					"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
-					"requires": {
-						"sprintf-js": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				}
-			}
-		},
-		"htmlparser2": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-			"requires": {
-				"domelementtype": "1.3.0",
-				"domhandler": "2.4.1",
-				"domutils": "1.6.2",
-				"entities": "1.1.1",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"http-signature": {
-			"version": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-			"requires": {
-				"assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-				"jsprim": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-				"sshpk": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz"
-			}
-		},
-		"https-proxy-agent": {
-			"version": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
-			"integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-			"dev": true,
-			"requires": {
-				"agent-base": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.0.tgz",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"
-			}
-		},
-		"iconv-lite": {
-			"version": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz",
-			"integrity": "sha1-T9qjs4rLwsAxsEXQ7c3+HsqxjI0=",
-			"dev": true
-		},
-		"ieee754": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-			"integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
-		},
-		"ignore": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
-			"integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=",
-			"dev": true
-		},
-		"imap": {
-			"version": "0.8.19",
-			"resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
-			"integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
-			"requires": {
-				"readable-stream": "1.1.14",
-				"utf7": "1.0.2"
-			},
-			"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": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"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="
-				}
-			}
-		},
-		"imurmurhash": {
-			"version": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-		},
-		"indent-string": {
-			"version": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-			"dev": true,
-			"requires": {
-				"repeating": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
-			}
-		},
-		"indexes-of": {
-			"version": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-			"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-			"dev": true
-		},
-		"inflight": {
-			"version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"requires": {
-				"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-				"wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-			}
-		},
-		"inherits": {
-			"version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-		},
-		"inherits-ex": {
-			"version": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.1.8.tgz",
-			"integrity": "sha1-9wmppZxYqT3f4B01MOZyR7rim+M=",
-			"requires": {
-				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-			}
-		},
-		"ini": {
-			"version": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-			"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
-		},
-		"inquirer": {
-			"version": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
-			"integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"cli-cursor": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-				"cli-width": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
-				"external-editor": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz",
-				"figures": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"mute-stream": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-				"run-async": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-				"rx": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-				"string-width": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz",
-				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-				"through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-			},
-			"dependencies": {
-				"figures": {
-					"version": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-					"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz",
-					"integrity": "sha1-Y1xUNsxypuDDh87KJ41OLuxSaH4=",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-						"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-					}
-				}
-			}
-		},
-		"invariant": {
-			"version": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-			"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-			"dev": true,
-			"requires": {
-				"loose-envify": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"
-			}
-		},
-		"irregular-plurals": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz",
-			"integrity": "sha1-evBpMb33S+M9z1haE+BvzMFsrs8=",
-			"dev": true
-		},
-		"is": {
-			"version": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
-		},
-		"is-absolute": {
-			"version": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-			"integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
-			"dev": true,
-			"requires": {
-				"is-relative": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-			}
-		},
-		"is-arrayish": {
-			"version": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-			"dev": true
-		},
-		"is-binary-path": {
-			"version": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-			"dev": true,
-			"requires": {
-				"binary-extensions": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"
-			}
-		},
-		"is-buffer": {
-			"version": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-			"integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
-			"dev": true
-		},
-		"is-builtin-module": {
-			"version": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-			"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-			"dev": true,
-			"requires": {
-				"builtin-modules": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"
-			}
-		},
-		"is-callable": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-			"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
-		},
-		"is-date-object": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-		},
-		"is-directory": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-			"dev": true
-		},
-		"is-dotfile": {
-			"version": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz",
-			"integrity": "sha1-LBMjg/ORmfjtwmjKAbmwB9IFzE0=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-			}
-		},
-		"is-extendable": {
-			"version": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
-		},
-		"is-extglob": {
-			"version": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-			"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-			"dev": true
-		},
-		"is-finite": {
-			"version": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-			"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-			"dev": true,
-			"requires": {
-				"number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-			}
-		},
-		"is-fullwidth-code-point": {
-			"version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-			"requires": {
-				"number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-			}
-		},
-		"is-generator": {
-			"version": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
-			"integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=",
-			"dev": true
-		},
-		"is-glob": {
-			"version": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-			"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-			}
-		},
-		"is-my-json-valid": {
-			"version": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-			"integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
-			"requires": {
-				"generate-function": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-				"generate-object-property": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-				"jsonpointer": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-			}
-		},
-		"is-number": {
-			"version": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-			"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-			"dev": true,
-			"requires": {
-				"kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
-			}
-		},
-		"is-obj": {
-			"version": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-			"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-			"integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "1.0.2"
-			}
-		},
-		"is-posix-bracket": {
-			"version": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-property": {
-			"version": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-			"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
-		},
-		"is-regex": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-			"requires": {
-				"has": "1.0.1"
-			}
-		},
-		"is-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-			"integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
-			"integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=",
-			"dev": true
-		},
-		"is-resolvable": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-			"integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-			"dev": true,
-			"requires": {
-				"tryit": "1.0.3"
-			}
-		},
-		"is-stream": {
-			"version": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-			"dev": true
-		},
-		"is-stream-ended": {
-			"version": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-			"integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
-		},
-		"is-subset": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-			"integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
-			"dev": true
-		},
-		"is-supported-regexp-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz",
-			"integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=",
-			"dev": true
-		},
-		"is-symbol": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-			"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
-		},
-		"is-text-path": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-			"integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-			"dev": true,
-			"requires": {
-				"text-extensions": "1.5.0"
-			}
-		},
-		"is-typedarray": {
-			"version": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"is-utf8": {
-			"version": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isemail": {
-			"version": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-			"integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
-			"dev": true
-		},
-		"isexe": {
-			"version": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"isnumeric": {
-			"version": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
-			"integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ=",
-			"dev": true
-		},
-		"isobject": {
-			"version": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-			"dev": true,
-			"requires": {
-				"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-			}
-		},
-		"isstream": {
-			"version": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"jasmine": {
-			"version": "https://registry.npmjs.org/jasmine/-/jasmine-2.6.0.tgz",
-			"integrity": "sha1-ayLnCIPo5YnUVjRhU7TSBt2+IX8=",
-			"dev": true,
-			"requires": {
-				"exit": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"jasmine-core": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.2.tgz"
-			}
-		},
-		"jasmine-core": {
-			"version": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.2.tgz",
-			"integrity": "sha1-dOoffPQoaRryARB9YxI0AnoJ2qs=",
-			"dev": true
-		},
-		"jmespath": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-			"integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
-		},
-		"jodid25519": {
-			"version": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-			"integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
-			"optional": true,
-			"requires": {
-				"jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
-			}
-		},
-		"jquery": {
-			"version": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-			"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
-		},
-		"js-base64": {
-			"version": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-			"integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
-			"dev": true
-		},
-		"js-tokens": {
-			"version": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
-			"integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=",
-			"dev": true
-		},
-		"js-yaml": {
-			"version": "3.9.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz",
-			"integrity": "sha1-T/u/JcKsljuCmdx02n43QN4cGM4=",
-			"dev": true,
-			"requires": {
-				"argparse": "1.0.9",
-				"esprima": "4.0.0"
-			}
-		},
-		"jsbn": {
-			"version": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"optional": true
-		},
-		"jschardet": {
-			"version": "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz",
-			"integrity": "sha1-KqEH8UKvQSHRRWWdRPUIMJYeaZo=",
-			"dev": true
-		},
-		"jsesc": {
-			"version": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-schema-traverse": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-			"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-			"dev": true
-		},
-		"json-stable-stringify": {
-			"version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-			"requires": {
-				"jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-			}
-		},
-		"json-stringify-safe": {
-			"version": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-		},
-		"json3": {
-			"version": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
-		},
-		"json5": {
-			"version": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
-			"integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
-			"dev": true
-		},
-		"jsonfile": {
-			"version": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-			"integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-			}
-		},
-		"jsonfilter": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/jsonfilter/-/jsonfilter-1.1.2.tgz",
-			"integrity": "sha1-Ie987cdRk4E8dZMulqmL4gW6WhE=",
-			"dev": true,
-			"requires": {
-				"JSONStream": "0.8.4",
-				"minimist": "1.2.0",
-				"stream-combiner": "0.2.2",
-				"through2": "0.6.5"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"jsonparse": {
-					"version": "0.0.5",
-					"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
-					"integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
-					"dev": true
-				},
-				"JSONStream": {
-					"version": "0.8.4",
-					"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-					"integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-					"dev": true,
-					"requires": {
-						"jsonparse": "0.0.5",
-						"through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-					}
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"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=",
-					"dev": true
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-					}
-				}
-			}
-		},
-		"jsonify": {
-			"version": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-			"dev": true
-		},
-		"jsonpointer": {
-			"version": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
-		},
-		"JSONStream": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
-			"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
-			"dev": true,
-			"requires": {
-				"jsonparse": "1.3.1",
-				"through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-			}
-		},
-		"jsprim": {
-			"version": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-			"integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-			"requires": {
-				"assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-				"extsprintf": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-				"json-schema": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-				"verror": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"jwa": {
-			"version": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-			"integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
-			"requires": {
-				"base64url": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-				"buffer-equal-constant-time": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-				"ecdsa-sig-formatter": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
-			}
-		},
-		"jws": {
-			"version": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-			"integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
-			"requires": {
-				"base64url": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-				"jwa": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
-			}
-		},
-		"kew": {
-			"version": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
-			"integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
-			"dev": true
-		},
-		"kind-of": {
-			"version": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"requires": {
-				"is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"
-			}
-		},
-		"klaw": {
-			"version": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-			"integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-			}
-		},
-		"known-css-properties": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.2.0.tgz",
-			"integrity": "sha1-iZyUvjaOVbQtfbjVvn1zpKSkFFQ=",
-			"dev": true
-		},
-		"lazy-cache": {
-			"version": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-			"integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-			"dev": true
-		},
-		"lazystream": {
-			"version": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
-			}
-		},
-		"ldjson-stream": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
-			"integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
-			"dev": true,
-			"requires": {
-				"split2": "0.2.1",
-				"through2": "0.6.5"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"split2": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
-					"integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
-					"dev": true,
-					"requires": {
-						"through2": "0.6.5"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-					}
-				}
-			}
-		},
-		"levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "1.1.2",
-				"type-check": "0.3.2"
-			}
-		},
-		"libbase64": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
-			"integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
-		},
-		"libmime": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/libmime/-/libmime-3.1.0.tgz",
-			"integrity": "sha1-EVAS8WcgUa3IgJqPk5Vf/DZI7fk=",
-			"requires": {
-				"iconv-lite": "0.4.15",
-				"libbase64": "0.1.0",
-				"libqp": "1.1.0"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.15",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
-				}
-			}
-		},
-		"libqp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
-			"integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
-		},
-		"load-json-file": {
-			"version": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"parse-json": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-				"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-				"strip-bom": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
-			}
-		},
-		"lodash": {
-			"version": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-		},
-		"lodash._baseassign": {
-			"version": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-				"lodash.keys": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
-			}
-		},
-		"lodash._basecopy": {
-			"version": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-			"dev": true
-		},
-		"lodash._basecreate": {
-			"version": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-			"integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-			"dev": true
-		},
-		"lodash._getnative": {
-			"version": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
-		},
-		"lodash._isiterateecall": {
-			"version": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-			"dev": true
-		},
-		"lodash._reinterpolate": {
-			"version": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-			"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-			"dev": true
-		},
-		"lodash.create": {
-			"version": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-			"integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-			"dev": true,
-			"requires": {
-				"lodash._baseassign": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-				"lodash._basecreate": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-				"lodash._isiterateecall": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-			}
-		},
-		"lodash.isarguments": {
-			"version": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
-		},
-		"lodash.isarray": {
-			"version": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-			"dev": true
-		},
-		"lodash.keys": {
-			"version": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
-			"requires": {
-				"lodash._getnative": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-				"lodash.isarguments": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-				"lodash.isarray": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-			}
-		},
-		"lodash.memoize": {
-			"version": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-			"dev": true
-		},
-		"lodash.noop": {
-			"version": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-			"integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
-		},
-		"lodash.template": {
-			"version": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-			"integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-			"dev": true,
-			"requires": {
-				"lodash._reinterpolate": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-				"lodash.templatesettings": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"
-			}
-		},
-		"lodash.templatesettings": {
-			"version": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-			"integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-			"dev": true,
-			"requires": {
-				"lodash._reinterpolate": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
-			}
-		},
-		"lodash.uniq": {
-			"version": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-			"dev": true
-		},
-		"log-driver": {
-			"version": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-			"integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
-		},
-		"log-symbols": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-			"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-			"dev": true,
-			"requires": {
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-			}
-		},
-		"loglevel": {
-			"version": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz",
-			"integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80=",
-			"dev": true
-		},
-		"longest": {
-			"version": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-			"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-			"dev": true
-		},
-		"loose-envify": {
-			"version": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-			"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-			"dev": true,
-			"requires": {
-				"js-tokens": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
-			}
-		},
-		"loud-rejection": {
-			"version": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-			"dev": true,
-			"requires": {
-				"currently-unhandled": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-				"signal-exit": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
-			}
-		},
-		"lower-case": {
-			"version": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-			"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-			"dev": true
-		},
-		"lru-cache": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-			"integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-			"dev": true,
-			"requires": {
-				"pseudomap": "1.0.2",
-				"yallist": "2.1.2"
-			}
-		},
-		"mailparser-node4": {
-			"version": "2.0.2-2",
-			"resolved": "https://registry.npmjs.org/mailparser-node4/-/mailparser-node4-2.0.2-2.tgz",
-			"integrity": "sha1-IK4hESKWWldb3a6bTADTwtgkR/U=",
-			"requires": {
-				"addressparser": "1.0.1",
-				"array-includes": "3.0.3",
-				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-				"he": "1.1.1",
-				"html-to-text": "3.1.0",
-				"iconv-lite": "0.4.15",
-				"libmime": "3.1.0",
-				"mailsplit-node4": "4.0.1",
-				"marked": "0.3.6"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.15",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
-				}
-			}
-		},
-		"mailsplit-node4": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/mailsplit-node4/-/mailsplit-node4-4.0.1.tgz",
-			"integrity": "sha1-XVEiiDVA/Ac/fQcWwv9ntlDP1oI=",
-			"requires": {
-				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-				"libbase64": "0.1.0",
-				"libmime": "3.1.0",
-				"libqp": "1.1.0"
-			}
-		},
-		"make-dir": {
-			"version": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-			"integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
-			"requires": {
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-			}
-		},
-		"map-obj": {
-			"version": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-			"dev": true
-		},
-		"marked": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
-			"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
-		},
-		"math-expression-evaluator": {
-			"version": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-			"integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
-			"dev": true
-		},
-		"mathjs": {
-			"version": "https://registry.npmjs.org/mathjs/-/mathjs-3.13.3.tgz",
-			"integrity": "sha1-ORNep2H1fAg9pDY4JI4/ZAcn4pA=",
-			"dev": true,
-			"requires": {
-				"complex.js": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.1.tgz",
-				"decimal.js": "https://registry.npmjs.org/decimal.js/-/decimal.js-7.1.1.tgz",
-				"fraction.js": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.0.tgz",
-				"seed-random": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
-				"tiny-emitter": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-1.0.2.tgz",
-				"typed-function": "https://registry.npmjs.org/typed-function/-/typed-function-0.10.5.tgz"
-			}
-		},
-		"mathml-tag-names": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz",
-			"integrity": "sha1-jUEmgWi/htEQK5gQnijlMeejRXg=",
-			"dev": true
-		},
-		"media-typer": {
-			"version": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-		},
-		"meow": {
-			"version": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-			"dev": true,
-			"requires": {
-				"camelcase-keys": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-				"decamelize": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-				"loud-rejection": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-				"map-obj": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-				"normalize-package-data": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
-				"object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-				"read-pkg-up": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-				"redent": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-				"trim-newlines": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				}
-			}
-		},
-		"meteor-promise": {
-			"version": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.4.tgz",
-			"integrity": "sha1-kCnj9ZaFTQT/NGxuGfMByKXlU7A=",
-			"dev": true
-		},
-		"methmeth": {
-			"version": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-			"integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
-		},
-		"methods": {
-			"version": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-			"dev": true
-		},
-		"micromatch": {
-			"version": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-			"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-			"dev": true,
-			"requires": {
-				"arr-diff": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-				"array-unique": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-				"braces": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-				"expand-brackets": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-				"extglob": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-				"filename-regex": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-				"is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-				"is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-				"kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-				"normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-				"object.omit": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-				"parse-glob": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-				"regex-cache": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"
-			}
-		},
-		"mime": {
-			"version": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-			"integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA="
-		},
-		"mime-db": {
-			"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.28.0.tgz",
-			"integrity": "sha1-/t00m+BtKGW3/FfYN8beTxfXrDw="
-		},
-		"mime-type": {
-			"version": "https://registry.npmjs.org/mime-type/-/mime-type-3.0.5.tgz",
-			"integrity": "sha1-ftKSan2oImifgSVPWYf+lQNiLpo=",
-			"requires": {
-				"media-typer": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"path.js": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
-				"util-ex": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz"
-			}
-		},
-		"mime-types": {
-			"version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-			"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-			"requires": {
-				"mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-					"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE="
-				}
-			}
-		},
-		"mimic-fn": {
-			"version": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-			"integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
-			"dev": true
-		},
-		"minimatch": {
-			"version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-			"requires": {
-				"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
-			}
-		},
-		"minimist": {
-			"version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-		},
-		"mkdirp": {
-			"version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-			"requires": {
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-			}
-		},
-		"mocha": {
-			"version": "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz",
-			"integrity": "sha1-0O9NMyEm2/GNDWQMmzgt1IvpdZQ=",
-			"dev": true,
-			"requires": {
-				"browser-stdout": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-				"commander": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
-				"diff": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-				"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-				"growl": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-				"json3": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-				"lodash.create": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
-					"integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs=",
-					"dev": true,
-					"requires": {
-						"ms": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
-					}
-				},
-				"glob": {
-					"version": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-					"integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"ms": {
-					"version": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-					"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-					"integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-					"dev": true,
-					"requires": {
-						"has-flag": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-					}
-				}
-			}
-		},
-		"modelo": {
-			"version": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-			"integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
-		},
-		"modify-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz",
-			"integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
-			"dev": true
-		},
-		"moment": {
-			"version": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-			"integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
-		},
-		"moment-timezone": {
-			"version": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
-			"integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
-			"requires": {
-				"moment": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"
-			}
-		},
-		"ms": {
-			"version": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-			"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-		},
-		"multimatch": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-			"integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-			"dev": true,
-			"requires": {
-				"array-differ": "1.0.0",
-				"array-union": "1.0.2",
-				"arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-			}
-		},
-		"mute-stream": {
-			"version": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-			"dev": true
-		},
-		"nan": {
-			"version": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz",
-			"integrity": "sha1-qo8eNFMdgH6eJ3VbI0tKbsDBUqg="
-		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
-		"no-case": {
-			"version": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
-			"integrity": "sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=",
-			"dev": true,
-			"requires": {
-				"lower-case": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"
-			}
-		},
-		"node-forge": {
-			"version": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-			"integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
-		},
-		"node-pre-gyp": {
-			"version": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz",
-			"integrity": "sha1-/EUrN25zGbPSVfXzSFPvb9j+H9U=",
-			"requires": {
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"nopt": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-				"npmlog": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
-				"rc": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-				"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-				"tar": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-				"tar-pack": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz"
-			}
-		},
-		"nopt": {
-			"version": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-			"requires": {
-				"abbrev": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"
-			}
-		},
-		"normalize-package-data": {
-			"version": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
-			"integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs=",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
-				"is-builtin-module": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-				"validate-npm-package-license": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
-			}
-		},
-		"normalize-path": {
-			"version": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-			"dev": true,
-			"requires": {
-				"remove-trailing-separator": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz"
-			}
-		},
-		"normalize-range": {
-			"version": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-			"dev": true
-		},
-		"normalize-selector": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-			"dev": true
-		},
-		"npm-install-package": {
-			"version": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
-			"integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
-			"dev": true
-		},
-		"npmlog": {
-			"version": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
-			"integrity": "sha1-3Fm+6F9k8A7UJO+yrweD3yXRwLU=",
-			"requires": {
-				"are-we-there-yet": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-				"console-control-strings": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-				"gauge": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-				"set-blocking": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
-			}
-		},
-		"num2fraction": {
-			"version": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-			"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-			"dev": true
-		},
-		"number-is-nan": {
-			"version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-		},
-		"oauth-sign": {
-			"version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-		},
-		"object-assign": {
-			"version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-		},
-		"object-keys": {
-			"version": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-			"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
-		},
-		"object.assign": {
-			"version": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
-			"integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
-			"dev": true,
-			"requires": {
-				"define-properties": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-				"object-keys": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"
-			}
-		},
-		"object.omit": {
-			"version": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-				"is-extendable": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-			}
-		},
-		"once": {
-			"version": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"requires": {
-				"wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-			}
-		},
-		"onecolor": {
-			"version": "https://registry.npmjs.org/onecolor/-/onecolor-2.4.2.tgz",
-			"integrity": "sha1-pT7D/xccNEYBbdUhDRobVEv32HQ=",
-			"dev": true
-		},
-		"onetime": {
-			"version": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-			"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-			"dev": true,
-			"requires": {
-				"mimic-fn": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"
-			}
-		},
-		"optimist": {
-			"version": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-			"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-			"requires": {
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-				"wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-			}
-		},
-		"optionator": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-			"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-			"dev": true,
-			"requires": {
-				"deep-is": "0.1.3",
-				"fast-levenshtein": "2.0.6",
-				"levn": "0.3.0",
-				"prelude-ls": "1.1.2",
-				"type-check": "0.3.2",
-				"wordwrap": "1.0.0"
-			},
-			"dependencies": {
-				"wordwrap": {
+				"assert-plus": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-					"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-					"dev": true
-				}
-			}
-		},
-		"os-homedir": {
-			"version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-			"dev": true
-		},
-		"os-tmpdir": {
-			"version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-			"dev": true
-		},
-		"parse-github-repo-url": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz",
-			"integrity": "sha1-KGxT4smWLgZBZJ7jrJUI/KTdlZw=",
-			"dev": true
-		},
-		"parse-glob": {
-			"version": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-				"is-dotfile": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz",
-				"is-extglob": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-				"is-glob": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
-			}
-		},
-		"parse-json": {
-			"version": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-			"dev": true,
-			"requires": {
-				"error-ex": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"
-			}
-		},
-		"path-exists": {
-			"version": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
-			"integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
-			"dev": true
-		},
-		"path-is-absolute": {
-			"version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-		},
-		"path-is-inside": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-			"dev": true
-		},
-		"path-parse": {
-			"version": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-			"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-			"dev": true
-		},
-		"path-type": {
-			"version": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-				"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-			}
-		},
-		"path.js": {
-			"version": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
-			"integrity": "sha1-fRNrYH3hm/2YugaIdJJih+ZTSTk=",
-			"requires": {
-				"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-				"inherits-ex": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.1.8.tgz",
-				"util-ex": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz"
-			}
-		},
-		"pend": {
-			"version": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-			"dev": true
-		},
-		"performance-now": {
-			"version": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-			"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-		},
-		"phantomjs-prebuilt": {
-			"version": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz",
-			"integrity": "sha1-ZlVq2ell2JPKWn3J52PffoaX920=",
-			"dev": true,
-			"requires": {
-				"es6-promise": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
-				"extract-zip": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
-				"fs-extra": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-				"hasha": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
-				"kew": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
-				"progress": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
-				"request-progress": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
-				"which": "https://registry.npmjs.org/which/-/which-1.2.14.tgz"
-			},
-			"dependencies": {
-				"async": {
-					"version": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-					"integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
-					"dev": true,
-					"requires": {
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-					}
-				},
-				"caseless": {
-					"version": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-					"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-					"dev": true
-				},
-				"form-data": {
-					"version": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
-					"integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
-					"dev": true,
-					"requires": {
-						"async": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-						"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-						"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
-					}
-				},
-				"fs-extra": {
-					"version": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-					"integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-						"jsonfile": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-						"klaw": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-						"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
-					}
-				},
-				"har-validator": {
-					"version": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-					"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"commander": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-						"is-my-json-valid": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-						"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-					}
-				},
-				"node-uuid": {
-					"version": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-					"integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-					"dev": true
-				},
-				"qs": {
-					"version": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-					"integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
-					"dev": true
-				},
-				"request": {
-					"version": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
-					"integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-						"aws4": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-						"bl": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-						"caseless": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-						"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-						"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-						"forever-agent": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-						"form-data": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
-						"har-validator": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-						"hawk": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-						"http-signature": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-						"is-typedarray": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-						"isstream": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-						"json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-						"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-						"node-uuid": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-						"oauth-sign": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-						"qs": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-						"stringstream": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-						"tough-cookie": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-						"tunnel-agent": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-					}
-				},
-				"tunnel-agent": {
-					"version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-					"dev": true
-				}
-			}
-		},
-		"photoswipe": {
-			"version": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.2.tgz",
-			"integrity": "sha1-lcIKdc6iO3DWKZZBytguA8rn95c="
-		},
-		"pify": {
-			"version": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-		},
-		"pinkie": {
-			"version": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-		},
-		"pinkie-promise": {
-			"version": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-			"requires": {
-				"pinkie": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
-			}
-		},
-		"pipetteur": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/pipetteur/-/pipetteur-2.0.3.tgz",
-			"integrity": "sha1-GVV2CVno0aEcsqUOyD7sRwYz5J8=",
-			"dev": true,
-			"requires": {
-				"onecolor": "3.0.4",
-				"synesthesia": "1.0.1"
-			},
-			"dependencies": {
-				"onecolor": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.4.tgz",
-					"integrity": "sha1-daRvgNpseqpbTarhekcZi9llJJQ=",
-					"dev": true
-				}
-			}
-		},
-		"pixrem": {
-			"version": "https://registry.npmjs.org/pixrem/-/pixrem-3.0.2.tgz",
-			"integrity": "sha1-MNG6+0w73Ojpu0vVahOYVhkyDDQ=",
-			"dev": true,
-			"requires": {
-				"browserslist": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"reduce-css-calc": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz"
-			}
-		},
-		"pleeease-filters": {
-			"version": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-3.0.1.tgz",
-			"integrity": "sha1-Tf4OjxBGYTUXxktyi8gGCKfr8i8=",
-			"dev": true,
-			"requires": {
-				"onecolor": "https://registry.npmjs.org/onecolor/-/onecolor-2.4.2.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-			}
-		},
-		"plur": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-			"integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-			"dev": true,
-			"requires": {
-				"irregular-plurals": "1.3.0"
-			}
-		},
-		"pluralize": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
-			"integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
-			"dev": true
-		},
-		"poplib": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
-			"integrity": "sha1-L0tYtVkpcjUM2X9IKrpo+OBVdLw=",
-			"requires": {
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
-			}
-		},
-		"postcss": {
-			"version": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-			"integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
-			"dev": true,
-			"requires": {
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"js-base64": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
-			},
-			"dependencies": {
-				"supports-color": {
-					"version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-					}
-				}
-			}
-		},
-		"postcss-apply": {
-			"version": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.3.0.tgz",
-			"integrity": "sha1-ovN8W9+ogeTBX08kXsDNlt0ucNU=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-			}
-		},
-		"postcss-attribute-case-insensitive": {
-			"version": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-1.0.1.tgz",
-			"integrity": "sha1-zrc3d+EGFn6yM/GTjJvZ8uaXMI0=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-selector-parser": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz"
-			}
-		},
-		"postcss-calc": {
-			"version": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-			"integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-message-helpers": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-				"reduce-css-calc": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz"
-			}
-		},
-		"postcss-color-function": {
-			"version": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-2.0.1.tgz",
-			"integrity": "sha1-mtIm9VDop8f4uKd4YFRbbdf1UkE=",
-			"dev": true,
-			"requires": {
-				"css-color-function": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.0.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-message-helpers": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
-			}
-		},
-		"postcss-color-gray": {
-			"version": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-3.0.1.tgz",
-			"integrity": "sha1-dEMu3mbdg7HRNjVlxos3bhj/Z3A=",
-			"dev": true,
-			"requires": {
-				"color": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-message-helpers": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-				"reduce-function-call": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz"
-			}
-		},
-		"postcss-color-hex-alpha": {
-			"version": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-2.0.0.tgz",
-			"integrity": "sha1-RP1uyt5mAoZIyIHLZQTNy/3GzQk=",
-			"dev": true,
-			"requires": {
-				"color": "https://registry.npmjs.org/color/-/color-0.10.1.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-message-helpers": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz"
-			},
-			"dependencies": {
-				"color": {
-					"version": "https://registry.npmjs.org/color/-/color-0.10.1.tgz",
-					"integrity": "sha1-wEGI34KiCd3rzOzazT7DIPGTc58=",
-					"dev": true,
-					"requires": {
-						"color-convert": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
-						"color-string": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"
-					}
-				},
-				"color-convert": {
-					"version": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
-					"integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
-					"dev": true
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
 				}
 			}
 		},
-		"postcss-color-hsl": {
-			"version": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-1.0.5.tgz",
-			"integrity": "sha1-9Tuxw0gxDOMHrYnjGBqGRzi15oc=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-				"units-css": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz"
-			}
-		},
-		"postcss-color-hwb": {
-			"version": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-2.0.1.tgz",
-			"integrity": "sha1-1jr6+bcMtZX5AKKcn+V78qMvq+w=",
-			"dev": true,
-			"requires": {
-				"color": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-message-helpers": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-				"reduce-function-call": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz"
-			}
-		},
-		"postcss-color-rebeccapurple": {
-			"version": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-2.0.1.tgz",
-			"integrity": "sha1-dMZETny7fYVhO19yht96SRYIRRw=",
-			"dev": true,
-			"requires": {
-				"color": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-			}
-		},
-		"postcss-color-rgb": {
-			"version": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-1.1.4.tgz",
-			"integrity": "sha1-8pJD4i6OjBNDRHQJI3LUzmBb6Lw=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
-			}
-		},
-		"postcss-color-rgba-fallback": {
-			"version": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz",
-			"integrity": "sha1-bSlJG+WZCpMXPUfnx29YELCUAro=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-				"rgb-hex": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz"
-			}
-		},
-		"postcss-cssnext": {
-			"version": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-2.11.0.tgz",
-			"integrity": "sha1-MeaPAB5AlgTacDtm3hS4uMjJ8rE=",
-			"dev": true,
-			"requires": {
-				"autoprefixer": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-				"caniuse-api": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"pixrem": "https://registry.npmjs.org/pixrem/-/pixrem-3.0.2.tgz",
-				"pleeease-filters": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-3.0.1.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-apply": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.3.0.tgz",
-				"postcss-attribute-case-insensitive": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-1.0.1.tgz",
-				"postcss-calc": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-				"postcss-color-function": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-2.0.1.tgz",
-				"postcss-color-gray": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-3.0.1.tgz",
-				"postcss-color-hex-alpha": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-2.0.0.tgz",
-				"postcss-color-hsl": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-1.0.5.tgz",
-				"postcss-color-hwb": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-2.0.1.tgz",
-				"postcss-color-rebeccapurple": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-2.0.1.tgz",
-				"postcss-color-rgb": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-1.1.4.tgz",
-				"postcss-color-rgba-fallback": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz",
-				"postcss-custom-media": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz",
-				"postcss-custom-properties": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-5.0.2.tgz",
-				"postcss-custom-selectors": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-3.0.0.tgz",
-				"postcss-font-family-system-ui": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-1.0.2.tgz",
-				"postcss-font-variant": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-2.0.1.tgz",
-				"postcss-image-set-polyfill": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.4.tgz",
-				"postcss-initial": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-1.5.3.tgz",
-				"postcss-media-minmax": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-2.1.2.tgz",
-				"postcss-nesting": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-2.3.1.tgz",
-				"postcss-pseudo-class-any-link": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-1.0.0.tgz",
-				"postcss-pseudoelements": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz",
-				"postcss-replace-overflow-wrap": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-1.0.0.tgz",
-				"postcss-selector-matches": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz",
-				"postcss-selector-not": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-2.0.0.tgz"
-			}
-		},
-		"postcss-custom-media": {
-			"version": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz",
-			"integrity": "sha1-E40loYS/LrVN4S1VpsAcMKnYvYE=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-			}
-		},
-		"postcss-custom-properties": {
-			"version": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-5.0.2.tgz",
-			"integrity": "sha1-lxnXjy2pz59TgQrrwj1GVhMKzrE=",
-			"dev": true,
+		"jwa": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+			"integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
 			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"base64url": "2.0.0",
+				"buffer-equal-constant-time": "1.0.1",
+				"ecdsa-sig-formatter": "1.0.9",
+				"safe-buffer": "5.1.1"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
 			}
 		},
-		"postcss-custom-selectors": {
-			"version": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-3.0.0.tgz",
-			"integrity": "sha1-j4Ekn17Qeo0JF89qOf5bBWt/lqw=",
-			"dev": true,
+		"jws": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+			"integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
 			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-selector-matches": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz"
+				"base64url": "2.0.0",
+				"jwa": "1.1.5",
+				"safe-buffer": "5.1.1"
 			},
 			"dependencies": {
-				"balanced-match": {
-					"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
-					"integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
-					"dev": true
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 				}
 			}
 		},
-		"postcss-font-family-system-ui": {
-			"version": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-1.0.2.tgz",
-			"integrity": "sha1-PhpeP7fjHl6ecUOcyw6AFFVpJ8c=",
-			"dev": true,
+		"libbase64": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
+			"integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
+		},
+		"libmime": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/libmime/-/libmime-3.1.0.tgz",
+			"integrity": "sha1-EVAS8WcgUa3IgJqPk5Vf/DZI7fk=",
 			"requires": {
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
+				"iconv-lite": "0.4.15",
+				"libbase64": "0.1.0",
+				"libqp": "1.1.0"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.15",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
+				}
 			}
 		},
-		"postcss-font-variant": {
-			"version": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-2.0.1.tgz",
-			"integrity": "sha1-fKKRA/WfoCyjrOLKIrL3VoU9Tvg=",
+		"libqp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
+			"integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
+		},
+		"lodash": {
+			"version": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+		},
+		"lodash.noop": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
+			"integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
+		},
+		"log-driver": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
+			"integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
+		},
+		"loose-envify": {
+			"version": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+			"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
 			"dev": true,
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"js-tokens": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
 			}
 		},
-		"postcss-image-set-polyfill": {
-			"version": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.4.tgz",
-			"integrity": "sha1-RuCEBQmFdOtQkMavmMS8mdc/UyY=",
-			"dev": true,
+		"mailparser-node4": {
+			"version": "2.0.2-2",
+			"resolved": "https://registry.npmjs.org/mailparser-node4/-/mailparser-node4-2.0.2-2.tgz",
+			"integrity": "sha1-IK4hESKWWldb3a6bTADTwtgkR/U=",
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-				"postcss-media-query-parser": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"
+				"addressparser": "1.0.1",
+				"array-includes": "3.0.3",
+				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+				"he": "1.1.1",
+				"html-to-text": "3.1.0",
+				"iconv-lite": "0.4.15",
+				"libmime": "3.1.0",
+				"mailsplit-node4": "4.0.1",
+				"marked": "0.3.6"
 			},
 			"dependencies": {
-				"postcss": {
-					"version": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-					"integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-						"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
-					}
-				},
-				"supports-color": {
-					"version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-					}
+				"iconv-lite": {
+					"version": "0.4.15",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
 				}
 			}
 		},
-		"postcss-initial": {
-			"version": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-1.5.3.tgz",
-			"integrity": "sha1-IMPpHJaCLdsb7UlQjbltVrrDd9A=",
-			"dev": true,
+		"mailsplit-node4": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/mailsplit-node4/-/mailsplit-node4-4.0.1.tgz",
+			"integrity": "sha1-XVEiiDVA/Ac/fQcWwv9ntlDP1oI=",
 			"requires": {
-				"lodash.template": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+				"libbase64": "0.1.0",
+				"libmime": "3.1.0",
+				"libqp": "1.1.0"
 			}
 		},
-		"postcss-less": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-0.14.0.tgz",
-			"integrity": "sha1-xjGwicbM5CK5oQ86lY0r7dOBkyQ=",
-			"dev": true,
+		"make-dir": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
+			"integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"pify": "2.3.0"
 			}
 		},
-		"postcss-media-minmax": {
-			"version": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-2.1.2.tgz",
-			"integrity": "sha1-RExc+JJqteT9iiUJ6Sl+dRZJzfg=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-			}
+		"marked": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+			"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
+		},
+		"media-typer": {
+			"version": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+		},
+		"methmeth": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
+			"integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
 		},
-		"postcss-media-query-parser": {
-			"version": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
+		"methods": {
+			"version": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
 			"dev": true
 		},
-		"postcss-message-helpers": {
-			"version": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-			"integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
+		"mime": {
+			"version": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
+			"integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
 			"dev": true
 		},
-		"postcss-nesting": {
-			"version": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-2.3.1.tgz",
-			"integrity": "sha1-lKa2pO9wf77CCof+5clXdZtOAc8=",
-			"dev": true,
+		"mime-db": {
+			"version": "1.30.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+			"integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+		},
+		"mime-type": {
+			"version": "https://registry.npmjs.org/mime-type/-/mime-type-3.0.5.tgz",
+			"integrity": "sha1-ftKSan2oImifgSVPWYf+lQNiLpo=",
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"media-typer": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+				"path.js": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
+				"util-ex": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz"
 			}
 		},
-		"postcss-pseudo-class-any-link": {
-			"version": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-1.0.0.tgz",
-			"integrity": "sha1-kDI5GWQB0zX+c6x1YYb6YuaTryY=",
-			"dev": true,
+		"mime-types": {
+			"version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
+			"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-selector-parser": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.3.tgz"
+				"mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
 			},
 			"dependencies": {
-				"postcss-selector-parser": {
-					"version": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.3.tgz",
-					"integrity": "sha1-0u4Z33pk+O8hwacchvfUg1yIwoE=",
-					"dev": true,
-					"requires": {
-						"flatten": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-						"indexes-of": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-						"uniq": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"
-					}
+				"mime-db": {
+					"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+					"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE="
 				}
 			}
 		},
-		"postcss-pseudoelements": {
-			"version": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz",
-			"integrity": "sha1-bGghd8eQC6BTtt8X+MWQKEx7i7w=",
-			"dev": true,
+		"minimatch": {
+			"version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
 			}
 		},
-		"postcss-replace-overflow-wrap": {
-			"version": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-1.0.0.tgz",
-			"integrity": "sha1-8KA7Meq5Y2ppNr/SEOKu8bQ0pkM=",
-			"dev": true,
+		"minimist": {
+			"version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+		},
+		"mkdirp": {
+			"version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
 			}
 		},
-		"postcss-reporter": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-3.0.0.tgz",
-			"integrity": "sha1-CeoPN6RExWk4eGBuCbAY6+/3z48=",
-			"dev": true,
+		"modelo": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
+			"integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
+		},
+		"moment": {
+			"version": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+			"integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+		},
+		"moment-timezone": {
+			"version": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
+			"integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
 			"requires": {
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"log-symbols": "1.0.2",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"moment": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"
 			}
 		},
-		"postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+		"ms": {
+			"version": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+			"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
 			"dev": true
 		},
-		"postcss-sass": {
-			"version": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.1.0.tgz",
-			"integrity": "sha1-DSplW10kHsj0Gbs9o43lyhF0bds=",
-			"dev": true,
+		"nan": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+			"integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
+		},
+		"node-forge": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+			"integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
+		},
+		"node-pre-gyp": {
+			"version": "0.6.36",
+			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+			"integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
 			"requires": {
-				"gonzales-pe": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.0.3.tgz",
-				"mathjs": "https://registry.npmjs.org/mathjs/-/mathjs-3.13.3.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+				"nopt": "4.0.1",
+				"npmlog": "4.1.2",
+				"rc": "1.2.1",
+				"request": "2.81.0",
+				"rimraf": "2.6.1",
+				"semver": "5.4.1",
+				"tar": "2.2.1",
+				"tar-pack": "3.4.0"
 			}
 		},
-		"postcss-scss": {
-			"version": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.0.tgz",
-			"integrity": "sha1-SVcBMJeXPf1b2bGtim3BNFal0bo=",
-			"dev": true,
+		"nopt": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+			"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-					"integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-						"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
-					}
-				},
-				"supports-color": {
-					"version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-					}
-				}
+				"abbrev": "1.1.0",
+				"osenv": "0.1.4"
 			}
 		},
-		"postcss-selector-matches": {
-			"version": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz",
-			"integrity": "sha1-+g9Dvle2jneqTNEYBwI0kqExAn8=",
-			"dev": true,
+		"npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
+				"are-we-there-yet": "1.1.4",
+				"console-control-strings": "1.1.0",
+				"gauge": "2.7.4",
+				"set-blocking": "2.0.0"
 			}
 		},
-		"postcss-selector-not": {
-			"version": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-2.0.0.tgz",
-			"integrity": "sha1-xzrSGj91I0vuf+4mnhVP1qhpeY0=",
-			"dev": true,
+		"number-is-nan": {
+			"version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+		},
+		"oauth-sign": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+		},
+		"object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+		},
+		"object-keys": {
+			"version": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+			"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
-					"integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
-					"dev": true
-				}
+				"wrappy": "1.0.2"
 			}
 		},
-		"postcss-selector-parser": {
-			"version": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-			"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-			"dev": true,
+		"optimist": {
+			"version": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+			"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
 			"requires": {
-				"flatten": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-				"indexes-of": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-				"uniq": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"
+				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+				"wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
 			}
 		},
-		"postcss-smart-import": {
-			"version": "https://registry.npmjs.org/postcss-smart-import/-/postcss-smart-import-0.7.4.tgz",
-			"integrity": "sha1-UM+z2aSbcKYfkRRRvCTYQfjb8gA=",
-			"dev": true,
+		"os-homedir": {
+			"version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+		},
+		"os-tmpdir": {
+			"version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+		},
+		"osenv": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+			"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-				"postcss-sass": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.1.0.tgz",
-				"postcss-scss": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.0.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-				"promise-each": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
-				"read-cache": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-				"resolve": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
-				"sugarss": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.0.tgz"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-					"integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-						"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
-					}
-				},
-				"supports-color": {
-					"version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-					}
-				}
+				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+			}
+		},
+		"path-exists": {
+			"version": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
+			"integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
+			"dev": true
+		},
+		"path-is-absolute": {
+			"version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+		},
+		"path.js": {
+			"version": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
+			"integrity": "sha1-fRNrYH3hm/2YugaIdJJih+ZTSTk=",
+			"requires": {
+				"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+				"inherits-ex": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.1.8.tgz",
+				"util-ex": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz"
 			}
 		},
-		"postcss-value-parser": {
-			"version": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-			"integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
-			"dev": true
+		"performance-now": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+			"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
 		},
-		"prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-			"dev": true
+		"photoswipe": {
+			"version": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.2.tgz",
+			"integrity": "sha1-lcIKdc6iO3DWKZZBytguA8rn95c="
 		},
-		"preserve": {
-			"version": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
+		"pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+		},
+		"poplib": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
+			"integrity": "sha1-L0tYtVkpcjUM2X9IKrpo+OBVdLw=",
+			"requires": {
+				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
+			}
 		},
 		"private": {
 			"version": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
@@ -6428,132 +2448,69 @@
 			"version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
 			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
 		},
-		"progress": {
-			"version": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-			"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-			"dev": true
-		},
 		"prom-client": {
-			"version": "9.1.1",
-			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-9.1.1.tgz",
-			"integrity": "sha1-lYjxaBoIaWFsfekWrTOujx4D/BA=",
-			"requires": {
-				"tdigest": "0.1.1",
-				"util-extend": "1.0.3"
-			}
-		},
-		"promise-each": {
-			"version": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
-			"integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=",
-			"dev": true,
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.1.0.tgz",
+			"integrity": "sha512-ny9EdxpG6UcNnuc3W3LedE9qC3RFLSD+aBCv1i9OtcLS/nyHFck5uncoWHpD+rxmdttUPVd8qYRT1rb15Lpmjg==",
 			"requires": {
-				"any-promise": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz"
+				"tdigest": "0.1.1"
 			}
 		},
-		"pseudomap": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-			"dev": true
-		},
 		"pump": {
-			"version": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
 			"integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
 			"requires": {
-				"end-of-stream": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-				"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+				"end-of-stream": "1.4.0",
+				"once": "1.4.0"
 			}
 		},
 		"pumpify": {
-			"version": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
 			"integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
 			"requires": {
-				"duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
+				"duplexify": "3.5.1",
 				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"pump": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz"
+				"pump": "1.0.2"
 			}
 		},
 		"punycode": {
-			"version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
 			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
 		},
-		"q": {
-			"version": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-			"integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
-			"dev": true
-		},
 		"qs": {
 			"version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
 			"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
 		},
 		"querystring": {
-			"version": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
 			"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
 		},
-		"randomatic": {
-			"version": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz",
-			"integrity": "sha1-EQ3Kv/OX6dz/fAeJzMCkmt8exbs=",
-			"dev": true,
-			"requires": {
-				"is-number": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-				"kind-of": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
-			}
-		},
 		"rc": {
-			"version": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz",
-			"integrity": "sha1-xepWS7B6/5/TpbMukGwdOmWUD+o=",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+			"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
 			"requires": {
-				"deep-extend": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-				"ini": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-				"strip-json-comments": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
+				"deep-extend": "0.4.2",
+				"ini": "1.3.4",
+				"minimist": "1.2.0",
+				"strip-json-comments": "2.0.1"
 			},
 			"dependencies": {
 				"minimist": {
-					"version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
 					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				}
 			}
 		},
-		"read-cache": {
-			"version": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
-			"dev": true,
-			"requires": {
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-			}
-		},
-		"read-file-stdin": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz",
-			"integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
-			"dev": true,
-			"requires": {
-				"gather-stream": "1.0.0"
-			}
-		},
-		"read-pkg": {
-			"version": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-			"dev": true,
-			"requires": {
-				"load-json-file": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-				"normalize-package-data": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
-				"path-type": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
-			}
-		},
-		"read-pkg-up": {
-			"version": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-			"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-			"dev": true,
-			"requires": {
-				"find-up": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-				"read-pkg": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
-			}
-		},
 		"readable-stream": {
 			"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
 			"integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
+			"dev": true,
 			"requires": {
 				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
 				"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -6564,72 +2521,21 @@
 				"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
 			}
 		},
-		"readdirp": {
-			"version": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-			"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-				"set-immediate-shim": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
-			}
-		},
-		"redent": {
-			"version": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-			"dev": true,
-			"requires": {
-				"indent-string": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-				"strip-indent": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
-			}
-		},
-		"reduce-css-calc": {
-			"version": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-			"integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-				"math-expression-evaluator": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-				"reduce-function-call": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz"
-			}
-		},
-		"reduce-function-call": {
-			"version": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
-			"integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-			}
-		},
 		"regenerate": {
 			"version": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
 			"integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
 			"dev": true
 		},
-		"regenerator-runtime": {
-			"version": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-			"integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
-		},
 		"regenerator-transform": {
 			"version": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz",
 			"integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+				"babel-runtime": "6.26.0",
 				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
 				"private": "https://registry.npmjs.org/private/-/private-0.1.7.tgz"
 			}
 		},
-		"regex-cache": {
-			"version": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-			"integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-				"is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-			}
-		},
 		"regexpu-core": {
 			"version": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
 			"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
@@ -6660,21 +2566,6 @@
 				}
 			}
 		},
-		"remove-trailing-separator": {
-			"version": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz",
-			"integrity": "sha1-YV67lq9VlVLUv0BXyENtSGq2PMQ=",
-			"dev": true
-		},
-		"repeat-element": {
-			"version": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-			"dev": true
-		},
-		"repeat-string": {
-			"version": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true
-		},
 		"repeating": {
 			"version": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
 			"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
@@ -6684,379 +2575,107 @@
 			}
 		},
 		"request": {
-			"version": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+			"version": "2.81.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
 			"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
 			"requires": {
-				"aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-				"aws4": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-				"caseless": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+				"aws-sign2": "0.6.0",
+				"aws4": "1.6.0",
+				"caseless": "0.12.0",
 				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
 				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"forever-agent": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+				"forever-agent": "0.6.1",
 				"form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-				"har-validator": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-				"hawk": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-				"http-signature": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-				"is-typedarray": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-				"isstream": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-				"json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-				"oauth-sign": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-				"performance-now": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+				"har-validator": "4.2.1",
+				"hawk": "3.1.3",
+				"http-signature": "1.1.1",
+				"is-typedarray": "1.0.0",
+				"isstream": "0.1.2",
+				"json-stringify-safe": "5.0.1",
+				"mime-types": "2.1.17",
+				"oauth-sign": "0.8.2",
+				"performance-now": "0.2.0",
 				"qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-				"stringstream": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-				"tough-cookie": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-				"tunnel-agent": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-				"uuid": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"
-			}
-		},
-		"request-progress": {
-			"version": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
-			"integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
-			"dev": true,
-			"requires": {
-				"throttleit": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"
-			}
-		},
-		"requestretry": {
-			"version": "https://registry.npmjs.org/requestretry/-/requestretry-1.5.0.tgz",
-			"integrity": "sha1-7RV7ulNSbt6z7DKo5wSkmYvs5ic=",
-			"dev": true,
-			"requires": {
-				"fg-lodash": "https://registry.npmjs.org/fg-lodash/-/fg-lodash-0.0.2.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
-			}
-		},
-		"require-from-string": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-			"integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
-			"dev": true
-		},
-		"require-uncached": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-			"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-			"dev": true,
-			"requires": {
-				"caller-path": "0.1.0",
-				"resolve-from": "1.0.1"
-			}
-		},
-		"resolve": {
-			"version": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
-			"integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
-			"dev": true,
-			"requires": {
-				"path-parse": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"
-			}
-		},
-		"resolve-from": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-			"integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-			"dev": true
-		},
-		"resolve-url": {
-			"version": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
-		},
-		"restore-cursor": {
-			"version": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-			"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-			"dev": true,
-			"requires": {
-				"onetime": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-				"signal-exit": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
+				"safe-buffer": "5.1.1",
+				"stringstream": "0.0.5",
+				"tough-cookie": "2.3.2",
+				"tunnel-agent": "0.6.0",
+				"uuid": "3.1.0"
+			},
+			"dependencies": {
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+					"requires": {
+						"mime-db": "1.30.0"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
 			}
 		},
 		"retry-request": {
-			"version": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
 			"integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
 			"requires": {
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
-			}
-		},
-		"rgb": {
-			"version": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
-			"integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
-			"dev": true
-		},
-		"rgb-hex": {
-			"version": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz",
-			"integrity": "sha1-v6+M2c2RZLWibXHrTxWgllMks8E=",
-			"dev": true
-		},
-		"rgb2hex": {
-			"version": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
-			"integrity": "sha1-zNVfhgrgxcTqN1BLlY5ELY0SMls=",
-			"dev": true
-		},
-		"right-align": {
-			"version": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-			"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-			"dev": true,
-			"requires": {
-				"align-text": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
+				"request": "2.81.0",
+				"through2": "2.0.3"
 			}
 		},
 		"rimraf": {
-			"version": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-			"integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
-			"requires": {
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
-			}
-		},
-		"run-async": {
-			"version": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-			"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-			"dev": true,
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+			"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
 			"requires": {
-				"is-promise": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"
+				"glob": "7.1.2"
 			}
 		},
-		"rx": {
-			"version": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-			"integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
-			"dev": true
-		},
 		"safe-buffer": {
 			"version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-			"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
-		},
-		"saucelabs": {
-			"version": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.4.0.tgz",
-			"integrity": "sha1-uTSpr52ih0s/QKrh/N5QpEZvXzg=",
-			"dev": true,
-			"requires": {
-				"https-proxy-agent": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"
-			}
+			"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+			"dev": true
 		},
 		"sax": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
 			"integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
 		},
-		"seed-random": {
-			"version": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
-			"integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ=",
-			"dev": true
-		},
-		"selenium-standalone": {
-			"version": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-5.11.2.tgz",
-			"integrity": "sha1-ckzKpy+ybzcR4OIJieR4xBM9+EQ=",
-			"dev": true,
-			"requires": {
-				"async": "https://registry.npmjs.org/async/-/async-1.2.1.tgz",
-				"commander": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz",
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-				"progress": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-				"tar-stream": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
-				"urijs": "https://registry.npmjs.org/urijs/-/urijs-1.16.1.tgz",
-				"which": "https://registry.npmjs.org/which/-/which-1.1.1.tgz",
-				"yauzl": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz"
-			},
-			"dependencies": {
-				"async": {
-					"version": "https://registry.npmjs.org/async/-/async-1.2.1.tgz",
-					"integrity": "sha1-pIFqF81f9RbfosdpikUzabl5DeA=",
-					"dev": true
-				},
-				"caseless": {
-					"version": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-					"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-					"dev": true
-				},
-				"commander": {
-					"version": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-					"integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
-					"dev": true
-				},
-				"har-validator": {
-					"version": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-					"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"commander": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-						"is-my-json-valid": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-						"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-					},
-					"dependencies": {
-						"commander": {
-							"version": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-							"integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-							"dev": true,
-							"requires": {
-								"graceful-readlink": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-							}
-						}
-					}
-				},
-				"lodash": {
-					"version": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz",
-					"integrity": "sha1-AVnoaDL+/8bWHYUrEqlTuZSWvTI=",
-					"dev": true
-				},
-				"minimist": {
-					"version": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz",
-					"integrity": "sha1-zfIl6ImPhAolje1E/JF3Z3Cv3JM=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-					"dev": true,
-					"requires": {
-						"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-							"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-							"dev": true
-						}
-					}
-				},
-				"qs": {
-					"version": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-					"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-					"dev": true
-				},
-				"request": {
-					"version": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-					"integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-						"aws4": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-						"caseless": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-						"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-						"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-						"forever-agent": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-						"form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-						"har-validator": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-						"hawk": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-						"http-signature": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-						"is-typedarray": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-						"isstream": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-						"json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-						"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-						"oauth-sign": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-						"qs": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-						"stringstream": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-						"tough-cookie": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-						"tunnel-agent": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-						"uuid": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"
-					}
-				},
-				"tunnel-agent": {
-					"version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-					"dev": true
-				},
-				"which": {
-					"version": "https://registry.npmjs.org/which/-/which-1.1.1.tgz",
-					"integrity": "sha1-nOUSRZlGFm4SwIPwjsBzOA/Iy7s=",
-					"dev": true,
-					"requires": {
-						"is-absolute": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
-					}
-				},
-				"yauzl": {
-					"version": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz",
-					"integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=",
-					"dev": true,
-					"requires": {
-						"buffer-crc32": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-						"fd-slicer": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"
-					}
-				}
-			}
-		},
 		"semver": {
-			"version": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-			"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+			"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
 		},
 		"set-blocking": {
-			"version": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
 		},
-		"set-immediate-shim": {
-			"version": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-			"integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-			"dev": true
-		},
-		"shebang-command": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-			"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-			"dev": true,
-			"requires": {
-				"shebang-regex": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
-			}
-		},
 		"shebang-regex": {
 			"version": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
 			"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
 			"dev": true
 		},
 		"signal-exit": {
-			"version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
 			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
 		},
-		"simple-git": {
-			"version": "1.73.0",
-			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.73.0.tgz",
-			"integrity": "sha1-h2g6cpsb7gFqMYL5Wiq3Ixe7AjA=",
-			"dev": true,
-			"requires": {
-				"debug": "2.6.8"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.8",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				}
-			}
-		},
 		"slash": {
 			"version": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
 			"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
 			"dev": true
 		},
-		"slice-ansi": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-			"integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-			"dev": true
-		},
-		"slide": {
-			"version": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-			"integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
-		},
 		"sntp": {
-			"version": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
 			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
 			"requires": {
-				"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+				"hoek": "2.16.3"
 			}
 		},
 		"source-map": {
@@ -7064,87 +2683,21 @@
 			"integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
 			"dev": true
 		},
-		"source-map-resolve": {
-			"version": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-			"integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
-			"dev": true,
-			"requires": {
-				"atob": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-				"resolve-url": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-				"source-map-url": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-				"urix": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
-			}
-		},
 		"source-map-support": {
 			"version": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
-			"integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
-			"dev": true,
-			"requires": {
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
-			}
-		},
-		"source-map-url": {
-			"version": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-			"integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
-			"dev": true
-		},
-		"spdx-correct": {
-			"version": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-			"integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-			"dev": true,
-			"requires": {
-				"spdx-license-ids": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"
-			}
-		},
-		"spdx-expression-parse": {
-			"version": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-			"integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-			"dev": true
-		},
-		"spdx-license-ids": {
-			"version": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-			"integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-			"dev": true
-		},
-		"specificity": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.1.tgz",
-			"integrity": "sha1-8bBoQkzjF64HR42V3jwhz4Xo1Wc=",
-			"dev": true
-		},
-		"split": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz",
-			"integrity": "sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64=",
+			"integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
 			"dev": true,
 			"requires": {
-				"through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
 			}
 		},
 		"split-array-stream": {
-			"version": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
 			"integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
 			"requires": {
-				"async": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-				"is-stream-ended": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz"
-			},
-			"dependencies": {
-				"async": {
-					"version": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
-					"integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
-					"requires": {
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-					}
-				}
-			}
-		},
-		"split2": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz",
-			"integrity": "sha1-eh9VHhdqkOzTNF9yRqDP4XXvT9A=",
-			"dev": true,
-			"requires": {
-				"through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
+				"async": "2.5.0",
+				"is-stream-ended": "0.1.3"
 			}
 		},
 		"sprintf-js": {
@@ -7152,113 +2705,66 @@
 			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
 		},
 		"sshpk": {
-			"version": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
-			"integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
-			"requires": {
-				"asn1": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-				"assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-				"bcrypt-pbkdf": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-				"dashdash": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-				"ecc-jsbn": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-				"getpass": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-				"jodid25519": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-				"jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-				"tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+			"requires": {
+				"asn1": "0.2.3",
+				"assert-plus": "1.0.0",
+				"bcrypt-pbkdf": "1.0.1",
+				"dashdash": "1.14.1",
+				"ecc-jsbn": "0.1.1",
+				"getpass": "0.1.7",
+				"jsbn": "0.1.1",
+				"tweetnacl": "0.14.5"
 			},
 			"dependencies": {
 				"assert-plus": {
-					"version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
 				}
 			}
 		},
-		"stack-chain": {
-			"version": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
-			"integrity": "sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=",
-			"dev": true
-		},
-		"stack-generator": {
-			"version": "https://registry.npmjs.org/stack-generator/-/stack-generator-1.1.0.tgz",
-			"integrity": "sha1-NvapIHUabBD0maE8Msu19RoLiyU=",
-			"dev": true,
-			"requires": {
-				"stackframe": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.3.tgz"
-			},
-			"dependencies": {
-				"stackframe": {
-					"version": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.3.tgz",
-					"integrity": "sha1-/mSrILFw5M5JBEsSbBGd+g5dx8w=",
-					"dev": true
-				}
-			}
-		},
-		"stackframe": {
-			"version": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
-			"integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
-			"dev": true
-		},
-		"stacktrace-gps": {
-			"version": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-2.4.4.tgz",
-			"integrity": "sha1-acgn6dbW9Bz0ONfxleLjy/zyjEQ=",
-			"dev": true,
-			"requires": {
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"stackframe": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz"
-			}
-		},
-		"stacktrace-js": {
-			"version": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-1.3.1.tgz",
-			"integrity": "sha1-Z8qyWJr1xBe5Yvc2mUAne7O2oYs=",
-			"dev": true,
-			"requires": {
-				"error-stack-parser": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
-				"stack-generator": "https://registry.npmjs.org/stack-generator/-/stack-generator-1.1.0.tgz",
-				"stacktrace-gps": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-2.4.4.tgz"
-			}
-		},
-		"stream-combiner": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-			"integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-			"dev": true,
-			"requires": {
-				"duplexer": "0.1.1",
-				"through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-			}
-		},
 		"stream-events": {
-			"version": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
 			"integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
 			"requires": {
-				"stubs": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz"
+				"stubs": "3.0.0"
 			}
 		},
 		"stream-shift": {
-			"version": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
 			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
 		},
 		"string_decoder": {
 			"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
 			"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+			"dev": true,
 			"requires": {
 				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
 			}
 		},
 		"string-format-obj": {
-			"version": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
 			"integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
 		},
 		"string-width": {
-			"version": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
 			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 			"requires": {
-				"code-point-at": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-				"is-fullwidth-code-point": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+				"code-point-at": "1.1.0",
+				"is-fullwidth-code-point": "1.0.0",
 				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
 			}
 		},
 		"stringstream": {
-			"version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+			"version": "0.0.5",
+			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
 			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
 		},
 		"strip-ansi": {
@@ -7268,288 +2774,16 @@
 				"ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
 			}
 		},
-		"strip-bom": {
-			"version": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-			"dev": true,
-			"requires": {
-				"is-utf8": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
-			}
-		},
-		"strip-indent": {
-			"version": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-			"dev": true,
-			"requires": {
-				"get-stdin": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-			}
-		},
 		"strip-json-comments": {
-			"version": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
 			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
 		},
 		"stubs": {
-			"version": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
 			"integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
 		},
-		"style-search": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-			"integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-			"dev": true
-		},
-		"stylehacks": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-2.3.2.tgz",
-			"integrity": "sha1-ZMg+BDimjJ7fRJ6MVSp9mrYAmws=",
-			"dev": true,
-			"requires": {
-				"browserslist": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"log-symbols": "1.0.2",
-				"minimist": "1.2.0",
-				"plur": "2.1.2",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-reporter": "1.4.1",
-				"postcss-selector-parser": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-				"read-file-stdin": "0.2.1",
-				"text-table": "0.2.0",
-				"write-file-stdout": "0.0.2"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				},
-				"postcss-reporter": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-					"integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-						"log-symbols": "1.0.2",
-						"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-					}
-				}
-			}
-		},
-		"stylelint": {
-			"version": "7.13.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-7.13.0.tgz",
-			"integrity": "sha1-ER+Xttpy53XICADWu29fhpmXeF0=",
-			"dev": true,
-			"requires": {
-				"autoprefixer": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-				"balanced-match": "0.4.2",
-				"chalk": "2.0.1",
-				"colorguard": "1.2.0",
-				"cosmiconfig": "2.2.1",
-				"debug": "2.6.8",
-				"doiuse": "2.6.0",
-				"execall": "1.0.0",
-				"file-entry-cache": "2.0.0",
-				"get-stdin": "5.0.1",
-				"globby": "6.1.0",
-				"globjoin": "0.1.4",
-				"html-tags": "2.0.0",
-				"ignore": "3.3.3",
-				"imurmurhash": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-				"known-css-properties": "0.2.0",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"log-symbols": "1.0.2",
-				"mathml-tag-names": "2.0.1",
-				"meow": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-				"micromatch": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-				"normalize-selector": "0.2.0",
-				"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-				"postcss-less": "0.14.0",
-				"postcss-media-query-parser": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-				"postcss-reporter": "3.0.0",
-				"postcss-resolve-nested-selector": "0.1.1",
-				"postcss-scss": "0.4.1",
-				"postcss-selector-parser": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-				"postcss-value-parser": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-				"resolve-from": "3.0.0",
-				"specificity": "0.3.1",
-				"string-width": "2.1.1",
-				"style-search": "0.1.0",
-				"stylehacks": "2.3.2",
-				"sugarss": "0.2.0",
-				"svg-tags": "1.0.0",
-				"table": "4.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
-					"integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
-					"dev": true,
-					"requires": {
-						"color-convert": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"
-					}
-				},
-				"balanced-match": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-					"integrity": "sha1-2+xJQ20q4V9TYRTnbRRlbNvA9E0=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.1.0",
-						"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-						"supports-color": "4.2.0"
-					}
-				},
-				"debug": {
-					"version": "2.6.8",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"get-stdin": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-					"integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
-					"dev": true
-				},
-				"globby": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-					"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-					"dev": true,
-					"requires": {
-						"array-union": "1.0.2",
-						"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-						"object-assign": "4.1.1",
-						"pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-						"pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-					}
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				},
-				"postcss-scss": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.4.1.tgz",
-					"integrity": "sha1-rXcbgfD3L19IRdCKpg+TVXZT1Uw=",
-					"dev": true,
-					"requires": {
-						"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-					}
-				},
-				"resolve-from": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-					"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "3.0.0"
-					}
-				},
-				"sugarss": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/sugarss/-/sugarss-0.2.0.tgz",
-					"integrity": "sha1-rDQjdWMyfG/4l7ZHQr9q7BkK054=",
-					"dev": true,
-					"requires": {
-						"postcss": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz"
-					}
-				},
-				"supports-color": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz",
-					"integrity": "sha1-rZhtx+sjFdAJtNd8gWnCIxpoQDc=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"sugarss": {
-			"version": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.0.tgz",
-			"integrity": "sha1-ZeUbOVhDL7cNVFGmi7M+MtDPHvc=",
-			"dev": true,
-			"requires": {
-				"postcss": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-					"integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
-					"dev": true,
-					"requires": {
-						"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-						"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-						"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
-					}
-				},
-				"supports-color": {
-					"version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-					}
-				}
-			}
-		},
 		"superagent": {
 			"version": "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz",
 			"integrity": "sha1-M2GjlxVnUEw1EGOr6q4PqiPb8/g=",
@@ -7578,136 +2812,76 @@
 		},
 		"supports-color": {
 			"version": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-		},
-		"svg-tags": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
 			"dev": true
 		},
-		"synesthesia": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/synesthesia/-/synesthesia-1.0.1.tgz",
-			"integrity": "sha1-XvlepUjA1cbm+btLDQcx3/hkp3c=",
-			"dev": true,
-			"requires": {
-				"css-color-names": "0.0.3"
-			}
-		},
-		"table": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz",
-			"integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=",
-			"dev": true,
-			"requires": {
-				"ajv": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-				"ajv-keywords": "1.5.1",
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"slice-ansi": "0.0.4",
-				"string-width": "2.1.1"
-			},
-			"dependencies": {
-				"ajv-keywords": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-					"integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "3.0.0"
-					}
-				}
-			}
-		},
 		"tar": {
-			"version": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
 			"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
 			"requires": {
-				"block-stream": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-				"fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+				"block-stream": "0.0.9",
+				"fstream": "1.0.11",
 				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
 			}
 		},
 		"tar-pack": {
-			"version": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz",
-			"integrity": "sha1-MJMYFkGPVa/E0hd1r91nIM7kXa4=",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+			"integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
 			"requires": {
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-				"fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-				"fstream-ignore": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-				"once": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-				"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-				"tar": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-				"uid-number": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+				"debug": "2.6.8",
+				"fstream": "1.0.11",
+				"fstream-ignore": "1.0.5",
+				"once": "1.4.0",
+				"readable-stream": "2.3.3",
+				"rimraf": "2.6.1",
+				"tar": "2.2.1",
+				"uid-number": "0.0.6"
 			},
 			"dependencies": {
-				"once": {
-					"version": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-					"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+				"debug": {
+					"version": "2.6.8",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
 					"requires": {
-						"wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+						"ms": "2.0.0"
 					}
 				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+				},
 				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-					"integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=",
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
 					"requires": {
-						"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
 						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
 						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
 					}
 				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
 				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
 				}
 			}
 		},
-		"tar-stream": {
-			"version": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
-			"integrity": "sha1-+8bG6DwaGdTLSMfZYXH8JI7/x78=",
-			"dev": true,
-			"requires": {
-				"bl": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-				"end-of-stream": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-			}
-		},
 		"tdigest": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
@@ -7716,65 +2890,42 @@
 				"bintrees": "1.0.1"
 			}
 		},
-		"tempfile": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
-			"integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-				"uuid": "2.0.3"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-					"integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-					"dev": true
-				}
-			}
-		},
-		"text-extensions": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz",
-			"integrity": "sha1-0cstFLXQvEW/3Kigikc/aMfrDLw=",
-			"dev": true
-		},
-		"text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-			"dev": true
-		},
-		"throttleit": {
-			"version": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-			"integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
-			"dev": true
-		},
-		"through": {
-			"version": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-			"dev": true
-		},
-		"through2": {
-			"version": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-			"requires": {
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-			}
-		},
-		"tiny-emitter": {
-			"version": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-1.0.2.tgz",
-			"integrity": "sha1-jklHDT9V+J4kchA2imu5+1GqFgE=",
-			"dev": true
-		},
-		"tmp": {
-			"version": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-			"integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
-			"dev": true,
+		"through2": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
 			"requires": {
-				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+				"readable-stream": "2.3.3",
+				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"requires": {
+						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				}
 			}
 		},
 		"to-fast-properties": {
@@ -7787,150 +2938,74 @@
 			"integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
 		},
 		"tough-cookie": {
-			"version": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
 			"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
 			"requires": {
-				"punycode": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+				"punycode": "1.4.1"
 			}
 		},
-		"trim-newlines": {
-			"version": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-			"dev": true
-		},
-		"trim-off-newlines": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
-			"integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
-			"dev": true
-		},
 		"trim-right": {
 			"version": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
 			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
 			"dev": true
 		},
-		"tryit": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-			"integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-			"dev": true
-		},
 		"tunnel-agent": {
-			"version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"requires": {
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
+				"safe-buffer": "5.1.1"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
 			}
 		},
 		"tweetnacl": {
-			"version": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
 			"optional": true
 		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "1.1.2"
-			}
-		},
-		"type-detect": {
-			"version": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
-			"integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
-			"dev": true
-		},
-		"typed-function": {
-			"version": "https://registry.npmjs.org/typed-function/-/typed-function-0.10.5.tgz",
-			"integrity": "sha1-Lg8Yq9BlIZ+raUpEamXG0ZgYMsA=",
-			"dev": true
-		},
 		"typedarray": {
-			"version": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
 			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
 		},
-		"uglify-js": {
-			"version": "2.8.28",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz",
-			"integrity": "sha512-WqKNbmNJKzIdIEQu/U2ytgGBbhCy2PVks94GoetczOAJ/zCgVu2CuO7gguI5KPFGPtUtI1dmPQl6h0D4cPzypA==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"uglify-to-browserify": "1.0.2",
-				"yargs": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
-			}
-		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-			"dev": true,
-			"optional": true
-		},
 		"uid-number": {
-			"version": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
 			"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
 		},
 		"underscore": {
 			"version": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
 			"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
 		},
-		"underscore.string": {
-			"version": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
-			"integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=",
-			"dev": true
-		},
-		"uniq": {
-			"version": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-			"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-			"dev": true
-		},
 		"unique-string": {
-			"version": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
 			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
 			"requires": {
-				"crypto-random-string": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"
-			}
-		},
-		"units-css": {
-			"version": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
-			"integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
-			"dev": true,
-			"requires": {
-				"isnumeric": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
-				"viewport-dimensions": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz"
+				"crypto-random-string": "1.0.0"
 			}
 		},
-		"upper-case": {
-			"version": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-			"integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-			"dev": true
-		},
-		"urijs": {
-			"version": "https://registry.npmjs.org/urijs/-/urijs-1.16.1.tgz",
-			"integrity": "sha1-hZrTGJD1+VKHJ76J8ZMslPtHMeI=",
-			"dev": true
-		},
-		"urix": {
-			"version": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
-		},
 		"url": {
-			"version": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-			"dev": true,
+			"version": "0.10.3",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+			"integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
 			"requires": {
-				"punycode": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-				"querystring": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
 			},
 			"dependencies": {
 				"punycode": {
-					"version": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-					"dev": true
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
 				}
 			}
 		},
@@ -7939,7 +3014,14 @@
 			"resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
 			"integrity": "sha1-lV9JCq5lO6IguUVqCod2wZk2CZE=",
 			"requires": {
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
+				"semver": "5.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+				}
 			}
 		},
 		"util-deprecate": {
@@ -7954,172 +3036,63 @@
 				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
 			}
 		},
-		"util-extend": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
-			"integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8="
-		},
 		"uuid": {
-			"version": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-			"integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
-		},
-		"validate-npm-package-license": {
-			"version": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-			"integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-			"dev": true,
-			"requires": {
-				"spdx-correct": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-				"spdx-expression-parse": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"
-			}
-		},
-		"validator": {
-			"version": "https://registry.npmjs.org/validator/-/validator-7.0.0.tgz",
-			"integrity": "sha1-x03rgGNRL6w1VHk45vCxUEooL9I=",
-			"dev": true
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+			"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
 		},
 		"verror": {
-			"version": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-			"integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-			"requires": {
-				"extsprintf": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-			}
-		},
-		"viewport-dimensions": {
-			"version": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
-			"integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w=",
-			"dev": true
-		},
-		"walkdir": {
-			"version": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
-			"integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
-			"dev": true
-		},
-		"wdio-dot-reporter": {
-			"version": "https://registry.npmjs.org/wdio-dot-reporter/-/wdio-dot-reporter-0.0.8.tgz",
-			"integrity": "sha1-NhlVdtoNmYIQxxlIy7ZfW/Eb/GU=",
-			"dev": true
-		},
-		"wdio-sync": {
-			"version": "https://registry.npmjs.org/wdio-sync/-/wdio-sync-0.6.14.tgz",
-			"integrity": "sha1-odzVkHuh0EFUquYXbGItkQw8qbM=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-				"fibers": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-				"object.assign": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"
-			}
-		},
-		"webdriverio": {
-			"version": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.8.0.tgz",
-			"integrity": "sha1-1Skpt0kID4mWf24WFAUcvIFy0TI=",
-			"dev": true,
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
 			"requires": {
-				"archiver": "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz",
-				"babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-				"css-parse": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-				"css-value": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-				"deepmerge": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
-				"ejs": "https://registry.npmjs.org/ejs/-/ejs-2.5.6.tgz",
-				"gaze": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"inquirer": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
-				"json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"npm-install-package": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-				"q": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-				"rgb2hex": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-				"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-				"url": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-				"validator": "https://registry.npmjs.org/validator/-/validator-7.0.0.tgz",
-				"wdio-dot-reporter": "https://registry.npmjs.org/wdio-dot-reporter/-/wdio-dot-reporter-0.0.8.tgz",
-				"wgxpath": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz"
+				"assert-plus": "1.0.0",
+				"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+				"extsprintf": "1.3.0"
 			},
 			"dependencies": {
-				"supports-color": {
-					"version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-					}
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
 				}
 			}
 		},
-		"websocket-driver": {
-			"version": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-			"integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
-			"dev": true,
-			"requires": {
-				"websocket-extensions": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"
-			}
-		},
-		"websocket-extensions": {
-			"version": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-			"integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
-			"dev": true
-		},
-		"wgxpath": {
-			"version": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz",
-			"integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
-			"dev": true
-		},
-		"which": {
-			"version": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-			"integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
-			"dev": true,
-			"requires": {
-				"isexe": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
-			}
-		},
 		"wide-align": {
-			"version": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-			"integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+			"integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
 			"requires": {
-				"string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+				"string-width": "1.0.2"
 			}
 		},
-		"window-size": {
-			"version": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-			"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-			"dev": true
+		"wolfy87-eventemitter": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.2.tgz",
+			"integrity": "sha1-nLjlj21TgUYCuREo3YHK0JAZek0="
 		},
 		"wordwrap": {
 			"version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
 			"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
 		},
 		"wrappy": {
-			"version": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
 		},
-		"write": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-			"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-			"dev": true,
-			"requires": {
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-			}
-		},
 		"write-file-atomic": {
-			"version": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz",
-			"integrity": "sha1-F2n0tVHu3OQZ8FBd6uLiZ2NULTc=",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+			"integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
 			"requires": {
-				"graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-				"imurmurhash": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-				"slide": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+				"graceful-fs": "4.1.11",
+				"imurmurhash": "0.1.4",
+				"signal-exit": "3.0.2"
 			}
 		},
-		"write-file-stdout": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz",
-			"integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
-			"dev": true
-		},
 		"xdg-basedir": {
-			"version": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
 			"integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
 		},
 		"xml2js": {
@@ -8139,256 +3112,9 @@
 				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
 			}
 		},
-		"xolvio-ddp": {
-			"version": "https://registry.npmjs.org/xolvio-ddp/-/xolvio-ddp-0.12.3.tgz",
-			"integrity": "sha1-NqarlhKyQLWg0cCoNJCK8XwLjwI=",
-			"dev": true,
-			"requires": {
-				"bluebird": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-				"ddp-ejson": "https://registry.npmjs.org/ddp-ejson/-/ddp-ejson-0.8.1-3.tgz",
-				"ddp-underscore-patched": "https://registry.npmjs.org/ddp-underscore-patched/-/ddp-underscore-patched-0.8.1-2.tgz",
-				"faye-websocket": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz",
-				"request": "https://registry.npmjs.org/request/-/request-2.53.0.tgz"
-			},
-			"dependencies": {
-				"asn1": {
-					"version": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-					"integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
-					"dev": true
-				},
-				"assert-plus": {
-					"version": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-					"integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
-					"dev": true
-				},
-				"aws-sign2": {
-					"version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-					"integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
-					"dev": true
-				},
-				"bl": {
-					"version": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
-					"integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-					}
-				},
-				"bluebird": {
-					"version": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-					"integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
-					"dev": true
-				},
-				"caseless": {
-					"version": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
-					"integrity": "sha1-t7Zc5r8UE4hlOc/VM/CzDv+pz4g=",
-					"dev": true
-				},
-				"combined-stream": {
-					"version": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-					"integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-					}
-				},
-				"delayed-stream": {
-					"version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-					"integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
-					"dev": true
-				},
-				"forever-agent": {
-					"version": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-					"integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=",
-					"dev": true
-				},
-				"form-data": {
-					"version": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-					"integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
-					"dev": true,
-					"requires": {
-						"async": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-						"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-						"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"
-					}
-				},
-				"hawk": {
-					"version": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
-					"integrity": "sha1-HnMc45RH+h0PbXB/e87r7A/R7B8=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-						"cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-						"sntp": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-					}
-				},
-				"http-signature": {
-					"version": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-					"integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
-					"dev": true,
-					"requires": {
-						"asn1": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-						"assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-						"ctype": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-					}
-				},
-				"isarray": {
-					"version": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"mime-db": {
-					"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
-					"integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-					"integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
-					"dev": true,
-					"requires": {
-						"mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-					}
-				},
-				"node-uuid": {
-					"version": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-					"integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-					"dev": true
-				},
-				"oauth-sign": {
-					"version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
-					"integrity": "sha1-fb6uRPbKRU4fFoRR1jB0ZzWBPOM=",
-					"dev": true
-				},
-				"qs": {
-					"version": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
-					"integrity": "sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-					}
-				},
-				"request": {
-					"version": "https://registry.npmjs.org/request/-/request-2.53.0.tgz",
-					"integrity": "sha1-GAo66St7Y5gC5PlUXdj83rcddgw=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-						"bl": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
-						"caseless": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
-						"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-						"forever-agent": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-						"form-data": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-						"hawk": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
-						"http-signature": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-						"isstream": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-						"json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-						"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-						"node-uuid": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-						"oauth-sign": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
-						"qs": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
-						"stringstream": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-						"tough-cookie": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-						"tunnel-agent": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"tunnel-agent": {
-					"version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-					"dev": true
-				}
-			}
-		},
-		"xolvio-fiber-utils": {
-			"version": "https://registry.npmjs.org/xolvio-fiber-utils/-/xolvio-fiber-utils-2.0.3.tgz",
-			"integrity": "sha1-vsjXDHQGGjFjFbun0w0lyz6C3FA=",
-			"dev": true,
-			"requires": {
-				"fibers": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-				"underscore": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
-			}
-		},
-		"xolvio-jasmine-expect": {
-			"version": "https://registry.npmjs.org/xolvio-jasmine-expect/-/xolvio-jasmine-expect-1.1.0.tgz",
-			"integrity": "sha1-vCud1ghCMR8EV59agtzqaisxnH0=",
-			"dev": true,
-			"requires": {
-				"jasmine-core": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.2.tgz"
-			}
-		},
-		"xolvio-sync-webdriverio": {
-			"version": "https://registry.npmjs.org/xolvio-sync-webdriverio/-/xolvio-sync-webdriverio-9.0.1.tgz",
-			"integrity": "sha1-WRri2MiqynQiZJWfzM+QtPndUWA=",
-			"dev": true,
-			"requires": {
-				"fibers": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-				"meteor-promise": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.4.tgz",
-				"underscore": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-				"wdio-sync": "https://registry.npmjs.org/wdio-sync/-/wdio-sync-0.6.14.tgz",
-				"webdriverio": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.8.0.tgz",
-				"xolvio-fiber-utils": "https://registry.npmjs.org/xolvio-fiber-utils/-/xolvio-fiber-utils-2.0.3.tgz"
-			}
-		},
 		"xtend": {
 			"version": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
 			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-		},
-		"yallist": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-			"dev": true
-		},
-		"yargs": {
-			"version": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-			"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-			"dev": true,
-			"requires": {
-				"camelcase": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-				"cliui": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-				"decamelize": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-				"window-size": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true
-				}
-			}
-		},
-		"yauzl": {
-			"version": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-			"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
-			"dev": true,
-			"requires": {
-				"fd-slicer": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"
-			}
-		},
-		"zip-stream": {
-			"version": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.1.tgz",
-			"integrity": "sha1-Uha0i7tNJlH2TVxubwnrSnOZ1Vc=",
-			"dev": true,
-			"requires": {
-				"archiver-utils": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-				"compress-commons": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
-			}
 		}
 	}
 }
diff --git a/package.json b/package.json
index 9fb603390ad..6ca36fb70cd 100644
--- a/package.json
+++ b/package.json
@@ -88,39 +88,39 @@
 	"devDependencies": {
 		"babel-mocha-es6-compiler": "^0.1.0",
 		"babel-plugin-array-includes": "^2.0.3",
-		"chimp": "^0.49.1",
-		"conventional-changelog-cli": "^1.3.2",
-		"eslint": "^4.5.0",
+		"chimp": "^0.50.0",
+		"conventional-changelog-cli": "^1.3.3",
+		"eslint": "^4.6.1",
 		"mock-require": "^2.0.2",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
 		"proxyquire": "^1.8.0",
-		"simple-git": "^1.75.0",
-		"stylelint": "^8.0.0",
+		"simple-git": "^1.77.0",
+		"stylelint": "^8.1.1",
 		"stylelint-order": "^0.6.0",
 		"supertest": "^3.0.0",
-		"underscore": "^1.5.2",
+		"underscore": "^1.8.3",
 		"underscore.string": "^3.3.4"
 	},
 	"dependencies": {
 		"@google-cloud/storage": "^1.2.1",
-		"aws-sdk": "^2.102.0",
+		"aws-sdk": "^2.111.0",
 		"babel-runtime": "^6.26.0",
-		"bcrypt": "^1.0.2",
-		"codemirror": "^5.28.0",
+		"bcrypt": "^1.0.3",
+		"codemirror": "^5.29.0",
 		"emailreplyparser": "0.0.5",
 		"file-type": "^6.1.0",
 		"highlight.js": "^9.12.0",
 		"imap": "^0.8.19",
 		"jquery": "^3.2.1",
 		"mailparser-node4": "^2.0.2-2",
-		"mime-db": "^1.29.0",
+		"mime-db": "^1.30.0",
 		"mime-type": "^3.0.5",
 		"moment": "^2.18.1",
 		"moment-timezone": "^0.5.13",
 		"photoswipe": "^4.1.2",
 		"poplib": "^0.1.7",
-		"prom-client": "^10.0.4",
+		"prom-client": "^10.1.0",
 		"semver": "^5.4.1",
 		"toastr": "^2.1.2",
 		"wolfy87-eventemitter": "^5.2.2"
diff --git a/packages/rocketchat-livechat/app/.meteor/packages b/packages/rocketchat-livechat/app/.meteor/packages
index c28486a1e03..a0cf19dae4c 100644
--- a/packages/rocketchat-livechat/app/.meteor/packages
+++ b/packages/rocketchat-livechat/app/.meteor/packages
@@ -4,15 +4,15 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor@1.7.0
-webapp@1.3.17
+meteor@1.7.1
+webapp@1.3.18
 logging@1.1.17
 tracker@1.1.3
 deps@1.0.12
 session@1.1.7
 ddp@1.3.0
 livedata@1.0.18
-mongo@1.1.19
+mongo@1.2.0
 blaze
 ui
 spacebars
@@ -21,7 +21,7 @@ check@1.2.5
 underscore@1.0.10
 jquery@1.11.10
 random@1.0.10
-ejson@1.0.13
+ejson@1.0.14
 rocketchat:streamer
 kadira:flow-router
 kadira:blaze-layout
@@ -34,7 +34,7 @@ reactive-var@1.0.11
 accounts-password@1.4.0
 tap:i18n
 smoral:sweetalert
-ecmascript@0.8.1
+ecmascript@0.8.2
 es5-shim@4.6.15
 standard-minifier-css@1.3.4
 standard-minifier-js@2.1.1
diff --git a/packages/rocketchat-livechat/app/.meteor/release b/packages/rocketchat-livechat/app/.meteor/release
index 1e7fc5b564c..47c31abcf45 100644
--- a/packages/rocketchat-livechat/app/.meteor/release
+++ b/packages/rocketchat-livechat/app/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.1
+METEOR@1.5.2
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index f38302ff7df..db0d2f521cc 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -1,14 +1,14 @@
-accounts-base@1.3.1
+accounts-base@1.3.2
 accounts-password@1.4.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.6
-babel-compiler@6.19.4
+babel-compiler@6.20.0
 babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-tools@1.0.10
-boilerplate-generator@1.1.1
+boilerplate-generator@1.2.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
@@ -17,7 +17,7 @@ check@1.2.5
 coffeescript@1.12.7_1
 coffeescript-compiler@1.12.7_1
 ddp@1.3.0
-ddp-client@2.0.0
+ddp-client@2.1.0
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
 ddp-server@2.0.0
@@ -28,7 +28,7 @@ ecmascript@0.8.2
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
-ejson@1.0.13
+ejson@1.0.14
 email@1.2.3
 es5-shim@4.6.15
 geojson-utils@1.0.10
@@ -48,19 +48,20 @@ mdg:validation-error@0.5.1
 meteor@1.7.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.1
-minimongo@1.2.1
+minifier-js@2.1.3
+minimongo@1.3.0
 mizzao:timesync@0.5.0
-modules@0.9.4
+modules@0.10.0
 modules-runtime@0.8.0
 momentjs:moment@2.18.1
-mongo@1.1.22
+mongo@1.2.0
+mongo-dev-server@1.0.1
 mongo-id@1.0.6
 npm-bcrypt@0.9.3
 npm-mongo@2.2.30
 observe-sequence@1.0.16
 ordered-dict@1.0.9
-promise@0.8.9
+promise@0.9.0
 raix:eventemitter@0.1.3
 random@1.0.10
 rate-limit@1.0.8
@@ -89,5 +90,5 @@ ui@1.0.13
 underscore@1.0.10
 underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.17
+webapp@1.3.18
 webapp-hashing@1.0.9
diff --git a/packages/rocketchat-livechat/app/package-lock.json b/packages/rocketchat-livechat/app/package-lock.json
new file mode 100644
index 00000000000..c760d61a356
--- /dev/null
+++ b/packages/rocketchat-livechat/app/package-lock.json
@@ -0,0 +1,752 @@
+{
+  "name": "rocketchat-livechat",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "abbrev": {
+      "version": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
+    },
+    "ajv": {
+      "version": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "requires": {
+        "co": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+        "json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
+      }
+    },
+    "ansi-regex": {
+      "version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "aproba": {
+      "version": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+      "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E="
+    },
+    "are-we-there-yet": {
+      "version": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "requires": {
+        "delegates": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
+      }
+    },
+    "asn1": {
+      "version": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assert-plus": {
+      "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+    },
+    "asynckit": {
+      "version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "autolinker": {
+      "version": "https://registry.npmjs.org/autolinker/-/autolinker-1.4.3.tgz",
+      "integrity": "sha1-LmFQV8jjcTmabXeUmppq8k/kbfw="
+    },
+    "aws-sign2": {
+      "version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+    },
+    "aws4": {
+      "version": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    },
+    "babel-runtime": {
+      "version": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz",
+        "regenerator-runtime": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
+      }
+    },
+    "balanced-match": {
+      "version": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "bcrypt": {
+      "version": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
+      "integrity": "sha1-sC3cbAtS6ha40883XVoy54DatUg=",
+      "requires": {
+        "nan": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+        "node-pre-gyp": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"
+      }
+    },
+    "bcrypt-pbkdf": {
+      "version": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+      }
+    },
+    "block-stream": {
+      "version": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+      }
+    },
+    "boom": {
+      "version": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "requires": {
+        "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+      }
+    },
+    "brace-expansion": {
+      "version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "requires": {
+        "balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+        "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+      }
+    },
+    "caseless": {
+      "version": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "co": {
+      "version": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "code-point-at": {
+      "version": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "combined-stream": {
+      "version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "requires": {
+        "delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+      }
+    },
+    "concat-map": {
+      "version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "console-control-strings": {
+      "version": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
+    "core-js": {
+      "version": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz",
+      "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY="
+    },
+    "core-util-is": {
+      "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cryptiles": {
+      "version": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "requires": {
+        "boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+      }
+    },
+    "dashdash": {
+      "version": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "debug": {
+      "version": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "requires": {
+        "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+      }
+    },
+    "deep-extend": {
+      "version": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+    },
+    "delayed-stream": {
+      "version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegates": {
+      "version": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
+    "ecc-jsbn": {
+      "version": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+      }
+    },
+    "extend": {
+      "version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+    },
+    "extsprintf": {
+      "version": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "forever-agent": {
+      "version": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "requires": {
+        "asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+        "combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+        "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"
+      }
+    },
+    "fs.realpath": {
+      "version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fstream": {
+      "version": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "requires": {
+        "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
+      }
+    },
+    "fstream-ignore": {
+      "version": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "requires": {
+        "fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+      }
+    },
+    "gauge": {
+      "version": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "requires": {
+        "aproba": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+        "console-control-strings": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+        "has-unicode": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+        "signal-exit": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+        "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+        "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+        "wide-align": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"
+      }
+    },
+    "getpass": {
+      "version": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "glob": {
+      "version": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+      "requires": {
+        "fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+        "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+        "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+      }
+    },
+    "graceful-fs": {
+      "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "har-schema": {
+      "version": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+    },
+    "har-validator": {
+      "version": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "requires": {
+        "ajv": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+        "har-schema": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"
+      }
+    },
+    "has-unicode": {
+      "version": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
+    "hawk": {
+      "version": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "requires": {
+        "boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+        "cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+        "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+        "sntp": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+      }
+    },
+    "hoek": {
+      "version": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+    },
+    "http-signature": {
+      "version": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "requires": {
+        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+        "jsprim": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+        "sshpk": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"
+      }
+    },
+    "inflight": {
+      "version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+        "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+      }
+    },
+    "inherits": {
+      "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ini": {
+      "version": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+    },
+    "is-fullwidth-code-point": {
+      "version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "requires": {
+        "number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+      }
+    },
+    "is-typedarray": {
+      "version": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "isarray": {
+      "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isstream": {
+      "version": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jquery": {
+      "version": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
+      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
+    },
+    "jsbn": {
+      "version": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "json-schema": {
+      "version": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-stable-stringify": {
+      "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "requires": {
+        "jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsonify": {
+      "version": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsprim": {
+      "version": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+        "extsprintf": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+        "json-schema": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+        "verror": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "mime-db": {
+      "version": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
+      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
+    },
+    "mime-types": {
+      "version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
+      "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
+      "requires": {
+        "mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"
+      }
+    },
+    "minimatch": {
+      "version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "requires": {
+        "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
+      }
+    },
+    "minimist": {
+      "version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mkdirp": {
+      "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+      }
+    },
+    "moment": {
+      "version": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+    },
+    "ms": {
+      "version": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "nan": {
+      "version": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
+    },
+    "node-pre-gyp": {
+      "version": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+      "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
+      "requires": {
+        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+        "nopt": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+        "npmlog": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+        "rc": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+        "request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+        "semver": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+        "tar": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+        "tar-pack": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz"
+      }
+    },
+    "nopt": {
+      "version": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+      "requires": {
+        "abbrev": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+        "osenv": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"
+      }
+    },
+    "npmlog": {
+      "version": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "requires": {
+        "are-we-there-yet": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+        "console-control-strings": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+        "gauge": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+        "set-blocking": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+      }
+    },
+    "number-is-nan": {
+      "version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "oauth-sign": {
+      "version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
+    "object-assign": {
+      "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "once": {
+      "version": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+      }
+    },
+    "os-homedir": {
+      "version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "os-tmpdir": {
+      "version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "osenv": {
+      "version": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "requires": {
+        "os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+        "os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+      }
+    },
+    "path-is-absolute": {
+      "version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "performance-now": {
+      "version": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+    },
+    "process-nextick-args": {
+      "version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+    },
+    "punycode": {
+      "version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "qs": {
+      "version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+    },
+    "rc": {
+      "version": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+      "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+      "requires": {
+        "deep-extend": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+        "ini": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+        "minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+        "strip-json-comments": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+      "requires": {
+        "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+        "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+        "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+        "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
+    },
+    "request": {
+      "version": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "requires": {
+        "aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+        "aws4": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+        "caseless": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+        "combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+        "extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+        "forever-agent": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+        "form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+        "har-validator": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+        "hawk": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+        "http-signature": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+        "is-typedarray": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+        "isstream": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+        "json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+        "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
+        "oauth-sign": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+        "performance-now": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+        "qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+        "stringstream": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+        "tough-cookie": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+        "tunnel-agent": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+        "uuid": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
+      }
+    },
+    "rimraf": {
+      "version": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "requires": {
+        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
+      }
+    },
+    "safe-buffer": {
+      "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+    },
+    "semver": {
+      "version": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
+    },
+    "set-blocking": {
+      "version": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "signal-exit": {
+      "version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "sntp": {
+      "version": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "requires": {
+        "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+      }
+    },
+    "sshpk": {
+      "version": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "requires": {
+        "asn1": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+        "bcrypt-pbkdf": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+        "dashdash": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+        "ecc-jsbn": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+        "getpass": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+        "jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+        "tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "requires": {
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+      }
+    },
+    "string-width": {
+      "version": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "requires": {
+        "code-point-at": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+        "is-fullwidth-code-point": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+        "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+      }
+    },
+    "stringstream": {
+      "version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+    },
+    "strip-ansi": {
+      "version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+      }
+    },
+    "strip-json-comments": {
+      "version": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "tar": {
+      "version": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "requires": {
+        "block-stream": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+        "fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+      }
+    },
+    "tar-pack": {
+      "version": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+      "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+      "requires": {
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+        "fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+        "fstream-ignore": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+        "tar": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+        "uid-number": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+      }
+    },
+    "toastr": {
+      "version": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
+      "integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
+    },
+    "tough-cookie": {
+      "version": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "requires": {
+        "punycode": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+      }
+    },
+    "tunnel-agent": {
+      "version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+      }
+    },
+    "tweetnacl": {
+      "version": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
+    "uid-number": {
+      "version": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+      "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
+    },
+    "util-deprecate": {
+      "version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "uuid": {
+      "version": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ="
+    },
+    "verror": {
+      "version": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+        "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+        "extsprintf": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "wide-align": {
+      "version": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+      "requires": {
+        "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+      }
+    },
+    "wrappy": {
+      "version": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  }
+}

From b4a9d4fcb998408bd76c8a33fe13e8a7ad7c111e Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Thu, 14 Sep 2017 16:47:58 -0300
Subject: [PATCH 060/244] Merge pull request #8094 from
 RocketChat/audio-notification-translations

[FIX] Add admin audio preferences translations
---
 packages/rocketchat-i18n/i18n/en.i18n.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 9413c0c42a0..2dff5bac7fb 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -225,6 +225,9 @@
   "Attachment_File_Uploaded": "File Uploaded",
   "Attribute_handling": "Attribute handling",
   "Audio_message": "Audio message",
+  "Audio_Notifications_Value": "Default message notification audio",
+  "Audio_Notification_Value_Description": "Can be any custom sound or the default ones: beep, chelle, ding, droplet, highbell, seasons",
+  "Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
   "Auth_Token": "Auth Token",
   "Author": "Author",
   "Authorization_URL": "Authorization URL",

From 01dc20d2d34571ca00345629180e82fb9a3ae6b8 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 16 Sep 2017 19:46:18 -0300
Subject: [PATCH 061/244] Merge pull request #8144 from
 RocketChat/fix-new-room-sound

[FIX] Fix new room sound being played too much
---
 client/notifications/notification.js          | 24 ++++++++-
 .../client/lib/cachedCollection.js            | 10 +++-
 .../client/accountBox.js                      |  2 +-
 .../client/chatRoomItem.js                    | 12 -----
 .../rocketchat-ui-sidenav/client/sideNav.html |  2 +-
 .../rocketchat-ui-sidenav/client/sideNav.js   | 19 +++----
 .../rocketchat-ui/client/lib/notification.js  | 49 +++++++++++--------
 7 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/client/notifications/notification.js b/client/notifications/notification.js
index 6adec5a6e03..6ad4ada930c 100644
--- a/client/notifications/notification.js
+++ b/client/notifications/notification.js
@@ -1,9 +1,21 @@
-/* globals KonchatNotification, fireGlobalEvent, readMessage */
+/* globals KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription */
 
 // Show notifications and play a sound for new messages.
 // We trust the server to only send notifications for interesting messages, e.g. direct messages or
 // group messages in which the user is mentioned.
 
+function notifyNewRoom(sub) {
+
+	// Do not play new room sound if user is busy
+	if (Session.equals(`user_${ Meteor.userId() }_status`, 'busy')) {
+		return;
+	}
+
+	if ((!FlowRouter.getParam('name') || FlowRouter.getParam('name') !== sub.name) && !sub.ls && sub.alert === true) {
+		return KonchatNotification.newRoom(sub.rid);
+	}
+}
+
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		if (Meteor.userId()) {
@@ -55,6 +67,16 @@ Meteor.startup(function() {
 					KonchatNotification.newMessage(notification.payload.rid);
 				}
 			});
+
+			CachedChatSubscription.onSyncData = function(action, sub) {
+				if (action !== 'removed') {
+					notifyNewRoom(sub);
+				}
+			};
+
+			RocketChat.Notifications.onUser('subscriptions-changed', (action, sub) => {
+				notifyNewRoom(sub);
+			});
 		}
 	});
 });
diff --git a/packages/rocketchat-lib/client/lib/cachedCollection.js b/packages/rocketchat-lib/client/lib/cachedCollection.js
index beb3d4995fe..88f369f83a5 100644
--- a/packages/rocketchat-lib/client/lib/cachedCollection.js
+++ b/packages/rocketchat-lib/client/lib/cachedCollection.js
@@ -99,7 +99,8 @@ class CachedCollection {
 		useCache = true,
 		debug = false,
 		version = 6,
-		maxCacheTime = 60*60*24*30
+		maxCacheTime = 60*60*24*30,
+		onSyncData = (/* action, record */) => {}
 	}) {
 		this.collection = collection || new Mongo.Collection(null);
 
@@ -116,6 +117,7 @@ class CachedCollection {
 		this.userRelated = userRelated;
 		this.updatedAt = new Date(0);
 		this.maxCacheTime = maxCacheTime;
+		this.onSyncData = onSyncData;
 
 		RocketChat.CachedCollectionManager.register(this);
 
@@ -206,6 +208,8 @@ class CachedCollection {
 				delete record.$loki;
 				this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));
 
+				this.onSyncData('changed', record);
+
 				if (record._updatedAt && record._updatedAt > this.updatedAt) {
 					this.updatedAt = record._updatedAt;
 				}
@@ -268,12 +272,16 @@ class CachedCollection {
 				if (record._deletedAt) {
 					this.collection.remove({ _id: record._id });
 
+					this.onSyncData('removed', record);
+
 					if (record._deletedAt && record._deletedAt > this.updatedAt) {
 						this.updatedAt = record._deletedAt;
 					}
 				} else {
 					this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));
 
+					this.onSyncData('changed', record);
+
 					if (record._updatedAt && record._updatedAt > this.updatedAt) {
 						this.updatedAt = record._updatedAt;
 					}
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js
index 4ce10ac67b1..6c112705f44 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.js
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.js
@@ -29,7 +29,7 @@ Template.accountBox.helpers({
 	},
 
 	isAnonymous() {
-		if (Meteor.user() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
+		if (Meteor.userId() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
 			return 'disabled';
 		}
 	}
diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
index 44b00e6588f..877f4290e8a 100644
--- a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
+++ b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
@@ -1,5 +1,3 @@
-/* globals KonchatNotification */
-
 Template.chatRoomItem.helpers({
 	roomData() {
 		let name = this.name;
@@ -25,10 +23,6 @@ Template.chatRoomItem.helpers({
 		if (!this.hideUnreadStatus && (FlowRouter.getParam('_id') !== this.rid || !document.hasFocus()) && this.alert) {
 			alertClass = 'sidebar-item__link--active';
 		}
-		// Sound notification
-		if (!(FlowRouter.getParam('name') === this.name) && !this.ls && this.alert === true) {
-			KonchatNotification.newRoom(this.rid);
-		}
 
 		const icon = RocketChat.roomTypes.getIcon(this.t);
 		const avatar = !icon;
@@ -47,9 +41,3 @@ Template.chatRoomItem.helpers({
 		};
 	}
 });
-
-Template.chatRoomItem.onRendered = function() {
-	if (!(FlowRouter.getParam('name') && (FlowRouter.getParam('name') === this.name)) && !this.ls && (this.alert === true)) {
-		return KonchatNotification.newRoom(this.rid);
-	}
-};
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.html b/packages/rocketchat-ui-sidenav/client/sideNav.html
index 35d3ec88aef..55bf3323b7f 100644
--- a/packages/rocketchat-ui-sidenav/client/sideNav.html
+++ b/packages/rocketchat-ui-sidenav/client/sideNav.html
@@ -5,7 +5,7 @@
 				{{> toolbar}}
 			</header>
 
-			{{#if currentUser}}
+			{{#if loggedInUser}}
 				<div class="unread-rooms background-primary-action-color color-primary-action-contrast top-unread-rooms hidden">
 					{{_ "More_unreads"}} <i class="icon-up-big"></i>
 				</div>
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js
index cecd50972f1..76415343588 100644
--- a/packages/rocketchat-ui-sidenav/client/sideNav.js
+++ b/packages/rocketchat-ui-sidenav/client/sideNav.js
@@ -1,14 +1,6 @@
 /* globals menu*/
 
 Template.sideNav.helpers({
-	hasUnread() {
-		const user = Meteor.user();
-		return user && user.settings && user.settings.preferences && user.settings.preferences.roomsListExhibitionMode === 'unread';
-	},
-	sortByActivity() {
-		const user = Meteor.user();
-		return user && user.settings && user.settings.preferences && user.settings.preferences.roomsListExhibitionMode === 'activity';
-	},
 	flexTemplate() {
 		return SideNav.getFlex().template;
 	},
@@ -23,6 +15,10 @@ Template.sideNav.helpers({
 
 	roomType() {
 		return RocketChat.roomTypes.getTypes();
+	},
+
+	loggedInUser() {
+		return !!Meteor.userId();
 	}
 });
 
@@ -69,7 +65,12 @@ Template.sideNav.onCreated(function() {
 	this.mergedChannels = new ReactiveVar(false);
 
 	this.autorun(() => {
-		const user = Meteor.user();
+		const user = RocketChat.models.Users.findOne(Meteor.userId(), {
+			fields: {
+				'settings.preferences.roomsListExhibitionMode': 1,
+				'settings.preferences.mergeChannels': 1
+			}
+		});
 		let userPref = null;
 		if (user && user.settings && user.settings.preferences) {
 			userPref = user.settings.preferences.roomsListExhibitionMode === 'category' && user.settings.preferences.mergeChannels;
diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js
index af8519ecfcb..fd0cfbac7f2 100644
--- a/packages/rocketchat-ui/client/lib/notification.js
+++ b/packages/rocketchat-ui/client/lib/notification.js
@@ -124,31 +124,38 @@ const KonchatNotification = {
 	}
 };
 
-Tracker.autorun(function() {
-	const user = Meteor.user();
-	const newRoomNotification = user && user.settings && user.settings.preferences && user.settings.preferences.newRoomNotification || 'door';
-	const audioVolume = user && user.settings && user.settings.preferences && user.settings.preferences.notificationsSoundVolume || 100;
+Meteor.startup(() => {
+	Tracker.autorun(function() {
+		const user = RocketChat.models.Users.findOne(Meteor.userId(), {
+			fields: {
+				'settings.preferences.newRoomNotification': 1,
+				'settings.preferences.notificationsSoundVolume': 1
+			}
+		});
+		const newRoomNotification = user && user.settings && user.settings.preferences && user.settings.preferences.newRoomNotification || 'door';
+		const audioVolume = user && user.settings && user.settings.preferences && user.settings.preferences.notificationsSoundVolume || 100;
 
-	if ((Session.get('newRoomSound') || []).length > 0) {
-		Tracker.nonreactive(function() {
-			if (!Session.equals(`user_${ Meteor.userId() }_status`, 'busy') && newRoomNotification !== 'none') {
-				const [audio] = $(`audio#${ newRoomNotification }`);
-				if (audio && audio.play) {
-					audio.volume = Number((audioVolume/100).toPrecision(2));
-					return audio.play();
+		if ((Session.get('newRoomSound') || []).length > 0) {
+			Meteor.defer(function() {
+				if (newRoomNotification !== 'none') {
+					const [audio] = $(`audio#${ newRoomNotification }`);
+					if (audio && audio.play) {
+						audio.volume = Number((audioVolume/100).toPrecision(2));
+						return audio.play();
+					}
 				}
+			});
+		} else {
+			const [room] = $(`audio#${ newRoomNotification }`);
+			if (!room) {
+				return;
+			}
+			if (room.pause) {
+				room.pause();
+				return room.currentTime = 0;
 			}
-		});
-	} else {
-		const [room] = $(`audio#${ newRoomNotification }`);
-		if (!room) {
-			return;
-		}
-		if (room.pause) {
-			room.pause();
-			return room.currentTime = 0;
 		}
-	}
+	});
 });
 export { KonchatNotification };
 this.KonchatNotification = KonchatNotification;

From 16e187762c9548a973c0e4113720da2eb4cb20f4 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 16 Sep 2017 19:43:24 -0300
Subject: [PATCH 062/244] Merge pull request #8159 from
 RocketChat/hotfix/text-lost-on-reload

[FIX] Text area lost text when page reloads
---
 .../rocketchat-ui-message/client/messageBox.js |  2 ++
 .../rocketchat-ui/client/lib/chatMessages.js   | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 056c18daff7..6393ce98a0e 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -469,6 +469,8 @@ Template.messageBox.onRendered(function() {
 	}).on('autogrow', () => {
 		this.data && this.data.onResize && this.data.onResize();
 	}).focus()[0];
+
+	chatMessages[RocketChat.openedRoom].restoreText(RocketChat.openedRoom);
 });
 
 Template.messageBox.onCreated(function() {
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
index 858210ddf4d..f2571e149f8 100644
--- a/packages/rocketchat-ui/client/lib/chatMessages.js
+++ b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -379,6 +379,13 @@ this.ChatMessages = class ChatMessages {
 		}
 	}
 
+	restoreText(rid) {
+		const text = localStorage.getItem(`messagebox_${ rid }`);
+		if (typeof text === 'string') {
+			this.input.value = text;
+		}
+	}
+
 	keyup(rid, event) {
 		let i;
 		const input = event.currentTarget;
@@ -407,6 +414,8 @@ this.ChatMessages = class ChatMessages {
 			this.startTyping(rid, input);
 		}
 
+		localStorage.setItem(`messagebox_${ rid }`, input.value);
+
 		return this.hasValue.set(input.value !== '');
 	}
 
@@ -520,3 +529,12 @@ this.ChatMessages = class ChatMessages {
 		return !this.hasValue.get();
 	}
 };
+
+
+RocketChat.callbacks.add('afterLogoutCleanUp', () => {
+	Object.keys(localStorage).forEach((item) => {
+		if (item.indexOf('messagebox_') === 0) {
+			localStorage.removeItem(item);
+		}
+	});
+}, RocketChat.callbacks.priority.MEDIUM, 'chatMessages-after-logout-cleanup');

From cc4702f7d0f85312bd808dbd34c7dc3ddb54dbe9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 18 Sep 2017 20:02:14 -0300
Subject: [PATCH 063/244] Merge pull request #8146 from astax-t/issue-8145

[FIX] Fix iframe login API response (issue #8145)
---
 .../rocketchat-iframe-login/iframe_client.js     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-iframe-login/iframe_client.js b/packages/rocketchat-iframe-login/iframe_client.js
index 125481fcd2f..2169d097714 100644
--- a/packages/rocketchat-iframe-login/iframe_client.js
+++ b/packages/rocketchat-iframe-login/iframe_client.js
@@ -66,7 +66,7 @@ class IframeLogin {
 
 		HTTP.call(this.apiMethod, this.apiUrl, options, (error, result) => {
 			console.log(error, result);
-			if (result && result.data && result.data.token) {
+			if (result && result.data && (result.data.token || result.data.loginToken)) {
 				this.loginWithToken(result.data, (error, result) => {
 					if (error) {
 						this.reactiveIframeUrl.set(iframeUrl);
@@ -82,27 +82,27 @@ class IframeLogin {
 		});
 	}
 
-	loginWithToken(token, callback) {
+	loginWithToken(tokenData, callback) {
 		if (!this.enabled) {
 			return;
 		}
 
-		if (Match.test(token, String)) {
-			token = {
-				token
+		if (Match.test(tokenData, String)) {
+			tokenData = {
+				token: tokenData
 			};
 		}
 
 		console.log('loginWithToken');
 
-		if (token.loginToken) {
-			return Meteor.loginWithToken(token.loginToken, callback);
+		if (tokenData.loginToken) {
+			return Meteor.loginWithToken(tokenData.loginToken, callback);
 		}
 
 		Accounts.callLoginMethod({
 			methodArguments: [{
 				iframe: true,
-				token: token.token
+				token: tokenData.token
 			}],
 			userCallback: callback
 		});

From a6808ccbccba18582057b780f4fc4d7e571d510b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 18 Sep 2017 20:00:26 -0300
Subject: [PATCH 064/244] Merge pull request #8147 from
 RocketChat/fix-the-members-list-rest-api

[FIX] "*.members" rest api being useless and only returning usernames
---
 packages/rocketchat-api/server/v1/channels.js | 5 ++++-
 packages/rocketchat-api/server/v1/groups.js   | 7 +++++--
 packages/rocketchat-api/server/v1/im.js       | 7 +++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index 15a6c3d0eaf..60f4941689c 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -430,8 +430,11 @@ RocketChat.API.v1.addRoute('channels.members', { authRequired: true }, {
 			limit: count
 		});
 
+		const users = RocketChat.models.Users.find({ username: { $in: members } },
+			{ fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 } }).fetch();
+
 		return RocketChat.API.v1.success({
-			members,
+			members: users,
 			count: members.length,
 			offset,
 			total: findResult.usernames.length
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index 426e509dc52..dfdde26b770 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -374,11 +374,14 @@ RocketChat.API.v1.addRoute('groups.members', { authRequired: true }, {
 			limit: count
 		});
 
+		const users = RocketChat.models.Users.find({ username: { $in: members } },
+			{ fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 } }).fetch();
+
 		return RocketChat.API.v1.success({
-			members,
+			members: users,
 			count: members.length,
 			offset,
-			total: findResult._room.usernames
+			total: findResult._room.usernames.length
 		});
 	}
 });
diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
index 5ffb999670f..087725da9f7 100644
--- a/packages/rocketchat-api/server/v1/im.js
+++ b/packages/rocketchat-api/server/v1/im.js
@@ -134,11 +134,14 @@ RocketChat.API.v1.addRoute(['dm.members', 'im.members'], { authRequired: true },
 			limit: count
 		});
 
+		const users = RocketChat.models.Users.find({ username: { $in: members } },
+			{ fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 } }).fetch();
+
 		return RocketChat.API.v1.success({
-			members,
+			members: users,
 			count: members.length,
 			offset,
-			total: findResult.room.usernames
+			total: findResult.room.usernames.length
 		});
 	}
 });

From 541af144cb9e7922d0d05cd48ba4ffa7e193408a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 18 Sep 2017 20:00:52 -0300
Subject: [PATCH 065/244] Merge pull request #8154 from
 RocketChat/sidebar-rtl-alignment

[FIX] Sidebar and RTL alignments
---
 .../.npm/package/npm-shrinkwrap.json          | 46 +++++++++++++++----
 .../app/client/lib/tapi18n.js                 |  5 +-
 .../client/stylesheets/livechat.less          |  2 -
 .../client/views/sideNav/livechat.html        |  2 +-
 .../client/imports/components/messages.css    |  5 ++
 .../components/modal/create-channel.css       | 13 ++++++
 .../imports/components/modal/full-modal.css   | 12 +++++
 .../client/imports/components/popover.css     |  7 +++
 .../imports/components/sidebar/rooms-list.css | 10 ++--
 .../components/sidebar/sidebar-account.css    | 11 +++--
 .../components/sidebar/sidebar-flex.css       | 10 ++++
 .../components/sidebar/sidebar-item.css       |  1 +
 .../imports/components/sidebar/toolbar.css    |  2 +-
 .../client/imports/forms/switch.css           | 15 ++++++
 .../client/imports/general/rtl.css            |  2 +-
 .../client/imports/general/variables.css      |  3 +-
 .../client/messageBox.js                      |  6 ++-
 .../client/accountBox.js                      | 13 ++++--
 .../client/roomList.html                      |  2 +-
 packages/rocketchat-ui/client/lib/menu.js     |  1 -
 packages/rocketchat-ui/client/lib/tapi18n.js  |  5 +-
 .../client/views/app/createChannel.html       |  2 +-
 .../client/views/app/createChannel.js         |  4 +-
 .../client/views/app/popover.html             |  2 +-
 .../rocketchat-ui/client/views/app/popover.js | 28 +++++------
 25 files changed, 157 insertions(+), 52 deletions(-)

diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 00561635dcd..689607dbd9b 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -15,6 +15,11 @@
       "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
       "from": "arguejs@>=0.2.3 <0.3.0"
     },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "from": "array-union@>=1.0.1 <2.0.0"
+    },
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
@@ -286,6 +291,11 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "from": "glob@>=7.0.5 <8.0.0"
     },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "from": "globby@>=6.1.0 <7.0.0"
+    },
     "google-auth-library": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
@@ -297,8 +307,8 @@
       "from": "google-auto-auth@>=0.7.1 <0.8.0"
     },
     "google-gax": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.13.4.tgz",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.13.5.tgz",
       "from": "google-gax@>=0.13.0 <0.14.0",
       "dependencies": {
         "google-auto-auth": {
@@ -307,9 +317,19 @@
           "from": "google-auto-auth@>=0.5.2 <0.6.0"
         },
         "google-proto-files": {
-          "version": "0.9.1",
-          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.9.1.tgz",
-          "from": "google-proto-files@>=0.9.1 <0.10.0"
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
+          "from": "google-proto-files@>=0.13.1 <0.14.0"
+        },
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "from": "object-assign@>=3.0.0 <4.0.0"
+        },
+        "protobufjs": {
+          "version": "6.8.0",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
+          "from": "protobufjs@>=6.8.0 <7.0.0"
         }
       }
     },
@@ -1125,9 +1145,9 @@
       "from": "oauth-sign@>=0.8.1 <0.9.0"
     },
     "object-assign": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "from": "object-assign@>=3.0.0 <4.0.0"
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "from": "object-assign@>=4.0.1 <5.0.0"
     },
     "once": {
       "version": "1.4.0",
@@ -1159,6 +1179,16 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "from": "pify@>=2.3.0 <3.0.0"
     },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "from": "pinkie@>=2.0.0 <3.0.0"
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "from": "pinkie-promise@>=2.0.0 <3.0.0"
+    },
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
diff --git a/packages/rocketchat-livechat/app/client/lib/tapi18n.js b/packages/rocketchat-livechat/app/client/lib/tapi18n.js
index 2a3f6ae10d0..8f1a41e9741 100644
--- a/packages/rocketchat-livechat/app/client/lib/tapi18n.js
+++ b/packages/rocketchat-livechat/app/client/lib/tapi18n.js
@@ -20,4 +20,7 @@ this.tr = function(key, options, ...replaces) {
 	}
 };
 
-this.isRtl = (language) => language != null && ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase());
+this.isRtl = (lang) => {
+	const language = lang ? lang : localStorage.getItem('userLanguage');
+	return ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase());
+};
diff --git a/packages/rocketchat-livechat/client/stylesheets/livechat.less b/packages/rocketchat-livechat/client/stylesheets/livechat.less
index 651827f2d1f..6b86af663b3 100644
--- a/packages/rocketchat-livechat/client/stylesheets/livechat.less
+++ b/packages/rocketchat-livechat/client/stylesheets/livechat.less
@@ -625,8 +625,6 @@
 }
 
 .livechat-status {
-	float: right;
-	margin-right: 16px;
 	font-size: 20px;
 	line-height: 18px;
 	color: #9d9fa3;
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.html b/packages/rocketchat-livechat/client/views/sideNav/livechat.html
index fdc1c866ad6..a895584a1ef 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechat.html
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechat.html
@@ -1,10 +1,10 @@
 <template name="livechat">
 	<div class="livechat-section">
 		<h3 class="rooms-list__type {{isActive}}">
+			<span class="rooms-list__type-text--livechat">{{_ "Livechat"}}</span>
 			{{#with available}}
 				<i class="livechat-status {{status}} {{icon}}" title="{{hint}}"></i>
 			{{/with}}
-			{{_ "Livechat"}}
 		</h3>
 
 		{{#if guestPool}}
diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index b316221e827..ee9af5d8d45 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -91,3 +91,8 @@
 .first-unread .message-actions {
 	top: 18px;
 }
+
+.rtl .message-actions {
+	right: auto;
+	left: 2px;
+}
diff --git a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
index bbbe922adc1..3ac6f55ef33 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
@@ -27,6 +27,7 @@
 
 	&__switches {
 		display: flex;
+		flex-wrap: wrap;
 	}
 
 	& .rc-switch {
@@ -47,3 +48,15 @@
 		opacity: 1;
 	}
 }
+
+@media (width <= 400px) {
+	.create-channel {
+		& .rc-switch {
+			width: 100%;
+
+			&:not(:last-child) {
+				margin-bottom: 2rem;
+			}
+		}
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
index 2c50987e33f..cd2bc4eca1a 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
@@ -41,5 +41,17 @@
 @media (width < 1024px) {
 	.full-modal {
 		padding: 50px;
+
+		&__wrapper {
+			margin: 0;
+		}
+	}
+}
+
+@media (width <= 400px) {
+	.full-modal {
+		&__back-button {
+			top: -1.5rem;
+		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 0e47a9ea32f..999c0276887 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -174,3 +174,10 @@
 		opacity: 1;
 	}
 }
+
+.rtl .rc-popover {
+	&__item-text {
+		margin-right: 0.25rem;
+		margin-left: auto;
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 7598b92b280..97273f697b8 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -23,13 +23,13 @@
 		font-size: var(--rooms-list-title-text-size);
 		align-items: center;
 
-		&-text {
-			margin: 0 8px;
+		&-text--livechat {
+			flex: 1;
 		}
 	}
 
 	&__empty-room {
-		margin-left: calc(var(--sidebar-default-padding) - calc(var(--sidebar-default-padding) / 3));
+		padding: 0 var(--sidebar-default-padding);
 
 		color: var(--rooms-list-empty-text-color);
 
@@ -62,10 +62,6 @@
 	.rooms-list {
 		&__type,
 		&__empty-room {
-			margin-left: 0;
-		}
-
-		&__type {
 			padding: 0 calc(var(--sidebar-small-default-padding) - 4px) 0.5rem calc(var(--sidebar-small-default-padding) - 4px);
 		}
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index f51e5280fa6..35913ae2059 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -1,9 +1,9 @@
 .sidebar__account {
 	display: flex;
 
-	margin: calc(var(--sidebar-default-padding) / 2) 0;
+	margin: 0 0 var(--sidebar-header-small-padding);
 
-	padding: calc(var(--sidebar-default-padding) / 2) var(--sidebar-default-padding);
+	padding: var(--sidebar-header-small-padding) var(--sidebar-default-padding) var(--sidebar-header-small-padding);
 
 	align-items: center;
 
@@ -21,6 +21,10 @@
 		& .sidebar__account-menu {
 			fill: var(--sidebar-account-username-color-darker);
 		}
+
+		&.active:hover {
+			background-color: var(--sidebar-background-light-hover);
+		}
 	}
 
 	&-thumb {
@@ -29,7 +33,7 @@
 
 		width: var(--sidebar-account-thumb-size);
 		height: var(--sidebar-account-thumb-size);
-		margin: 0 0.5rem;
+		margin: 0 0.5rem 0 0;
 	}
 
 	&-data {
@@ -144,6 +148,7 @@
 @media (width <= 400px) {
 	.sidebar__account {
 		margin: 0 0 5px;
+		padding: var(--sidebar-header-small-padding) calc(var(--sidebar-small-default-padding) - 8px) var(--sidebar-header-small-padding);
 
 		&-thumb {
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
index e3bd38bab4e..a2d4dc87c28 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
@@ -2,6 +2,8 @@
 	&__back-button {
 		margin-left: 0.25rem;
 
+		padding: 1rem var(--sidebar-default-padding) 1.5rem;
+
 		color: var(--sidebar-flex-back-button-color);
 
 		font-size: 1rem;
@@ -36,3 +38,11 @@
 		}
 	}
 }
+
+@media (width <= 400px) {
+	.sidebar-flex {
+		&__back-button {
+			padding: 1rem calc(var(--sidebar-small-default-padding) - 8px) 1.5rem;
+		}
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 4f558766ec0..5d11a43474f 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -120,6 +120,7 @@
 		text-overflow: ellipsis;
 
 		font-size: var(--sidebar-item-text-size);
+		line-height: var(--sidebar-item-height);
 	}
 }
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index 5f0e9e2725a..7ad0eabe920 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -104,6 +104,6 @@
 
 @media (width <= 400px) {
 	.toolbar {
-		padding: 0 var(--sidebar-small-default-padding) var(--sidebar-small-default-padding);
+		padding: 0 calc(var(--sidebar-small-default-padding) - 8px) var(--sidebar-small-default-padding);
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/forms/switch.css b/packages/rocketchat-theme/client/imports/forms/switch.css
index 28fc7138829..05018a2280d 100644
--- a/packages/rocketchat-theme/client/imports/forms/switch.css
+++ b/packages/rocketchat-theme/client/imports/forms/switch.css
@@ -79,3 +79,18 @@
 		font-size: var(--input-font-size);
 	}
 }
+
+.rtl .rc-switch {
+	&__button {
+		margin-right: 0;
+		margin-left: 0.5rem;
+	}
+
+	&__button-inside {
+		transform: translate3d(-13px, 1px, 0);
+	}
+
+	&__input:checked + .rc-switch__button .rc-switch__button-inside {
+		transform: translate3d(-1px, 1px, 0);
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/general/rtl.css b/packages/rocketchat-theme/client/imports/general/rtl.css
index 34b2d19d48f..2dfc17e7f7d 100644
--- a/packages/rocketchat-theme/client/imports/general/rtl.css
+++ b/packages/rocketchat-theme/client/imports/general/rtl.css
@@ -237,7 +237,7 @@
 	}
 
 	& .messages-box {
-		margin: 60px 0 0 20px;
+		margin: 60px 0 0;
 
 		& .new-message {
 			right: 50%;
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index 65442b56314..f284709f940 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -134,7 +134,8 @@
 	--sidebar-background-light-hover: var(--color-gray-light);
 	--sidebar-default-padding: 24px;
 	--sidebar-small-default-padding: 16px;
-	--sidebar-header-padding: var(--sidebar-default-padding);
+	--sidebar-header-padding: 16px;
+	--sidebar-header-small-padding: 12px;
 	--sidebar-footer-height: 70px;
 	--sidebar-footer-padding: var(--sidebar-header-padding);
 	--sidebar-small-header-padding: var(--sidebar-small-default-padding);
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 6393ce98a0e..95baa9a7782 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -1,4 +1,4 @@
-/* globals fileUpload KonchatNotification chatMessages popover */
+/* globals fileUpload KonchatNotification chatMessages popover isRtl */
 import toastr from 'toastr';
 import moment from 'moment';
 
@@ -425,6 +425,7 @@ Template.messageBox.events({
 	},
 	'click .rc-message-box__action-menu'(e) {
 		const groups = RocketChat.messageBox.actions.get();
+		const textArea = document.querySelector('.rc-message-box__textarea');
 
 		const config = {
 			popoverClass: 'message-box',
@@ -451,6 +452,9 @@ Template.messageBox.events({
 				x: document.querySelector('.rc-message-box__textarea').getBoundingClientRect().right + 10,
 				y: document.querySelector('.rc-message-box__textarea').getBoundingClientRect().top
 			},
+			customCSSProperties: {
+				left: isRtl() ? `${ textArea.getBoundingClientRect().left - 10 }px` : undefined
+			},
 			data: {
 				rid: this._id
 			},
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js
index 6c112705f44..eb2faf8a033 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.js
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.js
@@ -1,4 +1,4 @@
-/* globals popover */
+/* globals popover isRtl */
 
 Template.accountBox.helpers({
 	myUserInfo() {
@@ -93,7 +93,9 @@ Template.accountBox.events({
 									icon: item.icon,
 									name: t(item.name),
 									type: 'open',
-									id: item.name
+									id: item.name,
+									href: item.href,
+									sideNav: item.sideNav
 								};
 							}).concat([
 								adminOption,
@@ -116,11 +118,12 @@ Template.accountBox.events({
 				}
 			],
 			position: {
-				top: accountBox.offsetHeight + parseInt(getComputedStyle(accountBox)['padding-bottom'].replace('px', '')),
-				left: parseInt(getComputedStyle(accountBox)['padding-left'].replace('px', ''))
+				top: accountBox.offsetHeight
 			},
 			customCSSProperties: {
-				width: `${ accountBox.offsetWidth - parseInt(getComputedStyle(accountBox)['padding-left'].replace('px', '')) * 2 }px`
+				width: `${ accountBox.offsetWidth - parseInt(getComputedStyle(accountBox)['padding-left'].replace('px', '')) * 2 }px`,
+				left: isRtl() ? 'auto' : getComputedStyle(accountBox)['padding-left'],
+				right: isRtl() ? getComputedStyle(accountBox)['padding-right'] : 'auto'
 			}
 		};
 
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.html b/packages/rocketchat-ui-sidenav/client/roomList.html
index a7c4a21a7a6..4b4ef3ea92d 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.html
+++ b/packages/rocketchat-ui-sidenav/client/roomList.html
@@ -5,7 +5,7 @@
 		{{#with rooms}}
 			{{#if shouldAppear .. .}}
 					<h3 class="rooms-list__type">
-						<div class="rooms-list__type-text">{{_ ../label}}</div>
+						<span class="rooms-list__type-text">{{_ ../label}}</span>
 						{{#with count}}
 							{{#if .}}
 								<span class="badge">{{.}}</span>
diff --git a/packages/rocketchat-ui/client/lib/menu.js b/packages/rocketchat-ui/client/lib/menu.js
index 0876b9e426f..ff339473624 100644
--- a/packages/rocketchat-ui/client/lib/menu.js
+++ b/packages/rocketchat-ui/client/lib/menu.js
@@ -124,7 +124,6 @@ this.menu = new class extends EventEmitter {
 		this.wrapper.css('overflow', 'hidden');
 		this.sidebarWrap.css('background-color', '#000');
 		this.sidebarWrap.css('opacity', map((Math.abs(diff) / width), 0, 1, -.1, .8).toFixed(2));
-		console.log(sideNavW, diff);
 		this.isRtl ? this.sidebar.css('transform', `translate3d(${ (sideNavW + diff).toFixed(3) }px, 0 , 0)`) : this.sidebar.css('transform', `translate3d(${ (diff - sideNavW).toFixed(3) }px, 0 , 0)`);
 	}
 	touchend() {
diff --git a/packages/rocketchat-ui/client/lib/tapi18n.js b/packages/rocketchat-ui/client/lib/tapi18n.js
index 2a3f6ae10d0..8f1a41e9741 100644
--- a/packages/rocketchat-ui/client/lib/tapi18n.js
+++ b/packages/rocketchat-ui/client/lib/tapi18n.js
@@ -20,4 +20,7 @@ this.tr = function(key, options, ...replaces) {
 	}
 };
 
-this.isRtl = (language) => language != null && ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase());
+this.isRtl = (lang) => {
+	const language = lang ? lang : localStorage.getItem('userLanguage');
+	return ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase());
+};
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html
index 2aab64dd795..b90cf96c81d 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.html
+++ b/packages/rocketchat-ui/client/views/app/createChannel.html
@@ -8,7 +8,7 @@
 			<div class="create-channel__switches">
 				<div class="rc-switch">
 					<label class="rc-switch__label" tabindex="-1">
-						<input type="checkbox" class="rc-switch__input" name="type" value="d" checked>
+						<input type="checkbox" class="rc-switch__input" name="type" value="p" checked>
 						<span class="rc-switch__button">
 							<span class="rc-switch__button-inside"></span>
 						</span>
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index f55ea97ebb8..f17ed50acaa 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -106,7 +106,7 @@ Template.createChannel.events({
 		t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
 	},
 	'change [name=type]'(e, t) {
-		t.type.set(e.target.checked ? e.target.value : 'p');
+		t.type.set(e.target.checked ? e.target.value : 'd');
 	},
 	'input [name=users]'(e, t) {
 		const input = e.target;
@@ -189,7 +189,7 @@ Template.createChannel.onCreated(function() {
 	});
 
 	this.name = new ReactiveVar('');
-	this.type = new ReactiveVar('d');
+	this.type = new ReactiveVar('p');
 	this.inUse = new ReactiveVar(undefined);
 	this.invalid = new ReactiveVar(false);
 	this.userFilter = new ReactiveVar('');
diff --git a/packages/rocketchat-ui/client/views/app/popover.html b/packages/rocketchat-ui/client/views/app/popover.html
index 3bb07ae5419..84c53ad4c95 100644
--- a/packages/rocketchat-ui/client/views/app/popover.html
+++ b/packages/rocketchat-ui/client/views/app/popover.html
@@ -9,7 +9,7 @@
 						{{/if}}
 						<ul class="rc-popover__list">
 							{{#each item in group.items}}
-							<li class="rc-popover__item rc-popover__item--{{item.class}}" data-type={{item.type}} data-id={{item.id}} >
+							<li class="rc-popover__item rc-popover__item--{{item.class}}" data-type={{item.type}} data-id={{item.id.toLowerCase}} data-href={{item.href}} data-sidenav={{item.sideNav}}>
 									{{#if item.icon}}
 										<span class="rc-popover__icon">
 											{{> icon block="rc-popover__icon-element" icon=item.icon }}
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 5a55b200e43..2755feaa803 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -1,4 +1,4 @@
-/* globals popover */
+/* globals popover isRtl */
 
 this.popover = {
 	renderedPopover: null,
@@ -39,7 +39,7 @@ Template.popover.onRendered(function() {
 		const mousePosition = this.data.mousePosition;
 
 		let top;
-		if (mousePosition.y <= popoverHeight) {
+		if (mousePosition.y <= popoverHeightHalf) {
 			top = 10;
 		} else if (mousePosition.y + popoverHeightHalf > windowHeight) {
 			top = windowHeight - popoverHeight - 10;
@@ -47,19 +47,19 @@ Template.popover.onRendered(function() {
 			top = mousePosition.y - popoverHeightHalf;
 		}
 
-		let right;
+		let left;
 		if (mousePosition.x + popoverWidth >= windowWidth) {
-			right = mousePosition.x - popoverWidth;
+			left = mousePosition.x - popoverWidth;
 		} else if (mousePosition.x <= popoverWidth) {
-			right = 10;
+			left = isRtl() ? mousePosition.x + 10 : 10;
 		} else if (mousePosition.x <= windowWidth / 2) {
-			right = mousePosition.x;
+			left = mousePosition.x;
 		} else {
-			right = mousePosition.x - popoverWidth;
+			left = mousePosition.x - popoverWidth;
 		}
 
 		popoverContent.style.top = `${ top }px`;
-		popoverContent.style.left = `${ right }px`;
+		popoverContent.style.left = `${ left }px`;
 	}
 
 	if (customCSSProperties) {
@@ -96,9 +96,9 @@ Template.popover.events({
 		popover.close();
 	},
 	'click [data-type="open"]'(e) {
-		const open = e.currentTarget.dataset.id;
+		const data = e.currentTarget.dataset;
 
-		switch (open) {
+		switch (data.id) {
 			case 'account':
 				SideNav.setFlex('accountFlex');
 				SideNav.openFlex();
@@ -119,12 +119,12 @@ Template.popover.events({
 				break;
 		}
 
-		if (this.href) {
-			FlowRouter.go(this.href);
+		if (data.href) {
+			FlowRouter.go(data.href);
 		}
 
-		if (this.sideNav != null) {
-			SideNav.setFlex(this.sideNav);
+		if (data.sideNav) {
+			SideNav.setFlex(data.sideNav);
 			SideNav.openFlex();
 		}
 

From adc895a6a8fdcd11977fdbbbbce727cfa4a779f0 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 18 Sep 2017 20:01:33 -0300
Subject: [PATCH 066/244] Merge pull request #8167 from ruKurz/bugfix-8166

[FIX] Issue #8166 where empty analytics setting breaks to load Piwik script
---
 .../rocketchat-analytics/client/loadScript.js    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-analytics/client/loadScript.js b/packages/rocketchat-analytics/client/loadScript.js
index d09d67f7277..4e1ee8d7bda 100644
--- a/packages/rocketchat-analytics/client/loadScript.js
+++ b/packages/rocketchat-analytics/client/loadScript.js
@@ -38,10 +38,18 @@ Template.body.onRendered(() => {
 					window._paq.push(['setDomains', domains]);
 				}
 				(() => {
-					const addTrackers = JSON.parse(piwikAdditionalTracker);
-					for (let i = 0; i < addTrackers.length; i++) {
-						const tracker = addTrackers[i];
-						window._paq.push(['addTracker', `${ tracker['trackerURL'] }piwik.php`, tracker['siteId']]);
+					try {
+						if (/\S/.test(piwikAdditionalTracker)) {
+							// piwikAdditionalTracker is not empty or whitespace only
+							const addTrackers = JSON.parse(piwikAdditionalTracker);
+							for (let i = 0; i < addTrackers.length; i++) {
+								const tracker = addTrackers[i];
+								window._paq.push(['addTracker', `${ tracker['trackerURL'] }piwik.php`, tracker['siteId']]);
+							}
+						}
+					} catch (e) {
+						// parsing JSON faild
+						console.log('Error while parsing JSON value of "piwikAdditionalTracker": ', e);
 					}
 					window._paq.push(['setTrackerUrl', `${ piwikUrl }piwik.php`]);
 					window._paq.push(['setSiteId', Number.parseInt(piwikSiteId)]);

From b3cadfb4ad4c12d2050e33f3d1d08ee5b80fc76b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 18 Sep 2017 19:58:53 -0300
Subject: [PATCH 067/244] Merge pull request #8172 from
 TriPhoenix/file-upload-allow-whitelist

[FIX] Allow unknown file types if no allowed whitelist has been set (#7074)
---
 packages/rocketchat-lib/lib/fileUploadRestrictions.js | 10 +++++++++-
 packages/rocketchat-ui/client/lib/fileUpload.js       |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-lib/lib/fileUploadRestrictions.js b/packages/rocketchat-lib/lib/fileUploadRestrictions.js
index 26f798078e0..41290c9a729 100644
--- a/packages/rocketchat-lib/lib/fileUploadRestrictions.js
+++ b/packages/rocketchat-lib/lib/fileUploadRestrictions.js
@@ -11,7 +11,15 @@ RocketChat.fileUploadMediaWhiteList = function() {
 
 RocketChat.fileUploadIsValidContentType = function(type) {
 	const list = RocketChat.fileUploadMediaWhiteList();
-	if (!list || _.contains(list, type)) {
+	if (!list) {
+		return true;
+	}
+
+	if (!type) {
+		return false;
+	}
+
+	if (_.contains(list, type)) {
 		return true;
 	} else {
 		const wildCardGlob = '/*';
diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js
index e13ca480938..870b5be71e0 100644
--- a/packages/rocketchat-ui/client/lib/fileUpload.js
+++ b/packages/rocketchat-ui/client/lib/fileUpload.js
@@ -56,7 +56,7 @@ fileUpload = function(filesToUpload) {
 			return;
 		}
 
-		if (!file.file.type || !RocketChat.fileUploadIsValidContentType(file.file.type)) {
+		if (!RocketChat.fileUploadIsValidContentType(file.file.type)) {
 			swal({
 				title: t('FileUpload_MediaType_NotAccepted'),
 				text: file.file.type || `*.${ s.strRightBack(file.file.name, '.') }`,

From da5d8121256c685940035857912d071fae69fa83 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 18 Sep 2017 20:13:25 -0300
Subject: [PATCH 068/244] Bump version to 0.59.0-rc.6

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 22 ++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index b939dcbbea7..de98e12115a 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.5
+ENV RC_VERSION 0.59.0-rc.6
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index fae6f51c587..93d79356ccc 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.5"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.6"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index f04e332ac69..1d259a933cc 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.5
+    RC_VERSION=0.59.0-rc.6
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 2027506ede4..fa837e3d5a4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,25 @@
+<a name="0.59.0-rc.6"></a>
+# 0.59.0-rc.6 (2017-09-18)
+
+
+### New Features
+
+- [#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073) Upgrade to meteor 1.5.2
+
+
+### Bug Fixes
+
+- [#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147) "*.members" rest api being useless and only returning usernames
+- [#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094) Add admin audio preferences translations
+- [#8172](https://github.com/RocketChat/Rocket.Chat/pull/8172) Allow unknown file types if no allowed whitelist has been set ([#7074](https://github.com/RocketChat/Rocket.Chat/issues/7074))
+- [#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) Fix iframe login API response (issue [#8145](https://github.com/RocketChat/Rocket.Chat/issues/8145))
+- [#8144](https://github.com/RocketChat/Rocket.Chat/pull/8144) Fix new room sound being played too much
+- [#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) Issue [#8166](https://github.com/RocketChat/Rocket.Chat/issues/8166) where empty analytics setting breaks to load Piwik script
+- [#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) Sidebar and RTL alignments
+- [#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159) Text area lost text when page reloads
+
+
+
 <a name="0.59.0-rc.5"></a>
 # 0.59.0-rc.5 (2017-09-14)
 
diff --git a/package.json b/package.json
index 6ca36fb70cd..dd33ee9493c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.5",
+	"version": "0.59.0-rc.6",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 4db7f2e86ea..2a3c3627b57 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.5"
+	"version": "0.59.0-rc.6"
 }

From 6a96511805711bcf11bc5cf230fda017b94fafd8 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 20 Sep 2017 09:21:05 -0300
Subject: [PATCH 069/244] Merge pull request #8190 from RocketChat/scroll

[FIX] Scrollbar not using new style
---
 .meteor/packages                                       |  1 +
 .meteor/versions                                       |  1 +
 packages/rocketchat-lib/client/lib/settings.js         |  2 +-
 .../client/imports/components/messages.css             |  2 +-
 .../client/imports/components/sidebar/rooms-list.css   |  1 +
 .../client/imports/components/sidebar/sidebar-item.css |  2 +-
 .../rocketchat-theme/client/imports/general/base.css   |  8 ++++++++
 packages/rocketchat-ui-account/client/accountFlex.js   |  4 ++++
 packages/rocketchat-ui-admin/client/adminFlex.js       |  4 ++++
 packages/rocketchat-ui-message/client/message.js       |  4 +++-
 packages/rocketchat-ui-message/client/messageBox.js    |  4 ++--
 packages/rocketchat-ui-sidenav/client/roomList.js      |  4 ++++
 packages/rocketchat-ui/client/views/app/room.js        | 10 ++++++----
 tests/end-to-end/ui/11-admin.js                        |  2 ++
 tests/pageobjects/administration.page.js               |  1 +
 15 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/.meteor/packages b/.meteor/packages
index 1baeab932de..72d393aa44b 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -176,3 +176,4 @@ yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
 rocketchat:postcss
 dynamic-import@0.1.1
+keepnox:perfect-scrollbar
diff --git a/.meteor/versions b/.meteor/versions
index 56584e33d72..394fc993c5b 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -63,6 +63,7 @@ jparker:gravatar@0.5.1
 jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.12.1
+keepnox:perfect-scrollbar@0.6.8
 konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3
diff --git a/packages/rocketchat-lib/client/lib/settings.js b/packages/rocketchat-lib/client/lib/settings.js
index 70ada7d6f27..03896cd1151 100644
--- a/packages/rocketchat-lib/client/lib/settings.js
+++ b/packages/rocketchat-lib/client/lib/settings.js
@@ -60,7 +60,7 @@ Meteor.startup(function() {
 		}
 		Meteor.setTimeout(function() {
 			const currentUrl = location.origin + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
-			if (__meteor_runtime_config__.ROOT_URL !== currentUrl) {
+			if (__meteor_runtime_config__.ROOT_URL.replace(/\/$/, '') !== currentUrl) {
 				swal({
 					type: 'warning',
 					title: t('Warning'),
diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index ee9af5d8d45..0731807509a 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -1,7 +1,7 @@
 .message-actions {
 	position: absolute;
 	top: 2px;
-	right: 2px;
+	right: 0.4rem;
 
 	display: none;
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 97273f697b8..46ca9ee6363 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -1,6 +1,7 @@
 
 
 .rooms-list {
+	position: relative;
 	overflow-y: scroll;
 
 	height: 100%;
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 5d11a43474f..1e3ae68015f 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -9,7 +9,7 @@
 
 	height: var(--sidebar-item-height);
 
-	margin: 0 0 0 8px;
+	margin: 0 8px;
 
 	padding: 0 calc(var(--sidebar-default-padding) - 8px);
 
diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index 3cf4e4b2b3a..2c7271d7c10 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -109,3 +109,11 @@ button {
 
 	vertical-align: -0.15em;
 }
+
+.ps-scrollbar-y-rail {
+	background: transparent !important;
+}
+
+.ps-scrollbar-y {
+	width: 4px !important;
+}
diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js
index 440bedae4b9..ceaa081165a 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.js
+++ b/packages/rocketchat-ui-account/client/accountFlex.js
@@ -4,6 +4,10 @@ Template.accountFlex.events({
 	}
 });
 
+Template.accountFlex.onRendered(function() {
+	$(this.find('.rooms-list')).perfectScrollbar();
+});
+
 Template.accountFlex.helpers({
 	allowUserProfileChange() {
 		return RocketChat.settings.get('Accounts_AllowUserProfileChange');
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js
index 27e92bca7d6..389e0afdb25 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.js
+++ b/packages/rocketchat-ui-admin/client/adminFlex.js
@@ -14,6 +14,10 @@ const label = function() {
 	return TAPi18n.__(this.i18nLabel || this._id);
 };
 
+Template.adminFlex.onRendered(function() {
+	$(this.find('.rooms-list')).perfectScrollbar();
+});
+
 Template.adminFlex.helpers({
 	groups() {
 		const filter = Template.instance().settingsFilter.get();
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index cd142696d30..ad64a746b16 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -367,9 +367,11 @@ Template.message.onViewRendered = function(context) {
 			if (!templateInstance) {
 				return;
 			}
+
 			if (currentNode.classList.contains('own') === true) {
-				return (templateInstance.atBottom = true);
+				templateInstance.atBottom = true;
 			}
+			templateInstance.sendToBottomIfNecessary();
 		}
 	});
 };
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 95baa9a7782..74228fed869 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -364,9 +364,9 @@ Template.messageBox.events({
 			// fixes https://github.com/RocketChat/Rocket.Chat/issues/3037
 			// at this point, the input is cleared and ready for autogrow
 			input.updateAutogrow();
-			return instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
+			instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
+			return input.focus();
 		});
-		return input.focus();
 	},
 	'keyup .js-input-message'(event, instance) {
 		chatMessages[this._id].keyup(this._id, event, instance);
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
index cd893ba2f8c..ba8ac9791fe 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.js
+++ b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -76,6 +76,10 @@ Template.roomList.helpers({
 	}
 });
 
+Template.roomList.onRendered(function() {
+	$(this.firstNode.parentElement).perfectScrollbar();
+});
+
 Template.roomList.events({
 	'click .more'(e, t) {
 		if (t.data.identifier === 'p') {
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 2eddc2d540e..37d029387e8 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -800,6 +800,7 @@ Template.room.onDestroyed(function() {
 });
 
 Template.room.onRendered(function() {
+	$(this.find('.messages-box .wrapper')).perfectScrollbar();
 	const rid = Session.get('openedRoom');
 	if (!window.chatMessages[rid]) {
 		window.chatMessages[rid] = new ChatMessages;
@@ -816,8 +817,10 @@ Template.room.onRendered(function() {
 	const messageBox = $('.messages-box');
 
 	template.isAtBottom = function(scrollThreshold) {
-		if ((scrollThreshold == null)) { scrollThreshold = 0; }
-		if ((wrapper.scrollTop + scrollThreshold) >= (wrapper.scrollHeight - wrapper.clientHeight)) {
+		if (scrollThreshold == null) {
+			scrollThreshold = 0;
+		}
+		if (wrapper.scrollTop + scrollThreshold >= wrapper.scrollHeight - wrapper.clientHeight) {
 			newMessage.className = 'new-message background-primary-action-color color-content-background-color not';
 			return true;
 		}
@@ -836,8 +839,7 @@ Template.room.onRendered(function() {
 	};
 
 	template.sendToBottomIfNecessary = function() {
-
-		if ((template.atBottom === true) && (template.isAtBottom() !== true)) {
+		if (template.atBottom === true && template.isAtBottom() !== true) {
 			return template.sendToBottom();
 		}
 	};
diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index 2f190a0219b..7ddd185c62a 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -414,8 +414,10 @@ describe('[Administration]', () => {
 
 		describe('[General Settings]', () => {
 			before(() => {
+				admin.settingsSearch.setValue('general');
 				admin.generalLink.waitForVisible(5000);
 				admin.generalLink.click();
+				admin.settingsSearch.setValue('');
 				admin.generalSiteUrl.waitForVisible(5000);
 			});
 
diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index 526d1eedd00..eeaeb620416 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -3,6 +3,7 @@ import Page from './Page';
 class Administration extends Page {
 	get flexNav() { return browser.element('.flex-nav'); }
 	get flexNavContent() { return browser.element('.flex-nav'); }
+	get settingsSearch() { return browser.element('[name=settings-search]'); }
 	get layoutLink() { return browser.element('.flex-nav [href="/admin/Layout"]'); }
 	get infoLink() { return browser.element('.flex-nav [href="/admin/info"]'); }
 	get roomsLink() { return browser.element('.flex-nav [href="/admin/rooms"]'); }

From 0bac5d836db66f54c43d187370e769613cfd4b7c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 20 Sep 2017 09:36:55 -0300
Subject: [PATCH 070/244] Merge pull request #8194 from
 RocketChat/more-rtl-fixes

Fix more rtl issues
---
 .../client/imports/components/message-box.css |  6 ++++++
 .../imports/components/modal/full-modal.css   | 20 +++++++++++++++----
 .../imports/components/sidebar/toolbar.css    |  6 ++++++
 .../client/imports/forms/popup-list.css       |  5 +++++
 .../client/imports/general/rtl.css            | 16 ++++-----------
 .../client/messageBox.html                    |  2 +-
 .../client/views/app/fullModal.html           |  2 +-
 7 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/message-box.css b/packages/rocketchat-theme/client/imports/components/message-box.css
index ab9e171fb33..142ab9ce3bc 100644
--- a/packages/rocketchat-theme/client/imports/components/message-box.css
+++ b/packages/rocketchat-theme/client/imports/components/message-box.css
@@ -243,3 +243,9 @@
 		}
 	}
 }
+
+.rtl .rc-message-box__typing {
+	right: 0;
+
+	margin-right: 24px;
+}
diff --git a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
index cd2bc4eca1a..55516a09b9c 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
@@ -28,13 +28,15 @@
 	}
 
 	&__back-text {
-		margin-right: 0.375rem;
+		margin-right: 2px;
+
+		line-height: 22px;
 	}
 
 	&__back-icon {
-		width: 10px;
-		height: 10px;
-		stroke: currentColor;
+		transform: rotate(45deg);
+
+		font-size: 1rem;
 	}
 }
 
@@ -55,3 +57,13 @@
 		}
 	}
 }
+
+.rtl .full-modal {
+	&__back-button {
+		left: 0
+	}
+
+	&__back-text {
+		margin-left: 0.375rem;
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index 7ad0eabe920..5717024106b 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -107,3 +107,9 @@
 		padding: 0 calc(var(--sidebar-small-default-padding) - 8px) var(--sidebar-small-default-padding);
 	}
 }
+
+.rtl .toolbar {
+	& .rc-input__icon + .rc-input__element {
+		padding: 0.5rem 2.25rem 0.5rem 1rem;
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/forms/popup-list.css b/packages/rocketchat-theme/client/imports/forms/popup-list.css
index 340130cdcb0..923e580cb18 100644
--- a/packages/rocketchat-theme/client/imports/forms/popup-list.css
+++ b/packages/rocketchat-theme/client/imports/forms/popup-list.css
@@ -43,3 +43,8 @@
 		}
 	}
 }
+
+.rtl .rc-popup-list__item-image {
+	margin-right: 0;
+	margin-left: 1rem;
+}
diff --git a/packages/rocketchat-theme/client/imports/general/rtl.css b/packages/rocketchat-theme/client/imports/general/rtl.css
index 2dfc17e7f7d..c3c66aacbd7 100644
--- a/packages/rocketchat-theme/client/imports/general/rtl.css
+++ b/packages/rocketchat-theme/client/imports/general/rtl.css
@@ -1,6 +1,10 @@
 .rtl {
 	direction: rtl;
 
+	& .rc-old .page-container .content .rocket-form .submit {
+		text-align: left;
+	}
+
 	& button {
 		text-align: right;
 	}
@@ -641,18 +645,6 @@
 		}
 	}
 
-	& .first-unread .body {
-		&::before {
-			right: 20px;
-			left: 0;
-		}
-
-		&::after {
-			right: auto;
-			left: 0;
-		}
-	}
-
 	& .ticks-bar {
 		right: auto;
 		left: 2px;
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index e506486f4ed..0b1d080ec6f 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -25,7 +25,7 @@
 					<div class="rc-message-box__icon emoji-picker-icon">
 						{{> icon block="rc-input__icon-svg" icon="emoji"}}
 					</div>
-					<textarea autofocus dir="auto" name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message autogrow-short"></textarea>
+					<textarea autofocus name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message autogrow-short"></textarea>
 					{{#unless disableSendIcon}}
 						<div class="rc-message-box__icon rc-message-box__send js-send" data-desktop>
 							{{> icon block="rc-input__icon-svg" icon="send"}}
diff --git a/packages/rocketchat-ui/client/views/app/fullModal.html b/packages/rocketchat-ui/client/views/app/fullModal.html
index 2febffb428f..7bbfa988c29 100644
--- a/packages/rocketchat-ui/client/views/app/fullModal.html
+++ b/packages/rocketchat-ui/client/views/app/fullModal.html
@@ -3,7 +3,7 @@
 		<div class="full-modal__wrapper">
 			<button class="full-modal__back-button">
 				<span class="full-modal__back-text">{{_ "Cancel"}}</span>
-				{{> icon block="full-modal__back-icon" icon="cross"}}
+				{{> icon block="full-modal__back-icon" icon="plus"}}
 			</button>
 			{{> Template.dynamic template=template}}
 		</div>

From 4be07ae0a4e2ca7418e5ae3f2356a116474ae297 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 18 Sep 2017 21:59:39 -0300
Subject: [PATCH 071/244] Merge pull request #8197 from RocketChat/dep-update

npm deps update
---
 .meteor/versions                              | 20 ++++++++---------
 package.json                                  |  4 ++--
 .../rocketchat-livechat/app/.meteor/versions  | 22 +++++++++----------
 packages/rocketchat-livechat/app/package.json |  4 ++--
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.meteor/versions b/.meteor/versions
index 394fc993c5b..b861fe402cd 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -7,7 +7,7 @@ accounts-oauth@1.1.15
 accounts-password@1.4.0
 accounts-twitter@1.3.0
 aldeed:simple-schema@1.5.3
-allow-deny@1.0.6
+allow-deny@1.0.9
 autoupdate@1.3.12
 babel-compiler@6.20.0
 babel-runtime@1.0.1
@@ -25,16 +25,16 @@ check@1.2.5
 coffeescript@1.12.7_1
 coffeescript-compiler@1.12.7_1
 dandv:caret-position@2.1.1
-ddp@1.3.0
-ddp-client@2.1.0
+ddp@1.3.1
+ddp-client@2.1.2
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.0
+ddp-server@2.0.2
 deepwell:bootstrap-datepicker2@1.3.0
 deps@1.0.12
 diff-sequence@1.0.7
 dispatch:run-as-user@1.1.1
-dynamic-import@0.1.1
+dynamic-import@0.1.3
 ecmascript@0.8.2
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
@@ -77,7 +77,7 @@ localstorage@1.1.1
 logging@1.1.17
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.7.1
+meteor@1.7.2
 meteor-base@1.1.0
 meteor-developer-oauth@1.2.0
 meteorhacks:inject-initial@1.0.4
@@ -85,14 +85,14 @@ meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
 minifier-js@2.1.3
-minimongo@1.3.0
+minimongo@1.3.1
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
 mobile-experience@1.0.4
 mobile-status-bar@1.0.14
 modules@0.10.0
 modules-runtime@0.8.0
-mongo@1.2.0
+mongo@1.2.2
 mongo-dev-server@1.0.1
 mongo-id@1.0.6
 mongo-livedata@1.0.12
@@ -243,7 +243,7 @@ standard-minifier-js@2.1.1
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.2
-templating-compiler@1.3.2
+templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
 tmeasday:crypto-base@3.1.2
@@ -255,7 +255,7 @@ ui@1.0.13
 underscore@1.0.10
 underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.18
+webapp@1.3.19
 webapp-hashing@1.0.9
 yasaricli:slugify@0.0.7
 yasinuslu:blaze-meta@0.3.3
diff --git a/package.json b/package.json
index dd33ee9493c..7e5e198c068 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
 		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.50.0",
 		"conventional-changelog-cli": "^1.3.3",
-		"eslint": "^4.6.1",
+		"eslint": "^4.7.1",
 		"mock-require": "^2.0.2",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
@@ -104,7 +104,7 @@
 	},
 	"dependencies": {
 		"@google-cloud/storage": "^1.2.1",
-		"aws-sdk": "^2.111.0",
+		"aws-sdk": "^2.118.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
 		"codemirror": "^5.29.0",
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index db0d2f521cc..753859defef 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -1,7 +1,7 @@
 accounts-base@1.3.2
 accounts-password@1.4.0
 aldeed:simple-schema@1.5.3
-allow-deny@1.0.6
+allow-deny@1.0.9
 babel-compiler@6.20.0
 babel-runtime@1.0.1
 base64@1.0.10
@@ -16,14 +16,14 @@ cfs:http-methods@0.0.32
 check@1.2.5
 coffeescript@1.12.7_1
 coffeescript-compiler@1.12.7_1
-ddp@1.3.0
-ddp-client@2.1.0
+ddp@1.3.1
+ddp-client@2.1.2
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.0
+ddp-server@2.0.2
 deps@1.0.12
 diff-sequence@1.0.7
-dynamic-import@0.1.1
+dynamic-import@0.1.3
 ecmascript@0.8.2
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
@@ -45,16 +45,16 @@ livedata@1.0.18
 localstorage@1.1.1
 logging@1.1.17
 mdg:validation-error@0.5.1
-meteor@1.7.1
+meteor@1.7.2
 meteorspark:util@0.2.0
 minifier-css@1.2.16
 minifier-js@2.1.3
-minimongo@1.3.0
+minimongo@1.3.1
 mizzao:timesync@0.5.0
 modules@0.10.0
 modules-runtime@0.8.0
 momentjs:moment@2.18.1
-mongo@1.2.0
+mongo@1.2.2
 mongo-dev-server@1.0.1
 mongo-id@1.0.6
 npm-bcrypt@0.9.3
@@ -78,11 +78,11 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-css@1.3.4
+standard-minifier-css@1.3.5
 standard-minifier-js@2.1.1
 tap:i18n@1.8.2
 templating@1.3.2
-templating-compiler@1.3.2
+templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
 tracker@1.1.3
@@ -90,5 +90,5 @@ ui@1.0.13
 underscore@1.0.10
 underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.18
+webapp@1.3.19
 webapp-hashing@1.0.9
diff --git a/packages/rocketchat-livechat/app/package.json b/packages/rocketchat-livechat/app/package.json
index 9503388c0fa..47f55d9d029 100644
--- a/packages/rocketchat-livechat/app/package.json
+++ b/packages/rocketchat-livechat/app/package.json
@@ -20,10 +20,10 @@
     "email": "support@rocket.chat"
   },
   "dependencies": {
-    "autolinker": "^1.4.3",
+    "autolinker": "^1.4.4",
     "jquery": "^3.2.1",
     "babel-runtime": "^6.26.0",
-    "bcrypt": "^1.0.2",
+    "bcrypt": "^1.0.3",
     "moment": "^2.18.1",
     "toastr": "^2.1.2"
   }

From 211adb2c72f7b61d68e0635a9d5beb8ec21c4bb5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 19 Sep 2017 15:42:20 -0300
Subject: [PATCH 072/244] Merge pull request #8210 from RocketChat/fix-avatar

[FIX] User avatar in DM list.
---
 packages/rocketchat-ui-sidenav/client/chatRoomItem.js  | 3 ++-
 packages/rocketchat-ui-sidenav/client/sidebarItem.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
index 877f4290e8a..8cf4df405cd 100644
--- a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
+++ b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
@@ -1,6 +1,6 @@
 Template.chatRoomItem.helpers({
 	roomData() {
-		let name = this.name;
+		let {name} = this;
 		const realNameForDirectMessages = RocketChat.settings.get('UI_Use_Real_Name') && this.t === 'd';
 		const realNameForChannel = RocketChat.settings.get('UI_Allow_room_names_with_special_chars') && this.t !== 'd';
 		if ((realNameForDirectMessages || realNameForChannel) && this.fname) {
@@ -31,6 +31,7 @@ Template.chatRoomItem.helpers({
 			...this,
 			icon,
 			avatar,
+			username : this.name,
 			route: RocketChat.roomTypes.getRouteLink(this.t, this),
 			name,
 			unread,
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 4d62bdaec76..ae562f081e0 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -10,7 +10,7 @@
 				{{else}}
 					{{#if avatar}}
 						<div class="sidebar-item__user-thumb">
-							{{> avatar username=name}}
+							{{> avatar username=username}}
 						</div>
 					{{/if}}
 				{{/if}}

From a483db8a855c30de8feccc2b4b2cb99b140bbf4f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 20 Sep 2017 09:45:23 -0300
Subject: [PATCH 073/244] Merge pull request #8211 from
 Darkneon/fix-terms-of-serice-with-prefix

[FIX] Incorrect URL for login terms when using prefix
---
 packages/rocketchat-lib/server/startup/settings.js | 2 +-
 packages/rocketchat-ui/client/views/cmsPage.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index ec165002dc4..a363e2e0d44 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -1255,7 +1255,7 @@ RocketChat.settings.addGroup('Layout', function() {
 			multiline: true,
 			'public': true
 		});
-		this.add('Layout_Login_Terms', 'By proceeding you are agreeing to our <a href="/terms-of-service">Terms of Service</a> and <a href="/privacy-policy">Privacy Policy</a>.', {
+		this.add('Layout_Login_Terms', 'By proceeding you are agreeing to our <a href="terms-of-service">Terms of Service</a> and <a href="privacy-policy">Privacy Policy</a>.', {
 			type: 'string',
 			multiline: true,
 			'public': true
diff --git a/packages/rocketchat-ui/client/views/cmsPage.html b/packages/rocketchat-ui/client/views/cmsPage.html
index 30e92787934..8c13eb81b30 100644
--- a/packages/rocketchat-ui/client/views/cmsPage.html
+++ b/packages/rocketchat-ui/client/views/cmsPage.html
@@ -1,7 +1,7 @@
 <template name="cmsPage">
 	<div class="cms-page content-background-color">
 		<div class="cms-page-close">
-			<a href="/login" class="button primary"><i class="icon-cancel"></i></a>
+			<a href="login" class="button primary"><i class="icon-cancel"></i></a>
 		</div>
 		{{{page}}}
 	</div>

From b4651db8ce5bc53d3d53d792c5757899161a61e8 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 20 Sep 2017 09:59:42 -0300
Subject: [PATCH 074/244] Merge pull request #8213 from
 RocketChat/leave-and-hide

[FIX] Leave and hide buttons was removed
---
 .../.npm/package/npm-shrinkwrap.json          | 160 ++++++++----------
 packages/rocketchat-i18n/i18n/en.i18n.json    |   2 +
 .../components/sidebar/sidebar-item.css       |  18 ++
 .../rocketchat-ui-master/public/icons.svg     |   1 +
 .../client/sidebarItem.html                   |   5 +-
 .../client/sidebarItem.js                     |  40 ++++-
 .../rocketchat-ui/client/views/app/popover.js |  82 ++++++++-
 7 files changed, 215 insertions(+), 93 deletions(-)

diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 689607dbd9b..070d577237f 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "ajv": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-      "from": "ajv@>=4.9.1 <5.0.0"
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+      "from": "ajv@>=5.1.0 <6.0.0"
     },
     "ansi-regex": {
       "version": "2.1.1",
@@ -41,9 +41,9 @@
       "from": "asn1@>=0.2.3 <0.3.0"
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "from": "assert-plus@>=0.2.0 <0.3.0"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "from": "assert-plus@>=1.0.0 <2.0.0"
     },
     "async": {
       "version": "2.5.0",
@@ -56,14 +56,14 @@
       "from": "asynckit@>=0.4.0 <0.5.0"
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "from": "aws-sign2@>=0.6.0 <0.7.0"
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "from": "aws-sign2@>=0.7.0 <0.8.0"
     },
     "aws4": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "from": "aws4@>=1.2.1 <2.0.0"
+      "from": "aws4@>=1.6.0 <2.0.0"
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -81,9 +81,9 @@
       "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0"
     },
     "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "from": "boom@>=2.0.0 <3.0.0"
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "from": "boom@>=4.0.0 <5.0.0"
     },
     "brace-expansion": {
       "version": "1.1.8",
@@ -171,9 +171,16 @@
       "from": "create-error-class@>=3.0.2 <4.0.0"
     },
     "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "from": "cryptiles@>=2.0.0 <3.0.0"
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "from": "cryptiles@>=3.0.0 <4.0.0",
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "from": "boom@>=5.0.0 <6.0.0"
+        }
+      }
     },
     "crypto-random-string": {
       "version": "1.0.0",
@@ -183,14 +190,7 @@
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "from": "dashdash@>=1.12.0 <2.0.0",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
-        }
-      }
+      "from": "dashdash@>=1.12.0 <2.0.0"
     },
     "decamelize": {
       "version": "1.2.0",
@@ -242,15 +242,20 @@
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "from": "extsprintf@1.3.0"
     },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "from": "fast-deep-equal@>=1.0.0 <2.0.0"
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "from": "forever-agent@>=0.6.1 <0.7.0"
     },
     "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "from": "form-data@>=2.1.1 <2.2.0"
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "from": "form-data@>=2.3.1 <2.4.0"
     },
     "fs.realpath": {
       "version": "1.0.0",
@@ -277,14 +282,7 @@
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "from": "getpass@>=0.1.1 <0.2.0",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
-        }
-      }
+      "from": "getpass@>=0.1.1 <0.2.0"
     },
     "glob": {
       "version": "7.1.2",
@@ -933,14 +931,14 @@
       "from": "gtoken@>=1.2.1 <2.0.0"
     },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "from": "har-schema@>=1.0.5 <2.0.0"
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "from": "har-schema@>=2.0.0 <3.0.0"
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "from": "har-validator@>=4.2.1 <4.3.0"
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "from": "har-validator@>=5.0.3 <5.1.0"
     },
     "hash-stream-validation": {
       "version": "0.2.1",
@@ -948,19 +946,19 @@
       "from": "hash-stream-validation@>=0.2.1 <0.3.0"
     },
     "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "from": "hawk@>=3.1.3 <3.2.0"
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "from": "hawk@>=6.0.2 <6.1.0"
     },
     "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "from": "hoek@>=2.0.0 <3.0.0"
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "from": "hoek@>=4.0.0 <5.0.0"
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "from": "http-signature@>=1.1.0 <1.2.0"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "from": "http-signature@>=1.2.0 <1.3.0"
     },
     "imurmurhash": {
       "version": "0.1.4",
@@ -1027,6 +1025,11 @@
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
       "from": "json-schema@0.2.3"
     },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "from": "json-schema-traverse@>=0.3.0 <0.4.0"
+    },
     "json-stable-stringify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
@@ -1045,14 +1048,7 @@
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "from": "jsprim@>=1.2.2 <2.0.0",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@1.0.0"
-        }
-      }
+      "from": "jsprim@>=1.2.2 <2.0.0"
     },
     "jwa": {
       "version": "1.1.5",
@@ -1142,7 +1138,7 @@
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "from": "oauth-sign@>=0.8.1 <0.9.0"
+      "from": "oauth-sign@>=0.8.2 <0.9.0"
     },
     "object-assign": {
       "version": "4.1.1",
@@ -1170,9 +1166,9 @@
       "from": "path-is-absolute@>=1.0.0 <2.0.0"
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "from": "performance-now@>=0.2.0 <0.3.0"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "from": "performance-now@>=2.1.0 <3.0.0"
     },
     "pify": {
       "version": "2.3.0",
@@ -1225,9 +1221,9 @@
       "from": "punycode@>=1.4.1 <2.0.0"
     },
     "qs": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-      "from": "qs@>=6.4.0 <6.5.0"
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "from": "qs@>=6.5.1 <6.6.0"
     },
     "readable-stream": {
       "version": "2.3.3",
@@ -1235,8 +1231,8 @@
       "from": "readable-stream@>=2.2.2 <3.0.0"
     },
     "request": {
-      "version": "2.81.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "version": "2.82.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.82.0.tgz",
       "from": "request@>=2.79.0 <3.0.0"
     },
     "retry-request": {
@@ -1260,9 +1256,9 @@
       "from": "signal-exit@>=3.0.2 <4.0.0"
     },
     "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "from": "sntp@>=1.0.0 <2.0.0"
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+      "from": "sntp@>=2.0.0 <3.0.0"
     },
     "split-array-stream": {
       "version": "1.0.3",
@@ -1272,14 +1268,7 @@
     "sshpk": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "from": "sshpk@>=1.7.0 <2.0.0",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
-        }
-      }
+      "from": "sshpk@>=1.7.0 <2.0.0"
     },
     "stream-events": {
       "version": "1.0.2",
@@ -1309,7 +1298,7 @@
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "from": "stringstream@>=0.0.4 <0.1.0"
+      "from": "stringstream@>=0.0.5 <0.1.0"
     },
     "strip-ansi": {
       "version": "3.0.1",
@@ -1329,7 +1318,7 @@
     "tough-cookie": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "from": "tough-cookie@>=2.3.0 <2.4.0"
+      "from": "tough-cookie@>=2.3.2 <2.4.0"
     },
     "tunnel-agent": {
       "version": "0.6.0",
@@ -1359,19 +1348,12 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "from": "uuid@>=3.0.0 <4.0.0"
+      "from": "uuid@>=3.1.0 <4.0.0"
     },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "from": "verror@1.10.0",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
-        }
-      }
+      "from": "verror@1.10.0"
     },
     "window-size": {
       "version": "0.1.4",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 2dff5bac7fb..3fd343c7f75 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -704,6 +704,7 @@
   "Hide_flextab": "Hide right side bar with click",
   "Hide_Group_Warning": "Are you sure you want to hide the group \"%s\"?",
   "Hide_Private_Warning": "Are you sure you want to hide the discussion with \"%s\"?",
+  "Hide_Livechat_Warning": "Are you sure you want to hide the livechat with \"%s\"?",
   "Hide_room": "Hide room",
   "Hide_Room_Warning": "Are you sure you want to hide the room \"%s\"?",
   "Hide_roles": "Hide roles",
@@ -981,6 +982,7 @@
   "Least_Amount": "Least Amount",
   "Leave_Group_Warning": "Are you sure you want to leave the group \"%s\"?",
   "Leave_Private_Warning": "Are you sure you want to leave the discussion with \"%s\"?",
+  "Leave_Livechat_Warning": "Are you sure you want to leave the livechat with \"%s\"?",
   "Leave_room": "Leave room",
   "Leave_Room_Warning": "Are you sure you want to leave the room \"%s\"?",
   "Leave_the_current_channel": "Leave the current channel",
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 1e3ae68015f..151ab78e740 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -18,6 +18,16 @@
 	border-radius: var(--sidebar-item-radius);
 	align-items: center;
 
+	&:hover {
+		& .sidebar-item__menu {
+			display: block;
+		}
+
+		& .badge {
+			display: none;
+		}
+	}
+
 	&--active {
 		background-color: var(--color-dark-light);
 	}
@@ -122,6 +132,14 @@
 		font-size: var(--sidebar-item-text-size);
 		line-height: var(--sidebar-item-height);
 	}
+
+	&__menu {
+		display: none;
+
+		&-icon {
+			fill: var(--color-white);
+		}
+	}
 }
 
 .rtl .sidebar-item__user-status {
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index 9307d5af1fd..f84e5c748a1 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -61,4 +61,5 @@
     <symbol viewBox="0 0 20 20" id="icon-jump"><path d="M11.6 7.257V4L18 9.7l-6.4 5.7v-3.257S2 11.385 2 16c0-9.23 9.6-8.743 9.6-8.743z" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-flag"><path d="M12.928 6.063l3.263-3.77a.74.74 0 0 0 .112-.759.71.71 0 0 0-.647-.422H3.141v17.72h1.406v-7.876h11.11a.71.71 0 0 0 .646-.422.691.691 0 0 0-.112-.759l-3.263-3.713zM4.547 9.578V2.547h9.562l-2.643 3.065c-.225.254-.225.647 0 .929l2.643 3.065H4.547v-.028z" fill-rule="nonzero" fill="currentColor"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-circle"><circle cx="10" cy="10" r="9" fill="currentColor" fill-rule="evenodd"/></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-eye-off"><g fill-rule="nonzero" fill="currentColor"><path d="M10 3.99c-3.79.004-6.658 2.896-8.542 5.44a.62.62 0 0 0 0 .739c.679.919 1.482 1.873 2.41 2.725a.62.62 0 1 0 .84-.915c-.729-.668-1.371-1.421-1.95-2.172C4.533 7.51 7.014 5.235 10 5.232c.515 0 1.011.066 1.493.187a.62.62 0 1 0 .303-1.203A7.392 7.392 0 0 0 10 3.99zM14.14 5.32a.62.62 0 0 0-.327 1.145c1.33.867 2.47 2.11 3.422 3.342-1.776 2.294-4.254 4.562-7.234 4.566-1.22-.003-2.346-.37-3.389-.972a.62.62 0 1 0-.62 1.076c1.19.686 2.537 1.135 4.008 1.137 3.79-.004 6.659-2.895 8.543-5.44a.62.62 0 0 0 0-.738c-1.052-1.424-2.399-2.934-4.051-4.011a.62.62 0 0 0-.352-.106z"/><path d="M11.722 7.895a.62.62 0 0 0-.468.993c.188.257.298.57.298.914 0 .864-.687 1.552-1.552 1.552-.371 0-.706-.127-.972-.342a.62.62 0 1 0-.779.967 2.79 2.79 0 0 0 1.751.616 2.803 2.803 0 0 0 2.793-2.793c0-.612-.2-1.185-.536-1.646a.62.62 0 0 0-.535-.261z"/><path d="M18.057 1.107a.62.62 0 0 0-.427.187L1.492 17.432a.62.62 0 1 0 .878.879L18.508 2.172a.62.62 0 0 0-.45-1.065z"/></g></symbol>
 </svg>
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index ae562f081e0..34cd13069b9 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -17,8 +17,11 @@
 			</div>
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
 			{{#if unread}}
-			<span class="badge badge--unread">{{unread}}</span>
+				<span class="badge badge--unread">{{unread}}</span>
 			{{/if}}
+			<div class="sidebar-item__menu">
+				{{> icon block="sidebar-item__menu-icon" icon="menu"}}
+			</div>
 		</a>
 	</li>
 </template>
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
index a2ab6059516..bf3b20c2152 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
@@ -1,4 +1,4 @@
-/* globals menu */
+/* globals menu popover */
 
 Template.sidebarItem.helpers({
 	canLeave() {
@@ -17,6 +17,44 @@ Template.sidebarItem.helpers({
 Template.sidebarItem.events({
 	'click [data-id], click .sidebar-item__link'() {
 		return menu.close();
+	},
+	'click .sidebar-item__menu'(e) {
+		const config = {
+			popoverClass: 'sidebar-item',
+			columns: [
+				{
+					groups: [
+						{
+							items: [
+								{
+									icon: 'eye-off',
+									name: t('Hide_room'),
+									type: 'sidebar-item',
+									id: 'hide'
+								},
+								{
+									icon: 'sign-out',
+									name: t('Leave_room'),
+									type: 'sidebar-item',
+									id: 'leave'
+								}
+							]
+						}
+					]
+				}
+			],
+			mousePosition: {
+				x: e.clientX,
+				y: e.clientY
+			},
+			data: {
+				template: this.t,
+				rid: this.rid,
+				name: this.name
+			}
+		};
+
+		popover.open(config);
 	}
 });
 
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 2755feaa803..639ffe4626d 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -52,8 +52,6 @@ Template.popover.onRendered(function() {
 			left = mousePosition.x - popoverWidth;
 		} else if (mousePosition.x <= popoverWidth) {
 			left = isRtl() ? mousePosition.x + 10 : 10;
-		} else if (mousePosition.x <= windowWidth / 2) {
-			left = mousePosition.x;
 		} else {
 			left = mousePosition.x - popoverWidth;
 		}
@@ -129,5 +127,85 @@ Template.popover.events({
 		}
 
 		popover.close();
+	},
+	'click [data-type="sidebar-item"]'(e, instance) {
+		popover.close();
+		const { rid, name, template } = instance.data.data;
+
+		if (e.currentTarget.dataset.id === 'hide') {
+			let warnText;
+			switch (template) {
+				case 'c': warnText = 'Hide_Room_Warning'; break;
+				case 'p': warnText = 'Hide_Group_Warning'; break;
+				case 'd': warnText = 'Hide_Private_Warning'; break;
+				case 'l': warnText = 'Hide_Livechat_Warning'; break;
+			}
+
+			return swal({
+				title: t('Are_you_sure'),
+				text: warnText ? t(warnText, name) : '',
+				type: 'warning',
+				showCancelButton: true,
+				confirmButtonColor: '#DD6B55',
+				confirmButtonText: t('Yes_hide_it'),
+				cancelButtonText: t('Cancel'),
+				closeOnConfirm: true,
+				html: false
+			}, function() {
+				if (['channel', 'group', 'direct'].includes(FlowRouter.getRouteName()) && (Session.get('openedRoom') === rid)) {
+					FlowRouter.go('home');
+				}
+
+				Meteor.call('hideRoom', rid, function(err) {
+					if (err) {
+						handleError(err);
+					} else if (rid === Session.get('openedRoom')) {
+						Session.delete('openedRoom');
+					}
+				});
+			});
+		} else {
+			let warnText;
+			switch (template) {
+				case 'c': warnText = 'Leave_Room_Warning'; break;
+				case 'p': warnText = 'Leave_Group_Warning'; break;
+				case 'd': warnText = 'Leave_Private_Warning'; break;
+				case 'l': warnText = 'Hide_Livechat_Warning'; break;
+			}
+
+			swal({
+				title: t('Are_you_sure'),
+				text: t(warnText, name),
+				type: 'warning',
+				showCancelButton: true,
+				confirmButtonColor: '#DD6B55',
+				confirmButtonText: t('Yes_leave_it'),
+				cancelButtonText: t('Cancel'),
+				closeOnConfirm: false,
+				html: false
+			}, function(isConfirm) {
+				if (isConfirm) {
+					Meteor.call('leaveRoom', rid, function(err) {
+						if (err) {
+							swal({
+								title: t('Warning'),
+								text: handleError(err, false),
+								type: 'warning',
+								html: false
+							});
+						} else {
+							swal.close();
+							if (['channel', 'group', 'direct'].includes(FlowRouter.getRouteName()) && (Session.get('openedRoom') === rid)) {
+								FlowRouter.go('home');
+							}
+
+							RoomManager.close(rid);
+						}
+					});
+				} else {
+					swal.close();
+				}
+			});
+		}
 	}
 });

From dc9c0dd4d13fb1a5265b1c037e400b6bb8be2e30 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 20 Sep 2017 10:04:15 -0300
Subject: [PATCH 075/244] Bump version to 0.59.0-rc.7

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 21 +++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index de98e12115a..1f9b8108a12 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.6
+ENV RC_VERSION 0.59.0-rc.7
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 93d79356ccc..3a3c7eb072f 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.6"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.7"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 1d259a933cc..46c5008b751 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.6
+    RC_VERSION=0.59.0-rc.7
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index fa837e3d5a4..7a9ab9c6671 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,24 @@
+<a name="0.59.0-rc.7"></a>
+# 0.59.0-rc.7 (2017-09-20)
+
+
+### Bug Fixes
+
+- [#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) Incorrect URL for login terms when using prefix
+- [#8213](https://github.com/RocketChat/Rocket.Chat/pull/8213) Leave and hide buttons was removed
+- [#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190) Scrollbar not using new style
+- [#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210) User avatar in DM list.
+
+
+<details>
+<summary>Others</summary>
+
+- [#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) Fix more rtl issues
+- [#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197) npm deps update
+</details>
+
+
+
 <a name="0.59.0-rc.6"></a>
 # 0.59.0-rc.6 (2017-09-18)
 
diff --git a/package.json b/package.json
index 7e5e198c068..2ba892b215b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.6",
+	"version": "0.59.0-rc.7",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 2a3c3627b57..4bc674a7231 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.6"
+	"version": "0.59.0-rc.7"
 }

From 6634cee979d02b961f31be8ac65830df548c5408 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 21 Sep 2017 19:26:49 -0300
Subject: [PATCH 076/244] Merge pull request #8216 from
 arminfelder/0.57.2-meteorSamlMergeCaseInsensitveEmail

[FIX] Case insensitive SAML email check
---
 packages/meteor-accounts-saml/saml_server.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/meteor-accounts-saml/saml_server.js b/packages/meteor-accounts-saml/saml_server.js
index b3438252f6a..49b15c806a9 100644
--- a/packages/meteor-accounts-saml/saml_server.js
+++ b/packages/meteor-accounts-saml/saml_server.js
@@ -102,8 +102,10 @@ Accounts.registerLoginHandler(function(loginRequest) {
 	}
 
 	if (loginResult && loginResult.profile && loginResult.profile.email) {
+		const email = RegExp.escape(loginResult.profile.email);
+		const emailRegex = new RegExp(`^${ email }$`, 'i');
 		let user = Meteor.users.findOne({
-			'emails.address': loginResult.profile.email
+			'emails.address': emailRegex
 		});
 
 		if (!user) {

From f9d9538e7727da3bc9e3d19bddc1e22984beaee9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 21 Sep 2017 15:38:12 -0300
Subject: [PATCH 077/244] Merge pull request #8241 from
 RocketChat/rodrigok-patch-2

[FIX] Api groups.files is always returning empty
---
 packages/rocketchat-api/server/v1/groups.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index dfdde26b770..e7ce5184cc8 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -161,7 +161,7 @@ RocketChat.API.v1.addRoute('groups.files', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
-		const ourQuery = Object.assign({}, query, { rid: findResult._id });
+		const ourQuery = Object.assign({}, query, { rid: findResult.rid });
 
 		const files = RocketChat.models.Uploads.find(ourQuery, {
 			sort: sort ? sort : { name: 1 },

From 343c134db4287f22405f8338e91f04ee3640728c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 21 Sep 2017 19:24:23 -0300
Subject: [PATCH 078/244] Merge pull request #8243 from
 RocketChat/fix-leave-and-hide

Fix `leave and hide` click, color and position
---
 .../client/imports/components/popover.css                | 8 ++++++++
 .../client/imports/components/sidebar/sidebar-item.css   | 2 ++
 packages/rocketchat-ui-sidenav/client/accountBox.js      | 8 ++++----
 packages/rocketchat-ui-sidenav/client/sidebarItem.js     | 9 ++++-----
 packages/rocketchat-ui/client/views/app/popover.html     | 2 +-
 packages/rocketchat-ui/client/views/app/popover.js       | 2 ++
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 999c0276887..94fdc55db8b 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -92,6 +92,14 @@
 
 		font-size: var(--popover-item-text-size);
 		align-items: center;
+
+		&--error {
+			color: var(--color-error);
+
+			& .rc-icon {
+				fill: var(--color-error);
+			}
+		}
 	}
 
 	&__icon {
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 151ab78e740..91452af9b8e 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -136,6 +136,8 @@
 	&__menu {
 		display: none;
 
+		padding: 8px 0 8px 8px;
+
 		&-icon {
 			fill: var(--color-white);
 		}
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js
index eb2faf8a033..ac087a1a3b8 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.js
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.js
@@ -62,28 +62,28 @@ Template.accountBox.events({
 									name: t('Online'),
 									type: 'set-state',
 									id: 'online',
-									class: 'online'
+									modifier: 'online'
 								},
 								{
 									icon: 'circle',
 									name: t('Away'),
 									type: 'set-state',
 									id: 'away',
-									class: 'away'
+									modifier: 'away'
 								},
 								{
 									icon: 'circle',
 									name: t('Busy'),
 									type: 'set-state',
 									id: 'busy',
-									class: 'busy'
+									modifier: 'busy'
 								},
 								{
 									icon: 'circle',
 									name: t('Invisible'),
 									type: 'set-state',
 									id: 'offline',
-									class: 'offline'
+									modifier: 'offline'
 								}
 							]
 						},
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
index bf3b20c2152..730a8b38568 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
@@ -19,6 +19,8 @@ Template.sidebarItem.events({
 		return menu.close();
 	},
 	'click .sidebar-item__menu'(e) {
+		e.preventDefault();
+
 		const config = {
 			popoverClass: 'sidebar-item',
 			columns: [
@@ -36,7 +38,8 @@ Template.sidebarItem.events({
 									icon: 'sign-out',
 									name: t('Leave_room'),
 									type: 'sidebar-item',
-									id: 'leave'
+									id: 'leave',
+									modifier: 'error'
 								}
 							]
 						}
@@ -57,7 +60,3 @@ Template.sidebarItem.events({
 		popover.open(config);
 	}
 });
-
-Template.sidebarItem.onCreated(function() {
-	// console.log('sidebarItem', this.data);
-});
diff --git a/packages/rocketchat-ui/client/views/app/popover.html b/packages/rocketchat-ui/client/views/app/popover.html
index 84c53ad4c95..22ba0d120a8 100644
--- a/packages/rocketchat-ui/client/views/app/popover.html
+++ b/packages/rocketchat-ui/client/views/app/popover.html
@@ -9,7 +9,7 @@
 						{{/if}}
 						<ul class="rc-popover__list">
 							{{#each item in group.items}}
-							<li class="rc-popover__item rc-popover__item--{{item.class}}" data-type={{item.type}} data-id={{item.id.toLowerCase}} data-href={{item.href}} data-sidenav={{item.sideNav}}>
+							<li class="rc-popover__item {{#if item.modifier}}rc-popover__item--{{item.modifier}}{{/if}}" data-type={{item.type}} data-id={{item.id.toLowerCase}} data-href={{item.href}} data-sidenav={{item.sideNav}}>
 									{{#if item.icon}}
 										<span class="rc-popover__icon">
 											{{> icon block="rc-popover__icon-element" icon=item.icon }}
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 639ffe4626d..0ae6798dd6b 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -52,6 +52,8 @@ Template.popover.onRendered(function() {
 			left = mousePosition.x - popoverWidth;
 		} else if (mousePosition.x <= popoverWidth) {
 			left = isRtl() ? mousePosition.x + 10 : 10;
+		} else if (mousePosition.x <= windowWidth / 2) {
+			left = mousePosition.x;
 		} else {
 			left = mousePosition.x - popoverWidth;
 		}

From 8e1097409ee2bc325474502768395f678085643f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 21 Sep 2017 19:22:47 -0300
Subject: [PATCH 079/244] Merge pull request #8244 from
 RocketChat/disable-perfect-scrollbar

Disable perfect scrollbar
---
 packages/rocketchat-ui-account/client/accountFlex.js | 6 +++---
 packages/rocketchat-ui-admin/client/adminFlex.js     | 6 +++---
 packages/rocketchat-ui-sidenav/client/roomList.js    | 6 +++---
 packages/rocketchat-ui/client/views/app/room.js      | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js
index ceaa081165a..d37454102ad 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.js
+++ b/packages/rocketchat-ui-account/client/accountFlex.js
@@ -4,9 +4,9 @@ Template.accountFlex.events({
 	}
 });
 
-Template.accountFlex.onRendered(function() {
-	$(this.find('.rooms-list')).perfectScrollbar();
-});
+// Template.accountFlex.onRendered(function() {
+// 	$(this.find('.rooms-list')).perfectScrollbar();
+// });
 
 Template.accountFlex.helpers({
 	allowUserProfileChange() {
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js
index 389e0afdb25..83c685bda5b 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.js
+++ b/packages/rocketchat-ui-admin/client/adminFlex.js
@@ -14,9 +14,9 @@ const label = function() {
 	return TAPi18n.__(this.i18nLabel || this._id);
 };
 
-Template.adminFlex.onRendered(function() {
-	$(this.find('.rooms-list')).perfectScrollbar();
-});
+// Template.adminFlex.onRendered(function() {
+// 	$(this.find('.rooms-list')).perfectScrollbar();
+// });
 
 Template.adminFlex.helpers({
 	groups() {
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
index ba8ac9791fe..33bd611d657 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.js
+++ b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -76,9 +76,9 @@ Template.roomList.helpers({
 	}
 });
 
-Template.roomList.onRendered(function() {
-	$(this.firstNode.parentElement).perfectScrollbar();
-});
+// Template.roomList.onRendered(function() {
+// 	$(this.firstNode.parentElement).perfectScrollbar();
+// });
 
 Template.roomList.events({
 	'click .more'(e, t) {
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 37d029387e8..afca24e3543 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -800,7 +800,7 @@ Template.room.onDestroyed(function() {
 });
 
 Template.room.onRendered(function() {
-	$(this.find('.messages-box .wrapper')).perfectScrollbar();
+	// $(this.find('.messages-box .wrapper')).perfectScrollbar();
 	const rid = Session.get('openedRoom');
 	if (!window.chatMessages[rid]) {
 		window.chatMessages[rid] = new ChatMessages;

From 9ffb19a557db4152b4829a6005f0fa14ed6bc81a Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 22 Sep 2017 18:48:21 -0300
Subject: [PATCH 080/244] Merge pull request #8252 from
 RocketChat/hover-mentions

[FIX] sidenav mentions on hover
---
 .../imports/components/sidebar/sidebar-item.css       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 91452af9b8e..5f4a68c14ef 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -20,11 +20,7 @@
 
 	&:hover {
 		& .sidebar-item__menu {
-			display: block;
-		}
-
-		& .badge {
-			display: none;
+			margin: 0;
 		}
 	}
 
@@ -134,9 +130,10 @@
 	}
 
 	&__menu {
-		display: none;
+		margin: 0 -15px;
+		padding: 6px;
 
-		padding: 8px 0 8px 8px;
+		transition: margin 0.2s 0.3s;
 
 		&-icon {
 			fill: var(--color-white);

From b04faf86e6164da6ab256f272eeb94da083b4014 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 22 Sep 2017 21:33:37 -0300
Subject: [PATCH 081/244] Merge pull request #8259 from
 RocketChat/fix-popover-clipboard

[FIX] clipboard and permalink on new popover
---
 packages/rocketchat-ui/client/views/app/popover.js | 4 ++++
 packages/rocketchat-ui/client/views/app/room.js    | 9 ++++++---
 packages/rocketchat-ui/package.js                  | 4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 0ae6798dd6b..85180094ca7 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -16,6 +16,10 @@ this.popover = {
 };
 
 Template.popover.onRendered(function() {
+	if (this.data.onRendered) {
+		this.data.onRendered();
+	}
+
 	$('.rc-popover').click(function(e) {
 		if (e.currentTarget === e.target) {
 			popover.close();
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index afca24e3543..6e84324a102 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -1,6 +1,7 @@
-/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , mobileMessageMenu , cordova , readMessage , RoomRoles, popover*/
+/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , mobileMessageMenu , cordova , readMessage , RoomRoles, popover */
 import moment from 'moment';
 import mime from 'mime-type/with-db';
+import Clipboard from 'clipboard';
 
 window.chatMessages = window.chatMessages || {};
 const socialSharing = (options = {}) => window.plugins.socialsharing.share(options.message, options.subject, options.file, options.link);
@@ -551,7 +552,8 @@ Template.room.events({
 				icon: item.icon,
 				name: t(item.label),
 				type: 'message-action',
-				id: item.id
+				id: item.id,
+				modifier: item.id === 'delete-message' ? 'error' : null
 			};
 		});
 
@@ -571,7 +573,8 @@ Template.room.events({
 				x: e.clientX,
 				y: e.clientY
 			},
-			activeElement: $(e.currentTarget).parents('.message')[0]
+			activeElement: $(e.currentTarget).parents('.message')[0],
+			onRendered: () => new Clipboard('.rc-popover__item')
 		};
 
 		popover.open(config);
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 1dc4bc14e5b..2547ed44148 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -10,6 +10,10 @@ Package.describe({
 	documentation: 'README.md'
 });
 
+Npm.depends({
+	clipboard: '1.7.1'
+});
+
 Package.onUse(function(api) {
 	api.use([
 		'accounts-base',

From c40c653d715e443db48414398a079670b8d7834d Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 22 Sep 2017 21:36:56 -0300
Subject: [PATCH 082/244] Merge pull request #8260 from RocketChat/read-only

[NEW] Enable read only channel creation
---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  2 ++
 .../components/modal/create-channel.css       | 18 +++--------
 .../client/views/app/createChannel.html       |  3 +-
 .../client/views/app/createChannel.js         | 32 +++++++++++--------
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 3fd343c7f75..e17f106f876 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -159,6 +159,7 @@
   "All_channels": "All channels",
   "All_logs": "All logs",
   "All_messages": "All messages",
+  "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
   "Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs",
   "Allow_Invalid_SelfSigned_Certs_Description": "Allow invalid and self-signed SSL certificate's for link validation and previews.",
   "Allow_switching_departments": "Allow visitor to switch departments",
@@ -1223,6 +1224,7 @@
   "Offline_unavailable": "Offline unavailable",
   "On": "On",
   "Online": "Online",
+  "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages",
   "Only_On_Desktop": "Desktop mode (only sends with enter on desktop)",
   "Only_you_can_see_this_message": "Only you can see this message",
   "Oops!": "Oops",
diff --git a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
index 3ac6f55ef33..12672ef1335 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
@@ -31,7 +31,11 @@
 	}
 
 	& .rc-switch {
-		width: 50%;
+		width: 100%;
+
+		&:not(:last-child) {
+			margin-bottom: 2rem;
+		}
 	}
 
 	& .rc-input__icon-svg {
@@ -48,15 +52,3 @@
 		opacity: 1;
 	}
 }
-
-@media (width <= 400px) {
-	.create-channel {
-		& .rc-switch {
-			width: 100%;
-
-			&:not(:last-child) {
-				margin-bottom: 2rem;
-			}
-		}
-	}
-}
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html
index b90cf96c81d..f95e34efd19 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.html
+++ b/packages/rocketchat-ui/client/views/app/createChannel.html
@@ -20,7 +20,7 @@
 				</div>
 				<div class="rc-switch">
 					<label class="rc-switch__label">
-						<input type="checkbox" class="rc-switch__input" name="readOnly" {{readOnlyIsDisabled}}>
+						<input type="checkbox" class="rc-switch__input" name="readOnly">
 						<span class="rc-switch__button">
 							<span class="rc-switch__button-inside"></span>
 						</span>
@@ -28,6 +28,7 @@
 							{{_ "Read_only_channel"}}
 						</span>
 					</label>
+					<span class="rc-switch__description">{{readOnlyDescription}}</span>
 				</div>
 			</div>
 			<div class="create-channel__inputs">
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index f17ed50acaa..f8910a5f6fc 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -2,7 +2,7 @@ const acEvents = {
 	'click .rc-popup-list__item'(e, t) {
 		t.ac.onItemClick(this, e);
 	},
-	'keydown [name=users]'(e, t) {
+	'keydown [name="users"]'(e, t) {
 		if ([8, 46].includes(e.keyCode) && e.target.value === '') {
 			const users = t.selectedUsers;
 			const usersArr = users.get();
@@ -12,13 +12,13 @@ const acEvents = {
 
 		t.ac.onKeyDown(e);
 	},
-	'keyup [name=users]'(e, t) {
+	'keyup [name="users"]'(e, t) {
 		t.ac.onKeyUp(e);
 	},
-	'focus [name=users]'(e, t) {
+	'focus [name="users"]'(e, t) {
 		t.ac.onFocus(e);
 	},
-	'blur [name=users]'(e, t) {
+	'blur [name="users"]'(e, t) {
 		t.ac.onBlur(e);
 	}
 };
@@ -74,14 +74,14 @@ Template.createChannel.helpers({
 		const inUse = instance.inUse.get();
 		return invalid || inUse;
 	},
-	readOnlyIsDisabled() {
-		return 'disabled';
-	},
 	typeLabel() {
 		return t(Template.instance().type.get() === 'p' ? t('Private_Channel') : t('Public_Channel'));
 	},
 	typeDescription() {
-		return t(Template.instance().type.get() === 'p' ? t('Just_invited_people_can_access_this_channel'): t('Everyone_can_access_this_channel'));
+		return t(Template.instance().type.get() === 'p' ? t('Just_invited_people_can_access_this_channel') : t('Everyone_can_access_this_channel'));
+	},
+	readOnlyDescription() {
+		return t(Template.instance().readOnly.get() ? t('Only_authorized_users_can_write_new_messages') : t('All_users_in_the_channel_can_write_new_messages'));
 	},
 	createIsDisabled() {
 		const instance = Template.instance();
@@ -105,10 +105,13 @@ Template.createChannel.events({
 		const {username} = Blaze.getData(target);
 		t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
 	},
-	'change [name=type]'(e, t) {
+	'change [name="type"]'(e, t) {
 		t.type.set(e.target.checked ? e.target.value : 'd');
 	},
-	'input [name=users]'(e, t) {
+	'change [name="readOnly"]'(e, t) {
+		t.readOnly.set(e.target.checked);
+	},
+	'input [name="users"]'(e, t) {
 		const input = e.target;
 		const position = input.selectionEnd || input.selectionStart;
 		const length = input.value.length;
@@ -118,7 +121,7 @@ Template.createChannel.events({
 
 		t.userFilter.set(modified);
 	},
-	'input [name=name]'(e, t) {
+	'input [name="name"]'(e, t) {
 		const input = e.target;
 		const position = input.selectionEnd || input.selectionStart;
 		const length = input.value.length;
@@ -138,8 +141,8 @@ Template.createChannel.events({
 		e.stopPropagation();
 		const name = e.target.name.value;
 		const type = instance.type.get();
+		const readOnly = instance.readOnly.get();
 		const isPrivate = type === 'p';
-		const readOnly = false;//instance.find('#channel-ro').checked;
 
 		if (instance.invalid.get() || instance.inUse.get()) {
 			return e.target.name.focus();
@@ -169,8 +172,8 @@ Template.createChannel.events({
 Template.createChannel.onRendered(function() {
 	const users = this.selectedUsers;
 
-	this.firstNode.querySelector('[name=name]').focus();
-	this.ac.element = this.firstNode.querySelector('[name=users]');
+	this.firstNode.querySelector('[name="name"]').focus();
+	this.ac.element = this.firstNode.querySelector('[name="users"]');
 	this.ac.$element = $(this.ac.element);
 	this.ac.$element.on('autocompleteselect', function(e, {item}) {
 		const usersArr = users.get();
@@ -190,6 +193,7 @@ Template.createChannel.onCreated(function() {
 
 	this.name = new ReactiveVar('');
 	this.type = new ReactiveVar('p');
+	this.readOnly = new ReactiveVar(false);
 	this.inUse = new ReactiveVar(undefined);
 	this.invalid = new ReactiveVar(false);
 	this.userFilter = new ReactiveVar('');

From 5b3fd59c90716609785a7ad31461a2be0ffef1f7 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 22 Sep 2017 21:37:57 -0300
Subject: [PATCH 083/244] Merge pull request #8261 from
 RocketChat/fix-reply-rtl

[FIX] RTL on reply
---
 .../client/stylesheets/messageAttachments.css                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.css b/packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.css
index 440dec99ac1..fc3161698ef 100644
--- a/packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.css
+++ b/packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.css
@@ -1,4 +1,6 @@
 html.rtl .attachment {
+	direction: rtl;
+
 	& .attachment-block {
 		padding-right: 15px;
 		padding-left: 0;

From 8edaf1c8db6e798bc416d830bbbcca4d53125132 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 22 Sep 2017 21:12:04 -0300
Subject: [PATCH 084/244] Merge pull request #8262 from
 RocketChat/hover-mentions

[FIX] make sidebar item animation fast
---
 .../client/imports/components/sidebar/sidebar-item.css    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 5f4a68c14ef..8952a297ccb 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -28,6 +28,12 @@
 		background-color: var(--color-dark-light);
 	}
 
+	&--unread {
+		& .sidebar-item__menu {
+			transition: margin 0.1s;
+		}
+	}
+
 	&--darken {
 		&:hover {
 			background-color: var(--sidebar-item-darken-hover-background);
@@ -133,8 +139,6 @@
 		margin: 0 -15px;
 		padding: 6px;
 
-		transition: margin 0.2s 0.3s;
-
 		&-icon {
 			fill: var(--color-white);
 		}

From b5b6f48b449cefdf3223ac75a922cfdc6f117b99 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 22 Sep 2017 22:14:33 -0300
Subject: [PATCH 085/244] Merge pull request #8257 from RocketChat/hover-color

[FIX] sidenav colors, hide and leave, create channel on safari
---
 .../components/sidebar/sidebar-account.css    | 32 +++++------
 .../components/sidebar/sidebar-item.css       | 28 ++++++----
 .../imports/components/sidebar/toolbar.css    |  3 +-
 .../client/imports/general/variables.css      | 14 +++--
 .../client/accountBox.html                    |  2 +-
 .../client/sidebarItem.html                   | 10 ++--
 .../client/sidebarItem.js                     | 54 ++++++++-----------
 7 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 35913ae2059..18aefa7fb1c 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -1,3 +1,16 @@
+.sidebar-light {
+	& .sidebar__account-username {
+		color: var(--color-dark);
+	}
+
+	& .sidebar__account-menu {
+		fill: var(--color-dark);
+	}
+
+	& .sidebar__account.active:hover {
+		background-color: var(--sidebar-background-light-hover);
+	}
+}
 .sidebar__account {
 	display: flex;
 
@@ -7,26 +20,13 @@
 
 	align-items: center;
 
+	transition: background-color 0.3s;
+
 	&.active:hover {
 		cursor: pointer;
 
-		background-color: var(--sidebar-background-hover);
+		background-color: var(--sidebar-item-hover-background);
 	}
-
-	&--lighten {
-		& .sidebar__account-username {
-			color: var(--sidebar-account-username-color-darker);
-		}
-
-		& .sidebar__account-menu {
-			fill: var(--sidebar-account-username-color-darker);
-		}
-
-		&.active:hover {
-			background-color: var(--sidebar-background-light-hover);
-		}
-	}
-
 	&-thumb {
 
 		flex: 0 0 var(--sidebar-account-thumb-size);
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 8952a297ccb..0a1db558e83 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -1,7 +1,12 @@
-.rtl .sidebar-item {
-	margin: 0 8px 0 0;
-}
+.sidebar-light {
+	& .sidebar-item {
+		color: var(--color-dark);
 
+		&:hover {
+			background-color: var(--sidebar-background-light-hover);
+		}
+	}
+}
 .sidebar-item {
 	position: relative;
 
@@ -18,17 +23,26 @@
 	border-radius: var(--sidebar-item-radius);
 	align-items: center;
 
+	background-color: var(--sidebar-item-background);
+	color: var(--sidebar-item-text-color);
+
+	transition: all 0.3s;
+
 	&:hover {
+		background-color: var(--sidebar-item-hover-background);
+
 		& .sidebar-item__menu {
 			margin: 0;
 		}
 	}
 
 	&--active {
-		background-color: var(--color-dark-light);
+		background-color: var(--sidebar-item-active-background);
 	}
 
 	&--unread {
+    color: var(--sidebar-item-unread-color);
+
 		& .sidebar-item__menu {
 			transition: margin 0.1s;
 		}
@@ -59,14 +73,10 @@
 
 		margin: 0 -4px;
 
-		color: var(--sidebar-item-text-color);
+		color: inherit;
 
 		font-size: 1rem;
 		align-items: center;
-
-		&--active {
-			color: var(--sidebar-item-active-text-color);
-		}
 	}
 
 	& .badge {
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index 5717024106b..757e1e0d195 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -90,7 +90,8 @@
 	}
 
 	& .rc-button {
-		margin: 0 0.25rem;
+		margin-left: 0.25rem;
+		margin-right: 0.25rem;
 
 		color: var(--color-gray);
 		border-color: #414852;
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index f284709f940..e12f75dad3b 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -169,12 +169,16 @@
 	--sidebar-item-radius: 2px;
 	--sidebar-item-height: 32px;
 	--sidebar-item-thumb-size: 20px;
+
 	--sidebar-item-text-color: var(--color-gray);
-	--sidebar-item-lighten-hover-background: var(--color-dark-medium);
-	--sidebar-item-darken-hover-background: var(--color-gray-light);
-	--sidebar-item-darken-text-color: var(--color-dark);
-	--sidebar-item-active-background: var(--color-gray);
-	--sidebar-item-active-text-color: var(--color-white);
+	--sidebar-item-background: inherit;
+	--sidebar-item-hover-background: var(--color-darkest);
+
+	--sidebar-item-active-background: var(--color-dark-medium);
+	--sidebar-item-active-color: var(--sidebar-item-text-color);
+
+	--sidebar-item-unread-color: var(--color-white);
+
 	--sidebar-item-popup-background: var(--color-dark-medium);
 	--sidebar-item-user-status-size: 6px;
 	--sidebar-small-item-user-status-size: 4px;
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.html b/packages/rocketchat-ui-sidenav/client/accountBox.html
index 36f5a8246d4..9707b1cc04b 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.html
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.html
@@ -1,5 +1,5 @@
 <template name="accountBox">
-	<div class="sidebar__account {{#if lighten}}sidebar__account--lighten{{/if}} {{#unless isAnonymous}}active{{/unless}}" aria-label="{{_ "Account"}}" role="region">
+	<div class="sidebar__account {{#unless isAnonymous}}active{{/unless}}" aria-label="{{_ "Account"}}" role="region">
 		{{#with myUserInfo}}
 			{{#if username}}
 				<div class="sidebar__account-thumb" data-status='{{visualStatus}}'>
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 34cd13069b9..4f0ad5b36f4 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -1,5 +1,5 @@
 <template name="sidebarItem">
-	<li class="sidebar-item {{#if active}}sidebar-item--active{{else}}{{#if darken}}sidebar-item--darken{{else}}sidebar-item--lighten{{/if}}{{/if}} {{#if toolbar}}popup-item{{/if}}" data-id="{{_id}}">
+	<li class="sidebar-item {{#if unread}}sidebar-item--unread{{/if}} {{#if active}}sidebar-item--active{{/if}} {{#if toolbar}}popup-item{{/if}}" data-id="{{_id}}">
 		{{#if statusClass}}
 			<div class="sidebar-item__user-status sidebar-item__user-status--{{statusClass}}"></div>
 		{{/if}}
@@ -19,9 +19,11 @@
 			{{#if unread}}
 				<span class="badge badge--unread">{{unread}}</span>
 			{{/if}}
-			<div class="sidebar-item__menu">
-				{{> icon block="sidebar-item__menu-icon" icon="menu"}}
-			</div>
+			{{#if rid}}
+				<div class="sidebar-item__menu">
+					{{> icon block="sidebar-item__menu-icon" icon="menu"}}
+				</div>
+			{{/if}}
 		</a>
 	</li>
 </template>
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
index 730a8b38568..7505ffce3d4 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
@@ -1,47 +1,39 @@
 /* globals menu popover */
-
-Template.sidebarItem.helpers({
-	canLeave() {
-		const roomData = Session.get(`roomData${ this.rid }`);
-
-		if (!roomData) { return false; }
-
-		if (((roomData.cl != null) && !roomData.cl) || (roomData.t === 'd')) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-});
-
 Template.sidebarItem.events({
 	'click [data-id], click .sidebar-item__link'() {
 		return menu.close();
 	},
 	'click .sidebar-item__menu'(e) {
-		e.preventDefault();
+		const canLeave = () => {
+			const roomData = Session.get(`roomData${ this.rid }`);
+
+			if (!roomData) { return false; }
 
+			return !(((roomData.cl != null) && !roomData.cl) || (['d', 'l'].includes(roomData.t)));
+		};
+		e.preventDefault();
+		const items = [{
+			icon: 'eye-off',
+			name: t('Hide_room'),
+			type: 'sidebar-item',
+			id: 'hide'
+		}];
+		if (canLeave()) {
+			items.push({
+				icon: 'sign-out',
+				name: t('Leave_room'),
+				type: 'sidebar-item',
+				id: 'leave',
+				modifier: 'error'
+			});
+		}
 		const config = {
 			popoverClass: 'sidebar-item',
 			columns: [
 				{
 					groups: [
 						{
-							items: [
-								{
-									icon: 'eye-off',
-									name: t('Hide_room'),
-									type: 'sidebar-item',
-									id: 'hide'
-								},
-								{
-									icon: 'sign-out',
-									name: t('Leave_room'),
-									type: 'sidebar-item',
-									id: 'leave',
-									modifier: 'error'
-								}
-							]
+							items
 						}
 					]
 				}

From a080cf60bba0a7fa9a1c68332eb5e48203040dd9 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 22 Sep 2017 14:25:25 -0300
Subject: [PATCH 086/244] Merge pull request #8253 from
 vcapretz/fix-broken-link-readme

readme-file: fix broken link
# Conflicts:
#	README.md
---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b5a414fd2ac..99dbf62016e 100644
--- a/README.md
+++ b/README.md
@@ -17,11 +17,12 @@
 * [Deployment](#deployment)
    * [Snaps](#instant-server-installation-with-snaps)
    * [Layershift](#layershift)
-   * [Sandstorm.io](#sandstormio) 
-   * [DPlatform](#dplatform) 
+   * [Sandstorm.io](#sandstormio)
+   * [Yunohost.org](#yunohostorg)
+   * [DPlatform](#dplatform)
    * [IndieHosters](#indiehosters)
    * [Ubuntu 16.04](#ubuntu-1604)
-   * [Cloudron.io](#cloudronio) 
+   * [Cloudron.io](#cloudronio)
    * [Heroku](#heroku)
    * [Helm Kubernetes](#helm-kubernetes)
   * [Scalingo](#scalingo)
@@ -80,7 +81,7 @@ Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron]
 # Deployment
 
 ## Instant Server Installation with Snaps
- 
+
 Install Rocket.Chat in seconds on Linux (Ubuntu and others) with:
 
 ```
@@ -89,7 +90,7 @@ sudo snap install rocketchat-server
 
 [![Rocket.Chat Snap is recommended for Linux deployments](https://github.com/Sing-Li/bbug/raw/master/images/ubuntulogo.png)](https://uappexplorer.com/snap/ubuntu/rocketchat-server)
 
-Installing snaps is very quick.  By running that command you have your full Rocket.Chat server up and running.  Snaps are secure.  They are isolated with all of their dependencies.  Snaps also auto update when we release new versions. 
+Installing snaps is very quick.  By running that command you have your full Rocket.Chat server up and running.  Snaps are secure.  They are isolated with all of their dependencies.  Snaps also auto update when we release new versions.
 
 Our snap features a built-in reverse proxy that can request and maintain free letsencrypt SSL certificates. You can go from zero to a public-facing SSL-secured Rocket.Chat server in less than 5 minutes.
 
@@ -323,7 +324,7 @@ It is a great solution for communities and companies wanting to privately host t
 
 ## How it all started
 
-Read about [how it all started](http://osdelivers.blackducksoftware.com/2016/06/10/rocket-chat-hosted-chat-services/).
+Read about [how it all started](https://blog.blackducksoftware.com/rocket-chat-enabling-privately-hosted-chat-services).
 
 ## Awards
 [![InfoWorld Bossie Awards 2016 - Best Open Source Applications](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/bossie.png)](http://www.infoworld.com/article/3122000/open-source-tools/bossie-awards-2016-the-best-open-source-applications.html#slide4)

From a51e9922654dd2411d1ca0d81a1b7f6da1a3f668 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 22 Sep 2017 22:35:09 -0300
Subject: [PATCH 087/244] Bump version to 0.59.0-rc.8

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 30 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 1f9b8108a12..8be632f836a 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.7
+ENV RC_VERSION 0.59.0-rc.8
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 3a3c7eb072f..24630c8ce55 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.7"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.8"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 46c5008b751..979194b7626 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.7
+    RC_VERSION=0.59.0-rc.8
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 7a9ab9c6671..c7e3e8a1775 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,33 @@
+<a name="0.59.0-rc.8"></a>
+# 0.59.0-rc.8 (2017-09-23)
+
+
+### New Features
+
+- [#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) Enable read only channel creation
+
+
+### Bug Fixes
+
+- [#8241](https://github.com/RocketChat/Rocket.Chat/pull/8241) Api groups.files is always returning empty
+- [#8216](https://github.com/RocketChat/Rocket.Chat/pull/8216) Case insensitive SAML email check
+- [#8259](https://github.com/RocketChat/Rocket.Chat/pull/8259) clipboard and permalink on new popover
+- [#8262](https://github.com/RocketChat/Rocket.Chat/pull/8262) make sidebar item animation fast
+- [#8261](https://github.com/RocketChat/Rocket.Chat/pull/8261) RTL on reply
+- [#8257](https://github.com/RocketChat/Rocket.Chat/pull/8257) sidenav colors, hide and leave, create channel on safari
+- [#8252](https://github.com/RocketChat/Rocket.Chat/pull/8252) sidenav mentions on hover
+
+
+<details>
+<summary>Others</summary>
+
+- [#8244](https://github.com/RocketChat/Rocket.Chat/pull/8244) Disable perfect scrollbar
+- [#8243](https://github.com/RocketChat/Rocket.Chat/pull/8243) Fix `leave and hide` click, color and position
+- [#8253](https://github.com/RocketChat/Rocket.Chat/pull/8253) readme-file: fix broken link
+</details>
+
+
+
 <a name="0.59.0-rc.7"></a>
 # 0.59.0-rc.7 (2017-09-20)
 
diff --git a/package.json b/package.json
index 2ba892b215b..ec1c35419ea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.7",
+	"version": "0.59.0-rc.8",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 4bc674a7231..a930221d82e 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.7"
+	"version": "0.59.0-rc.8"
 }

From e0f82479af17cdb41855f7d28978c42d4b15bb98 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 23 Sep 2017 15:36:45 -0300
Subject: [PATCH 088/244] Merge pull request #8237 from matheusml/fix-8168

[FIX] Removing pipe and commas from custom emojis (#8168)
---
 .../server/methods/insertOrUpdateEmoji.js                    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js b/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
index b373348ef4b..ef7ad08401c 100644
--- a/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
+++ b/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
@@ -9,13 +9,10 @@ Meteor.methods({
 			throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', { method: 'insertOrUpdateEmoji', field: 'Name' });
 		}
 
-		//let nameValidation = new RegExp('^[0-9a-zA-Z-_+;.]+$');
-		//let aliasValidation = new RegExp('^[0-9a-zA-Z-_+;., ]+$');
-
 		//allow all characters except colon, whitespace, comma, >, <, &, ", ', /, \, (, )
 		//more practical than allowing specific sets of characters; also allows foreign languages
 		const nameValidation = /[\s,:><&"'\/\\\(\)]/;
-		const aliasValidation = /[:><&"'\/\\\(\)]/;
+		const aliasValidation = /[:><&\|"'\/\\\(\)]/;
 
 		//silently strip colon; this allows for uploading :emojiname: as emojiname
 		emojiData.name = emojiData.name.replace(/:/g, '');

From abc12dc2ef9ac70e52ebab7720d7ea600f0c754a Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 23 Sep 2017 15:23:04 -0300
Subject: [PATCH 089/244] Merge pull request #8266 from
 intwarehq/rtl-room-info-buttons

[FIX] "Channel Setting" buttons alignment in RTL
---
 .../client/stylesheets/channel-settings.css     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
index 1134444d829..973fadc683a 100644
--- a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
+++ b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
@@ -1,3 +1,19 @@
+html.rtl .flex-tab {
+  direction: rtl;
+
+  & .channel-settings {
+	& .editing {
+	  padding-right: 8px;
+	  padding-left: 80px;
+	}
+	& .buttons {
+	  right: auto;
+	  left: 1px;
+	  border-radius: 4px 0 0 4px;
+	}
+  }
+}
+
 .flex-tab {
 	& .channel-settings {
 		& ul {
@@ -36,7 +52,6 @@
 		& .editing {
 			margin: -2px 0 -1px -9px;
 			padding-right: 80px;
-
 			font-size: 14px;
 		}
 

From 929bada2a8b1b03f975edbd26c2cdae4fe52115f Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 23 Sep 2017 15:08:07 -0300
Subject: [PATCH 090/244] Merge pull request #8269 from
 intwarehq/some-translation-fix

[FIX] some placeholder and phrase traslation fix
# Conflicts:
#	packages/rocketchat-ui-account/client/accountProfile.html
---
 .../client/accountProfile.html                | 44 ++++++++++++-------
 .../client/views/app/createChannel.html       |  4 +-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index f0bad64077a..ecb9eb23407 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -14,7 +14,7 @@
 	<section class="preferences-page">
 		<header class="preferences-page__header">
 			{{> burger}}
-			<h2 style="flex: 1 1; white-space: nowrap;">{{_ "My Profile"}}</h2>
+			<h2 style="flex: 1 1; white-space: nowrap;">{{_ "My_profile"}}</h2>
 			<div class="content" style="text-align: end; max-width: 649px;  flex: 1 1 100%">
 				<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>{{_ "Save_changes"}}</button>
 			</div>
@@ -38,10 +38,10 @@
 									{{#if allowAvatarChange}}
 										{{#if suggestions.ready}}
 											<div class="rc-select-avatar__list">
-												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-initials" aria-label="Username initials">
+												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-initials" aria-label="{{_ "Username_initials" }}">
 													{{> avatar username=initialsUsername }}
 												</div>
-												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-upload" aria-label="upload file">
+												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-upload" aria-label="{{_ "Upload_file" }}">
 													<label class="rc-select-avatar__upload-label avatar" for="upload-avatar">
 														{{> icon block="rc-select-avatar__upload-icon" icon="upload"}}
 													</label>
@@ -64,7 +64,7 @@
 								<label class="rc-input__label">
 									<div class="rc-input__title">{{_ "Name"}}</div>
 									<div class="rc-input__wrapper">
-										<input type="text" class="rc-input__element" name="realname" id="realname" value="{{realname}}" >
+										<input type="text" class="rc-input__element" name="realname" id="realname" placeholder="{{_ "Name_Placeholder" }}" value="{{realname}}" >
 									</div>
 								</label>
 							</div>
@@ -76,7 +76,7 @@
 										<div class="rc-input__icon">
 											{{> icon block="rc-input__icon-svg" icon="at"}}
 										</div>
-										<input type="text" class="rc-input__element" name="username" id="username" value="{{username}}" {{ifThenElse canChange '' 'disabled'}}>
+										<input type="text" class="rc-input__element" name="username" id="username" placeholder="{{_ "Username_Placeholder" }}" value="{{username}}" {{ifThenElse canChange '' 'disabled'}}>
 									</div>
 								</label>
 								{{# unless canChange}}
@@ -96,15 +96,29 @@
 						<div class="rc-form-group rc-grid">
 							{{#with canChange=allowEmailChange}}
 							<div class="rc-input rc-w50 padded {{#if emailInvalid}}rc-input--error{{/if}}">
-									<label class="rc-input__label">
-										<div class="rc-input__title">{{_ "Email"}}</div>
-										<div class="rc-input__wrapper">
-											<input name="email" type="text" class="rc-input__element" placeholder="Type email" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
-										</div>
-									</label>
-									{{# unless canChange}}
-										<div class="rc-input__description">{{_ 'Email_Change_Disabled'}}</div>
-									{{/unless}}
+								<label class="rc-input__label">
+									<div class="rc-input__title">{{_ "Email"}}</div>
+									<div class="rc-input__wrapper">
+										<input name="email" type="text" class="rc-input__element" placeholder="{{_ "Email_Placeholder" }}" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
+										{{#unless emailVerified}}
+											<div class="rc-input__icon rc-input__icon--right">
+												{{> icon block="rc-input__icon-svg" icon="cross-circled"}}
+											</div>
+										{{else}}
+											<div class="rc-input__icon rc-input__icon--right">
+												{{> icon block="rc-input__icon-svg" icon="checkmark-circled"}}
+											</div>
+										{{/unless}}
+									</div>
+								</label>
+								{{#unless canChange}}
+									<div class="rc-input__description">{{_ 'Email_Change_Disabled'}}</div>
+								{{/unless}}
+								{{#unless emailVerified}}
+									<div class="rc-input__error">
+										<button class="rc-button rc-button--small" id="resend-verification-email">{{_ "Resend_verification_mail"}}</button>
+									</div>
+								{{/unless}}
 							</div>
 							{{/with}}
 							<div class="rc-input rc-w50 padded">
@@ -112,7 +126,7 @@
 									<label class="rc-input__label">
 										<div class="rc-input__title">{{_ "New_password"}}</div>
 										<div class="rc-input__wrapper">
-											<input name="password" type="password" class="rc-input__element" placeholder="Type new password"  autocomplete="new-password" {{ifThenElse canChange '' 'disabled'}}>
+											<input name="password" type="password" class="rc-input__element" placeholder="{{_ "New_Password_Placeholder"}}"  autocomplete="new-password" {{ifThenElse canChange '' 'disabled'}}>
 										</div>
 									</label>
 									{{# unless canChange}}
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html
index f95e34efd19..23b9e787f07 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.html
+++ b/packages/rocketchat-ui/client/views/app/createChannel.html
@@ -39,7 +39,7 @@
 							<div class="rc-input__icon">
 								{{> icon block="rc-input__icon-svg" icon=iconType }}
 							</div>
-							<input name="name" type="text" class="rc-input__element" placeholder="Type channel name" autofocus>
+							<input name="name" type="text" class="rc-input__element" placeholder="{{_ "Channel_Name_Placeholder"}}" autofocus>
 						</div>
 					</label>
 					{{!--<div class="rc-input__description">Names must be all lower case and shorter than 22 characters</div>--}}
@@ -63,7 +63,7 @@
 								{{#each user in selectedUsers}}
 									{{> tag user}}
 								{{/each}}
-								<input type="text" class="rc-tags__input" placeholder="{{_ "username"}}" name="users" autocomplete="off"/>
+								<input type="text" class="rc-tags__input" placeholder="{{_ "Username_Placeholder"}}" name="users" autocomplete="off"/>
 							</div>
 						</div>
 						{{#with config}}

From 5a5026e144a2cf191f783b3b5f79340ab334a7d7 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 23 Sep 2017 15:42:11 -0300
Subject: [PATCH 091/244] Merge pull request #8270 from Rzeszow/develop

[FIX] [i18n] My Profile & README.md links
# Conflicts:
#	README.md
---
 README.md                                                 | 7 +++++--
 packages/rocketchat-ui-account/client/accountProfile.html | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 99dbf62016e..fd36c88f39e 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
 * [Desktop apps](#desktop-apps)
 * [Deployment](#deployment)
    * [Snaps](#instant-server-installation-with-snaps)
+   * [RocketChatLauncher](#rocketchatlauncher)
    * [Layershift](#layershift)
    * [Sandstorm.io](#sandstormio)
    * [Yunohost.org](#yunohostorg)
@@ -63,12 +64,14 @@ Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.ch
 Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
 
 
-# Native Mobile Apps
+# Mobile Apps
+
+## Native Mobile Apps
 *Note: currently the native apps doesn't support all the features that web does. If you're looking for it, you should download the Cordova apps.*
 
 [![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=chat.rocket.android)
 
-# Hybrid Mobile Apps (Cordova)
+## Hybrid Mobile Apps (Cordova)
 
 [![Rocket.Chat on Apple AppStore](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
 
diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index ecb9eb23407..9c0afbffa06 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -14,7 +14,7 @@
 	<section class="preferences-page">
 		<header class="preferences-page__header">
 			{{> burger}}
-			<h2 style="flex: 1 1; white-space: nowrap;">{{_ "My_profile"}}</h2>
+			<h2 style="flex: 1 1; white-space: nowrap;">{{_ "Profile"}}</h2>
 			<div class="content" style="text-align: end; max-width: 649px;  flex: 1 1 100%">
 				<button class="rc-button rc-button--primary" name="send" type="submit" data-button="create" form="profile" {{canSave 'disabled'}}>{{_ "Save_changes"}}</button>
 			</div>

From 12218872569c901c790b2f2a8fb0cfa015114b7c Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 23 Sep 2017 17:01:59 -0300
Subject: [PATCH 092/244] Merge pull request #8271 from
 intwarehq/fix-attachment-icons-alignment

[FIX] Attachment icons alignment in LTR and RTL
---
 .../client/imports/general/base_old.css                | 10 +++++-----
 .../rocketchat-theme/client/imports/general/rtl.css    |  9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index d5d378fb839..964f48eede2 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3752,6 +3752,11 @@ body:not(.is-cordova) {
 	}
 
 	&.uploaded-files-list {
+	  	& ul {
+		  & li {
+			margin-bottom: 10px;
+		  }
+		}
 		& a .file-name {
 			display: block;
 
@@ -3777,19 +3782,14 @@ body:not(.is-cordova) {
 
 		& i {
 			float: left;
-
 			margin-right: 10px;
 
 			&.file-delete {
 				float: right;
-
-				padding-top: 10px;
 			}
 
 			&.file-download {
 				float: right;
-
-				padding-top: 11px;
 			}
 		}
 	}
diff --git a/packages/rocketchat-theme/client/imports/general/rtl.css b/packages/rocketchat-theme/client/imports/general/rtl.css
index c3c66aacbd7..9d18175910f 100644
--- a/packages/rocketchat-theme/client/imports/general/rtl.css
+++ b/packages/rocketchat-theme/client/imports/general/rtl.css
@@ -669,9 +669,16 @@
 
 			& i {
 				float: right;
-
 				margin-right: auto;
 				margin-left: 10px;
+
+				&.file-delete {
+				  float: left;
+				}
+
+				&.file-download {
+				  float: left;
+				}
 			}
 		}
 	}

From 6663d0a8414f3ef49cbf12c32ce37305df8f4e3c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 12:59:53 -0300
Subject: [PATCH 093/244] Merge pull request #8273 from
 RocketChat/meteor-update

Deps update
---
 .meteor/versions                              |  4 +--
 package.json                                  | 10 +++----
 .../.npm/package/npm-shrinkwrap.json          | 12 ++++----
 .../rocketchat-livechat/app/.meteor/versions  |  4 +--
 .../rocketchat-ui/.npm/package/.gitignore     |  1 +
 packages/rocketchat-ui/.npm/package/README    |  7 +++++
 .../.npm/package/npm-shrinkwrap.json          | 29 +++++++++++++++++++
 7 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 packages/rocketchat-ui/.npm/package/.gitignore
 create mode 100644 packages/rocketchat-ui/.npm/package/README
 create mode 100644 packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json

diff --git a/.meteor/versions b/.meteor/versions
index b861fe402cd..61b6df76fa6 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.2
+accounts-base@1.3.3
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0
@@ -26,7 +26,7 @@ coffeescript@1.12.7_1
 coffeescript-compiler@1.12.7_1
 dandv:caret-position@2.1.1
 ddp@1.3.1
-ddp-client@2.1.2
+ddp-client@2.1.3
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
 ddp-server@2.0.2
diff --git a/package.json b/package.json
index ec1c35419ea..1c31dd850d4 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
 		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.50.0",
 		"conventional-changelog-cli": "^1.3.3",
-		"eslint": "^4.7.1",
+		"eslint": "^4.7.2",
 		"mock-require": "^2.0.2",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
@@ -103,13 +103,13 @@
 		"underscore.string": "^3.3.4"
 	},
 	"dependencies": {
-		"@google-cloud/storage": "^1.2.1",
-		"aws-sdk": "^2.118.0",
+		"@google-cloud/storage": "^1.3.0",
+		"aws-sdk": "^2.122.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
-		"codemirror": "^5.29.0",
+		"codemirror": "^5.30.0",
 		"emailreplyparser": "0.0.5",
-		"file-type": "^6.1.0",
+		"file-type": "^6.2.0",
 		"highlight.js": "^9.12.0",
 		"imap": "^0.8.19",
 		"jquery": "^3.2.1",
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 070d577237f..2d20406f861 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -263,8 +263,8 @@
       "from": "fs.realpath@>=1.0.0 <2.0.0"
     },
     "gcp-metadata": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.0.tgz",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
       "from": "gcp-metadata@>=0.3.0 <0.4.0",
       "dependencies": {
         "retry-request": {
@@ -275,8 +275,8 @@
       }
     },
     "gcs-resumable-upload": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.1.tgz",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
       "from": "gcs-resumable-upload@>=0.8.0 <0.9.0"
     },
     "getpass": {
@@ -1316,8 +1316,8 @@
       "from": "through2@>=2.0.0 <3.0.0"
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
       "from": "tough-cookie@>=2.3.2 <2.4.0"
     },
     "tunnel-agent": {
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index 753859defef..dee2f5b195c 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.2
+accounts-base@1.3.3
 accounts-password@1.4.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.9
@@ -17,7 +17,7 @@ check@1.2.5
 coffeescript@1.12.7_1
 coffeescript-compiler@1.12.7_1
 ddp@1.3.1
-ddp-client@2.1.2
+ddp-client@2.1.3
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
 ddp-server@2.0.2
diff --git a/packages/rocketchat-ui/.npm/package/.gitignore b/packages/rocketchat-ui/.npm/package/.gitignore
new file mode 100644
index 00000000000..3c3629e647f
--- /dev/null
+++ b/packages/rocketchat-ui/.npm/package/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/packages/rocketchat-ui/.npm/package/README b/packages/rocketchat-ui/.npm/package/README
new file mode 100644
index 00000000000..3d492553a43
--- /dev/null
+++ b/packages/rocketchat-ui/.npm/package/README
@@ -0,0 +1,7 @@
+This directory and the files immediately inside it are automatically generated
+when you change this package's NPM dependencies. Commit the files in this
+directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
+so that others run the same versions of sub-dependencies.
+
+You should NOT check in the node_modules directory that Meteor automatically
+creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json
new file mode 100644
index 00000000000..00d02c6b242
--- /dev/null
+++ b/packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json
@@ -0,0 +1,29 @@
+{
+  "dependencies": {
+    "clipboard": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz",
+      "from": "clipboard@1.7.1"
+    },
+    "delegate": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz",
+      "from": "delegate@>=3.1.2 <4.0.0"
+    },
+    "good-listener": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "from": "good-listener@>=1.2.2 <2.0.0"
+    },
+    "select": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "from": "select@>=1.1.2 <2.0.0"
+    },
+    "tiny-emitter": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
+      "from": "tiny-emitter@>=2.0.0 <3.0.0"
+    }
+  }
+}

From 9543632daa60801c80200d95b9d7b68cba856365 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sun, 24 Sep 2017 10:55:47 -0300
Subject: [PATCH 094/244] Merge pull request #8278 from
 intwarehq/rtl-modal-cancel-button

[FIX] "Cancel button" on modal in RTL in Firefox 55
---
 .../client/imports/components/modal/full-modal.css             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
index 55516a09b9c..1eb2a86ac72 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
@@ -60,7 +60,8 @@
 
 .rtl .full-modal {
 	&__back-button {
-		left: 0
+	  right: auto;
+	  left: 0;
 	}
 
 	&__back-text {

From cb8fa8fe6d55265c06c4582d2064e154fe430490 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 09:16:07 -0300
Subject: [PATCH 095/244] Merge pull request #8282 from RocketChat/hover-color

fix color on unread messages
---
 .../imports/components/sidebar/sidebar-item.css    | 14 --------------
 .../rocketchat-ui-sidenav/client/chatRoomItem.js   |  6 +-----
 .../rocketchat-ui-sidenav/client/sidebarItem.html  |  4 ++--
 .../rocketchat-ui-sidenav/client/sidebarItem.js    |  6 ++++++
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 0a1db558e83..2e2368783b6 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -48,20 +48,6 @@
 		}
 	}
 
-	&--darken {
-		&:hover {
-			background-color: var(--sidebar-item-darken-hover-background);
-		}
-
-		& .sidebar-item__link {
-			color: var(--sidebar-item-darken-text-color);
-		}
-	}
-
-	&--lighten:hover {
-		background-color: var(--sidebar-item-lighten-hover-background);
-	}
-
 	&__popup-active {
 		background-color: var(--sidebar-item-popup-background);
 	}
diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
index 8cf4df405cd..cc8dabdce6e 100644
--- a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
+++ b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
@@ -19,10 +19,7 @@ Template.chatRoomItem.helpers({
 
 		const archivedClass = this.archived ? 'archived' : false;
 
-		let alertClass = false;
-		if (!this.hideUnreadStatus && (FlowRouter.getParam('_id') !== this.rid || !document.hasFocus()) && this.alert) {
-			alertClass = 'sidebar-item__link--active';
-		}
+		this.alert = !this.hideUnreadStatus && (FlowRouter.getParam('_id') !== this.rid || !document.hasFocus()) && this.alert;
 
 		const icon = RocketChat.roomTypes.getIcon(this.t);
 		const avatar = !icon;
@@ -37,7 +34,6 @@ Template.chatRoomItem.helpers({
 			unread,
 			active,
 			archivedClass,
-			alertClass,
 			statusClass: this.t === 'd' ? Session.get(`user_${ this.name }_status`) || 'offline' : this.t === 'l' ? RocketChat.roomTypes.getUserStatus(this.t, this.rid) || 'offline' : false
 		};
 	}
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 4f0ad5b36f4..3eeb96ea2d7 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -1,9 +1,9 @@
 <template name="sidebarItem">
-	<li class="sidebar-item {{#if unread}}sidebar-item--unread{{/if}} {{#if active}}sidebar-item--active{{/if}} {{#if toolbar}}popup-item{{/if}}" data-id="{{_id}}">
+	<li class="sidebar-item {{#if or unread alert }}sidebar-item--unread{{/if}} {{#if active}}sidebar-item--active{{/if}} {{#if toolbar}}popup-item{{/if}}" data-id="{{_id}}">
 		{{#if statusClass}}
 			<div class="sidebar-item__user-status sidebar-item__user-status--{{statusClass}}"></div>
 		{{/if}}
-		<a class="sidebar-item__link {{alertClass}} {{#if active}}sidebar-item__link--active{{/if}}" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
+		<a class="sidebar-item__link" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
 			<div class="sidebar-item__picture">
 				{{#if icon}}
 					{{> icon block="sidebar-item__icon" icon=icon}}
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
index 7505ffce3d4..84b20d41dcf 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
@@ -1,4 +1,10 @@
 /* globals menu popover */
+Template.sidebarItem.helpers({
+	or(...args) {
+		args.pop();
+		return args.some(arg => arg);
+	}
+});
 Template.sidebarItem.events({
 	'click [data-id], click .sidebar-item__link'() {
 		return menu.close();

From 9ef9376db45e498f594086ecb01262dcfad47ee1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 09:15:31 -0300
Subject: [PATCH 096/244] Merge pull request #8286 from
 RocketChat/added-placeholder-translatoins

[FIX] Missing placeholder translations
---
 packages/rocketchat-i18n/i18n/en.i18n.json | 619 +++++++++++----------
 1 file changed, 312 insertions(+), 307 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index e17f106f876..71ffa15e24f 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -12,6 +12,10 @@
   "Accept": "Accept",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Accept incoming livechat requests even if there are no online agents",
   "Accept_with_no_online_agents": "Accept with no online agents",
+  "access-mailer": "Access Mailer Screen",
+  "access-mailer_description": "Permission to send mass email to all users.",
+  "access-permissions": "Access Permissions Screen",
+  "access-permissions_description": "Modify permissions for various roles.",
   "Access_not_authorized": "Access not authorized",
   "Access_Token_URL": "Access Token URL",
   "Accessing_permissions": "Accessing permissions",
@@ -96,6 +100,8 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor Callback URL",
   "Accounts_OAuth_Meteor_id": "Meteor Id",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_host": "Proxy Host",
+  "Accounts_OAuth_Proxy_services": "Proxy Services",
   "Accounts_OAuth_Twitter": "Twitter Login",
   "Accounts_OAuth_Twitter_callback_url": "Twitter Callback URL",
   "Accounts_OAuth_Twitter_id": "Twitter Id",
@@ -105,8 +111,6 @@
   "Accounts_OAuth_Wordpress_id": "WordPress Id",
   "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "Password Reset",
-  "Accounts_OAuth_Proxy_host": "Proxy Host",
-  "Accounts_OAuth_Proxy_services": "Proxy Services",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Default Roles for Authentication Services",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Default roles (comma-separated) users will be given when registering through authentication services",
   "Accounts_Registration_AuthenticationServices_Enabled": "Registration with Authentication Services",
@@ -131,6 +135,16 @@
   "Activate": "Activate",
   "Activity": "Activity",
   "Add": "Add",
+  "add-oauth-service": "Add Oauth Service",
+  "add-oauth-service_description": "Permission to add a new Oauth service",
+  "add-user": "Add User",
+  "add-user-to-any-c-room": "Add User to Any Public Channel",
+  "add-user-to-any-c-room_description": "Permission to add a user to any public channel",
+  "add-user-to-any-p-room": "Add User to Any Private Channel",
+  "add-user-to-any-p-room_description": "Permission to add a user to any private channel",
+  "add-user-to-joined-room": "Add User to Any Joined Channel",
+  "add-user-to-joined-room_description": "Permission to add a user to a currently joined channel",
+  "add-user_description": "Permission to add new users to the server via users screen",
   "Add_agent": "Add agent",
   "Add_custom_oauth": "Add custom oauth",
   "Add_Domain": "Add Domain",
@@ -184,8 +198,8 @@
   "API_Drupal_URL": "Drupal Server URL",
   "API_Drupal_URL_Description": "Example: https://domain.com (excluding trailing slash)",
   "API_Embed": "Embed Link Previews",
-  "API_Embed_UserAgent": "Embed request user agent",
   "API_Embed_Description": "Whether embedded link previews are enabled or not when a user posts a link to a website.",
+  "API_Embed_UserAgent": "Embed request user agent",
   "API_EmbedCacheExpirationDays": "Embed cache expiration days",
   "API_EmbedDisabledFor": "Disable Embed for Users",
   "API_EmbedDisabledFor_Description": "Comma-separated list of usernames to disable the embedded link previews.",
@@ -216,24 +230,31 @@
   "Application_updated": "Application updated",
   "Apply_and_refresh_all_clients": "Apply and refresh all clients",
   "Archive": "Archive",
+  "archive-room": "Archive Room",
+  "archive-room_description": "Permission to archive a channel",
   "are_also_typing": "are also typing",
   "are_typing": "are typing",
   "Are_you_sure": "Are you sure?",
   "Are_you_sure_you_want_to_delete_your_account": "Are you sure you want to delete your account?",
+  "assign-admin-role": "Assign Admin Role",
+  "assign-admin-role_description": "Permission to assign the admin role to other users",
   "Assign_admin": "Assigning admin",
   "at": "at",
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "File Uploaded",
   "Attribute_handling": "Attribute handling",
   "Audio_message": "Audio message",
-  "Audio_Notifications_Value": "Default message notification audio",
   "Audio_Notification_Value_Description": "Can be any custom sound or the default ones: beep, chelle, ding, droplet, highbell, seasons",
   "Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
+  "Audio_Notifications_Value": "Default message notification audio",
   "Auth_Token": "Auth Token",
   "Author": "Author",
   "Authorization_URL": "Authorization URL",
   "Authorize": "Authorize",
+  "auto-translate": "Auto Translate",
+  "auto-translate_description": "Permission to use the auto translate tool",
   "Auto_Load_Images": "Auto Load Images",
+  "Auto_Translate": "Auto-Translate",
   "AutoLinker_Email": "AutoLinker Email",
   "AutoLinker_Phone": "AutoLinker Phone",
   "AutoLinker_Phone_Description": "Automatically linked for Phone numbers. e.g. `(123)456-7890`",
@@ -244,10 +265,9 @@
   "AutoLinker_Urls_www": "AutoLinker 'www' URLs",
   "AutoLinker_UrlsRegExp": "AutoLinker URL Regular Expression",
   "Automatic_Translation": "Automatic Translation",
-  "Auto_Translate": "Auto-Translate",
+  "AutoTranslate_Change_Language_Description": "Changing the auto-translate language does not translate previous messages.",
   "AutoTranslate_Enabled": "Enable Auto-Translate",
   "AutoTranslate_Enabled_Description": "Enabling auto-translation will allow people with the <code class=\"inline\">auto-translate</code> permission to have all messages automatically translated into their selected language. Fees may apply, see <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">Google's Documentation</a>",
-  "AutoTranslate_Change_Language_Description": "Changing the auto-translate language does not translate previous messages.",
   "AutoTranslate_GoogleAPIKey": "Google API Key",
   "Available": "Available",
   "Available_agents": "Available agents",
@@ -264,11 +284,13 @@
   "Back": "Back",
   "Back_to_applications": "Back to applications",
   "Back_to_chat": "Back to chat",
-  "Back_to_integrations": "Back to integrations",
   "Back_to_integration_detail": "Back to the integration detail",
+  "Back_to_integrations": "Back to integrations",
   "Back_to_login": "Back to login",
   "Back_to_permissions": "Back to permissions",
   "Backup_codes": "Backup codes",
+  "ban-user": "Ban User",
+  "ban-user_description": "Permission to ban a user from a channel",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta feature. Depends on Video Conference to be enabled.",
   "Block_User": "Block User",
   "Body": "Body",
@@ -279,6 +301,10 @@
   "Branch": "Branch",
   "Broadcast_Connected_Instances": "Broadcast Connected Instances",
   "Bugsnag_api_key": "Bugsnag API Key",
+  "bulk-create-c": "Bulk Create Channels",
+  "bulk-create-c_description": "Permission to create channels in bulk",
+  "bulk-register-user": "Bulk Create Channels",
+  "bulk-register-user_description": "Permission to create channels in bulk",
   "busy": "busy",
   "Busy": "Busy",
   "busy_female": "busy",
@@ -286,7 +312,6 @@
   "busy_male": "busy",
   "Busy_male": "Busy",
   "by": "by",
-  "Content": "Content",
   "cache_cleared": "Cache cleared",
   "Cancel": "Cancel",
   "Cancel_message_input": "Cancel",
@@ -312,22 +337,23 @@
   "CAS_version_Description": "Only use a supported CAS version supported by your CAS SSO service.",
   "CDN_PREFIX": "CDN Prefix",
   "Certificates_and_Keys": "Certificates and Keys",
-  "Changing_email": "Changing email",
   "Change_Room_Type": "Changing the Room Type",
+  "Changing_email": "Changing email",
   "channel": "channel",
   "Channel": "Channel",
   "Channel_already_exist": "The channel `#%s` already exists.",
   "Channel_already_exist_static": "The channel already exists.",
-  "Channel_created": "Channel `#%s` created.",
   "Channel_already_Unarchived": "Channel with name `#%s` is already in Unarchived state",
   "Channel_Archived": "Channel with name `#%s` has been archived successfully",
+  "Channel_created": "Channel `#%s` created.",
   "Channel_doesnt_exist": "The channel `#%s` does not exist.",
   "Channel_name": "Channel name",
+  "Channel_Name_Placeholder": "Please enter channel name...",
   "Channel_to_listen_on": "Channel to listen on",
   "Channel_Unarchived": "Channel with name `#%s` has been Unarchived successfully",
   "Channels": "Channels",
-  "Channels_list": "List of public channels",
   "Channels_are_where_your_team_communicate": "Channels are where your team communicate.",
+  "Channels_list": "List of public channels",
   "Chat_button": "Chat button",
   "Chat_closed": "Chat closed",
   "Chat_closed_successfully": "Chat closed successfully",
@@ -340,19 +366,23 @@
   "Choose_messages": "Choose messages",
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Choose the alias that will appear before the username in messages.",
   "Choose_the_username_that_this_integration_will_post_as": "Choose the username that this integration will post as.",
+  "clean-channel-history": "Clean Channel History",
+  "clean-channel-history_description": "Permission to Clear the history from channels",
   "clear": "Clear",
+  "Clear_all_unreads_question": "Clear all unreads?",
   "clear_cache_now": "Clear cache now",
   "clear_history": "Clear History",
-  "Clear_all_unreads_question": "Clear all unreads?",
   "Click_here": "Click here",
   "Click_here_for_more_info": "Click here for more info",
-  "UI_Click_Direct_Message": "Click to Create Direct Message",
-  "UI_Click_Direct_Message_Description": "Skip opening profile tab, instead go straight to conversation",
   "Client_ID": "Client ID",
   "Client_Secret": "Client Secret",
   "Clients_will_refresh_in_a_few_seconds": "Clients will refresh in a few seconds",
   "close": "close",
   "Close": "Close",
+  "close-livechat-room": "Close Livechat Room",
+  "close-livechat-room_description": "Permission to close the current LiveChat channel",
+  "close-others-livechat-room": "Close Livechat Room",
+  "close-others-livechat-room_description": "Permission to close other LiveChat channels",
   "Closed": "Closed",
   "Closed_by_visitor": "Closed by visitor",
   "Closing_chat": "Closing chat",
@@ -362,6 +392,7 @@
   "Comment_to_leave_on_closing_session": "Comment to leave on closing session",
   "Compact": "Compact",
   "Confirm_password": "Confirm your password",
+  "Content": "Content",
   "Conversation": "Conversation",
   "Conversation_closed": "Conversation closed: __comment__.",
   "Convert_Ascii_Emojis": "Convert ASCII to Emoji",
@@ -372,13 +403,21 @@
   "Count": "Count",
   "Cozy": "Cozy",
   "Create": "Create",
+  "create-c": "Create Public Channels",
+  "create-c_description": "Permission to create public channels",
+  "create-d": "Create Direct Messages",
+  "create-d_description": "Permission to start direct messages",
+  "create-p": "Create Private Channels",
+  "create-p_description": "Permission to create private channels",
+  "create-user": "Create User",
+  "create-user_description": "Permission to create users",
   "Create_A_New_Channel": "Create a New Channel",
   "Create_new": "Create new",
   "Created_at": "Created at",
   "Created_at_s_by_s": "Created at <strong>%s</strong> by <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "Created at <strong>%s</strong> by <strong>%s</strong> triggered by <strong>%s</strong>",
-  "CROWD_Reject_Unauthorized": "Reject Unauthorized",
   "CRM_Integration": "CRM Integration",
+  "CROWD_Reject_Unauthorized": "Reject Unauthorized",
   "Current_Chats": "Current Chats",
   "Current_Status": "Current Status",
   "Custom": "Custom",
@@ -394,10 +433,9 @@
   "Custom_Fields": "Custom Fields",
   "Custom_oauth_helper": "When setting up your OAuth Provider, you'll have to inform a Callback URL. Use <pre>%s</pre> .",
   "Custom_oauth_unique_name": "Custom oauth unique name",
-  "Custom_Scripts": "Custom Scripts",
   "Custom_Script_Logged_In": "Custom Script for logged in users",
   "Custom_Script_Logged_Out": "Custom Script for logged out users",
-  "Custom_Sounds": "Custom Sounds",
+  "Custom_Scripts": "Custom Scripts",
   "Custom_Sound_Add": "Add Custom Sound",
   "Custom_Sound_Delete_Warning": "Deleting a sound cannot be undone.",
   "Custom_Sound_Error_Invalid_Sound": "Invalid sound",
@@ -405,6 +443,7 @@
   "Custom_Sound_Has_Been_Deleted": "The custom sound has been deleted.",
   "Custom_Sound_Info": "Custom Sound Info",
   "Custom_Sound_Saved_Successfully": "Custom sound saved successfully",
+  "Custom_Sounds": "Custom Sounds",
   "Custom_Translations": "Custom Translations",
   "Custom_Translations_Description": "Should be a valid JSON where keys are languages containing a dictionary of key and translations. Example:<br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"pt\": {\n  \"Channels\": \"Salas\"\n }\n}</code> ",
   "CustomSoundsFilesystem": "Custom Sounds Filesystem",
@@ -419,6 +458,16 @@
   "Decline": "Decline",
   "Default": "Default",
   "Delete": "Delete",
+  "delete-c": "Delete Public Channels",
+  "delete-c_description": "Permission to delete public channels",
+  "delete-d": "Delete Direct Messages",
+  "delete-d_description": "Permission to delete direct messages",
+  "delete-message": "Delete Message",
+  "delete-message_description": "Permission to delete a message within a room",
+  "delete-p": "Delete Private Channels",
+  "delete-p_description": "Permission to delete private channels",
+  "delete-user": "Delete User",
+  "delete-user_description": "Permission to delete users",
   "Delete_message": "Delete message",
   "Delete_my_account": "Delete my account",
   "Delete_Room_Warning": "Deleting a room will delete all messages posted within the room. This cannot be undone.",
@@ -447,15 +496,15 @@
   "Direct_Reply_Enable": "Enable Direct Reply",
   "Direct_Reply_Frequency": "Email Check Frequency",
   "Direct_Reply_Frequency_Description": "(in minutes, default/minimum 2)",
-  "Direct_Reply_Protocol": "Direct Reply Protocol",
   "Direct_Reply_Host": "Direct Reply Host",
-  "Direct_Reply_Port": "Direct_Reply_Port",
   "Direct_Reply_IgnoreTLS": "IgnoreTLS",
-  "Direct_Reply_Username": "Username",
-  "Direct_Reply_Username_Description": "Please use absolute email, tagging is not allowed, it would be over-written",
   "Direct_Reply_Password": "Password",
+  "Direct_Reply_Port": "Direct_Reply_Port",
+  "Direct_Reply_Protocol": "Direct Reply Protocol",
   "Direct_Reply_Separator": "Separator",
   "Direct_Reply_Separator_Description": "[Alter only if you know exactly what you are doing, refer docs]<br/>Separator between base & tag part of email",
+  "Direct_Reply_Username": "Username",
+  "Direct_Reply_Username_Description": "Please use absolute email, tagging is not allowed, it would be over-written",
   "Disable_Notifications": "Disable Notifications",
   "Disable_two-factor_authentication": "Disable two-factor authentication",
   "Display_offline_form": "Display offline form",
@@ -465,6 +514,7 @@
   "Domain_added": "domain Added",
   "Domain_removed": "Domain Removed",
   "Domains": "Domains",
+  "Domains_allowed_to_embed_the_livechat_widget": "Comma-separated list of domains allowed to embed the livechat widget. Leave blank to allow all domains.",
   "Download_Snippet": "Download",
   "Drop_to_upload_file": "Drop to upload file",
   "Dry_run": "Dry run",
@@ -475,8 +525,21 @@
   "Duplicate_private_group_name": "A Private Group with name '%s' exists",
   "Duration": "Duration",
   "Edit": "Edit",
+  "edit-message": "Edit Message",
+  "edit-message_description": "Permission to edit a message within a room",
+  "edit-other-user-active-status": "Edit Other User Active Status",
+  "edit-other-user-active-status_description": "Permission to enable or disable other accounts",
+  "edit-other-user-info": "Edit Other User Information",
+  "edit-other-user-info_description": "Permission to change other user’s name, username or email address.",
+  "edit-other-user-password": "Edit Other User Password",
+  "edit-other-user-password_description": "Permission to modify other user’s passwords. Requires edit-other-user-info permission.",
+  "edit-privileged-setting": "Edit privileged Setting",
+  "edit-privileged-setting_description": "Permission to edit settings",
+  "edit-room": "Edit Room",
+  "edit-room_description": "Permission to edit a room’s name, topic, type (private or public status) and status (active or archived)",
   "Edit_Custom_Field": "Edit Custom Field",
   "Edit_Department": "Edit Department",
+  "Edit_previous_message": "`%s` - Edit previous message",
   "Edit_Trigger": "Edit Trigger",
   "edited": "edited",
   "Editing_room": "Editing room",
@@ -493,6 +556,7 @@
   "Email_Notification_Mode_All": "Every Mention/DM",
   "Email_Notification_Mode_Disabled": "Disabled",
   "Email_or_username": "Email or username",
+  "Email_Placeholder": "Please enter your email address...",
   "Email_subject": "Subject",
   "Email_verified": "Email verified",
   "Emoji": "Emoji",
@@ -500,24 +564,22 @@
   "Empty_title": "Empty title",
   "Enable": "Enable",
   "Enable_Desktop_Notifications": "Enable Desktop Notifications",
+  "Enable_Svg_Favicon": "Enable SVG favicon",
   "Enable_two-factor_authentication": "Enable two-factor authentication",
   "Enabled": "Enabled",
-  "Enable_Svg_Favicon": "Enable SVG favicon",
   "Encrypted_message": "Encrypted message",
   "End_OTR": "End OTR",
-  "Enter_authentication_code": "Enter authentication code",
-  "Enter_Alternative": "Alternative mode (send with Enter + Ctrl/Alt/Shift/CMD)",
   "Enter_a_regex": "Enter a regex",
   "Enter_a_room_name": "Enter a room name",
   "Enter_a_username": "Enter a username",
+  "Enter_Alternative": "Alternative mode (send with Enter + Ctrl/Alt/Shift/CMD)",
+  "Enter_authentication_code": "Enter authentication code",
   "Enter_Behaviour": "Enter key Behaviour",
   "Enter_Behaviour_Description": "This changes if the enter key will send a message or do a line break",
   "Enter_name_here": "Enter name here",
   "Enter_Normal": "Normal mode (send with Enter)",
   "Enter_to": "Enter to",
   "Error": "Error",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server",
   "error-action-not-allowed": "__action__ is not allowed",
   "error-application-not-found": "Application not found",
   "error-archived-duplicate-name": "There's an archived channel with name '__room_name__'",
@@ -529,6 +591,7 @@
   "error-could-not-change-username": "Could not change username",
   "error-delete-protected-role": "Cannot delete a protected role",
   "error-department-not-found": "Department not found",
+  "error-direct-message-file-upload-not-allowed": "File sharing not allowed in direct messages",
   "error-duplicate-channel-name": "A channel with name '__channel_name__' exists",
   "error-email-domain-blacklisted": "The email domain is blacklisted",
   "error-email-send-failed": "Error trying to send email: __message__",
@@ -550,7 +613,6 @@
   "error-invalid-email-address": "Invalid email address",
   "error-invalid-file-height": "Invalid file height",
   "error-invalid-file-type": "Invalid file type",
-  "error-direct-message-file-upload-not-allowed": "File sharing not allowed in direct messages",
   "error-invalid-file-width": "Invalid file width",
   "error-invalid-from-address": "You informed an invalid FROM address.",
   "error-invalid-integration": "Invalid integration",
@@ -585,12 +647,14 @@
   "error-the-field-is-required": "The field __field__ is required.",
   "error-too-many-requests": "Error, too many requests. Please slow down. You must wait __seconds__ seconds before trying again.",
   "error-user-is-not-activated": "User is not activated",
+  "error-user-limit-exceeded": "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator",
   "error-user-not-in-room": "User is not in this room",
   "error-user-registration-disabled": "User registration is disabled",
-  "error-user-limit-exceeded": "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator",
   "error-user-registration-secret": "User registration is only allowed via Secret URL",
   "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.",
   "Error_changing_password": "Error changing password",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server",
   "Esc_to": "Esc to",
   "Event_Trigger": "Event Trigger",
   "Event_Trigger_Description": "Select which type of event will trigger this Outgoing WebHook Integration",
@@ -603,7 +667,6 @@
   "Exclude_Botnames_Description": "Do not propagate messages from bots whose name matches the regular expression above. If left empty, all messages from bots will be propagated.",
   "False": "False",
   "Favorite_Rooms": "Enable Favorite Rooms",
-  "First_Channel_After_Login": "First Channel After Login",
   "Favorites": "Favorites",
   "Features_Enabled": "Features Enabled",
   "Field": "Field",
@@ -614,8 +677,8 @@
   "File_type_is_not_accepted": "File type is not accepted.",
   "File_uploaded": "File uploaded",
   "FileUpload": "File Upload",
-  "FileUpload_Enabled": "File Uploads Enabled",
   "FileUpload_Disabled": "File uploads are disabled.",
+  "FileUpload_Enabled": "File Uploads Enabled",
   "FileUpload_Enabled_Direct": "File Uploads Enabled in Direct Messages ",
   "FileUpload_File_Empty": "File empty",
   "FileUpload_FileSystemPath": "System Path",
@@ -635,29 +698,32 @@
   "FileUpload_S3_AWSAccessKeyId": "Access Key",
   "FileUpload_S3_AWSSecretAccessKey": "Secret Key",
   "FileUpload_S3_Bucket": "Bucket name",
-  "FileUpload_S3_SignatureVersion": "Signature Version",
-  "FileUpload_S3_ForcePathStyle": "Force Path Style",
   "FileUpload_S3_BucketURL": "Bucket URL",
   "FileUpload_S3_CDN": "CDN domain for downloads",
+  "FileUpload_S3_ForcePathStyle": "Force Path Style",
   "FileUpload_S3_Region": "Region",
+  "FileUpload_S3_SignatureVersion": "Signature Version",
   "FileUpload_S3_URLExpiryTimeSpan": "URLs expiration timespan",
   "FileUpload_S3_URLExpiryTimeSpan_Description": "Time after which Amazon S3 generated URLs will no longer be valid (in seconds). If set to less than 5 seconds, this field will be ignored.",
   "FileUpload_Storage_Type": "Storage Type",
+  "First_Channel_After_Login": "First Channel After Login",
   "Flags": "Flags",
   "Follow_social_profiles": "Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our trello board.",
+  "Fonts": "Fonts",
   "Food_and_Drink": "Food & Drink",
   "Footer": "Footer",
   "Footer_Direct_Reply": "Footer when Direct Reply enabled",
-  "Fonts": "Fonts",
   "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your current password to continue",
+  "force-delete-message": "Force Delete Message",
+  "force-delete-message_description": "Permission to delete a message bypassing all restrictions",
   "Force_Disable_OpLog_For_Cache": "Force disable OpLog for Cache",
   "Force_Disable_OpLog_For_Cache_Description": "Will not use OpLog to sync cache even when it's available",
   "Force_SSL": "Force SSL",
   "Force_SSL_Description": "*Caution!* _Force SSL_ should never be used with reverse proxy. If you have a reverse proxy, you should do the redirect THERE. This option exists for deployments like Heroku, that does not allow the redirect configuration at the reverse proxy.",
   "Forgot_password": "Forgot your password",
   "Forgot_Password_Description": "You may use the following placeholders: <br /><ul><li>[Forgot_Password_Url] for the password recovery URL.</li><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
-  "Forgot_Password_Email_Subject": "[Site_Name] - Password Recovery",
   "Forgot_Password_Email": "Click <a href=\"[Forgot_Password_Url]\">here</a> to reset your password.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Password Recovery",
   "Forgot_password_section": "Forgot password",
   "Forward": "Forward",
   "Forward_chat": "Forward chat",
@@ -674,25 +740,25 @@
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Give the application a name. This will be seen by your users.",
   "Global": "Global",
   "Google_Vision_usage_limit_exceeded": "Google Vision usage limit exceeded",
-  "GoogleVision_Enable": "Enable Google Vision",
+  "GoogleCloudStorage": "Google Cloud Storage",
+  "GoogleNaturalLanguage_ServiceAccount_Description": "Service account key JSON file. More information can be found [here](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
+  "GoogleTagManager_id": "Google Tag Manager Id",
   "GoogleVision_Block_Adult_Images": "Block Adult Images",
   "GoogleVision_Block_Adult_Images_Description": "Blocking adult images will not work once the monthly limit has been reached",
   "GoogleVision_Current_Month_Calls": "Current Month Calls",
+  "GoogleVision_Enable": "Enable Google Vision",
   "GoogleVision_Max_Monthly_Calls": "Max Monthly Calls",
   "GoogleVision_Max_Monthly_Calls_Description": "Use 0 for unlimited",
   "GoogleVision_ServiceAccount": "Google Vision Service Account",
   "GoogleVision_ServiceAccount_Description": "Create a server key (JSON format) and paste the JSON content here",
   "GoogleVision_Type_Document": "Document Text Detection",
   "GoogleVision_Type_Faces": "Face Detection",
-  "GoogleVision_Type_Landmarks": "Landmarks Detection",
   "GoogleVision_Type_Labels": "Labels Detection",
+  "GoogleVision_Type_Landmarks": "Landmarks Detection",
   "GoogleVision_Type_Logos": "Logos Detection",
   "GoogleVision_Type_Properties": "Properties (color) Detection",
   "GoogleVision_Type_SafeSearch": "SafeSearch Detection",
   "GoogleVision_Type_Similar": "Search Similar Images",
-  "GoogleCloudStorage": "Google Cloud Storage",
-  "GoogleNaturalLanguage_ServiceAccount_Description": "Service account key JSON file. More information can be found [here](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
-  "GoogleTagManager_id": "Google Tag Manager Id",
   "Group_mentions_only": "Group mentions only",
   "Guest_Pool": "Guest Pool",
   "Hash": "Hash",
@@ -704,11 +770,11 @@
   "Hide_Avatars": "Hide Avatars",
   "Hide_flextab": "Hide right side bar with click",
   "Hide_Group_Warning": "Are you sure you want to hide the group \"%s\"?",
-  "Hide_Private_Warning": "Are you sure you want to hide the discussion with \"%s\"?",
   "Hide_Livechat_Warning": "Are you sure you want to hide the livechat with \"%s\"?",
+  "Hide_Private_Warning": "Are you sure you want to hide the discussion with \"%s\"?",
+  "Hide_roles": "Hide roles",
   "Hide_room": "Hide room",
   "Hide_Room_Warning": "Are you sure you want to hide the room \"%s\"?",
-  "Hide_roles": "Hide roles",
   "Hide_Unread_Room_Status": "Hide Unread Room Status",
   "Hide_usernames": "Hide usernames",
   "Highlights": "Highlights",
@@ -738,13 +804,15 @@
   "Iframe_Integration_send_target_origin_Description": "Origin with protocol prefix, which commands are sent to e.g. 'https://localhost', or * to allow sending to anywhere.",
   "IMAP_intercepter_already_running": "IMAP intercepter already running",
   "IMAP_intercepter_Not_running": "IMAP intercepter Not running",
+  "Impersonate_user": "Impersonate User",
+  "Impersonate_user_description": "When enabled, integration posts as the user that triggered integration",
   "Importer_Archived": "Archived",
   "Importer_CSV_Information": "The CSV importer requires a specific format, please read the documentation for how to structure your zip file:",
-  "Importer_HipChatEnterprise_Information": "The file uploaded must be a decrypted tar.gz, please read the documentation for further information:",
-  "Importer_HipChatEnterprise_BetaWarning": "Please be aware that this import is still a work in progress, please report any errors which occur in GitHub:",
   "Importer_done": "Importing complete!",
   "Importer_finishing": "Finishing up the import.",
   "Importer_From_Description": "Imports __from__ data into Rocket.Chat.",
+  "Importer_HipChatEnterprise_BetaWarning": "Please be aware that this import is still a work in progress, please report any errors which occur in GitHub:",
+  "Importer_HipChatEnterprise_Information": "The file uploaded must be a decrypted tar.gz, please read the documentation for further information:",
   "Importer_import_cancelled": "Import cancelled.",
   "Importer_import_failed": "An error occurred while running the import.",
   "Importer_importing_channels": "Importing the channels.",
@@ -761,6 +829,7 @@
   "Importer_setup_error": "An error occurred while setting up the importer.",
   "Importer_Source_File": "Source File Selection",
   "Incoming_Livechats": "Incoming Livechats",
+  "Incoming_WebHook": "Incoming WebHook",
   "inline_code": "inline code",
   "Install_Extension": "Install Extension",
   "Install_FxOs": "Install Rocket.Chat on your Firefox",
@@ -771,52 +840,49 @@
   "Installed_at": "Installed at",
   "Instance_Record": "Instance Record",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instructions to your visitor fill the form to send a message",
-  "Impersonate_user": "Impersonate User",
-  "Impersonate_user_description": "When enabled, integration posts as the user that triggered integration",
-  "Incoming_WebHook": "Incoming WebHook",
-  "Integration_Advanced_Settings": "Advanced Settings",
   "Integration_added": "Integration has been added",
+  "Integration_Advanced_Settings": "Advanced Settings",
   "Integration_History_Cleared": "Integration History Successfully Cleared",
   "Integration_Incoming_WebHook": "Incoming WebHook Integration",
   "Integration_New": "New Integration",
-  "Integrations_Outgoing_Type_FileUploaded": "File Uploaded",
-  "Integrations_Outgoing_Type_RoomArchived": "Room Archived",
-  "Integrations_Outgoing_Type_RoomCreated": "Room Created (public and private)",
-  "Integrations_Outgoing_Type_RoomJoined": "User Joined Room",
-  "Integrations_Outgoing_Type_RoomLeft": "User Left Room",
-  "Integrations_Outgoing_Type_SendMessage": "Message Sent",
-  "Integrations_Outgoing_Type_UserCreated": "User Created",
   "Integration_Outgoing_WebHook": "Outgoing WebHook Integration",
   "Integration_Outgoing_WebHook_History": "Outgoing WebHook Integration History",
-  "Integration_Outgoing_WebHook_No_History": "This outgoing webhook integration has yet to have any history recorded.",
-  "Integration_Outgoing_WebHook_History_Time_Triggered": "Time Integration Triggered",
-  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Time it Ended or Error'd",
-  "Integration_Outgoing_WebHook_History_Trigger_Step": "Last Trigger Step",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Messages Sent from Prepare Step",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Messages Sent from Process Response Step",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Data Passed to Integration",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Data Passed to URL",
-  "Integration_Outgoing_WebHook_History_Http_Response_Error": "HTTP Response Error",
-  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP Response",
   "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Error Stacktrace",
-  "Integration_Retry_Failed_Url_Calls": "Retry Failed Url Calls",
-  "Integration_Retry_Failed_Url_Calls_Description": "Should the integration try a reasonable amount of time if the call out to the url fails?",
+  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP Response",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "HTTP Response Error",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Messages Sent from Prepare Step",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Messages Sent from Process Response Step",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Time it Ended or Error'd",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Time Integration Triggered",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "Last Trigger Step",
+  "Integration_Outgoing_WebHook_No_History": "This outgoing webhook integration has yet to have any history recorded.",
   "Integration_Retry_Count": "Retry Count",
   "Integration_Retry_Count_Description": "How many times should the integration be tried if the call to the url fails?",
   "Integration_Retry_Delay": "Retry Delay",
   "Integration_Retry_Delay_Description": "Which delay algorithm should the retrying use? <code class=\"inline\">10^x</code> or <code class=\"inline\">2^x</code> or <code class=\"inline\">x*2</code>",
+  "Integration_Retry_Failed_Url_Calls": "Retry Failed Url Calls",
+  "Integration_Retry_Failed_Url_Calls_Description": "Should the integration try a reasonable amount of time if the call out to the url fails?",
   "Integration_Run_When_Message_Is_Edited": "Run On Edits",
   "Integration_Run_When_Message_Is_Edited_Description": "Should the integration run when the message is edited? Setting this to false will cause the integration to only run on <strong>new</strong> messages.",
+  "Integration_updated": "Integration has been updated.",
   "Integration_Word_Trigger_Placement": "Word Placement Anywhere",
   "Integration_Word_Trigger_Placement_Description": "Should the Word be Triggered when placed anywhere in the sentence other than the beginning?",
-  "Integration_updated": "Integration has been updated.",
   "Integrations": "Integrations",
   "Integrations_for_all_channels": "Enter <strong>all_public_channels</strong> to listen on all public channels, <strong>all_private_groups</strong> to listen on all private groups, and <strong>all_direct_messages</strong> to listen to all direct messages.",
+  "Integrations_Outgoing_Type_FileUploaded": "File Uploaded",
+  "Integrations_Outgoing_Type_RoomArchived": "Room Archived",
+  "Integrations_Outgoing_Type_RoomCreated": "Room Created (public and private)",
+  "Integrations_Outgoing_Type_RoomJoined": "User Joined Room",
+  "Integrations_Outgoing_Type_RoomLeft": "User Left Room",
+  "Integrations_Outgoing_Type_SendMessage": "Message Sent",
+  "Integrations_Outgoing_Type_UserCreated": "User Created",
   "InternalHubot": "Internal Hubot",
-  "InternalHubot_ScriptsToLoad": "Scripts to load",
-  "InternalHubot_ScriptsToLoad_Description": "Please enter a comma separated list of scripts to load from your custom folder",
   "InternalHubot_PathToLoadCustomScripts": "Folder to load the scripts",
   "InternalHubot_reload": "Reload the scripts",
+  "InternalHubot_ScriptsToLoad": "Scripts to load",
+  "InternalHubot_ScriptsToLoad_Description": "Please enter a comma separated list of scripts to load from your custom folder",
   "InternalHubot_Username_Description": "This must be a valid username of a bot registered on your server.",
   "Invalid_confirm_pass": "The password confirmation does not match password",
   "Invalid_email": "The email entered is invalid",
@@ -838,45 +904,44 @@
   "Invitation_Subject": "Invitation Subject",
   "Invitation_Subject_Default": "You have been invited to [Site_Name]",
   "Invite_user_to_join_channel": "Invite one user to join this channel",
-  "Invite_user_to_join_channel_all_to": "Invite all users from this channel to join [#channel]",
   "Invite_user_to_join_channel_all_from": "Invite all users from [#channel] to join this channel",
+  "Invite_user_to_join_channel_all_to": "Invite all users from this channel to join [#channel]",
   "Invite_Users": "Invite Users",
-  "is_also_typing": "is also typing",
-  "is_also_typing_female": "is also typing",
-  "is_also_typing_male": "is also typing",
-  "is_typing": "is typing",
-  "is_typing_female": "is typing",
-  "is_typing_male": "is typing",
   "IRC_Channel_Join": "Output of the JOIN command.",
   "IRC_Channel_Leave": "Output of the PART command.",
-  "IRC_Description": "Internet Relay Chat (IRC) is a text-based group communication tool. Users join uniquely named channels, or rooms, for open discussion. IRC also supports private messages between indivdiual users and file sharing capabilities. This package integrates these layers of functionality with Rocket.Chat.",
-  "IRC_Enabled": "Attempt to integrate IRC support. Changing this value requires restarting Rocket.Chat.",
-  "IRC_Private_Message": "Output of the PRIVMSG command.",
   "IRC_Channel_Users": "Output of the NAMES command.",
   "IRC_Channel_Users_End": "End of output of the NAMES command.",
+  "IRC_Description": "Internet Relay Chat (IRC) is a text-based group communication tool. Users join uniquely named channels, or rooms, for open discussion. IRC also supports private messages between indivdiual users and file sharing capabilities. This package integrates these layers of functionality with Rocket.Chat.",
+  "IRC_Enabled": "Attempt to integrate IRC support. Changing this value requires restarting Rocket.Chat.",
   "IRC_Hostname": "The IRC host server to connect to.",
   "IRC_Login_Fail": "Output upon a failed connection to the IRC server.",
   "IRC_Login_Success": "Output upon a successful connection to the IRC server.",
   "IRC_Message_Cache_Size": "The cache limit for outbound message handling.",
   "IRC_Port": "The port to bind to on the IRC host server.",
+  "IRC_Private_Message": "Output of the PRIVMSG command.",
   "IRC_Quit": "Output upon quitting an IRC session.",
+  "is_also_typing": "is also typing",
+  "is_also_typing_female": "is also typing",
+  "is_also_typing_male": "is also typing",
+  "is_typing": "is typing",
+  "is_typing_female": "is typing",
+  "is_typing_male": "is typing",
   "Issue_Links": "Issue tracker links",
+  "IssueLinks_Incompatible": "Warning: do not enable this and the 'Hex Color Preview' at the same time.",
+  "IssueLinks_LinkTemplate": "Template for issue links",
+  "IssueLinks_LinkTemplate_Description": "Template for issue links; %s will be replaced by the issue number.",
   "It_works": "It works",
   "italics": "italics",
   "Jitsi_Chrome_Extension": "Chrome Extension Id",
   "Jitsi_Enable_Channels": "Enable in Channels",
   "join": "Join",
+  "join-without-join-code": "Join Without Join Code",
+  "join-without-join-code_description": "Permission to bypass the join code in channels with join code enabled",
   "Join_audio_call": "Join audio call",
   "Join_Chat": "Join Chat",
   "Join_default_channels": "Join default channels",
   "Join_the_Community": "Join the Community",
   "Join_the_given_channel": "Join the given channel",
-  "Show_the_keyboard_shortcut_list": "Show the keyboard shortcut list",
-  "Open_channel_user_search": "`%s` - Open Channel / User search",
-  "Edit_previous_message": "`%s` - Edit previous message",
-  "Move_beginning_message": "`%s` - Move to the beginning of the message",
-  "Move_end_message": "`%s` - Move to the end of the message",
-  "New_line_message_compose_input": "`%s` - New line in message compose input",
   "Join_video_call": "Join video call",
   "Joined": "Joined",
   "Jump": "Jump",
@@ -900,8 +965,8 @@
   "Keyboard_Shortcuts_Keys_7": "<kbd>Shift</kbd> + <kbd>Enter</kbd>",
   "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "Move to the beginning of the message",
   "Keyboard_Shortcuts_Move_To_End_Of_Message": "Move to the end of the message",
-  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Open Channel / User search",
   "Keyboard_Shortcuts_New_Line_In_Message": "New line in message compose input",
+  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Open Channel / User search",
   "Keyboard_Shortcuts_Title": "Keyboard Shortcuts",
   "Knowledge_Base": "Knowledge Base",
   "Label": "Label",
@@ -943,6 +1008,18 @@
   "LDAP_Enable_Description": "Attempt to utilize LDAP for authentication.",
   "LDAP_Encryption": "Encryption",
   "LDAP_Encryption_Description": "The encryption method used to secure communications to the LDAP server. Examples include `plain` (no encryption), `SSL/LDAPS` (encrypted from the start), and `StartTLS` (upgrade to encrypted communication once connected).",
+  "LDAP_Group_Filter_Enable": "Enable LDAP user group filter",
+  "LDAP_Group_Filter_Enable_Description": "Restrict access to users in a LDAP group<br/>Useful for OpenLDAP servers without overlays that not permit *memberOf* filter",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Group ID Attribute",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "E.g. *OpenLDAP:*cn",
+  "LDAP_Group_Filter_Group_Member_Attribute": "Group Member Attribute",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "E.g. *OpenLDAP:*uniqueMember",
+  "LDAP_Group_Filter_Group_Member_Format": "Group Member Format",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "E.g. *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
+  "LDAP_Group_Filter_Group_Name": "Group name",
+  "LDAP_Group_Filter_Group_Name_Description": "Group name to which it belong the user",
+  "LDAP_Group_Filter_ObjectClass": "Group ObjectClass",
+  "LDAP_Group_Filter_ObjectClass_Description": "The *objectclass* that identify the groups.<br/> E.g. OpenLDAP:groupOfUniqueNames",
   "LDAP_Host": "Host",
   "LDAP_Host_Description": "The LDAP host, e.g. `ldap.example.com` or `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Idle Timeout (ms)",
@@ -968,34 +1045,18 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Write your own filter to search users in the LDAP server.",
   "LDAP_Username_Field": "Username Field",
   "LDAP_Username_Field_Description": "Which field will be used as *username* for new users. Leave empty to use the username informed on login page.<br/>You can use template tags too, like `#{givenName}.#{sn}`.<br/>Default value is `sAMAccountName`.",
-  "LDAP_Group_Filter_Enable": "Enable LDAP user group filter",
-  "LDAP_Group_Filter_Enable_Description": "Restrict access to users in a LDAP group<br/>Useful for OpenLDAP servers without overlays that not permit *memberOf* filter",
-  "LDAP_Group_Filter_ObjectClass": "Group ObjectClass",
-  "LDAP_Group_Filter_ObjectClass_Description": "The *objectclass* that identify the groups.<br/> E.g. OpenLDAP:groupOfUniqueNames",
-  "LDAP_Group_Filter_Group_Id_Attribute": "Group ID Attribute",
-  "LDAP_Group_Filter_Group_Id_Attribute_Description": "E.g. *OpenLDAP:*cn",
-  "LDAP_Group_Filter_Group_Member_Attribute": "Group Member Attribute",
-  "LDAP_Group_Filter_Group_Member_Attribute_Description": "E.g. *OpenLDAP:*uniqueMember",
-  "LDAP_Group_Filter_Group_Member_Format": "Group Member Format",
-  "LDAP_Group_Filter_Group_Member_Format_Description": "E.g. *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
-  "LDAP_Group_Filter_Group_Name": "Group name",
-  "LDAP_Group_Filter_Group_Name_Description": "Group name to which it belong the user",
   "Least_Amount": "Least Amount",
   "Leave_Group_Warning": "Are you sure you want to leave the group \"%s\"?",
-  "Leave_Private_Warning": "Are you sure you want to leave the discussion with \"%s\"?",
   "Leave_Livechat_Warning": "Are you sure you want to leave the livechat with \"%s\"?",
+  "Leave_Private_Warning": "Are you sure you want to leave the discussion with \"%s\"?",
   "Leave_room": "Leave room",
   "Leave_Room_Warning": "Are you sure you want to leave the room \"%s\"?",
   "Leave_the_current_channel": "Leave the current channel",
   "line": "line",
-  "IssueLinks_Incompatible": "Warning: do not enable this and the 'Hex Color Preview' at the same time.",
-  "IssueLinks_LinkTemplate": "Template for issue links",
-  "IssueLinks_LinkTemplate_Description": "Template for issue links; %s will be replaced by the issue number.",
   "List_of_Channels": "List of Channels",
   "List_of_Direct_Messages": "List of Direct Messages",
   "Livechat_agents": "Livechat agents",
   "Livechat_AllowedDomainsList": "Livechat allowed domains",
-  "Domains_allowed_to_embed_the_livechat_widget": "Comma-separated list of domains allowed to embed the livechat widget. Leave blank to allow all domains.",
   "Livechat_Dashboard": "Livechat Dashboard",
   "Livechat_enabled": "Livechat enabled",
   "Livechat_forward_open_chats": "Forward open chats",
@@ -1029,6 +1090,8 @@
   "Login_with": "Login with %s",
   "Logout": "Logout",
   "Logout_Others": "Logout From Other Logged In Locations",
+  "mail-messages": "Mail Messages",
+  "mail-messages_description": "Permission to use the mail messages option",
   "Mail_Message_Invalid_emails": "You have provided one or more invalid emails: %s",
   "Mail_Message_Missing_to": "You must select one or more users or provide one or more email addresses, separated by commas.",
   "Mail_Message_No_messages_selected_select_all": "You haven't selected any messages. Would you like to <a href='#' class='select-all'>select all</a> visible messages?",
@@ -1040,6 +1103,18 @@
   "Mailing": "Mailing",
   "Make_Admin": "Make Admin",
   "Make_sure_you_have_a_copy_of_your_codes": "Make sure you have a copy of your codes: __codes__ If you lose access to your authenticator app, you can use one of these codes to log in.",
+  "manage-assets": "Manage Assets",
+  "manage-assets_description": "Permission to manage the server assets",
+  "manage-emoji": "Manage Emoji",
+  "manage-emoji_description": "Permission to manage the server emojis",
+  "manage-integrations": "Manage Integrations",
+  "manage-integrations_description": "Permission to manage the server integrations",
+  "manage-oauth-apps": "Manage Oauth Apps",
+  "manage-oauth-apps_description": "Permission to manage the server Oauth apps",
+  "manage-own-integrations": "Manage Own Integrations",
+  "manage-own-integrations_description": "Permition to allow users to create and edit their own integration or webhooks",
+  "manage-sounds": "Manage Sounds",
+  "manage-sounds_description": "Permission to manage the server sounds",
   "Manager_added": "Manager added",
   "Manager_removed": "Manager removed",
   "Managing_assets": "Managing assets",
@@ -1050,19 +1125,20 @@
   "MapView_GMapsAPIKey_Description": "This can be obtained from the Google Developers Console for free.",
   "Mark_as_read": "Mark as read",
   "Mark_as_unread": "Mark as unread",
-  "Markdown_Parser": "Markdown Parser",
-  "Original": "Original",
   "Markdown_Headers": "Allow Markdown headers in messages",
-  "Markdown_SupportSchemesForLink": "Markdown Support Schemes for Link",
-  "Markdown_SupportSchemesForLink_Description": "Comma-separated list of allowed schemes",
-  "Markdown_Marked_GFM": "Enable Marked GFM",
-  "Markdown_Marked_Tables": "Enable Marked Tables",
   "Markdown_Marked_Breaks": "Enable Marked Breaks",
+  "Markdown_Marked_GFM": "Enable Marked GFM",
   "Markdown_Marked_Pedantic": "Enable Marked Pedantic",
   "Markdown_Marked_SmartLists": "Enable Marked Smart Lists",
   "Markdown_Marked_Smartypants": "Enable Marked Smartypants",
+  "Markdown_Marked_Tables": "Enable Marked Tables",
+  "Markdown_Parser": "Markdown Parser",
+  "Markdown_SupportSchemesForLink": "Markdown Support Schemes for Link",
+  "Markdown_SupportSchemesForLink_Description": "Comma-separated list of allowed schemes",
   "Max_length_is": "Max length is %s",
   "Members_List": "Members List",
+  "mention-all": "Mention All",
+  "mention-all_description": "Permission to use the @all mention",
   "Mentions": "Mentions",
   "Mentions_default": "Mentions (default)",
   "Mentions_only": "Mentions only",
@@ -1105,25 +1181,25 @@
   "Message_pinning": "Message pinning",
   "Message_QuoteChainLimit": "Maximum Number of Chained Quotes",
   "Message_removed": "Message removed",
+  "Message_sent_by_email": "Message sent by Email",
   "Message_SetNameToAliasEnabled": "Set a user name to alias in message",
   "Message_SetNameToAliasEnabled_Description": "Only if not already set alias. The old messages alias not changed if user has changed the name.",
   "Message_ShowDeletedStatus": "Show Deleted Status",
   "Message_ShowEditedStatus": "Show Edited Status",
   "Message_ShowFormattingTips": "Show Formatting Tips",
-  "Message_sent_by_email": "Message sent by Email",
   "Message_starring": "Message starring",
-  "Message_TimeFormat": "Time Format",
   "Message_TimeAndDateFormat": "Time and Date Format",
-  "Message_TimeFormat_Description": "See also: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeAndDateFormat_Description": "See also: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
+  "Message_TimeFormat": "Time Format",
+  "Message_TimeFormat_Description": "See also: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Message too long",
   "Message_VideoRecorderEnabled": "Video Recorder Enabled",
   "Message_VideoRecorderEnabledDescription": "Requires 'video/webm' files to be an accepted media type within 'File Upload' settings.",
   "Messages": "Messages",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Messages that are sent to the Incoming WebHook will be posted here.",
   "Meta": "Meta",
-  "Meta_fb_app_id": "Facebook App Id",
   "Meta_custom": "Custom Meta Tags",
+  "Meta_fb_app_id": "Facebook App Id",
   "Meta_google-site-verification": "Google Site Verification",
   "Meta_language": "Language",
   "Meta_msvalidate01": "MSValidate.01",
@@ -1138,9 +1214,13 @@
   "More_direct_messages": "More direct messages",
   "More_groups": "More private groups",
   "More_unreads": "More unreads",
+  "Move_beginning_message": "`%s` - Move to the beginning of the message",
+  "Move_end_message": "`%s` - Move to the end of the message",
   "Msgs": "Msgs",
   "multi": "multi",
   "multi_line": "multi line",
+  "mute-user": "Mute User",
+  "mute-user_description": "Permission to mute other users in the same channel",
   "Mute_someone_in_room": "Mute someone in the room",
   "Mute_user": "Mute user",
   "Muted": "Muted",
@@ -1152,19 +1232,22 @@
   "Name_cant_be_empty": "Name can't be empty",
   "Name_of_agent": "Name of agent",
   "Name_optional": "Name (optional)",
+  "Name_Placeholder": "Please enter your name...",
   "Navigation_History": "Navigation History",
   "New_Application": "New Application",
   "New_Custom_Field": "New Custom Field",
   "New_Department": "New Department",
   "New_integration": "New integration",
+  "New_line_message_compose_input": "`%s` - New line in message compose input",
   "New_logs": "New logs",
   "New_Message_Notification": "New Message Notification",
   "New_messages": "New messages",
   "New_password": "New password",
+  "New_Password_Placeholder": "Please enter new password...",
   "New_role": "New role",
   "New_Room_Notification": "New Room Notification",
-  "New_videocall_request": "New videocall request",
   "New_Trigger": "New Trigger",
+  "New_videocall_request": "New videocall request",
   "No_available_agents_to_transfer": "No available agents to transfer",
   "No_channel_with_name_%s_was_found": "No channel with name <strong>\"%s\"</strong> was found!",
   "No_channels_yet": "You aren't part of any channel yet.",
@@ -1177,9 +1260,9 @@
   "No_mentions_found": "No mentions found",
   "No_pinned_messages": "No pinned messages",
   "No_results_found": "No results found",
+  "No_snippet_messages": "No snippet",
   "No_starred_messages": "No starred messages",
   "No_such_command": "No such command: `/__command__`",
-  "No_snippet_messages": "No snippet",
   "No_user_with_username_%s_was_found": "No user with username <strong>\"%s\"</strong> was found!",
   "Nobody_available": "Nobody available",
   "Node_version": "Node version",
@@ -1191,15 +1274,15 @@
   "Nothing": "Nothing",
   "Nothing_found": "Nothing found",
   "Notification_Desktop_Default_For": "Show Desktop Notifications For",
-  "Notification_Mobile_Default_For": "Push Mobile Notifications For",
   "Notification_Duration": "Notification Duration",
+  "Notification_Mobile_Default_For": "Push Mobile Notifications For",
   "Notifications": "Notifications",
-  "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
   "Notifications_Max_Room_Members": "Max room members before disabling all message notifications",
   "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
+  "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
   "Notifications_Sound_Volume": "Notifications sound volume",
-  "Notify_all_in_this_room": "Notify all in this room",
   "Notify_active_in_this_room": "Notify active users in this room",
+  "Notify_all_in_this_room": "Notify all in this room",
   "Num_Agents": "# Agents",
   "Number_of_messages": "Number of messages",
   "OAuth_Application": "OAuth Application",
@@ -1217,8 +1300,8 @@
   "Offline_form": "Offline form",
   "Offline_form_unavailable_message": "Offline form unavailable message",
   "Offline_Link_Message": "GO TO MESSAGE",
-  "Offline_Mention_Email": "Mention Email Subject",
   "Offline_Mention_All_Email": "Mention All Email Subject",
+  "Offline_Mention_Email": "Mention Email Subject",
   "Offline_message": "Offline message",
   "Offline_success_message": "Offline success message",
   "Offline_unavailable": "Offline unavailable",
@@ -1229,17 +1312,18 @@
   "Only_you_can_see_this_message": "Only you can see this message",
   "Oops!": "Oops",
   "Open": "Open",
+  "Open_channel_user_search": "`%s` - Open Channel / User search",
   "Open_days_of_the_week": "Open Days of the Week",
   "Open_Livechats": "Open Livechats",
+  "Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code. You can also use one of your backup codes.",
   "Opened": "Opened",
   "Opened_in_a_new_window": "Opened in a new window.",
   "Opens_a_channel_group_or_direct_message": "Opens a channel, group or direct message",
   "optional": "optional",
-  "Use_minor_colors": "Use minor color palette (defaults inherit major colors)",
   "or": "or",
-  "Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code. You can also use one of your backup codes.",
-  "Order": "Order",
   "Or_talk_as_anonymous": "Or talk as anonymous",
+  "Order": "Order",
+  "Original": "Original",
   "OS_Arch": "OS Arch",
   "OS_Cpus": "OS CPU Count",
   "OS_Freemem": "OS Free Memory",
@@ -1265,177 +1349,34 @@
   "People": "People",
   "Permalink": "Permalink",
   "Permissions": "Permissions",
-  "Please_fill_all_the_information": "Please fill all the information",
-  "access-mailer": "Access Mailer Screen",
-  "access-mailer_description": "Permission to send mass email to all users.",
-  "access-permissions": "Access Permissions Screen",
-  "access-permissions_description": "Modify permissions for various roles.",
-  "add-oauth-service": "Add Oauth Service",
-  "add-oauth-service_description": "Permission to add a new Oauth service",
-  "add-user": "Add User",
-  "add-user_description": "Permission to add new users to the server via users screen",
-  "add-user-to-any-c-room": "Add User to Any Public Channel",
-  "add-user-to-any-c-room_description": "Permission to add a user to any public channel",
-  "add-user-to-any-p-room": "Add User to Any Private Channel",
-  "add-user-to-any-p-room_description": "Permission to add a user to any private channel",
-  "add-user-to-joined-room": "Add User to Any Joined Channel",
-  "add-user-to-joined-room_description": "Permission to add a user to a currently joined channel",
-  "archive-room": "Archive Room",
-  "archive-room_description": "Permission to archive a channel",
-  "assign-admin-role": "Assign Admin Role",
-  "assign-admin-role_description": "Permission to assign the admin role to other users",
-  "auto-translate": "Auto Translate",
-  "auto-translate_description": "Permission to use the auto translate tool",
-  "ban-user": "Ban User",
-  "ban-user_description": "Permission to ban a user from a channel",
-  "bulk-create-c": "Bulk Create Channels",
-  "bulk-create-c_description": "Permission to create channels in bulk",
-  "bulk-register-user": "Bulk Create Channels",
-  "bulk-register-user_description": "Permission to create channels in bulk",
-  "clean-channel-history": "Clean Channel History",
-  "clean-channel-history_description": "Permission to Clear the history from channels",
-  "close-livechat-room": "Close Livechat Room",
-  "close-livechat-room_description": "Permission to close the current LiveChat channel",
-  "close-others-livechat-room": "Close Livechat Room",
-  "close-others-livechat-room_description": "Permission to close other LiveChat channels",
-  "create-c": "Create Public Channels",
-  "create-c_description": "Permission to create public channels",
-  "create-d": "Create Direct Messages",
-  "create-d_description": "Permission to start direct messages",
-  "create-p": "Create Private Channels",
-  "create-p_description": "Permission to create private channels",
-  "create-user": "Create User",
-  "create-user_description": "Permission to create users",
-  "delete-c": "Delete Public Channels",
-  "delete-c_description": "Permission to delete public channels",
-  "delete-d": "Delete Direct Messages",
-  "delete-d_description": "Permission to delete direct messages",
-  "delete-p": "Delete Private Channels",
-  "delete-p_description": "Permission to delete private channels",
-  "delete-message": "Delete Message",
-  "delete-message_description": "Permission to delete a message within a room",
-  "delete-user": "Delete User",
-  "delete-user_description": "Permission to delete users",
-  "edit-message": "Edit Message",
-  "edit-message_description": "Permission to edit a message within a room",
-  "edit-other-user-active-status": "Edit Other User Active Status",
-  "edit-other-user-active-status_description": "Permission to enable or disable other accounts",
-  "edit-other-user-info": "Edit Other User Information",
-  "edit-other-user-info_description": "Permission to change other user’s name, username or email address.",
-  "edit-other-user-password": "Edit Other User Password",
-  "edit-other-user-password_description": "Permission to modify other user’s passwords. Requires edit-other-user-info permission.",
-  "edit-privileged-setting": "Edit privileged Setting",
-  "edit-privileged-setting_description": "Permission to edit settings",
-  "edit-room": "Edit Room",
-  "edit-room_description": "Permission to edit a room’s name, topic, type (private or public status) and status (active or archived)",
-  "force-delete-message": "Force Delete Message",
-  "force-delete-message_description": "Permission to delete a message bypassing all restrictions",
-  "join-without-join-code": "Join Without Join Code",
-  "join-without-join-code_description": "Permission to bypass the join code in channels with join code enabled",
-  "mail-messages": "Mail Messages",
-  "mail-messages_description": "Permission to use the mail messages option",
-  "manage-assets": "Manage Assets",
-  "manage-assets_description": "Permission to manage the server assets",
-  "manage-emoji": "Manage Emoji",
-  "manage-emoji_description": "Permission to manage the server emojis",
-  "manage-integrations": "Manage Integrations",
-  "manage-integrations_description": "Permission to manage the server integrations",
-  "manage-oauth-apps": "Manage Oauth Apps",
-  "manage-oauth-apps_description": "Permission to manage the server Oauth apps",
-  "manage-own-integrations": "Manage Own Integrations",
-  "manage-own-integrations_description": "Permition to allow users to create and edit their own integration or webhooks",
-  "manage-sounds": "Manage Sounds",
-  "manage-sounds_description": "Permission to manage the server sounds",
-  "mention-all": "Mention All",
-  "mention-all_description": "Permission to use the @all mention",
-  "mute-user": "Mute User",
-  "mute-user_description": "Permission to mute other users in the same channel",
   "pin-message": "Pin Message",
   "pin-message_description": "Permission to pin a message in a channel",
-  "post-readonly": "Post ReadOnly",
-  "post-readonly_description": "Permission to post a message in a read-only channel",
-  "preview-c-room": "Preview Public Channel",
-  "preview-c-room_description": "Permission to view the contents of a public channel before joining",
-  "remove-user": "Remove User",
-  "remove-user_description": "Permission to remove a user from a room",
-  "run-import": "Run Import",
-  "run-import_description": "Permission to run the importers",
-  "run-migration": "Run Migration",
-  "run-migration_description": "Permission to run the migrations",
-  "save-others-livechat-room-info": "Save Others Livechat Room Info",
-  "save-others-livechat-room-info_description": "Permission to save information from other livechat channels",
-  "set-moderator": "Set Moderator",
-  "set-moderator_description": "Permission to set other users as moderator of a channel",
-  "set-owner": "Set Owner",
-  "set-owner_description": "Permission to set other users as owner of a channel",
-  "set-react-when-readonly": "Set React When ReadOnly",
-  "set-react-when-readonly_description": "Permission to set the ability to react to messages in a read only channel",
-  "set-readonly": "Set ReadOnly",
-  "set-readonly_description": "Permission to set a channel to read only channel",
-  "snippet-message": "Snippet Message",
-  "snippet-message_description": "Permission to create snippet message",
-  "unarchive-room": "Unarchive Room",
-  "unarchive-room_description": "Permission to unarchive channels",
-  "user-generate-access-token": "User Generate Access Token",
-  "user-generate-access-token_description": "Permission for users to generate access tokens",
-  "view-c-room": "View Public Channel",
-  "view-c-room_description": "Permission to view public channels",
-  "view-d-room": "View Direct Messages",
-  "view-d-room_description": "Permission to view direct messages",
-  "view-full-other-user-info": "View Full Other User Info",
-  "view-full-other-user-info_description": "Permission to view full profile of other users including account creation date, last login, etc.",
-  "view-history": "View History",
-  "view-history_description": "Permission to view the channel history",
-  "view-join-code": "View Join Code",
-  "view-join-code_description": "Permission to view the channel join code",
-  "view-joined-room": "View Joined Room",
-  "view-joined-room_description": "Permission to view the currently joined channels",
-  "view-l-room": "View Livechat Rooms",
-  "view-l-room_description": "Permission to view livechat channels",
-  "view-livechat-manager": "View Livechat Manager",
-  "view-livechat-manager_description": "Permission to view other livechat managers",
-  "view-livechat-rooms": "View Livechat Rooms",
-  "view-livechat-rooms_description": "Permission to view other livechat channels",
-  "view-logs": "View Logs",
-  "view-logs_description": "Permission to view the server logs ",
-  "view-p-room": "View Private Room",
-  "view-p-room_description": "Permission to view private channels",
-  "view-privileged-setting": "View Privileged Setting",
-  "view-privileged-setting_description": "Permission to view settings",
-  "view-other-user-channels": "View Other User Channels",
-  "view-outside-room": "View Outside Room",
-  "view-other-user-channels_description": "Permission to view channels owned by other users",
-  "view-room-administration": "View Room Administration",
-  "view-room-administration_description": "Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives",
-  "view-statistics": "View Statistics",
-  "view-statistics_description": "Permission o view system statistics such as number of users logged in, number of rooms, operating system information",
-  "view-user-administration": "View User Administration",
-  "view-user-administration_description": "Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission",
   "Pin_Message": "Pin Message",
   "Pinned_a_message": "Pinned a message:",
   "Pinned_Messages": "Pinned Messages",
-  "PiwikAnalytics_siteId_Description": "The site id to use for identifying this site. Example: 17",
   "PiwikAdditionalTrackers": "Additional piwik sites",
   "PiwikAdditionalTrackers_Description": "Enter addtitional Piwik website URLs and SiteIDs in the following format, if you wnat to track the same data into different websites: [ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]",
-  "PiwikAnalytics_prependDomain": "Prepend domain",
-  "PiwikAnalytics_prependDomain_Description": "Prepend the site domain to the page title when tracking",
   "PiwikAnalytics_cookieDomain": "All subdomains",
   "PiwikAnalytics_cookieDomain_Description": "Track visitors across all subdomains",
   "PiwikAnalytics_domains": "Hide outgoing links",
   "PiwikAnalytics_domains_Description": "In the 'Outlinks' report, hide clicks to known alias URLs. Please insert one domain per line and do not use any separators.",
+  "PiwikAnalytics_prependDomain": "Prepend domain",
+  "PiwikAnalytics_prependDomain_Description": "Prepend the site domain to the page title when tracking",
+  "PiwikAnalytics_siteId_Description": "The site id to use for identifying this site. Example: 17",
   "PiwikAnalytics_url_Description": "The url where the Piwik resides, be sure to include the trailing slash. Example: //piwik.rocket.chat/",
   "Placeholder_for_email_or_username_login_field": "Placeholder for email or username login field",
   "Placeholder_for_password_login_field": "Placeholder for password login field",
   "Please_add_a_comment": "Please add a comment",
   "Please_add_a_comment_to_close_the_room": "Please, add a comment to close the room",
   "Please_answer_survey": "Please take a moment to answer a quick survey about this chat",
+  "please_enter_valid_domain": "Please enter a valid domain",
   "Please_enter_value_for_url": "Please enter a value for the url of your avatar.",
   "Please_enter_your_new_password_below": "Please enter your new password below:",
   "Please_enter_your_password": "Please enter your password",
-  "please_enter_valid_domain": "Please enter a valid domain",
   "Please_fill_a_label": "Please fill a label",
   "Please_fill_a_name": "Please fill a name",
   "Please_fill_a_username": "Please fill a username",
+  "Please_fill_all_the_information": "Please fill all the information",
   "Please_fill_name_and_email": "Please fill name and email",
   "Please_select_an_user": "Please select an user",
   "Please_select_enabled_yes_or_no": "Please select an option for Enabled",
@@ -1445,11 +1386,15 @@
   "Please_wait_while_your_account_is_being_deleted": "Please wait while your account is being deleted...",
   "Please_wait_while_your_profile_is_being_saved": "Please wait while your profile is being saved...",
   "Port": "Port",
+  "post-readonly": "Post ReadOnly",
+  "post-readonly_description": "Permission to post a message in a read-only channel",
   "Post_as": "Post as",
   "Post_to_Channel": "Post to Channel",
   "Post_to_s_as_s": "Post to <strong>%s</strong> as <strong>%s</strong>",
   "Preferences": "Preferences",
   "Preferences_saved": "Preferences saved",
+  "preview-c-room": "Preview Public Channel",
+  "preview-c-room_description": "Permission to view the contents of a public channel before joining",
   "Privacy": "Privacy",
   "Private": "Private",
   "Private_Channel": "Private Channel",
@@ -1495,8 +1440,8 @@
   "Read_only_group": "Read Only Group",
   "Record": "Record",
   "Redirect_URI": "Redirect URI",
-  "Refresh_oauth_services": "Refresh OAuth Services",
   "Refresh_keys": "Refresh keys",
+  "Refresh_oauth_services": "Refresh OAuth Services",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "Refresh your page after install to enable screen sharing",
   "Regenerate_codes": "Regenerate codes",
   "Register": "Register a new account",
@@ -1507,26 +1452,28 @@
   "Release": "Release",
   "Reload": "Reload",
   "Remove": "Remove",
+  "remove-user": "Remove User",
+  "remove-user_description": "Permission to remove a user from a room",
   "Remove_Admin": "Remove Admin",
+  "Remove_as_leader": "Remove as leader",
   "Remove_as_moderator": "Remove as moderator",
   "Remove_as_owner": "Remove as owner",
-  "Remove_as_leader": "Remove as leader",
   "Remove_custom_oauth": "Remove custom oauth",
   "Remove_from_room": "Remove from room",
   "Remove_last_admin": "Removing last admin",
   "Remove_someone_from_room": "Remove someone from the room",
   "Removed": "Removed",
   "Reply": "Reply",
-  "Reporting": "Reporting",
   "Report_Abuse": "Report Abuse",
   "Report_exclamation_mark": "Report!",
   "Report_sent": "Report sent",
   "Report_this_message_question_mark": "Report this message?",
+  "Reporting": "Reporting",
   "Require_password_change": "Require password change",
   "Resend_verification_email": "Resend verification email",
   "Reset": "Reset",
-  "Reset_section_settings": "Reset section settings",
   "Reset_password": "Reset password",
+  "Reset_section_settings": "Reset section settings",
   "Restart": "Restart",
   "Restart_the_server": "Restart the server",
   "Retry_Count": "Retry Count",
@@ -1543,12 +1490,11 @@
   "room_changed_description": "Room description changed to: <em>__room_description__</em> by <em>__user_by__</em>",
   "room_changed_privacy": "Room type changed to: <em>__room_type__</em> by <em>__user_by__</em>",
   "room_changed_topic": "Room topic changed to: <em>__room_topic__</em> by <em>__user_by__</em>",
+  "Room_default_change_to_private_will_be_default_no_more": "This is a default channel and changing it to a private group will cause it to no longer be a default channel. Do you want to proceed?",
   "Room_description_changed_successfully": "Room description changed successfully",
-  "Room_has_been_deleted": "Room has been deleted",
   "Room_has_been_archived": "Room has been archived",
+  "Room_has_been_deleted": "Room has been deleted",
   "Room_has_been_unarchived": "Room has been unarchived",
-  "Room_type_of_default_rooms_cant_be_changed": "This is a default room and the type can not be changed, please consult with your administrator.",
-  "Room_default_change_to_private_will_be_default_no_more": "This is a default channel and changing it to a private group will cause it to no longer be a default channel. Do you want to proceed?",
   "Room_Info": "Room Info",
   "room_is_blocked": "This room is blocked",
   "room_is_read_only": "This room is read only",
@@ -1559,10 +1505,15 @@
   "Room_password_changed_successfully": "Room password changed successfully",
   "Room_topic_changed_successfully": "Room topic changed successfully",
   "Room_type_changed_successfully": "Room type changed successfully",
+  "Room_type_of_default_rooms_cant_be_changed": "This is a default room and the type can not be changed, please consult with your administrator.",
   "Room_unarchived": "Room unarchived",
   "Room_uploaded_file_list": "Files List",
   "Room_uploaded_file_list_empty": "No files available.",
   "Rooms": "Rooms",
+  "run-import": "Run Import",
+  "run-import_description": "Permission to run the importers",
+  "run-migration": "Run Migration",
+  "run-migration_description": "Permission to run the migrations",
   "Running_Instances": "Running Instances",
   "S_new_messages_since_s": "%s new messages since %s",
   "Same_Style_For_Mentions": "Same style for mentions",
@@ -1572,12 +1523,14 @@
   "SAML_Custom_Generate_Username": "Generate Username",
   "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO Redirect URL",
   "SAML_Custom_Issuer": "Custom Issuer",
+  "SAML_Custom_Private_Key": "Private key contents",
   "SAML_Custom_Provider": "Custom Provider",
   "SAML_Custom_Public_Cert": "Public cert contents",
-  "SAML_Custom_Private_Key": "Private key contents",
   "Sandstorm_Powerbox_Share": "Share a Sandstorm grain",
   "Saturday": "Saturday",
   "Save": "Save",
+  "save-others-livechat-room-info": "Save Others Livechat Room Info",
+  "save-others-livechat-room-info_description": "Permission to save information from other livechat channels",
   "Save_changes": "Save changes",
   "Save_Mobile_Bandwidth": "Save Mobile Bandwidth",
   "Save_to_enable_this_action": "Save to enable this action",
@@ -1598,8 +1551,8 @@
   "Select_a_user": "Select a user",
   "Select_an_avatar": "Select an avatar",
   "Select_file": "Select file",
-  "Select_service_to_login": "Select a service to login to load your picture or upload one directly from your computer",
   "Select_role": "Select a Role",
+  "Select_service_to_login": "Select a service to login to load your picture or upload one directly from your computer",
   "Select_user": "Select user",
   "Select_users": "Select users",
   "Selected_agents": "Selected agents",
@@ -1623,9 +1576,17 @@
   "Served_By": "Served By",
   "Service": "Service",
   "Service_account_key": "Service account key",
+  "set-moderator": "Set Moderator",
+  "set-moderator_description": "Permission to set other users as moderator of a channel",
+  "set-owner": "Set Owner",
+  "set-owner_description": "Permission to set other users as owner of a channel",
+  "set-react-when-readonly": "Set React When ReadOnly",
+  "set-react-when-readonly_description": "Permission to set the ability to react to messages in a read only channel",
+  "set-readonly": "Set ReadOnly",
+  "set-readonly_description": "Permission to set a channel to read only channel",
+  "Set_as_leader": "Set as leader",
   "Set_as_moderator": "Set as moderator",
   "Set_as_owner": "Set as owner",
-  "Set_as_leader": "Set as leader",
   "Settings": "Settings",
   "Settings_updated": "Settings updated",
   "Share_Location_Title": "Share Location?",
@@ -1639,6 +1600,7 @@
   "Show_only_online": "Show only online",
   "Show_preregistration_form": "Show pre-registration form",
   "Show_queue_list_to_all_agents": "Show queue list to all agents",
+  "Show_the_keyboard_shortcut_list": "Show the keyboard shortcut list",
   "Showing_archived_results": "<p>Showing <b>%s</b> archived results</p>",
   "Showing_online_users": "Showing: <b>__total_showing__</b>, Online: __online__, Total: __total__ users",
   "Showing_results": "<p>Showing <b>%s</b> results</p>",
@@ -1650,11 +1612,11 @@
   "Site_Url_Description": "Example: https://chat.domain.com/",
   "Skip": "Skip",
   "SlackBridge_error": "SlackBridge got an error while importing your messages at %s: %s",
+  "SlackBridge_finish": "SlackBridge has finished importing the messages at %s. Please reload to view all messages.",
   "SlackBridge_Out_All": "SlackBridge Out All",
   "SlackBridge_Out_All_Description": "Send messages from all channels that exist in Slack and the bot has joined",
   "SlackBridge_Out_Channels": "SlackBridge Out Channels",
   "SlackBridge_Out_Channels_Description": "Choose which channels will send messages back to Slack",
-  "SlackBridge_finish": "SlackBridge has finished importing the messages at %s. Please reload to view all messages.",
   "SlackBridge_Out_Enabled": "SlackBridge Out Enabled",
   "SlackBridge_Out_Enabled_Description": "Choose whether SlackBridge should also send your messages back to Slack",
   "SlackBridge_start": "@%s has started a SlackBridge import at `#%s`. We'll let you know when it's finished.",
@@ -1681,6 +1643,8 @@
   "SMTP_Port": "SMTP Port",
   "SMTP_Test_Button": "Test SMTP Settings",
   "SMTP_Username": "SMTP Username",
+  "snippet-message": "Snippet Message",
+  "snippet-message_description": "Permission to create snippet message",
   "Snippet_Added": "Created on %s",
   "Snippet_Messages": "Snippet Messages",
   "Snippeted_a_message": "Created a snippet __snippetLink__",
@@ -1714,9 +1678,9 @@
   "Stats_Total_Livechat_Rooms": "Total Livechat Rooms",
   "Stats_Total_Messages": "Total Messages",
   "Stats_Total_Messages_Channel": "Total Messages in Channels",
-  "Stats_Total_Messages_PrivateGroup": "Total Messages in Private Groups",
   "Stats_Total_Messages_Direct": "Total Messages in Direct Messages",
   "Stats_Total_Messages_Livechat": "Total Messages in Livechats",
+  "Stats_Total_Messages_PrivateGroup": "Total Messages in Private Groups",
   "Stats_Total_Private_Groups": "Total Private Groups",
   "Stats_Total_Rooms": "Total Rooms",
   "Stats_Total_Users": "Total Users",
@@ -1757,32 +1721,32 @@
   "The_user_will_be_removed_from_s": "The user will be removed from %s",
   "The_user_wont_be_able_to_type_in_s": "The user won't be able to type in %s",
   "Theme": "Theme",
-  "theme-color-transparent-darker": "Transparent Darker",
-  "theme-color-transparent-dark": "Transparent Dark",
-  "theme-color-transparent-light": "Transparent Light",
-  "theme-color-transparent-lighter": "Transparent Lighter",
-  "theme-color-transparent-lightest": "Transparent Lightest",
+  "theme-color-component-color": "Component Color",
   "theme-color-content-background-color": "Content Background Color",
+  "theme-color-custom-scrollbar-color": "Custom Scrollbar Color",
+  "theme-color-error-color": "Error Color",
+  "theme-color-info-font-color": "Info Font Color",
+  "theme-color-link-font-color": "Link Font Color",
+  "theme-color-pending-color": "Pending Color",
+  "theme-color-primary-action-color": "Primary Action Color",
   "theme-color-primary-background-color": "Primary Background Color",
   "theme-color-primary-font-color": "Primary Font Color",
-  "theme-color-primary-action-color": "Primary Action Color",
+  "theme-color-secondary-action-color": "Secondary Action Color",
   "theme-color-secondary-background-color": "Secondary Background Color",
   "theme-color-secondary-font-color": "Secondary Font Color",
-  "theme-color-secondary-action-color": "Secondary Action Color",
-  "theme-color-component-color": "Component Color",
-  "theme-color-success-color": "Success Color",
-  "theme-color-pending-color": "Pending Color",
-  "theme-color-error-color": "Error Color",
   "theme-color-selection-color": "Selection Color",
-  "theme-color-tertiary-background-color": "Tertiary Background Color",
-  "theme-color-tertiary-font-color": "Tertiary Font Color",
-  "theme-color-link-font-color": "Link Font Color",
-  "theme-color-info-font-color": "Info Font Color",
-  "theme-color-custom-scrollbar-color": "Custom Scrollbar Color",
   "theme-color-status-away": "Away Status Color",
   "theme-color-status-busy": "Busy Status Color",
   "theme-color-status-offline": "Offline Status Color",
   "theme-color-status-online": "Online Status Color",
+  "theme-color-success-color": "Success Color",
+  "theme-color-tertiary-background-color": "Tertiary Background Color",
+  "theme-color-tertiary-font-color": "Tertiary Font Color",
+  "theme-color-transparent-dark": "Transparent Dark",
+  "theme-color-transparent-darker": "Transparent Darker",
+  "theme-color-transparent-light": "Transparent Light",
+  "theme-color-transparent-lighter": "Transparent Lighter",
+  "theme-color-transparent-lightest": "Transparent Lightest",
   "theme-color-unread-notification-color": "Unread Notifications Color",
   "theme-custom-css": "Custom CSS",
   "theme-font-body-font-family": "Body Font Family",
@@ -1795,11 +1759,6 @@
   "This_is_a_push_test_messsage": "This is a push test message",
   "This_room_has_been_archived_by__username_": "This room has been archived by __username__",
   "This_room_has_been_unarchived_by__username_": "This room has been unarchived by __username__",
-  "Two-factor_authentication": "Two-factor authentication",
-  "Two-factor_authentication_disabled": "Two-factor authentication disabled",
-  "Two-factor_authentication_enabled": "Two-factor authentication enabled",
-  "Two-factor_authentication_is_currently_disabled": "Two-factor authentication is currently disabled",
-  "Two-factor_authentication_native_mobile_app_warning": "WARNING: Once you enable this, you will not be able to login on the native mobile apps (Rocket.Chat+) using your password until they implement the 2FA.",
   "Thursday": "Thursday",
   "Time_in_seconds": "Time in seconds",
   "Title": "Title",
@@ -1811,29 +1770,38 @@
   "To_users": "To Users",
   "Toggle_original_translated": "Toggle original/translated",
   "Topic": "Topic",
-  "Travel_and_Places": "Travel & Places",
   "Transcript_Enabled": "Ask visitor if they would like a transcript after chat closed",
   "Transcript_message": "Message to show when asking about transcript",
   "Transcript_of_your_livechat_conversation": "Transcript of your livechat conversation.",
   "Translated": "Translated",
   "Translations": "Translations",
+  "Travel_and_Places": "Travel & Places",
   "Trigger_removed": "Trigger removed",
   "Trigger_Words": "Trigger Words",
   "Triggers": "Triggers",
   "True": "True",
   "Tuesday": "Tuesday",
+  "Two-factor_authentication": "Two-factor authentication",
+  "Two-factor_authentication_disabled": "Two-factor authentication disabled",
+  "Two-factor_authentication_enabled": "Two-factor authentication enabled",
+  "Two-factor_authentication_is_currently_disabled": "Two-factor authentication is currently disabled",
+  "Two-factor_authentication_native_mobile_app_warning": "WARNING: Once you enable this, you will not be able to login on the native mobile apps (Rocket.Chat+) using your password until they implement the 2FA.",
   "Type": "Type",
   "Type_your_email": "Type your email",
   "Type_your_message": "Type your message",
   "Type_your_name": "Type your name",
   "Type_your_new_password": "Type your new password",
   "UI_Allow_room_names_with_special_chars": "Allow special chars on room names",
+  "UI_Click_Direct_Message": "Click to Create Direct Message",
+  "UI_Click_Direct_Message_Description": "Skip opening profile tab, instead go straight to conversation",
   "UI_DisplayRoles": "Display Roles",
   "UI_Merge_Channels_Groups": "Merge private groups with channels",
   "UI_Unread_Counter_Style": "Unread counter style",
   "UI_Use_Name_Avatar": "Use full name initials to generate default avatar",
   "UI_Use_Real_Name": "Use Real Name",
   "Unarchive": "Unarchive",
+  "unarchive-room": "Unarchive Room",
+  "unarchive-room_description": "Permission to unarchive channels",
   "Unblock_User": "Unblock User",
   "Unmute_someone_in_room": "Unmute someone in the room",
   "Unmute_user": "Unmute user",
@@ -1841,10 +1809,10 @@
   "Unpin_Message": "Unpin Message",
   "Unread_Count": "Unread Count",
   "Unread_Count_DM": "Unread Count for Direct Messages",
-  "Unread_Tray_Icon_Alert": "Unread Tray Icon Alert",
   "Unread_Messages": "Unread Messages",
   "Unread_Rooms": "Unread Rooms",
   "Unread_Rooms_Mode": "Unread Rooms Mode",
+  "Unread_Tray_Icon_Alert": "Unread Tray Icon Alert",
   "Unstar_Message": "Remove Star",
   "Updated_at": "Updated at",
   "Upload_file_description": "File description",
@@ -1858,18 +1826,21 @@
   "Use_Emojis": "Use Emojis",
   "Use_Global_Settings": "Use Global Settings",
   "Use_initials_avatar": "Use your username initials",
+  "Use_minor_colors": "Use minor color palette (defaults inherit major colors)",
   "Use_service_avatar": "Use %s avatar",
   "Use_this_username": "Use this username",
   "Use_uploaded_avatar": "Use uploaded avatar",
   "Use_url_for_avatar": "Use url for avatar",
   "Use_User_Preferences_or_Global_Settings": "Use User Preferences or Global Settings",
   "User": "User",
+  "user-generate-access-token": "User Generate Access Token",
+  "user-generate-access-token_description": "Permission for users to generate access tokens",
+  "User__username__is_now_a_leader_of__room_name_": "User __username__ is now a leader of __room_name__",
   "User__username__is_now_a_moderator_of__room_name_": "User __username__ is now a moderator of __room_name__",
   "User__username__is_now_a_owner_of__room_name_": "User __username__ is now a owner of __room_name__",
-  "User__username__is_now_a_leader_of__room_name_": "User __username__ is now a leader of __room_name__",
+  "User__username__removed_from__room_name__leaders": "User __username__ removed from __room_name__ leaders",
   "User__username__removed_from__room_name__moderators": "User __username__ removed from __room_name__ moderators",
   "User__username__removed_from__room_name__owners": "User __username__ removed from __room_name__ owners",
-  "User__username__removed_from__room_name__leaders": "User __username__ removed from __room_name__ leaders",
   "User_added": "User added",
   "User_added_by": "User <em>__user_added__</em> added by <em>__user_by__</em>.",
   "User_added_successfully": "User added successfully",
@@ -1919,6 +1890,7 @@
   "Username_invalid": "<strong>%s</strong> is not a valid username,<br/> use only letters, numbers, dots, hyphens and underscores",
   "Username_is_already_in_here": "`@%s` is already in here.",
   "Username_is_not_in_this_room": "The user `#%s` is not in this room.",
+  "Username_Placeholder": "Please enter usernames...",
   "Username_title": "Register username",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ wants to start OTR. Do you want to accept?",
   "Users": "Users",
@@ -1930,9 +1902,9 @@
   "Validate_email_address": "Validate email address",
   "Verification": "Verification",
   "Verification_Description": "You may use the following placeholders: <br /><ul><li>[Verification_Url] for the verification URL.</li><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
+  "Verification_Email": "Click <a href=\"[Verification_Url]\">here</a> to verify your account.",
   "Verification_email_sent": "Verification email sent",
   "Verification_Email_Subject": "[Site_Name] - Verify your account",
-  "Verification_Email": "Click <a href=\"[Verification_Url]\">here</a> to verify your account.",
   "Verified": "Verified",
   "Verify": "Verify",
   "Version": "Version",
@@ -1941,6 +1913,39 @@
   "Video_message": "Video message",
   "Videocall_declined": "Videocall declined.",
   "Videocall_enabled": "Videocall enabled",
+  "view-c-room": "View Public Channel",
+  "view-c-room_description": "Permission to view public channels",
+  "view-d-room": "View Direct Messages",
+  "view-d-room_description": "Permission to view direct messages",
+  "view-full-other-user-info": "View Full Other User Info",
+  "view-full-other-user-info_description": "Permission to view full profile of other users including account creation date, last login, etc.",
+  "view-history": "View History",
+  "view-history_description": "Permission to view the channel history",
+  "view-join-code": "View Join Code",
+  "view-join-code_description": "Permission to view the channel join code",
+  "view-joined-room": "View Joined Room",
+  "view-joined-room_description": "Permission to view the currently joined channels",
+  "view-l-room": "View Livechat Rooms",
+  "view-l-room_description": "Permission to view livechat channels",
+  "view-livechat-manager": "View Livechat Manager",
+  "view-livechat-manager_description": "Permission to view other livechat managers",
+  "view-livechat-rooms": "View Livechat Rooms",
+  "view-livechat-rooms_description": "Permission to view other livechat channels",
+  "view-logs": "View Logs",
+  "view-logs_description": "Permission to view the server logs ",
+  "view-other-user-channels": "View Other User Channels",
+  "view-other-user-channels_description": "Permission to view channels owned by other users",
+  "view-outside-room": "View Outside Room",
+  "view-p-room": "View Private Room",
+  "view-p-room_description": "Permission to view private channels",
+  "view-privileged-setting": "View Privileged Setting",
+  "view-privileged-setting_description": "Permission to view settings",
+  "view-room-administration": "View Room Administration",
+  "view-room-administration_description": "Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives",
+  "view-statistics": "View Statistics",
+  "view-statistics_description": "Permission o view system statistics such as number of users logged in, number of rooms, operating system information",
+  "view-user-administration": "View User Administration",
+  "view-user-administration_description": "Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission",
   "View_All": "View All",
   "View_Logs": "View Logs",
   "View_mode": "View mode",
@@ -1973,13 +1978,13 @@
   "Would_you_like_to_return_the_inquiry": "Would you like to return the inquiry?",
   "Yes": "Yes",
   "Yes_archive_it": "Yes, archive it!",
-  "Yes_unarchive_it": "Yes, unarchive it!",
   "Yes_clear_all": "Yes, clear all!",
   "Yes_delete_it": "Yes, delete it!",
   "Yes_hide_it": "Yes, hide it!",
   "Yes_leave_it": "Yes, leave it!",
   "Yes_mute_user": "Yes, mute user!",
   "Yes_remove_user": "Yes, remove user!",
+  "Yes_unarchive_it": "Yes, unarchive it!",
   "You": "You",
   "you_are_in_preview_mode_of": "You are in preview mode of channel #<strong>__room_name__</strong>",
   "You_are_logged_in_as": "You are logged in as",

From 22d84565772cd8ab0ac9ddfe8393ed194ae6123a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 18:35:59 -0300
Subject: [PATCH 097/244] Merge pull request #8295 from
 Darkneon/fix-accessing-undefined-attachments

[FIX] Check attachments is defined before accessing first element
---
 .../rocketchat-lib/server/lib/sendNotificationsOnMessage.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index 1083d18d76e..ddda8b880de 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -31,7 +31,7 @@ function parseMessageText(message, userId) {
 	const user = RocketChat.models.Users.findOneById(userId);
 	const lng = user && user.language || RocketChat.settings.get('language') || 'en';
 
-	if (!message.msg && message.attachments[0]) {
+	if (!message.msg && message.attachments && message.attachments[0]) {
 		message.msg = message.attachments[0].image_type ? TAPi18n.__('User_uploaded_image', {lng}) : TAPi18n.__('User_uploaded_file', {lng});
 	}
 	message.msg = RocketChat.callbacks.run('beforeNotifyUser', message.msg);

From 3e72e0c2d474e2d556e7b5e14081d12ab1a4c8f0 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 25 Sep 2017 19:26:49 -0300
Subject: [PATCH 098/244] Merge pull request #8296 from
 RocketChat/hotfix/s3-download-file-name

[FIX] Wrong file name when upload to AWS S3
---
 packages/rocketchat-file-upload/ufs/AmazonS3/server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
index f69b05a883c..048732e8838 100644
--- a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
+++ b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
@@ -137,7 +137,8 @@ export class AmazonS3Store extends UploadFS.Store {
 			s3.putObject({
 				Key: this.getPath(file),
 				Body: writeStream,
-				ContentType: file.type
+				ContentType: file.type,
+				ContentDisposition: `inline; filename=${ file.name }`
 
 			}, (error) => {
 				if (error) {

From ab6339399dbd3486e17036592cef1b5fc2e6906b Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 25 Sep 2017 19:25:06 -0300
Subject: [PATCH 099/244] Merge pull request #8298 from
 RocketChat/hotfix/exception-on-room-notification

[FIX] TypeError: Cannot read property 't' of undefined
---
 packages/rocketchat-lib/server/functions/Notifications.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/rocketchat-lib/server/functions/Notifications.js b/packages/rocketchat-lib/server/functions/Notifications.js
index 89fec97a279..1ebd77f6e8d 100644
--- a/packages/rocketchat-lib/server/functions/Notifications.js
+++ b/packages/rocketchat-lib/server/functions/Notifications.js
@@ -36,6 +36,10 @@ RocketChat.Notifications = new class {
 				}
 			});
 			const room = RocketChat.models.Rooms.findOneById(roomId);
+			if (!room) {
+				console.warn(`Invalid streamRoom eventName: "${ eventName }"`);
+				return false;
+			}
 			if (room.t === 'l' && room.v._id === user._id) {
 				return true;
 			}

From 1156ad1cb1d1fd9ba253de670e1b5f134dd00b75 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 18:32:47 -0300
Subject: [PATCH 100/244] Merge pull request #8299 from RocketChat/scroll-admin

 [FIX] Amin menu not showing all items & File list breaking line
---
 .../client/imports/components/sidebar/rooms-list.css          | 2 ++
 .../client/imports/components/sidebar/sidebar.css             | 4 ++++
 packages/rocketchat-theme/client/imports/general/base_old.css | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 46ca9ee6363..8dc048b042e 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -6,6 +6,8 @@
 
 	height: 100%;
 
+	flex: 1 1 auto;
+
 	&__list {
 		&:not(:last-child) {
 			margin-bottom: 32px;
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index be8f8e403b2..98efa6a0940 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -20,6 +20,10 @@
 	&-light {
 		position: absolute;
 
+		display: flex;
+
+		flex-direction: column;
+
 		width: 100%;
 
 		height: 100%;
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 964f48eede2..35e0f1ca16e 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3757,7 +3757,8 @@ body:not(.is-cordova) {
 			margin-bottom: 10px;
 		  }
 		}
-		& a .file-name {
+		
+		& .file-name {
 			display: block;
 
 			padding: 10px 5px;

From 96528fea454159e6e0ba443d5f0b834964b17b5f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 18:28:11 -0300
Subject: [PATCH 101/244] Merge pull request #8300 from
 RocketChat/fix-emojipicker-index

[FIX] Emoji Picker hidden for reactions in RTL
---
 packages/rocketchat-emoji/client/emojiPicker.css              | 1 +
 .../rocketchat-google-vision/.npm/package/npm-shrinkwrap.json | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-emoji/client/emojiPicker.css b/packages/rocketchat-emoji/client/emojiPicker.css
index 6e3b1d9f6c8..0f301babf00 100644
--- a/packages/rocketchat-emoji/client/emojiPicker.css
+++ b/packages/rocketchat-emoji/client/emojiPicker.css
@@ -16,6 +16,7 @@
 
 .emoji-picker {
 	position: absolute;
+	z-index: 100;
 
 	display: none;
 
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 2d20406f861..3f74f649d01 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1096,8 +1096,8 @@
       "from": "methmeth@>=1.1.0 <2.0.0"
     },
     "mime": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
       "from": "mime@>=1.2.11 <2.0.0"
     },
     "mime-db": {

From 0e2de7ca51b9622caf921c39a8fb8f16dd6346b2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 22:32:45 -0300
Subject: [PATCH 102/244] Merge pull request #8304 from
 RocketChat/add-rdstation-livechat-integration

[NEW] Add RD Station integration to livechat
---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  1 +
 packages/rocketchat-livechat/config.js        |  8 +++
 packages/rocketchat-livechat/package.js       |  1 +
 .../server/hooks/RDStation.js                 | 53 +++++++++++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 packages/rocketchat-livechat/server/hooks/RDStation.js

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 71ffa15e24f..a420e7eb096 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1430,6 +1430,7 @@
   "quote": "quote",
   "Quote": "Quote",
   "Random": "Random",
+  "RDStation_Token": "RD Station Token",
   "React_when_read_only": "Allow Reacting",
   "React_when_read_only_changed_successfully": "Allow reacting when read only changed successfully",
   "Reacted_with": "Reacted with",
diff --git a/packages/rocketchat-livechat/config.js b/packages/rocketchat-livechat/config.js
index 014dfef9401..b9ea597aa5a 100644
--- a/packages/rocketchat-livechat/config.js
+++ b/packages/rocketchat-livechat/config.js
@@ -235,4 +235,12 @@ Meteor.startup(function() {
 		i18nLabel: 'Livechat_AllowedDomainsList',
 		i18nDescription: 'Domains_allowed_to_embed_the_livechat_widget'
 	});
+
+	RocketChat.settings.add('Livechat_RDStation_Token', '', {
+		type: 'string',
+		group: 'Livechat',
+		public: false,
+		section: 'RD Station',
+		i18nLabel: 'RDStation_Token'
+	});
 });
diff --git a/packages/rocketchat-livechat/package.js b/packages/rocketchat-livechat/package.js
index 26451fc650a..c90187ef6f3 100644
--- a/packages/rocketchat-livechat/package.js
+++ b/packages/rocketchat-livechat/package.js
@@ -127,6 +127,7 @@ Package.onUse(function(api) {
 	api.addFiles('server/hooks/externalMessage.js', 'server');
 	api.addFiles('server/hooks/markRoomResponded.js', 'server');
 	api.addFiles('server/hooks/offlineMessage.js', 'server');
+	api.addFiles('server/hooks/RDStation.js', 'server');
 	api.addFiles('server/hooks/sendToCRM.js', 'server');
 
 	// methods
diff --git a/packages/rocketchat-livechat/server/hooks/RDStation.js b/packages/rocketchat-livechat/server/hooks/RDStation.js
new file mode 100644
index 00000000000..796a6ade780
--- /dev/null
+++ b/packages/rocketchat-livechat/server/hooks/RDStation.js
@@ -0,0 +1,53 @@
+function sendToRDStation(room) {
+	if (!RocketChat.settings.get('Livechat_RDStation_Token')) {
+		return room;
+	}
+
+	const livechatData = RocketChat.Livechat.getLivechatRoomGuestInfo(room);
+
+	if (!livechatData.visitor.email) {
+		return room;
+	}
+
+	const options = {
+		headers: {
+			'Content-Type': 'application/json'
+		},
+		data: {
+			token_rdstation: RocketChat.settings.get('Livechat_RDStation_Token'),
+			identificador: 'rocketchat-livechat',
+			client_id: livechatData.visitor._id,
+			email: livechatData.visitor.email
+		}
+	};
+
+	options.data.nome = livechatData.visitor.name || livechatData.visitor.username;
+
+	if (livechatData.visitor.phone) {
+		options.data.telefone = livechatData.visitor.phone;
+	}
+
+	if (livechatData.tags) {
+		options.data.tags = livechatData.tags;
+	}
+
+	Object.keys(livechatData.customFields || {}).forEach(field => {
+		options.data[field] = livechatData.customFields[field];
+	});
+
+	Object.keys(livechatData.visitor.customFields || {}).forEach(field => {
+		options.data[field] = livechatData.visitor.customFields[field];
+	});
+
+	try {
+		HTTP.call('POST', 'https://www.rdstation.com.br/api/1.3/conversions', options);
+	} catch (e) {
+		console.error('Error sending lead to RD Station ->', e);
+	}
+
+	return room;
+}
+
+RocketChat.callbacks.add('livechat.closeRoom', sendToRDStation, RocketChat.callbacks.priority.MEDIUM, 'livechat-rd-station-close-room');
+
+RocketChat.callbacks.add('livechat.saveInfo', sendToRDStation, RocketChat.callbacks.priority.MEDIUM, 'livechat-rd-station-save-info');

From 412f8be9061ef1c07af2cbb9a7228d80bbd20a6a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 18:29:16 -0300
Subject: [PATCH 103/244] Merge pull request #8307 from
 RocketChat/call-button-rtl

[FIX] Call buttons with wrong margin on RTL
---
 packages/rocketchat-theme/client/imports/general/rtl.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/general/rtl.css b/packages/rocketchat-theme/client/imports/general/rtl.css
index 9d18175910f..759ec7b0d6b 100644
--- a/packages/rocketchat-theme/client/imports/general/rtl.css
+++ b/packages/rocketchat-theme/client/imports/general/rtl.css
@@ -1,6 +1,15 @@
 .rtl {
 	direction: rtl;
 
+	& .rc-old .buttons-group .button {
+		margin-right: 4px;
+		margin-left: auto;
+
+		&:first-child {
+			margin-right: 0;
+		}
+	}
+
 	& .rc-old .page-container .content .rocket-form .submit {
 		text-align: left;
 	}

From 5097a5bc6ab5b7231b6bfd0dba46c870578f4756 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Sep 2017 22:31:16 -0300
Subject: [PATCH 104/244] Merge pull request #8310 from
 RocketChat/disable-travis-chache-on-tags

[FIX] Execute meteor reset on TRAVIS_TAG builds
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 948ec8f880c..b273a174da2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ before_install:
 install:
 - export PATH="$HOME/.meteor:$PATH"
 before_script:
+- if [[ $TRAVIS_TAG ]]; then meteor reset; fi
 - echo "replication:" | sudo tee -a /etc/mongod.conf
 - |-
   echo "  replSetName: \"rs0\"" | sudo tee -a /etc/mongod.conf

From 0cbf5b5d28127e93962cf8db2dc3662b0e62aa8c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 26 Sep 2017 10:55:04 -0300
Subject: [PATCH 105/244] Bump version to 0.59.0-rc.9

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 36 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 8be632f836a..ab7eb6a3f2a 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.8
+ENV RC_VERSION 0.59.0-rc.9
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 24630c8ce55..f4043bf25be 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.8"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.9"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 979194b7626..91614cb341f 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.8
+    RC_VERSION=0.59.0-rc.9
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index c7e3e8a1775..34c1cd23815 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,39 @@
+<a name="0.59.0-rc.9"></a>
+# 0.59.0-rc.9 (2017-09-26)
+
+
+### New Features
+
+- [#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304) Add RD Station integration to livechat
+
+
+### Bug Fixes
+
+- [#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) "Cancel button" on modal in RTL in Firefox 55
+- [#8266](https://github.com/RocketChat/Rocket.Chat/pull/8266) "Channel Setting" buttons alignment in RTL
+- [#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) [i18n] My Profile & README.md links
+- [#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) Attachment icons alignment in LTR and RTL
+- [#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) Call buttons with wrong margin on RTL
+- [#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) Check attachments is defined before accessing first element
+- [#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) Emoji Picker hidden for reactions in RTL
+- [#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310) Execute meteor reset on TRAVIS_TAG builds
+- [#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286) Missing placeholder translations
+- [#8237](https://github.com/RocketChat/Rocket.Chat/pull/8237) Removing pipe and commas from custom emojis ([#8168](https://github.com/RocketChat/Rocket.Chat/issues/8168))
+- [#8269](https://github.com/RocketChat/Rocket.Chat/pull/8269) some placeholder and phrase traslation fix
+- [#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298) TypeError: Cannot read property 't' of undefined
+- [#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296) Wrong file name when upload to AWS S3
+
+
+<details>
+<summary>Others</summary>
+
+- [#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299)  [FIX] Amin menu not showing all items & File list breaking line
+- [#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273) Deps update
+- [#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282) fix color on unread messages
+</details>
+
+
+
 <a name="0.59.0-rc.8"></a>
 # 0.59.0-rc.8 (2017-09-23)
 
diff --git a/package.json b/package.json
index 1c31dd850d4..002fadd3a48 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.8",
+	"version": "0.59.0-rc.9",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index a930221d82e..671261211ce 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.8"
+	"version": "0.59.0-rc.9"
 }

From a494cf501d67af619b844a441aee8564d7a483be Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 27 Sep 2017 16:19:24 -0300
Subject: [PATCH 106/244] Deps update

---
 .meteor/versions                              | 48 ++++++++++---------
 .../rocketchat-livechat/app/.meteor/versions  | 48 ++++++++++---------
 2 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/.meteor/versions b/.meteor/versions
index 08ec0c6b51f..614c87b262f 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.1
+accounts-base@1.3.3
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0
@@ -7,39 +7,40 @@ accounts-oauth@1.1.15
 accounts-password@1.4.0
 accounts-twitter@1.3.0
 aldeed:simple-schema@1.5.3
-allow-deny@1.0.6
+allow-deny@1.0.9
 autoupdate@1.3.12
-babel-compiler@6.19.4
+babel-compiler@6.20.0
 babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.1.1
+boilerplate-generator@1.2.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
 cfs:http-methods@0.0.32
 check@1.2.5
-coffeescript@1.12.6_1
+coffeescript@1.12.7_1
+coffeescript-compiler@1.12.7_1
 dandv:caret-position@2.1.1
-ddp@1.3.0
-ddp-client@2.0.0
+ddp@1.3.1
+ddp-client@2.1.3
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.0
+ddp-server@2.0.2
 deepwell:bootstrap-datepicker2@1.3.0
 deps@1.0.12
 diff-sequence@1.0.7
 dispatch:run-as-user@1.1.1
-dynamic-import@0.1.1
-ecmascript@0.8.2
+dynamic-import@0.1.3
+ecmascript@0.8.3
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
 edgee:slingshot@0.7.1
-ejson@1.0.13
+ejson@1.0.14
 email@1.2.3
 emojione:emojione@2.2.6
 facebook-oauth@1.3.2
@@ -75,22 +76,23 @@ localstorage@1.1.1
 logging@1.1.17
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.7.0
+meteor@1.7.2
 meteor-base@1.1.0
 meteor-developer-oauth@1.2.0
 meteorhacks:inject-initial@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.1
-minimongo@1.2.1
+minifier-js@2.1.4
+minimongo@1.3.2
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
-mobile-experience@1.0.4
+mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.9.2
+modules@0.10.0
 modules-runtime@0.8.0
-mongo@1.1.19
+mongo@1.2.2
+mongo-dev-server@1.0.1
 mongo-id@1.0.6
 mongo-livedata@1.0.12
 mrt:reactive-store@0.0.1
@@ -98,7 +100,7 @@ mystor:device-detection@0.2.0
 nimble:restivus@0.8.12
 nooitaf:colors@1.1.2_1
 npm-bcrypt@0.9.3
-npm-mongo@2.2.24
+npm-mongo@2.2.30
 oauth@1.1.13
 oauth1@1.1.11
 oauth2@1.1.11
@@ -108,7 +110,7 @@ ostrio:cookies@2.2.2
 pauli:accounts-linkedin@2.1.3
 pauli:linkedin-oauth@1.1.0
 percolate:synced-cron@1.3.2
-promise@0.8.9
+promise@0.9.0
 raix:eventemitter@0.1.3
 raix:eventstate@0.0.4
 raix:handlebar-helpers@0.2.5
@@ -232,13 +234,13 @@ shell-server@0.2.4
 simple:json-routes@2.1.0
 smoral:sweetalert@1.1.1
 spacebars@1.0.15
-spacebars-compiler@1.1.2
+spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-js@2.1.1
+standard-minifier-js@2.1.2
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.2
-templating-compiler@1.3.2
+templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
 tmeasday:crypto-base@3.1.2
@@ -250,7 +252,7 @@ ui@1.0.13
 underscore@1.0.10
 underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.17
+webapp@1.3.19
 webapp-hashing@1.0.9
 yasaricli:slugify@0.0.7
 yasinuslu:blaze-meta@0.3.3
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index 68415ab19a6..3a67863f420 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -1,33 +1,34 @@
-accounts-base@1.3.1
+accounts-base@1.3.3
 accounts-password@1.4.0
 aldeed:simple-schema@1.5.3
-allow-deny@1.0.6
-babel-compiler@6.19.4
+allow-deny@1.0.9
+babel-compiler@6.20.0
 babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-tools@1.0.10
-boilerplate-generator@1.1.1
+boilerplate-generator@1.2.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
 cfs:http-methods@0.0.32
 check@1.2.5
-coffeescript@1.12.6_1
-ddp@1.3.0
-ddp-client@2.0.0
+coffeescript@1.12.7_1
+coffeescript-compiler@1.12.7_1
+ddp@1.3.1
+ddp-client@2.1.3
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.0
+ddp-server@2.0.2
 deps@1.0.12
 diff-sequence@1.0.7
-dynamic-import@0.1.1
-ecmascript@0.8.2
+dynamic-import@0.1.3
+ecmascript@0.8.3
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
-ejson@1.0.13
+ejson@1.0.14
 email@1.2.3
 es5-shim@4.6.15
 geojson-utils@1.0.10
@@ -44,22 +45,23 @@ livedata@1.0.18
 localstorage@1.1.1
 logging@1.1.17
 mdg:validation-error@0.5.1
-meteor@1.7.0
+meteor@1.7.2
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.1
-minimongo@1.2.1
+minifier-js@2.1.4
+minimongo@1.3.2
 mizzao:timesync@0.5.0
-modules@0.9.2
+modules@0.10.0
 modules-runtime@0.8.0
 momentjs:moment@2.18.1
-mongo@1.1.19
+mongo@1.2.2
+mongo-dev-server@1.0.1
 mongo-id@1.0.6
 npm-bcrypt@0.9.3
-npm-mongo@2.2.24
+npm-mongo@2.2.30
 observe-sequence@1.0.16
 ordered-dict@1.0.9
-promise@0.8.9
+promise@0.9.0
 raix:eventemitter@0.1.3
 random@1.0.10
 rate-limit@1.0.8
@@ -74,13 +76,13 @@ sha@1.0.9
 shell-server@0.2.4
 smoral:sweetalert@1.1.1
 spacebars@1.0.15
-spacebars-compiler@1.1.2
+spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-css@1.3.4
-standard-minifier-js@2.1.1
+standard-minifier-css@1.3.5
+standard-minifier-js@2.1.2
 tap:i18n@1.8.2
 templating@1.3.2
-templating-compiler@1.3.2
+templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
 tracker@1.1.3
@@ -88,5 +90,5 @@ ui@1.0.13
 underscore@1.0.10
 underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.17
+webapp@1.3.19
 webapp-hashing@1.0.9

From bd331177efd9149b96439f55d4f7ab0955f629a2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 27 Sep 2017 16:44:52 -0300
Subject: [PATCH 107/244] Bump version to 0.58.3

---
 .docker/Dockerfile                      | 2 +-
 .sandstorm/sandstorm-pkgdef.capnp       | 2 +-
 .travis/snap.sh                         | 2 +-
 HISTORY.md                              | 5 +++++
 package.json                            | 2 +-
 packages/rocketchat-lib/rocketchat.info | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 41eaa635012..c3596c9f7c3 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.58.2
+ENV RC_VERSION 0.58.3
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 61a74fd70dc..79a1116c533 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.58.2"),
+		appMarketingVersion = (defaultText = "0.58.3"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index fa0a814d2fa..4cd3613f9ad 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.58.2
+    RC_VERSION=0.58.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 8863fd21a08..24927916816 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,8 @@
+<a name="0.58.3"></a>
+## 0.58.3 (2017-09-27)
+- Dependencies update
+
+
 <a name="0.58.2"></a>
 ## 0.58.2 (2017-08-23)
 
diff --git a/package.json b/package.json
index a76fde173de..7bb1fb3bb3d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.58.2",
+	"version": "0.58.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 4d1504916bf..47cb647194e 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.58.2"
+	"version": "0.58.3"
 }

From 5114ce8fa8d90290e817a01d235c7b782d9adcdb Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 26 Sep 2017 15:44:15 -0300
Subject: [PATCH 108/244] Merge pull request #8316 from
 RocketChat/hotfix/mention-indicator

[FIX] Mention unread indicator was removed
---
 .../rocketchat-theme/client/imports/components/badge.css     | 3 ++-
 .../client/imports/components/sidebar/sidebar-item.css       | 5 +++--
 packages/rocketchat-ui-sidenav/client/sidebarItem.html       | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/badge.css b/packages/rocketchat-theme/client/imports/components/badge.css
index b3fbeb8e163..b8c73374510 100644
--- a/packages/rocketchat-theme/client/imports/components/badge.css
+++ b/packages/rocketchat-theme/client/imports/components/badge.css
@@ -11,7 +11,8 @@
 
 	font-size: var(--badge-text-size);
 
-	&--unread {
+	&--unread,
+	&--mention {
 		background-color: var(--badge-unread-background);
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 2e2368783b6..efe8f46a5a8 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -40,8 +40,9 @@
 		background-color: var(--sidebar-item-active-background);
 	}
 
-	&--unread {
-    color: var(--sidebar-item-unread-color);
+	&--unread,
+	&--mention {
+    	color: var(--sidebar-item-unread-color);
 
 		& .sidebar-item__menu {
 			transition: margin 0.1s;
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 3eeb96ea2d7..a567a205388 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -16,6 +16,9 @@
 				{{/if}}
 			</div>
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
+			{{#if userMentions}}
+				<span class="badge badge--mention">@</span>
+			{{/if}}
 			{{#if unread}}
 				<span class="badge badge--unread">{{unread}}</span>
 			{{/if}}

From b0c7fd03033696d3d8b839d72248707663ab5302 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 09:34:59 -0300
Subject: [PATCH 109/244] Merge pull request #8315 from
 RocketChat/message-actions-popover

[FIX] Put delete action on another popover group
---
 packages/rocketchat-lib/client/MessageAction.js  |  1 +
 .../client/imports/components/popover.css        |  2 +-
 packages/rocketchat-ui/client/views/app/room.js  | 16 +++++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index e73f3309bee..4a931008a51 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -173,6 +173,7 @@ Meteor.startup(function() {
 		icon: 'trash',
 		label: 'Delete',
 		context: ['message', 'message-mobile'],
+		color: 'alert',
 		action() {
 			const message = this._arguments[1];
 			chatMessages[Session.get('openedRoom')].confirmDeleteMsg(message);
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 94fdc55db8b..25de8edb18c 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -93,7 +93,7 @@
 		font-size: var(--popover-item-text-size);
 		align-items: center;
 
-		&--error {
+		&--alert {
 			color: var(--color-error);
 
 			& .rc-icon {
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 6e84324a102..3182ecf1122 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -547,24 +547,26 @@ Template.room.events({
 		}
 
 		const [, message] = this._arguments;
-		const items = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
+		const allItems = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
 			return {
 				icon: item.icon,
 				name: t(item.label),
 				type: 'message-action',
 				id: item.id,
-				modifier: item.id === 'delete-message' ? 'error' : null
+				modifier: item.color
 			};
 		});
+		const [items, deleteItem] = allItems.reduce((result, value) => (result[value.id === 'delete-message' ? 1 : 0].push(value), result), [[], []]);
+		const groups = [{ items }];
+
+		if (deleteItem.length) {
+			groups.push({ items: deleteItem });
+		}
 
 		const config = {
 			columns: [
 				{
-					groups: [
-						{
-							items
-						}
-					]
+					groups
 				}
 			],
 			instance: i,

From 16ecc69f224cbf215e2c2db384f4b361aa6ddf76 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 09:35:37 -0300
Subject: [PATCH 110/244] Merge pull request #8317 from
 RocketChat/MartinSchoeler-patch-1

[FIX] Email Subjects not being sent
---
 packages/rocketchat-lib/server/lib/sendEmailOnMessage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
index affb1844108..2f507d071fc 100644
--- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
@@ -113,7 +113,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 			usersOfMention.forEach((user) => {
 				if (usersToSendEmail[user._id] === 'default') {
 					if (!user.settings || !user.settings.preferences || !user.settings.preferences.emailNotificationMode || user.settings.preferences.emailNotificationMode === 'all') { //Mention/DM
-						usersToSendEmail[user._id] === 'mention';
+						usersToSendEmail[user._id] = 'mention';
 					} else {
 						return;
 					}

From 7827574549d40fc2e1b89fa2218745a1ea79300e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 09:36:41 -0300
Subject: [PATCH 111/244] Merge pull request #8331 from
 RocketChat/mobile-file-upload

[FIX-RC] Mobile file upload not working
---
 .../startup/messageBoxActions.js              | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/packages/rocketchat-ui-message/startup/messageBoxActions.js b/packages/rocketchat-ui-message/startup/messageBoxActions.js
index 4a115fe7b76..878dd2207ed 100644
--- a/packages/rocketchat-ui-message/startup/messageBoxActions.js
+++ b/packages/rocketchat-ui-message/startup/messageBoxActions.js
@@ -1,4 +1,4 @@
-/* globals fileUpload popover chatMessages AudioRecorder */
+/* globals fileUpload chatMessages AudioRecorder device */
 
 import mime from 'mime-type/with-db';
 import {VRecDialog} from 'meteor/rocketchat:ui-vrecord';
@@ -46,32 +46,35 @@ RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
 	id: 'file-upload',
 	icon: 'computer',
 	condition: () => RocketChat.settings.get('FileUpload_Enabled'),
-	action() {
-		setTimeout(() => {
-			popover.close();
-			const input = document.createElement('input');
-			input.style.display = 'none';
-			input.type = 'file';
-			input.setAttribute('multiple', 'multiple');
-			document.body.appendChild(input);
+	action({event}) {
+		event.preventDefault();
+		const input = document.createElement('input');
+		input.style.display = 'none';
+		input.type = 'file';
+		input.setAttribute('multiple', 'multiple');
+		document.body.appendChild(input);
+
+		input.click();
 
+		// Simple hack for cordova aka codegueira
+		if (typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios') {
 			input.click();
+		}
 
-			input.addEventListener('change', function(e) {
-				const filesToUpload = [...e.target.files].map(file => {
-					Object.defineProperty(file, 'type', {
-						value: mime.lookup(file.name)
-					});
-					return {
-						file,
-						name: file.name
-					};
+		input.addEventListener('change', function(e) {
+			const filesToUpload = [...e.target.files].map(file => {
+				Object.defineProperty(file, 'type', {
+					value: mime.lookup(file.name)
 				});
-				return fileUpload(filesToUpload);
-			}, {once: true});
+				return {
+					file,
+					name: file.name
+				};
+			});
+			return fileUpload(filesToUpload);
+		}, {once: true});
 
-			input.remove();
-		}, 100);
+		input.remove();
 	}
 });
 

From 63b910ed923763bb222d01d85f5376693761de15 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 09:38:24 -0300
Subject: [PATCH 112/244] Merge pull request #8334 from
 RocketChat/admin-embedded-version

[FIX] Remove sidebar header on admin embedded version
---
 .../client/views/sideNav/livechatFlex.html     | 18 ++++++++++--------
 .../client/views/sideNav/livechatFlex.js       |  3 +++
 .../imports/components/sidebar/rooms-list.css  |  7 ++++++-
 .../client/accountFlex.html                    | 18 ++++++++++--------
 .../client/accountFlex.js                      |  3 +++
 .../rocketchat-ui-admin/client/adminFlex.html  | 18 ++++++++++--------
 .../rocketchat-ui-admin/client/adminFlex.js    |  3 +++
 .../rocketchat-ui/client/views/app/burger.html | 12 +++++++-----
 .../rocketchat-ui/client/views/app/burger.js   |  3 +++
 9 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
index e49d9b3d7f1..db39a88c72f 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
@@ -1,13 +1,15 @@
 <template name="livechatFlex">
 	<aside class="sidebar-light" role="navigation">
-		<header class="sidebar__header">
-			{{> accountBox lighten=true modifier="--livechat"}}
-			<button class="sidebar-flex__back-button" data-action="back">
-				{{> icon block="sidebar-flex__back-icon" icon="back"}}
-				<span>{{_ "Back_to_chat"}}</span>
-			</button>
-		</header>
-		<div class="rooms-list">
+		{{#unless embeddedVersion}}
+			<header class="sidebar__header">
+				{{> accountBox lighten=true modifier="--livechat"}}
+				<button class="sidebar-flex__back-button" data-action="back">
+					{{> icon block="sidebar-flex__back-icon" icon="back"}}
+					<span>{{_ "Back_to_chat"}}</span>
+				</button>
+			</header>
+		{{/unless}}
+		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}">
 			<ul class="rooms-list__list">
 				{{> sidebarItem menuItem "Current_Chats" false "livechat-current-chats" }}
 				{{> sidebarItem menuItem "User_management" false "livechat-users" }}
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
index e9b55bc890e..4106d41ea44 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
@@ -6,6 +6,9 @@ Template.livechatFlex.helpers({
 			pathSection: section,
 			darken: true
 		};
+	},
+	embeddedVersion() {
+		return RocketChat.Layout.isEmbedded();
 	}
 });
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 8dc048b042e..62558ef1d43 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -2,11 +2,16 @@
 
 .rooms-list {
 	position: relative;
+
 	overflow-y: scroll;
 
+	flex: 1 1 auto;
+
 	height: 100%;
 
-	flex: 1 1 auto;
+	&--embedded {
+		margin-top: 2rem;
+	}
 
 	&__list {
 		&:not(:last-child) {
diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html
index 2571bda5e8b..f0829b5eae2 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.html
+++ b/packages/rocketchat-ui-account/client/accountFlex.html
@@ -1,13 +1,15 @@
 <template name="accountFlex">
 	<aside class="sidebar-light" role="navigation">
-		<header class="sidebar__header">
-			{{> accountBox lighten=true modifier="--account" }}
-			<button class="sidebar-flex__back-button" data-action="back">
-				{{> icon block="sidebar-flex__back-icon" icon="back"}}
-				<span>{{_ "Back_to_chat"}}</span>
-			</button>
-		</header>
-		<div class="rooms-list">
+		{{#unless embeddedVersion}}
+			<header class="sidebar__header">
+				{{> accountBox lighten=true modifier="--account" }}
+				<button class="sidebar-flex__back-button" data-action="back">
+					{{> icon block="sidebar-flex__back-icon" icon="back"}}
+					<span>{{_ "Back_to_chat"}}</span>
+				</button>
+			</header>
+		{{/unless}}
+		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}">
 			<ul class="rooms-list__list">
 				{{> sidebarItem menuItem "Preferences" "customize" "account" "preferences" }}
 
diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js
index d37454102ad..4b794bbe985 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.js
+++ b/packages/rocketchat-ui-account/client/accountFlex.js
@@ -20,5 +20,8 @@ Template.accountFlex.helpers({
 			pathGroup: group,
 			darken: true
 		};
+	},
+	embeddedVersion() {
+		return RocketChat.Layout.isEmbedded();
 	}
 });
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.html b/packages/rocketchat-ui-admin/client/adminFlex.html
index b31088c1721..312380a6200 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.html
+++ b/packages/rocketchat-ui-admin/client/adminFlex.html
@@ -1,13 +1,15 @@
 <template name="adminFlex">
 	<aside class="sidebar-light" role="navigation">
-		<header class="sidebar__header">
-			{{> accountBox lighten=true modifier="--admin"}}
-			<button class="sidebar-flex__back-button" data-action="back">
-				{{> icon block="sidebar-flex__back-icon" icon="back"}}
-				<span>{{_ "Back_to_chat"}}</span>
-			</button>
-		</header>
-		<div class="rooms-list" aria-label="{{_ "Administration"}}">
+		{{#unless embeddedVersion}}
+			<header class="sidebar__header">
+				{{> accountBox lighten=true modifier="--admin"}}
+				<button class="sidebar-flex__back-button" data-action="back">
+					{{> icon block="sidebar-flex__back-icon" icon="back"}}
+					<span>{{_ "Back_to_chat"}}</span>
+				</button>
+			</header>
+		{{/unless}}
+		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}" aria-label="{{_ "Administration"}}">
 			<h3 class="rooms-list__type">{{_ "Administration"}}</h3>
 			<ul class="rooms-list__list">
 				{{> sidebarItem menuItem "Info" false "admin-info" "" }}
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js
index 83c685bda5b..836b8ec67ab 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.js
+++ b/packages/rocketchat-ui-admin/client/adminFlex.js
@@ -63,6 +63,9 @@ Template.adminFlex.helpers({
 			pathGroup: group,
 			darken: true
 		};
+	},
+	embeddedVersion() {
+		return RocketChat.Layout.isEmbedded();
 	}
 });
 
diff --git a/packages/rocketchat-ui/client/views/app/burger.html b/packages/rocketchat-ui/client/views/app/burger.html
index 0b7cdcacc48..825dcd4f18c 100644
--- a/packages/rocketchat-ui/client/views/app/burger.html
+++ b/packages/rocketchat-ui/client/views/app/burger.html
@@ -3,10 +3,12 @@
 		<i></i>
 		<i></i>
 		<i></i>
-		{{#if unread}}
-			<div class="unread-burger-alert color-error-contrast background-error-color">
-				{{unread}}
-			</div>
-		{{/if}}
+		{{#unless embeddedVersion}}
+			{{#if unread}}
+				<div class="unread-burger-alert color-error-contrast background-error-color">
+					{{unread}}
+				</div>
+			{{/if}}
+		{{/unless}}
 	</div>
 </template>
diff --git a/packages/rocketchat-ui/client/views/app/burger.js b/packages/rocketchat-ui/client/views/app/burger.js
index 07df5c0e1ca..19c1b33db96 100644
--- a/packages/rocketchat-ui/client/views/app/burger.js
+++ b/packages/rocketchat-ui/client/views/app/burger.js
@@ -6,5 +6,8 @@ Template.burger.helpers({
 		if (Session.equals('isMenuOpen', true)) {
 			return 'menu-opened';
 		}
+	},
+	embeddedVersion() {
+		return RocketChat.Layout.isEmbedded();
 	}
 });

From 3403d8b3332471e5024170d96f9093adaa9ec12a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 09:48:01 -0300
Subject: [PATCH 113/244] Merge pull request #8314 from szluohua/synchronizing

[FIX] After deleting the room, cache is not synchronizing
---
 packages/rocketchat-lib/client/lib/cachedCollection.js | 1 +
 packages/rocketchat-ui/client/views/app/room.js        | 6 ++++++
 server/publications/room.js                            | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/client/lib/cachedCollection.js b/packages/rocketchat-lib/client/lib/cachedCollection.js
index 88f369f83a5..7fed8068d2b 100644
--- a/packages/rocketchat-lib/client/lib/cachedCollection.js
+++ b/packages/rocketchat-lib/client/lib/cachedCollection.js
@@ -330,6 +330,7 @@ class CachedCollection {
 			this.log('record received', t, record);
 			if (t === 'removed') {
 				this.collection.remove(record._id);
+				RoomManager.close(record.t+record.name);
 			} else {
 				delete record.$loki;
 				this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 3182ecf1122..81bfc6b141d 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -954,4 +954,10 @@ Template.room.onRendered(function() {
 			newMessage.classList.remove('not');
 		}
 	});
+	Tracker.autorun(function() {
+		const subRoom = ChatSubscription.findOne({rid:template.data._id});
+		if (!subRoom) {
+			FlowRouter.go('home');
+		}
+	});
 });
diff --git a/server/publications/room.js b/server/publications/room.js
index ba1420ffb4c..d35010b0575 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -97,7 +97,7 @@ RocketChat.models.Rooms.cache.on('sync', (type, room/*, diff*/) => {
 });
 
 RocketChat.models.Subscriptions.on('changed', (type, subscription/*, diff*/) => {
-	if (type === 'inserted') {
+	if (type === 'inserted' || type === 'removed') {
 		const room = RocketChat.models.Rooms.findOneById(subscription.rid);
 		if (room) {
 			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}));

From 30838bcac5bb713c2a9142b213dbc0f9c7f13084 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 10:00:45 -0300
Subject: [PATCH 114/244] Merge pull request #8355 from
 RocketChat/meteor-update

Update meteor to 1.5.2.2-rc.0
---
 .meteor/packages                                 | 10 +++++-----
 .meteor/release                                  |  2 +-
 .meteor/versions                                 | 12 ++++++------
 .../.npm/package/npm-shrinkwrap.json             | 10 +++++-----
 .../rocketchat-livechat/app/.meteor/packages     | 16 ++++++++--------
 packages/rocketchat-livechat/app/.meteor/release |  2 +-
 .../rocketchat-livechat/app/.meteor/versions     | 10 +++++-----
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.meteor/packages b/.meteor/packages
index 72d393aa44b..75080384110 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -13,7 +13,7 @@ accounts-twitter@1.3.0
 blaze-html-templates
 check@1.2.5
 ddp-rate-limiter@1.0.7
-ecmascript@0.8.2
+ecmascript@0.8.3
 ejson@1.0.14
 email@1.2.3
 fastclick@1.0.13
@@ -22,8 +22,8 @@ jquery@1.11.10
 less@2.7.9
 logging@1.1.17
 meteor-base@1.1.0
-mobile-experience@1.0.4
-mongo@1.2.0
+mobile-experience@1.0.5
+mongo@1.2.2
 random@1.0.10
 rate-limit@1.0.8
 reactive-dict@1.1.9
@@ -33,7 +33,7 @@ service-configuration@1.0.11
 session@1.1.7
 shell-server@0.2.4
 spacebars
-standard-minifier-js@2.1.1
+standard-minifier-js@2.1.2
 tracker@1.1.3
 
 rocketchat:2fa
@@ -175,5 +175,5 @@ yasaricli:slugify
 yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
 rocketchat:postcss
-dynamic-import@0.1.1
+dynamic-import@0.1.3
 keepnox:perfect-scrollbar
diff --git a/.meteor/release b/.meteor/release
index 47c31abcf45..1395764d86f 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2
+METEOR@1.5.2.2-rc.0
diff --git a/.meteor/versions b/.meteor/versions
index 61b6df76fa6..04ca6160f8f 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.3
+accounts-base@1.3.4-rc1522.0
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0
@@ -35,7 +35,7 @@ deps@1.0.12
 diff-sequence@1.0.7
 dispatch:run-as-user@1.1.1
 dynamic-import@0.1.3
-ecmascript@0.8.2
+ecmascript@0.8.3
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
@@ -84,11 +84,11 @@ meteorhacks:inject-initial@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.3
-minimongo@1.3.1
+minifier-js@2.1.4
+minimongo@1.3.2
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
-mobile-experience@1.0.4
+mobile-experience@1.0.5
 mobile-status-bar@1.0.14
 modules@0.10.0
 modules-runtime@0.8.0
@@ -239,7 +239,7 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-js@2.1.1
+standard-minifier-js@2.1.2
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.2
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 3f74f649d01..3485f52f8fb 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "ajv": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
       "from": "ajv@>=5.1.0 <6.0.0"
     },
     "ansi-regex": {
@@ -1231,8 +1231,8 @@
       "from": "readable-stream@>=2.2.2 <3.0.0"
     },
     "request": {
-      "version": "2.82.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.82.0.tgz",
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
       "from": "request@>=2.79.0 <3.0.0"
     },
     "retry-request": {
@@ -1318,7 +1318,7 @@
     "tough-cookie": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "from": "tough-cookie@>=2.3.2 <2.4.0"
+      "from": "tough-cookie@>=2.3.3 <2.4.0"
     },
     "tunnel-agent": {
       "version": "0.6.0",
diff --git a/packages/rocketchat-livechat/app/.meteor/packages b/packages/rocketchat-livechat/app/.meteor/packages
index a0cf19dae4c..b0e4e967d69 100644
--- a/packages/rocketchat-livechat/app/.meteor/packages
+++ b/packages/rocketchat-livechat/app/.meteor/packages
@@ -4,15 +4,15 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor@1.7.1
-webapp@1.3.18
+meteor@1.7.2
+webapp@1.3.19
 logging@1.1.17
 tracker@1.1.3
 deps@1.0.12
 session@1.1.7
-ddp@1.3.0
+ddp@1.3.1
 livedata@1.0.18
-mongo@1.2.0
+mongo@1.2.2
 blaze
 ui
 spacebars
@@ -34,9 +34,9 @@ reactive-var@1.0.11
 accounts-password@1.4.0
 tap:i18n
 smoral:sweetalert
-ecmascript@0.8.2
+ecmascript@0.8.3
 es5-shim@4.6.15
-standard-minifier-css@1.3.4
-standard-minifier-js@2.1.1
+standard-minifier-css@1.3.5
+standard-minifier-js@2.1.2
 shell-server@0.2.4
-dynamic-import@0.1.1
+dynamic-import@0.1.3
diff --git a/packages/rocketchat-livechat/app/.meteor/release b/packages/rocketchat-livechat/app/.meteor/release
index 47c31abcf45..1395764d86f 100644
--- a/packages/rocketchat-livechat/app/.meteor/release
+++ b/packages/rocketchat-livechat/app/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2
+METEOR@1.5.2.2-rc.0
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index dee2f5b195c..7db162aeafa 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.3
+accounts-base@1.3.4-rc1522.0
 accounts-password@1.4.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.9
@@ -24,7 +24,7 @@ ddp-server@2.0.2
 deps@1.0.12
 diff-sequence@1.0.7
 dynamic-import@0.1.3
-ecmascript@0.8.2
+ecmascript@0.8.3
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
@@ -48,8 +48,8 @@ mdg:validation-error@0.5.1
 meteor@1.7.2
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.3
-minimongo@1.3.1
+minifier-js@2.1.4
+minimongo@1.3.2
 mizzao:timesync@0.5.0
 modules@0.10.0
 modules-runtime@0.8.0
@@ -79,7 +79,7 @@ spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
 standard-minifier-css@1.3.5
-standard-minifier-js@2.1.1
+standard-minifier-js@2.1.2
 tap:i18n@1.8.2
 templating@1.3.2
 templating-compiler@1.3.3

From 36862d942b1335a7b4f2c5f406b81531db09194e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 10:06:46 -0300
Subject: [PATCH 115/244] Bump version to 0.59.0-rc.10

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 22 ++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index ab7eb6a3f2a..84b1080342f 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.9
+ENV RC_VERSION 0.59.0-rc.10
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index f4043bf25be..2b5c8c0b6d1 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.9"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.10"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 91614cb341f..e9e6d24f260 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.9
+    RC_VERSION=0.59.0-rc.10
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 34c1cd23815..83b93a79ccd 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,25 @@
+<a name="0.59.0-rc.10"></a>
+# 0.59.0-rc.10 (2017-09-29)
+
+
+### Bug Fixes
+
+- [#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) After deleting the room, cache is not synchronizing
+- [#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317) Email Subjects not being sent
+- [#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316) Mention unread indicator was removed
+- [#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) Put delete action on another popover group
+- [#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) Remove sidebar header on admin embedded version
+
+
+<details>
+<summary>Others</summary>
+
+- [#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) [FIX-RC] Mobile file upload not working
+- [#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355) Update meteor to 1.5.2.2-rc.0
+</details>
+
+
+
 <a name="0.59.0-rc.9"></a>
 # 0.59.0-rc.9 (2017-09-26)
 
diff --git a/package.json b/package.json
index 002fadd3a48..405d79458bd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.9",
+	"version": "0.59.0-rc.10",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 671261211ce..d335754afc0 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.9"
+	"version": "0.59.0-rc.10"
 }

From 24d60532cb40973b6195fe54b7de5957929ac94c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 15:48:17 -0300
Subject: [PATCH 116/244] Merge pull request #8345 from
 RocketChat/remove-lastact

Remove field `lastActivity` from subscription data
---
 .../server/lib/notifyUsersOnMessage.js              |  2 --
 .../rocketchat-lib/server/models/Subscriptions.js   | 13 -------------
 packages/rocketchat-ui-sidenav/client/roomList.js   |  8 +++-----
 server/publications/room.js                         |  1 -
 server/publications/subscription.js                 |  1 -
 server/startup/migrations/v101.js                   |  6 ++++++
 6 files changed, 9 insertions(+), 22 deletions(-)
 create mode 100644 server/startup/migrations/v101.js

diff --git a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js b/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
index 0e009c98eee..efe67344d3c 100644
--- a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
@@ -105,8 +105,6 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	// Update all other subscriptions to alert their owners but witout incrementing
 	// the unread counter, as it is only for mentions and direct messages
 	RocketChat.models.Subscriptions.setAlertForRoomIdExcludingUserId(message.rid, message.u._id);
-	// Used to order subscriptions by activity
-	RocketChat.models.Subscriptions.updateUserSubscription(message.rid, message.u._id);
 
 	return message;
 
diff --git a/packages/rocketchat-lib/server/models/Subscriptions.js b/packages/rocketchat-lib/server/models/Subscriptions.js
index d42bdb66990..e741e532260 100644
--- a/packages/rocketchat-lib/server/models/Subscriptions.js
+++ b/packages/rocketchat-lib/server/models/Subscriptions.js
@@ -416,19 +416,6 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 		return this.update(query, update, { multi: true });
 	}
-	updateUserSubscription(rid, userId) {
-		const query = {
-			rid,
-			'u._id': userId
-		};
-		const update = {
-			$set: {
-				open: true,
-				lastActivity: new Date
-			}
-		};
-		return this.update(query, update);
-	}
 	setAlertForRoomIdExcludingUserId(roomId, userId) {
 		const query = {
 			rid: roomId,
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
index 33bd611d657..c59bdb92c15 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.js
+++ b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -19,17 +19,16 @@ Template.roomList.helpers({
 		const query = {
 			open: true
 		};
-		let sort = { 't': 1, 'name': 1 };
+		const sort = { 't': 1, 'name': 1 };
 		if (this.identifier === 'f') {
 			query.f = favoritesEnabled;
 		} else {
 			let types = [this.identifier];
 			if (this.identifier === 'activity') {
 				types = ['c', 'p', 'd'];
-				sort = { lastActivity : -1, _updatedAt: -1};
 			}
 			if (this.identifier === 'channels' || this.identifier === 'unread') {
-				types= [ 'c', 'p'];
+				types = [ 'c', 'p'];
 			}
 			const user = Meteor.user();
 			if (user && user.settings && user.settings.preferences && user.settings.preferences.roomsListExhibitionMode === 'unread') {
@@ -50,9 +49,8 @@ Template.roomList.helpers({
 				};
 			});
 			return _.sortBy(list, 'lm').reverse();
-		} else {
-			return ChatSubscription.find(query, { sort });
 		}
+		return ChatSubscription.find(query, { sort });
 	},
 
 	isLivechat() {
diff --git a/server/publications/room.js b/server/publications/room.js
index d35010b0575..cb35cd9c789 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -23,7 +23,6 @@ const options = {
 		sms: 1,
 		code: 1,
 		open: 1,
-		lastActivity: 1,
 		v: 1,
 		label: 1,
 		ro: 1,
diff --git a/server/publications/subscription.js b/server/publications/subscription.js
index 89222ed32bc..2685aca38e0 100644
--- a/server/publications/subscription.js
+++ b/server/publications/subscription.js
@@ -8,7 +8,6 @@ const fields = {
 	code: 1,
 	f: 1,
 	u: 1,
-	lastActivity: 1,
 	open: 1,
 	alert: 1,
 	roles: 1,
diff --git a/server/startup/migrations/v101.js b/server/startup/migrations/v101.js
new file mode 100644
index 00000000000..79b6ea9fbc8
--- /dev/null
+++ b/server/startup/migrations/v101.js
@@ -0,0 +1,6 @@
+RocketChat.Migrations.add({
+	version: 101,
+	up() {
+		RocketChat.models.Subscriptions.update({lastActivity:{$exists:1}}, { $unset: { 'lastActivity': '' } }, {multi: true});
+	}
+});

From 0b5bd77f746daec3c25197622902d9995b1f75b4 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 29 Sep 2017 15:50:04 -0300
Subject: [PATCH 117/244] Merge pull request #8357 from
 RocketChat/fix-missing-i18n

[FIX] Missing i18n translations
---
 packages/rocketchat-i18n/i18n/en.i18n.json                      | 2 ++
 packages/rocketchat-ui/client/views/app/room.html               | 2 +-
 packages/rocketchat-videobridge/lib/messageType.js              | 2 +-
 .../rocketchat-videobridge/server/methods/jitsiSetTimeout.js    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index a420e7eb096..ac0a6f427ac 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -374,6 +374,7 @@
   "clear_history": "Clear History",
   "Click_here": "Click here",
   "Click_here_for_more_info": "Click here for more info",
+  "Click_to_join": "Click to Join!",
   "Client_ID": "Client ID",
   "Client_Secret": "Client Secret",
   "Clients_will_refresh_in_a_few_seconds": "Clients will refresh in a few seconds",
@@ -1663,6 +1664,7 @@
   "Start_video_call": "Start video call",
   "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Start with <code class=\"inline\">%s</code> for user or <code class=\"inline\">%s</code> for channel. Eg: <code class=\"inline\">%s</code> or <code class=\"inline\">%s</code>",
   "Started_At": "Started At",
+  "Started_a_video_call": "Started a Video Call",
   "Statistics": "Statistics",
   "Statistics_reporting": "Send statistics to Rocket.Chat",
   "Statistics_reporting_Description": "By sending your statistics, you'll help us identify how many instances of Rocket.Chat are deployed, as well as how good the system is behaving, so we can further improve it. Don't worry, as no user information is sent and all the information we receive is kept confidential.",
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
index 02932e69777..c32d010129d 100644
--- a/packages/rocketchat-ui/client/views/app/room.html
+++ b/packages/rocketchat-ui/client/views/app/room.html
@@ -88,7 +88,7 @@
 										<div class="upload-progress-text">
 											{{name}}... {{percentage}}%
 											<button>
-												{{_ "cancel"}}
+												{{_ "Cancel"}}
 											</button>
 										</div>
 									{{/if}}
diff --git a/packages/rocketchat-videobridge/lib/messageType.js b/packages/rocketchat-videobridge/lib/messageType.js
index b264b124343..c5a179b40d2 100644
--- a/packages/rocketchat-videobridge/lib/messageType.js
+++ b/packages/rocketchat-videobridge/lib/messageType.js
@@ -2,6 +2,6 @@ Meteor.startup(function() {
 	RocketChat.MessageTypes.registerType({
 		id: 'jitsi_call_started',
 		system: true,
-		message: 'Started a Video Call!'
+		message: TAPi18n.__('Started_a_video_call')
 	});
 });
diff --git a/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js b/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js
index 67ccc3ce491..02aea743ab4 100644
--- a/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js
+++ b/packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js
@@ -15,7 +15,7 @@ Meteor.methods({
 			RocketChat.models.Rooms.setJitsiTimeout(rid, new Date(currentTime + 35*1000));
 			RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('jitsi_call_started', rid, '', Meteor.user(), {
 				actionLinks : [
-					{ icon: 'icon-videocam', label: 'Click To Join!', method_id: 'joinJitsiCall', params: ''}
+					{ icon: 'icon-videocam', label: TAPi18n.__('Click_to_join'), method_id: 'joinJitsiCall', params: ''}
 				]
 			});
 		} else if ((jitsiTimeout - currentTime) / 1000 <= 15) {

From c0fa17c4250e0af999d34c596d3b37cc396fdb0c Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 30 Sep 2017 01:18:48 -0300
Subject: [PATCH 118/244] Merge pull request #8360 from
 RocketChat/reduce-accountbox-size

[NEW] Smaller accountBox
---
 .../client/imports/components/sidebar/sidebar-account.css      | 1 -
 packages/rocketchat-theme/client/imports/general/variables.css | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 18aefa7fb1c..3a2b3b64c5a 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -53,7 +53,6 @@
 
 		max-width: fit-content;
 		height: calc(var(--sidebar-account-username-size) + 0.1rem);
-		margin-bottom: 0.5rem;
 
 		white-space: nowrap;
 		text-overflow: ellipsis;
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index e12f75dad3b..994fb29d8cb 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -143,14 +143,13 @@
 	/*
 	* Sidebar flex
 	*/
-	--sidebar-flex-back-button-color: var(--color-dark);
 	--sidebar-flex-search-background: var(--color-white);
 	--sidebar-flex-search-placeholder-color: var(--color-gray);
 
 	/*
 	* Sidebar Account
 	*/
-	--sidebar-account-thumb-size: 48px;
+	--sidebar-account-thumb-size: 36px;
 	--sidebar-small-account-thumb-size: 40px;
 	--sidebar-account-status-bullet-size: 12px;
 	--sidebar-small-account-status-bullet-size: 8px;

From ca60ad98dd0bbdae7e9a061517bed2f7031891b9 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 30 Sep 2017 01:21:58 -0300
Subject: [PATCH 119/244] Merge pull request #8362 from
 RocketChat/sidebar-item-width

[NEW] Sidebar item width to 100%
---
 .../imports/components/sidebar/rooms-list.css | 11 +++++-----
 .../components/sidebar/sidebar-item.css       | 21 +++++++------------
 .../client/sidebarItem.html                   |  2 +-
 .../client/sidebarItem.js                     |  4 ++++
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 62558ef1d43..f6860dcac7a 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -14,6 +14,10 @@
 	}
 
 	&__list {
+		& .badge {
+			margin: 0 4px;
+		}
+
 		&:not(:last-child) {
 			margin-bottom: 32px;
 		}
@@ -44,10 +48,6 @@
 		font-size: var(--rooms-list-empty-text-size);
 	}
 
-	& .badge {
-		margin: 0 4px;
-	}
-
 	&__toolbar-search {
 		position: absolute;
 		z-index: 1;
@@ -55,10 +55,9 @@
 		bottom: var(--sidebar-footer-height);
 		left: 0;
 
-		overflow-y: auto;
+		overflow-y: scroll;
 
 		width: 100%;
-		padding: 0 8px;
 
 		background-color: var(--sidebar-background);
 	}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index efe8f46a5a8..687c40b8d17 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -7,6 +7,7 @@
 		}
 	}
 }
+
 .sidebar-item {
 	position: relative;
 
@@ -14,9 +15,7 @@
 
 	height: var(--sidebar-item-height);
 
-	margin: 0 8px;
-
-	padding: 0 calc(var(--sidebar-default-padding) - 8px);
+	padding: 0 var(--sidebar-default-padding);
 
 	cursor: pointer;
 
@@ -32,7 +31,7 @@
 		background-color: var(--sidebar-item-hover-background);
 
 		& .sidebar-item__menu {
-			margin: 0;
+			display: block;
 		}
 	}
 
@@ -43,10 +42,6 @@
 	&--unread,
 	&--mention {
     	color: var(--sidebar-item-unread-color);
-
-		& .sidebar-item__menu {
-			transition: margin 0.1s;
-		}
 	}
 
 	&__popup-active {
@@ -66,10 +61,6 @@
 		align-items: center;
 	}
 
-	& .badge {
-		margin: 0 16px 0 3px;
-	}
-
 	&__icon {
 		font-size: 1.25rem;
 		fill: currentColor;
@@ -84,7 +75,7 @@
 		position: absolute;
 
 		top: 50%;
-		left: 4px;
+		left: 10px;
 
 		width: var(--sidebar-item-user-status-size);
 		height: var(--sidebar-item-user-status-size);
@@ -133,8 +124,10 @@
 	}
 
 	&__menu {
-		margin: 0 -15px;
 		padding: 6px;
+		position: absolute;
+		right: 0;
+		display: none;
 
 		&-icon {
 			fill: var(--color-white);
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index a567a205388..334877a7442 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -22,7 +22,7 @@
 			{{#if unread}}
 				<span class="badge badge--unread">{{unread}}</span>
 			{{/if}}
-			{{#if rid}}
+			{{#if isRoom}}
 				<div class="sidebar-item__menu">
 					{{> icon block="sidebar-item__menu-icon" icon="menu"}}
 				</div>
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
index 84b20d41dcf..98f425afdb6 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
@@ -3,8 +3,12 @@ Template.sidebarItem.helpers({
 	or(...args) {
 		args.pop();
 		return args.some(arg => arg);
+	},
+	isRoom() {
+		return this.rid || this._id;
 	}
 });
+
 Template.sidebarItem.events({
 	'click [data-id], click .sidebar-item__link'() {
 		return menu.close();

From 36fa7956b598cbc882770b1f711ba3ed3d52f0aa Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 30 Sep 2017 01:22:35 -0300
Subject: [PATCH 120/244] Merge pull request #8361 from
 RocketChat/mentions-badge

[NEW] Unify unread and mentions badge
---
 .../rocketchat-theme/client/imports/components/badge.css     | 3 +--
 packages/rocketchat-ui-sidenav/client/sidebarItem.html       | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/badge.css b/packages/rocketchat-theme/client/imports/components/badge.css
index b8c73374510..b3fbeb8e163 100644
--- a/packages/rocketchat-theme/client/imports/components/badge.css
+++ b/packages/rocketchat-theme/client/imports/components/badge.css
@@ -11,8 +11,7 @@
 
 	font-size: var(--badge-text-size);
 
-	&--unread,
-	&--mention {
+	&--unread {
 		background-color: var(--badge-unread-background);
 	}
 }
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 334877a7442..3ac3cd8ede1 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -16,11 +16,8 @@
 				{{/if}}
 			</div>
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
-			{{#if userMentions}}
-				<span class="badge badge--mention">@</span>
-			{{/if}}
 			{{#if unread}}
-				<span class="badge badge--unread">{{unread}}</span>
+				<span class="badge badge--unread">{{#if userMentions}}@ {{/if}}{{unread}}</span>
 			{{/if}}
 			{{#if isRoom}}
 				<div class="sidebar-item__menu">

From 47ed90ac47b9fa2f2099c4cfded354fb48cdf807 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 30 Sep 2017 02:04:25 -0300
Subject: [PATCH 121/244] Merge pull request #8358 from
 RocketChat/remove-accountBox

[FIX] remove accountBox from admin menu
---
 .../client/startup.js                         |  1 +
 .../client/admin/startup.js                   |  1 +
 .../rocketchat-emoji-custom/admin/startup.js  |  1 +
 .../rocketchat-integrations/client/startup.js |  1 +
 .../client/views/sideNav/livechatFlex.html    | 15 +++++------
 .../client/views/sideNav/livechatFlex.js      |  2 +-
 packages/rocketchat-logger/client/viewLogs.js |  3 ++-
 packages/rocketchat-mailer/client/startup.js  |  1 +
 .../admin/client/startup.js                   |  1 +
 .../components/sidebar/sidebar-flex.css       | 17 +++++++-----
 .../client/accountFlex.html                   | 15 +++++------
 .../client/accountFlex.js                     |  2 +-
 .../rocketchat-ui-admin/client/adminFlex.html | 26 +++++++++----------
 .../rocketchat-ui-admin/client/adminFlex.js   |  2 +-
 .../rocketchat-ui-master/public/icons.svg     |  6 ++++-
 .../client/sidebarItem.html                   | 14 +++++-----
 tests/pageobjects/side-nav.page.js            |  2 +-
 17 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/packages/rocketchat-authorization/client/startup.js b/packages/rocketchat-authorization/client/startup.js
index c4ef2b2deaf..fc62cafc60d 100644
--- a/packages/rocketchat-authorization/client/startup.js
+++ b/packages/rocketchat-authorization/client/startup.js
@@ -3,6 +3,7 @@ Meteor.subscribe('roles');
 RocketChat.AdminBox.addOption({
 	href: 'admin-permissions',
 	i18nLabel: 'Permissions',
+	icon: 'lock',
 	permissionGranted() {
 		return RocketChat.authz.hasAllPermission('access-permissions');
 	}
diff --git a/packages/rocketchat-custom-sounds/client/admin/startup.js b/packages/rocketchat-custom-sounds/client/admin/startup.js
index d5d5fed7d3c..20ca6ef9317 100644
--- a/packages/rocketchat-custom-sounds/client/admin/startup.js
+++ b/packages/rocketchat-custom-sounds/client/admin/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'custom-sounds',
 	i18nLabel: 'Custom_Sounds',
+	icon: 'volume',
 	permissionGranted() {
 		return RocketChat.authz.hasAtLeastOnePermission(['manage-sounds']);
 	}
diff --git a/packages/rocketchat-emoji-custom/admin/startup.js b/packages/rocketchat-emoji-custom/admin/startup.js
index 3cfaa4b825a..71f27f95ec4 100644
--- a/packages/rocketchat-emoji-custom/admin/startup.js
+++ b/packages/rocketchat-emoji-custom/admin/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'emoji-custom',
 	i18nLabel: 'Custom_Emoji',
+	icon: 'emoji',
 	permissionGranted() {
 		return RocketChat.authz.hasAtLeastOnePermission(['manage-emoji']);
 	}
diff --git a/packages/rocketchat-integrations/client/startup.js b/packages/rocketchat-integrations/client/startup.js
index 8462e3d4cb2..1f9e4e0bce1 100644
--- a/packages/rocketchat-integrations/client/startup.js
+++ b/packages/rocketchat-integrations/client/startup.js
@@ -1,5 +1,6 @@
 RocketChat.AdminBox.addOption({
 	href: 'admin-integrations',
 	i18nLabel: 'Integrations',
+	icon: 'code',
 	permissionGranted: () => RocketChat.authz.hasAtLeastOnePermission(['manage-integrations', 'manage-own-integrations'])
 });
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
index db39a88c72f..f81dc4b5ef7 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
@@ -1,14 +1,13 @@
 <template name="livechatFlex">
 	<aside class="sidebar-light" role="navigation">
-		{{#unless embeddedVersion}}
-			<header class="sidebar__header">
-				{{> accountBox lighten=true modifier="--livechat"}}
-				<button class="sidebar-flex__back-button" data-action="back">
-					{{> icon block="sidebar-flex__back-icon" icon="back"}}
-					<span>{{_ "Back_to_chat"}}</span>
+		<header class="sidebar-flex__header">
+			<h1 class="sidebar-flex__title">{{_ "Livechat"}}</h1>
+			{{#unless embeddedVersion}}
+				<button class="sidebar-flex__close-button" data-action="close">
+					{{> icon block="sidebar-flex__close-icon" icon="cross"}}
 				</button>
-			</header>
-		{{/unless}}
+			{{/unless}}
+		</header>
 		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}">
 			<ul class="rooms-list__list">
 				{{> sidebarItem menuItem "Current_Chats" false "livechat-current-chats" }}
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
index 4106d41ea44..2eff33e7bd2 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js
@@ -13,7 +13,7 @@ Template.livechatFlex.helpers({
 });
 
 Template.livechatFlex.events({
-	'click [data-action="back"]'() {
+	'click [data-action="close"]'() {
 		SideNav.closeFlex();
 	}
 });
diff --git a/packages/rocketchat-logger/client/viewLogs.js b/packages/rocketchat-logger/client/viewLogs.js
index 680ff3813fd..a1d20726232 100644
--- a/packages/rocketchat-logger/client/viewLogs.js
+++ b/packages/rocketchat-logger/client/viewLogs.js
@@ -2,9 +2,10 @@
 this.stdout = new Mongo.Collection('stdout');
 
 Meteor.startup(function() {
-	return RocketChat.AdminBox.addOption({
+	RocketChat.AdminBox.addOption({
 		href: 'admin-view-logs',
 		i18nLabel: 'View_Logs',
+		icon: 'post',
 		permissionGranted() {
 			return RocketChat.authz.hasAllPermission('view-logs');
 		}
diff --git a/packages/rocketchat-mailer/client/startup.js b/packages/rocketchat-mailer/client/startup.js
index 728ebddf8c1..33726ff2312 100644
--- a/packages/rocketchat-mailer/client/startup.js
+++ b/packages/rocketchat-mailer/client/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'mailer',
 	i18nLabel: 'Mailer',
+	icon: 'mail',
 	permissionGranted() {
 		return RocketChat.authz.hasAllPermission('access-mailer');
 	}
diff --git a/packages/rocketchat-oauth2-server-config/admin/client/startup.js b/packages/rocketchat-oauth2-server-config/admin/client/startup.js
index 27cee4bd559..930647bb526 100644
--- a/packages/rocketchat-oauth2-server-config/admin/client/startup.js
+++ b/packages/rocketchat-oauth2-server-config/admin/client/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'admin-oauth-apps',
 	i18nLabel: 'OAuth Apps',
+	icon: 'discover',
 	permissionGranted() {
 		return RocketChat.authz.hasAllPermission('manage-oauth-apps');
 	}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
index a2d4dc87c28..cb2061465f4 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-flex.css
@@ -1,16 +1,19 @@
 .sidebar-flex {
-	&__back-button {
-		margin-left: 0.25rem;
+	&__header {
+		padding: var(--sidebar-default-padding);
 
-		padding: 1rem var(--sidebar-default-padding) 1.5rem;
-
-		color: var(--sidebar-flex-back-button-color);
+		display: flex;
+	}
 
+	&__title {
 		font-size: 1rem;
+		font-weight: 400;
+		
+		flex: 1;
 	}
 
-	&__back-icon {
-		font-size: 1.25rem;
+	&__close-button {
+		font-size: 18px;
 	}
 
 	&__search {
diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html
index f0829b5eae2..a3df570e97d 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.html
+++ b/packages/rocketchat-ui-account/client/accountFlex.html
@@ -1,14 +1,13 @@
 <template name="accountFlex">
 	<aside class="sidebar-light" role="navigation">
-		{{#unless embeddedVersion}}
-			<header class="sidebar__header">
-				{{> accountBox lighten=true modifier="--account" }}
-				<button class="sidebar-flex__back-button" data-action="back">
-					{{> icon block="sidebar-flex__back-icon" icon="back"}}
-					<span>{{_ "Back_to_chat"}}</span>
+		<header class="sidebar-flex__header">
+			<h1 class="sidebar-flex__title">{{_ "My_Account"}}</h1>
+			{{#unless embeddedVersion}}
+				<button class="sidebar-flex__close-button" data-action="close">
+					{{> icon block="sidebar-flex__close-icon" icon="cross"}}
 				</button>
-			</header>
-		{{/unless}}
+			{{/unless}}
+		</header>
 		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}">
 			<ul class="rooms-list__list">
 				{{> sidebarItem menuItem "Preferences" "customize" "account" "preferences" }}
diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js
index 4b794bbe985..45d9fccd75a 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.js
+++ b/packages/rocketchat-ui-account/client/accountFlex.js
@@ -1,5 +1,5 @@
 Template.accountFlex.events({
-	'click [data-action="back"]'() {
+	'click [data-action="close"]'() {
 		SideNav.closeFlex();
 	}
 });
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.html b/packages/rocketchat-ui-admin/client/adminFlex.html
index 312380a6200..98c3207f9b2 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.html
+++ b/packages/rocketchat-ui-admin/client/adminFlex.html
@@ -1,34 +1,32 @@
 <template name="adminFlex">
 	<aside class="sidebar-light" role="navigation">
-		{{#unless embeddedVersion}}
-			<header class="sidebar__header">
-				{{> accountBox lighten=true modifier="--admin"}}
-				<button class="sidebar-flex__back-button" data-action="back">
-					{{> icon block="sidebar-flex__back-icon" icon="back"}}
-					<span>{{_ "Back_to_chat"}}</span>
+		<header class="sidebar-flex__header">
+			<h1 class="sidebar-flex__title">{{_ "Administration"}}</h1>
+			{{#unless embeddedVersion}}
+				<button class="sidebar-flex__close-button" data-action="close">
+					{{> icon block="sidebar-flex__close-icon" icon="cross"}}
 				</button>
-			</header>
-		{{/unless}}
+			{{/unless}}
+		</header>
 		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}" aria-label="{{_ "Administration"}}">
-			<h3 class="rooms-list__type">{{_ "Administration"}}</h3>
 			<ul class="rooms-list__list">
-				{{> sidebarItem menuItem "Info" false "admin-info" "" }}
+				{{> sidebarItem menuItem "Info" "info-circled" "admin-info" "" }}
 
 				{{#if hasPermission 'run-import'}}
-					{{> sidebarItem menuItem "Import" false "admin-import" "" }}
+					{{> sidebarItem menuItem "Import" "import" "admin-import" "" }}
 				{{/if}}
 
 				{{#if hasPermission 'view-room-administration'}}
-					{{> sidebarItem menuItem "Rooms" false "admin-rooms" "" }}
+					{{> sidebarItem menuItem "Rooms" "hashtag" "admin-rooms" "" }}
 				{{/if}}
 
 				{{#if hasPermission 'view-user-administration'}}
-					{{> sidebarItem menuItem "Users" false "admin-users" "" }}
+					{{> sidebarItem menuItem "Users" "team" "admin-users" "" }}
 				{{/if}}
 
 				{{#each adminBoxOptions}}
 					{{#if permissionGranted}}
-						{{> sidebarItem menuItem label false href "" }}
+						{{> sidebarItem menuItem label icon href "" }}
 					{{/if}}
 				{{/each}}
 			</ul>
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js
index 836b8ec67ab..ad181b29f58 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.js
+++ b/packages/rocketchat-ui-admin/client/adminFlex.js
@@ -70,7 +70,7 @@ Template.adminFlex.helpers({
 });
 
 Template.adminFlex.events({
-	'click [data-action="back"]'() {
+	'click [data-action="close"]'() {
 		SideNav.closeFlex();
 	},
 	'keyup [name=settings-search]'(e, t) {
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index f84e5c748a1..c0bb0485187 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -62,4 +62,8 @@
     <symbol viewBox="0 0 20 20" id="icon-flag"><path d="M12.928 6.063l3.263-3.77a.74.74 0 0 0 .112-.759.71.71 0 0 0-.647-.422H3.141v17.72h1.406v-7.876h11.11a.71.71 0 0 0 .646-.422.691.691 0 0 0-.112-.759l-3.263-3.713zM4.547 9.578V2.547h9.562l-2.643 3.065c-.225.254-.225.647 0 .929l2.643 3.065H4.547v-.028z" fill-rule="nonzero" fill="currentColor"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-circle"><circle cx="10" cy="10" r="9" fill="currentColor" fill-rule="evenodd"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-eye-off"><g fill-rule="nonzero" fill="currentColor"><path d="M10 3.99c-3.79.004-6.658 2.896-8.542 5.44a.62.62 0 0 0 0 .739c.679.919 1.482 1.873 2.41 2.725a.62.62 0 1 0 .84-.915c-.729-.668-1.371-1.421-1.95-2.172C4.533 7.51 7.014 5.235 10 5.232c.515 0 1.011.066 1.493.187a.62.62 0 1 0 .303-1.203A7.392 7.392 0 0 0 10 3.99zM14.14 5.32a.62.62 0 0 0-.327 1.145c1.33.867 2.47 2.11 3.422 3.342-1.776 2.294-4.254 4.562-7.234 4.566-1.22-.003-2.346-.37-3.389-.972a.62.62 0 1 0-.62 1.076c1.19.686 2.537 1.135 4.008 1.137 3.79-.004 6.659-2.895 8.543-5.44a.62.62 0 0 0 0-.738c-1.052-1.424-2.399-2.934-4.051-4.011a.62.62 0 0 0-.352-.106z"/><path d="M11.722 7.895a.62.62 0 0 0-.468.993c.188.257.298.57.298.914 0 .864-.687 1.552-1.552 1.552-.371 0-.706-.127-.972-.342a.62.62 0 1 0-.779.967 2.79 2.79 0 0 0 1.751.616 2.803 2.803 0 0 0 2.793-2.793c0-.612-.2-1.185-.536-1.646a.62.62 0 0 0-.535-.261z"/><path d="M18.057 1.107a.62.62 0 0 0-.427.187L1.492 17.432a.62.62 0 1 0 .878.879L18.508 2.172a.62.62 0 0 0-.45-1.065z"/></g></symbol>
-</svg>
+    <symbol viewBox="0 0 20 20" id="icon-cross"><path d="M16.364 3.636l-6.018 6.018-6.71 6.71m12.728 0L3.636 3.636" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd" stroke-linecap="square"/></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-post"><g fill="none" fill-rule="evenodd"><path d="M0 0h20v20H0z"/><path stroke="currentColor" stroke-width="1.5" d="M5 3h6l4 4v10H5z"/><path d="M8.5 10.5h3M8.5 13.5h3" stroke="currentColor" stroke-width="1.5" stroke-linecap="square"/></g></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-discover"><g transform="translate(1 1)" fill="none" fill-rule="evenodd"><path d="M0 0h18v18H0z"/><circle stroke="currentColor" stroke-width="1.5" cx="9" cy="9" r="6.75"/><path d="M9 15.75c1.5 0 3-3.022 3-6.75s-1.5-6.75-3-6.75S6 5.272 6 9s1.5 6.75 3 6.75z" stroke="currentColor" stroke-width="1.5"/><path d="M2.25 9c0 1.5 3.022 3 6.75 3s6.75-1.5 6.75-3S12.728 6 9 6 2.25 7.5 2.25 9z" stroke="currentColor" stroke-width="1.5"/></g></symbol>
+    <symbol viewBox="0 0 20 20" id="icon-import"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M10 7.5v9.583" stroke-linecap="square"/><path d="M13.333 14.581l-3.291 3.292L6.75 14.58m.75-2.913H5V2.5h10v9.167h-2.5"/></g></symbol>
+</svg>
\ No newline at end of file
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 3ac3cd8ede1..cd24e8318f4 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -4,17 +4,19 @@
 			<div class="sidebar-item__user-status sidebar-item__user-status--{{statusClass}}"></div>
 		{{/if}}
 		<a class="sidebar-item__link" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
-			<div class="sidebar-item__picture">
-				{{#if icon}}
+			{{#if icon}}
+				<div class="sidebar-item__picture">
 					{{> icon block="sidebar-item__icon" icon=icon}}
-				{{else}}
-					{{#if avatar}}
+				</div>
+			{{else}}
+				{{#if avatar}}
+					<div class="sidebar-item__picture">
 						<div class="sidebar-item__user-thumb">
 							{{> avatar username=username}}
 						</div>
-					{{/if}}
+					</div>
 				{{/if}}
-			</div>
+			{{/if}}
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
 			{{#if unread}}
 				<span class="badge badge--unread">{{#if userMentions}}@ {{/if}}{{unread}}</span>
diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index 6a7ca954b12..fcd8e0b89a0 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -37,7 +37,7 @@ class SideNav extends Page {
 	get preferences() { return browser.element('[href="/account/preferences"]'); }
 	get profile() { return browser.element('[href="/account/profile"]'); }
 	get avatar() { return browser.element('[href="/changeavatar"]'); }
-	get preferencesClose() { return browser.element('.sidebar-flex__back-button[data-action="back"]'); }
+	get preferencesClose() { return browser.element('.sidebar-flex__close-button[data-action="close"]'); }
 
 	get burgerBtn() { return browser.element('.burger'); }
 

From 5a6dee953efb8dcc10e85682f47737230bd4db80 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 30 Sep 2017 13:47:24 -0300
Subject: [PATCH 122/244] Merge pull request #8363 from
 RocketChat/lingohub_based_on_develop

Sync translations from LingoHub
---
 packages/rocketchat-i18n/i18n/ar.i18n.json    |  379 ++--
 packages/rocketchat-i18n/i18n/ca.i18n.json    |  641 ++++---
 packages/rocketchat-i18n/i18n/cs.i18n.json    |  671 ++++---
 packages/rocketchat-i18n/i18n/de-AT.i18n.json |   28 +-
 packages/rocketchat-i18n/i18n/de.i18n.json    | 1563 +++++++++++------
 packages/rocketchat-i18n/i18n/el.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |    2 +-
 packages/rocketchat-i18n/i18n/es.i18n.json    |   46 +-
 packages/rocketchat-i18n/i18n/fa.i18n.json    |   61 +-
 packages/rocketchat-i18n/i18n/fi.i18n.json    |   32 +-
 packages/rocketchat-i18n/i18n/fr.i18n.json    |  170 +-
 packages/rocketchat-i18n/i18n/he.i18n.json    |   16 +-
 packages/rocketchat-i18n/i18n/hr.i18n.json    |   54 +-
 packages/rocketchat-i18n/i18n/hu.i18n.json    |   28 +-
 packages/rocketchat-i18n/i18n/id.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/it.i18n.json    |  240 +--
 packages/rocketchat-i18n/i18n/ja.i18n.json    |   26 +-
 packages/rocketchat-i18n/i18n/km.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/ko.i18n.json    |   30 +-
 packages/rocketchat-i18n/i18n/ku.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/lo.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/ms-MY.i18n.json |   14 +-
 packages/rocketchat-i18n/i18n/nl.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/no.i18n.json    |    4 +-
 packages/rocketchat-i18n/i18n/pl.i18n.json    |  105 +-
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |   16 +-
 packages/rocketchat-i18n/i18n/pt.i18n.json    |   44 +-
 packages/rocketchat-i18n/i18n/ro.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/ru.i18n.json    |  623 ++++---
 packages/rocketchat-i18n/i18n/sl-SI.i18n.json |    3 +
 packages/rocketchat-i18n/i18n/sq.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/sr.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/sv.i18n.json    |  104 +-
 packages/rocketchat-i18n/i18n/ta-IN.i18n.json |   14 +-
 packages/rocketchat-i18n/i18n/tr.i18n.json    |   71 +-
 packages/rocketchat-i18n/i18n/ug.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/uk.i18n.json    |   14 +-
 packages/rocketchat-i18n/i18n/zh-TW.i18n.json |   14 +-
 packages/rocketchat-i18n/i18n/zh.i18n.json    |  102 +-
 .../rocketchat-livechat/app/i18n/de.i18n.json |   12 +-
 .../rocketchat-livechat/app/i18n/fa.i18n.json |   22 +-
 .../rocketchat-livechat/app/i18n/fi.i18n.json |    1 +
 .../rocketchat-livechat/app/i18n/pl.i18n.json |    2 +-
 .../app/i18n/sl-SI.i18n.json                  |    4 +
 .../rocketchat-livechat/app/i18n/tr.i18n.json |   12 +-
 45 files changed, 3186 insertions(+), 2122 deletions(-)
 create mode 100644 packages/rocketchat-i18n/i18n/sl-SI.i18n.json
 create mode 100644 packages/rocketchat-livechat/app/i18n/sl-SI.i18n.json

diff --git a/packages/rocketchat-i18n/i18n/ar.i18n.json b/packages/rocketchat-i18n/i18n/ar.i18n.json
index ecbbe0e3b18..eff7f45c7d9 100644
--- a/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -1,4 +1,5 @@
 {
+  "#channel": "#channel",
   "0_Errors_Only": "0 - أخطاء فقط",
   "1_Errors_and_Information": "1 - أخطاء ومعلومات",
   "2_Erros_Information_and_Debug": "2 - Erros والمعلومات وتصحيح",
@@ -9,6 +10,10 @@
   "Accept": "قبول",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "قبول طلبات الدردشة المباشرة وإن لم يكن هناك موظفون أونلاين",
   "Accept_with_no_online_agents": "قبول إن ولم يكن هنالك موظفون أونلاين",
+  "access-mailer": "الدخول إلى نافذة البريد",
+  "access-mailer_description": "التصريح بإرسال إيميلات دفعة واحدة إلى كل المستخدمين",
+  "access-permissions": "الدخول إلى صفحة الصلاحيات والأذونات",
+  "access-permissions_description": "تعديل الصلاحيات للأدوار المختلفة",
   "Access_not_authorized": "وصول غير مخول",
   "Access_Token_URL": "URL الوصول رمز",
   "Accessing_permissions": "أذونات الوصول",
@@ -90,6 +95,8 @@
   "Accounts_OAuth_Meteor_callback_url": "URL نيزك الاستدعاء",
   "Accounts_OAuth_Meteor_id": "نيزك رقم",
   "Accounts_OAuth_Meteor_secret": "نيزك السرية",
+  "Accounts_OAuth_Proxy_host": "مضيف الوكيل -البروكسي-",
+  "Accounts_OAuth_Proxy_services": "خدمات البروكسي",
   "Accounts_OAuth_Twitter": "تويتر الدخول",
   "Accounts_OAuth_Twitter_callback_url": "URL تويتر الاستدعاء",
   "Accounts_OAuth_Twitter_id": "تويتر إيد",
@@ -99,8 +106,6 @@
   "Accounts_OAuth_Wordpress_id": "وورد إيد",
   "Accounts_OAuth_Wordpress_secret": "وورد السرية",
   "Accounts_PasswordReset": "إعادة تعيين كلمة السر",
-  "Accounts_OAuth_Proxy_host": "مضيف الوكيل -البروكسي-",
-  "Accounts_OAuth_Proxy_services": "خدمات البروكسي",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "الأدوار الافتراضية لخدمات المصادقة",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "سيتم تعيين الأدوار الافتراضية للمستخدمين عند التسجيل عبر خدمات المصادقة (افصل بينها بفاصلة)",
   "Accounts_Registration_AuthenticationServices_Enabled": "تسجيل مع خدمات المصادقة",
@@ -124,6 +129,12 @@
   "Activate": "تفعيل",
   "Activity": "أنشطة",
   "Add": "إضافة",
+  "add-user": "إضافة مستخدم",
+  "add-user-to-any-c-room": "إضافة مستخدم لأي قناة عامة",
+  "add-user-to-any-c-room_description": "التصريح بإضافة مستخدم إلى أي قناة عامة",
+  "add-user-to-any-p-room": "إضافة مستخدم لأي قناة خاصة",
+  "add-user-to-any-p-room_description": "التصريح بإضافة مستخدم إلى أي قناة خاصة",
+  "add-user_description": "التصريح بإضافة مستخدمين جدد إلى الخادم عبر نافذة المستخدمين",
   "Add_agent": "أضف وكيل",
   "Add_custom_oauth": "إضافة أوث مخصصة",
   "Add_Domain": "إضافة اسم مجال",
@@ -194,10 +205,14 @@
   "Application_updated": "تحديث التطبيق",
   "Apply_and_refresh_all_clients": "تطبيق وتحديث كافة عملاء",
   "Archive": "الأرشيف",
+  "archive-room": "أرشفة الغرفة",
+  "archive-room_description": "التصريح بأرشفة القناة",
   "are_also_typing": "هم أيضا يكتبون",
   "are_typing": "يكتبون",
   "Are_you_sure": "هل أنت متأكد؟",
   "Are_you_sure_you_want_to_delete_your_account": "هل أنت متأكد من أنك تريد حذف حسابك؟",
+  "assign-admin-role": "تعيين دور المدير",
+  "assign-admin-role_description": "التصريح بمنح المستخدمين الآخرين دور المدير",
   "Assign_admin": "تعيين المدير",
   "at": "في",
   "Attachment_File_Uploaded": "تم رفع الملف",
@@ -206,7 +221,10 @@
   "Author": "الكاتب",
   "Authorization_URL": "URL التخويل",
   "Authorize": "يأذن",
+  "auto-translate": "ترجمة تلقائية",
+  "auto-translate_description": "التصريح باستخدام أداة الترجمة التلقائية",
   "Auto_Load_Images": "تحميل تلقائي للصور",
+  "Auto_Translate": "ترجمة تلقائية",
   "AutoLinker_Email": "AutoLinker البريد الإلكتروني",
   "AutoLinker_Phone": "AutoLinker الهاتف",
   "AutoLinker_Phone_Description": "ترتبط آليا عن أرقام الهاتف. على سبيل المثال `(123) 456-7890`",
@@ -217,9 +235,8 @@
   "AutoLinker_Urls_www": "عناوين AutoLinker \"شبكة الاتصالات العالمية\"",
   "AutoLinker_UrlsRegExp": "AutoLinker URL التعبير منتظم",
   "Automatic_Translation": "ترجمة تلقائية",
-  "Auto_Translate": "ترجمة تلقائية",
-  "AutoTranslate_Enabled": "تفعيل الترجمة التلقائية",
   "AutoTranslate_Change_Language_Description": "لن يتم ترجمة الرسائل السابقة عند تغيير لغة الترجمة التلقائية ",
+  "AutoTranslate_Enabled": "تفعيل الترجمة التلقائية",
   "AutoTranslate_GoogleAPIKey": "مفتاح API للغوغل",
   "Available": "متاح",
   "Available_agents": "الوكلاء الموجودون",
@@ -235,11 +252,13 @@
   "Away_male": "بعيد",
   "Back": "العودة",
   "Back_to_applications": "العودة إلى التطبيقات",
-  "Back_to_integrations": "العودة إلى التكامل",
   "Back_to_integration_detail": "العودة إلى تفاصيل الدمج",
+  "Back_to_integrations": "العودة إلى التكامل",
   "Back_to_login": "العودة إلى تسجيل الدخول",
   "Back_to_permissions": "العودة إلى التصريحات",
   "Backup_codes": "شيفرات التخزين الاحتياطي",
+  "ban-user": "حظر المستخدم",
+  "ban-user_description": "التصريح لحظر مستخدم من القناة",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "ميزة تجريبية. تعتمد على تفعيل إقامة مؤتمر عبر الفيديو.",
   "Block_User": "حظر المستخدم",
   "Body": "الجسم",
@@ -247,6 +266,10 @@
   "bot_request": "طلب الروبوت",
   "BotHelpers_userFields": "حقول المستخدم",
   "Branch": "الفرع",
+  "bulk-create-c": "إنشاء قنوات دفعة واحدة",
+  "bulk-create-c_description": "التصريح بإنشاء قنوات دفعة واحدة",
+  "bulk-register-user": "إنشاء قنوات دفعة واحدة",
+  "bulk-register-user_description": "التصريح بإنشاء قنوات دفعة واحدة",
   "busy": "مشغول",
   "Busy": "مشغول",
   "busy_female": "مشغولة",
@@ -254,7 +277,6 @@
   "busy_male": "مشغول",
   "Busy_male": "مشغول",
   "by": "بواسطة",
-  "Content": "المحتوى",
   "cache_cleared": "تم مسح التخزين المؤقت",
   "Cancel": "إلغاء",
   "Cancel_message_input": "لإلغاء التغييرات",
@@ -272,14 +294,14 @@
   "CAS_version": "نسخة CAS",
   "CDN_PREFIX": "كندي البادئة",
   "Certificates_and_Keys": "شهادات ومفاتيح",
-  "Changing_email": "البريد الإلكتروني تغيير",
   "Change_Room_Type": "تغيير نوع الغرفة",
+  "Changing_email": "البريد الإلكتروني تغيير",
   "channel": "القناة",
   "Channel": "قناة",
   "Channel_already_exist": "القناة #٪ s 'موجود مسبقا.",
-  "Channel_created": "تم إنشاء قناة `#%s`",
   "Channel_already_Unarchived": "قناة مع اسم `#٪ s` هي بالفعل في حالة إلغاء أرشفة",
   "Channel_Archived": "تم أرشفة قناة مع اسم `#٪ s` بنجاح",
+  "Channel_created": "تم إنشاء قناة `#%s`",
   "Channel_doesnt_exist": "القناة '#%s' غير موجودة.",
   "Channel_to_listen_on": "السماع إلى هذه القناة",
   "Channel_Unarchived": "وكانت قناة مع اسم `#٪ s` إلغاء أرشفة بنجاح",
@@ -297,9 +319,9 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "اختيار الاسم المستعار الذي سيمثل أمام اسم المستخدم في الرسائل.",
   "Choose_the_username_that_this_integration_will_post_as": "اختيار اسم المستخدم أن هذا التكامل سوف منصب.",
   "clear": "مسح",
+  "Clear_all_unreads_question": "مسح كافة الغير مقروءة؟",
   "clear_cache_now": "مسح التخزين المؤقت الآن",
   "clear_history": "مسح السجل",
-  "Clear_all_unreads_question": "مسح كافة الغير مقروءة؟",
   "Click_here": "انقر هنا",
   "Click_here_for_more_info": "انقر هنا للمزيد من المعلومات",
   "Client_ID": "معرف العميل",
@@ -316,6 +338,7 @@
   "Comment_to_leave_on_closing_session": "التعليق الموضوع على إنهاء الجلسة",
   "Compact": "اتفاق",
   "Confirm_password": "تأكيد كلمة السر",
+  "Content": "المحتوى",
   "Conversation": "محادثة",
   "Conversation_closed": "المحادثة أغلقت: __comment__.",
   "Convert_Ascii_Emojis": "حول محارف الأسكي إلى اموجي",
@@ -326,13 +349,20 @@
   "Count": "عد",
   "Cozy": "دافئ",
   "Create": "خلق",
+  "create-c_description": "التصريح بإنشاء قنوات عامة",
+  "create-d": "إنشاء رسائل مباشرة",
+  "create-d_description": "التصريح بالبدء بإرسال رسائل مباشرة",
+  "create-p": "إنشاء قنوات خاصة",
+  "create-p_description": "التصريح بإنشاء قنوات خاصة",
+  "create-user": "إنشاء مستخدم",
+  "create-user_description": "التصريح بإنشاء مستخدمين",
   "Create_A_New_Channel": "إنشاء قناة جديدة",
   "Create_new": "إنشاء جديد",
   "Created_at": "أنشئت في",
   "Created_at_s_by_s": "أنشئت <strong>في %s</strong> <strong>بواسطة %s</strong>",
   "Created_at_s_by_s_triggered_by_s": "تم الإنشاء في <strong>%s</strong> بوساطة <strong> %s </strong>ومُشغّل بوساطة <strong> %s </strong>",
-  "CROWD_Reject_Unauthorized": "رفض غير المُصرّح به",
   "CRM_Integration": "دمج CRM",
+  "CROWD_Reject_Unauthorized": "رفض غير المُصرّح به",
   "Current_Chats": "الدردشات الحالية",
   "Current_Status": "الحالة الحالية",
   "Custom": "عرف",
@@ -348,10 +378,9 @@
   "Custom_Fields": "الحقول المخصصة",
   "Custom_oauth_helper": "عند إعداد مزود أوث الخاص بك، سيكون لديك لإبلاغ URL الاستدعاء. استعمال <pre style=\";text-align:right;direction:rtl\"> ٪ الصورة </pre> .",
   "Custom_oauth_unique_name": "اسم فريد أوث مخصص",
-  "Custom_Scripts": "سكربتات مخصصة",
   "Custom_Script_Logged_In": "سيناريو المخصصة لتسجيل الدخول للمستخدمين",
   "Custom_Script_Logged_Out": "سيناريو مخصصة للمستخدمين تسجيل الخروج",
-  "Custom_Sounds": "أصوات مخصصة",
+  "Custom_Scripts": "سكربتات مخصصة",
   "Custom_Sound_Add": "إضافة صوت مخصص",
   "Custom_Sound_Delete_Warning": "لا يمكن التراجع عن حذف الصوت",
   "Custom_Sound_Error_Invalid_Sound": "صوت غير صالح",
@@ -359,6 +388,7 @@
   "Custom_Sound_Has_Been_Deleted": "تم حذف الصوت المخصص",
   "Custom_Sound_Info": "بيانات الصوت المخصص",
   "Custom_Sound_Saved_Successfully": "تم حفظ الصوت المخصص بنجاح",
+  "Custom_Sounds": "أصوات مخصصة",
   "Custom_Translations": "ترجمة مخصصة",
   "Custom_Translations_Description": "يجب أن يكون كود  JSON صالح. حيث تكون المفاتيح لغات تحتوي على قاموس المفتاح والترجمة. مثال:\n <br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"pt\": {\n  \"Channels\": \"Salas\"\n }\n</code>\n}",
   "CustomSoundsFilesystem": "ملفات الأصوات المخصصة",
@@ -373,6 +403,16 @@
   "Decline": "إلغاء",
   "Default": "افتراضي",
   "Delete": "حذف",
+  "delete-c": "حذف قنوات عامة",
+  "delete-c_description": "التصريح بحذف قنوات عامة",
+  "delete-d": "حذف رسائل مباشرة",
+  "delete-d_description": "التصريح بحذف الرسائل العامة",
+  "delete-message": "حذف الرسائل",
+  "delete-message_description": "التصريح بحذف رسالة في غرفة",
+  "delete-p": "حذف القنوات الخاصة",
+  "delete-p_description": "التصريح بحذف القنوات الخاصة",
+  "delete-user": "حذف مسخدم",
+  "delete-user_description": "التصريح بحذف المستخدمين",
   "Delete_message": "حذف رسالة",
   "Delete_my_account": "حذف حسابي",
   "Delete_Room_Warning": "حذف الغرفة، يحذف جميع الرسائل المرسلة داخل الغرفة.، هذا لا يمكن التراجع عنه.",
@@ -411,8 +451,20 @@
   "Duplicate_private_group_name": "توجد مجموعة خاصة باسم '%s'",
   "Duration": "المدة",
   "Edit": "تعديل",
+  "edit-message": "تعديل الرسالة",
+  "edit-message_description": "التصريح بتعديل رسالة في غرفة",
+  "edit-other-user-active-status": "تعديل حالة المستخدمين النشطين الآخرين",
+  "edit-other-user-active-status_description": "التصريح بتفعيل أو إلغاء تفعيل الحسابات الأخرى",
+  "edit-other-user-info": "تعديل معلومات المستخدمين الآخرين",
+  "edit-other-user-info_description": "التصريح بتغيير الاسم، أو اسم المستخدم أو عنوان البريد الإلكتروني",
+  "edit-other-user-password": "تعديل كلمات مرور المستخدمين الآخرين",
+  "edit-other-user-password_description": "التصريح بتعديل كلمات المرور للأشخاص. يتطلب تعديل تصريح معلومات المستخدم الأخرى",
+  "edit-privileged-setting": "تعديل إعدادات الامتيازات",
+  "edit-privileged-setting_description": "التصريح بتعديل الإعدادات",
+  "edit-room": "تعديل الرسالة",
   "Edit_Custom_Field": "تحرير حقل مخصص",
   "Edit_Department": "وزارة تحرير",
+  "Edit_previous_message": "`%s` تعديل الرسالة السابقة",
   "Edit_Trigger": "تعديل المُشغل",
   "edited": "تم العديل",
   "Editing_room": "غرفة التحرير",
@@ -436,15 +488,15 @@
   "Empty_title": "عنوان فارغ",
   "Enable": "تمكين",
   "Enable_Desktop_Notifications": "تفعيل تنبيهات سطح المكتب",
+  "Enable_Svg_Favicon": "تفعيل أيقونة SVG ",
   "Enable_two-factor_authentication": "تفعيل المصادقة بخطوتين",
   "Enabled": "مفعل",
-  "Enable_Svg_Favicon": "تفعيل أيقونة SVG ",
   "Encrypted_message": "رسالة مشفرة",
   "End_OTR": "إنهاء المحادثة السرية",
-  "Enter_authentication_code": "ادخل رمز المصادقة",
   "Enter_a_regex": "أدخل التعابير المنطقية",
   "Enter_a_room_name": "أدخل اسم الغرفة",
   "Enter_a_username": "أدخل اسم المستخدم",
+  "Enter_authentication_code": "ادخل رمز المصادقة",
   "Enter_name_here": "أدخل اسم هنا",
   "Enter_to": "زر الإدخال",
   "Error": "خطأ",
@@ -459,6 +511,7 @@
   "error-could-not-change-username": "لا يمكن تغيير اسم المستخدم",
   "error-delete-protected-role": "لا يمكنك حذف دور محمية",
   "error-department-not-found": "قسم غير موجود",
+  "error-direct-message-file-upload-not-allowed": "لا يسمح بمشاركة الملفات في الرسائل المباشرة",
   "error-duplicate-channel-name": "توجد قناة باسم '%s'",
   "error-email-domain-blacklisted": "القائمة السوداء المجال البريد الإلكتروني",
   "error-field-unavailable": "<strong>__field__</strong> مستخدم مسبقا :(",
@@ -479,7 +532,6 @@
   "error-invalid-email-address": "البريد الإلكتروني غير صالح",
   "error-invalid-file-height": "ارتفاع ملف غير صالح",
   "error-invalid-file-type": "نوع الملف غير صالح",
-  "error-direct-message-file-upload-not-allowed": "لا يسمح بمشاركة الملفات في الرسائل المباشرة",
   "error-invalid-file-width": "عرض ملف غير صالح",
   "error-invalid-from-address": "كنت على علم غير صالح من عنوان.",
   "error-invalid-integration": "التكامل غير صالح",
@@ -538,8 +590,8 @@
   "File_type_is_not_accepted": "نوع الملف غير مسموح",
   "File_uploaded": "الملف المرفوع",
   "FileUpload": "تحميل الملف",
-  "FileUpload_Enabled": "تحميل الملفات مفعلة",
   "FileUpload_Disabled": "تم إلغاء تفعيل رفع الملفات",
+  "FileUpload_Enabled": "تحميل الملفات مفعلة",
   "FileUpload_File_Empty": "ملف فارغ",
   "FileUpload_FileSystemPath": "مسار النظام",
   "FileUpload_GoogleStorage_AccessId": "رمز تعريف وصول تخزين غوغل",
@@ -555,24 +607,26 @@
   "FileUpload_S3_AWSAccessKeyId": "الأمازون S3 AWSAccessKeyId",
   "FileUpload_S3_AWSSecretAccessKey": "الأمازون S3 AWSSecretAccessKey",
   "FileUpload_S3_Bucket": "الأمازون S3 اسم دلو",
-  "FileUpload_S3_SignatureVersion": "نسخة التوقيع",
-  "FileUpload_S3_ForcePathStyle": "فرض مظهر المسار",
   "FileUpload_S3_BucketURL": "URL دلو",
   "FileUpload_S3_CDN": "نطاق كندي للتنزيل",
+  "FileUpload_S3_ForcePathStyle": "فرض مظهر المسار",
   "FileUpload_S3_Region": "منطقة",
+  "FileUpload_S3_SignatureVersion": "نسخة التوقيع",
   "FileUpload_S3_URLExpiryTimeSpan": "فترة انتهاء صلاحية الروابط",
   "FileUpload_Storage_Type": "نوع التخزين",
   "Flags": "أعلام",
   "Follow_social_profiles": "اتبع محات اجتماعية لدينا، مفترق لنا على جيثب وتبادل الأفكار حول التطبيق rocket.chat على متن trello لدينا.",
+  "Fonts": "الخطوط",
   "Food_and_Drink": "طعام و مشروبات",
   "Footer": "تذييل",
-  "Fonts": "الخطوط",
   "For_your_security_you_must_enter_your_current_password_to_continue": "ﻷسباب أمنية، عليك إعادة إدخال كلمة المرور للمتابعة",
+  "force-delete-message": "فرض حذف الرسالة",
+  "force-delete-message_description": "التصريح بحذف رسالة بتخطي كل القيود",
   "Force_SSL": "قوة SSL",
   "Force_SSL_Description": "* الحذر! * لا ينبغي أبدا أن تستخدم _Force SSL_ مع وكيل عكسي. إذا كان لديك وكيل عكسي، يجب القيام إعادة التوجيه هناك. يوجد هذا الخيار لنشر مثل Heroku، لا يسمح التكوين إعادة توجيه في كيل عكسي.",
   "Forgot_password": "نسيت كلمة السر",
-  "Forgot_Password_Email_Subject": "[Site_Name] - استرداد كلمة المرور",
   "Forgot_Password_Email": "انقر <a href=\"[Forgot_Password_Url]\">هنا </a> لإعادة تعيين كلمة المرور الخاصة بك.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - استرداد كلمة المرور",
   "Forgot_password_section": "تم نسيان كلمة المرور",
   "Forward": "إعادة توجيه",
   "Forward_chat": "إعادة توجيه الدردشة",
@@ -600,9 +654,9 @@
   "Hide_flextab": "إخفاء الشريط الجانبي الأيمن بنقرة واحدة",
   "Hide_Group_Warning": "هل أنت متأكد من أنك تريد إخفاء المجموعة \"%s\"؟",
   "Hide_Private_Warning": "هل أنت متأكد من أنك تريد إخفاء المحادثة مع \"%s\"؟",
+  "Hide_roles": "إخفاء الأدوار",
   "Hide_room": "إخفاء الغرفة",
   "Hide_Room_Warning": "هل أنت متأكد من أنك تريد إخفاء الغرفة \"%s\"؟",
-  "Hide_roles": "إخفاء الأدوار",
   "Hide_Unread_Room_Status": "إخفاء حالة الغرفة في حالة غير المقروءة",
   "Hide_usernames": "إخفاء أسماء المستخدمين",
   "Highlights": "التظليل",
@@ -654,33 +708,33 @@
   "Installed_at": "تثبيت في",
   "Instance_Record": "مثال على قيد",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "تعليمات لزائرك ملء النموذج لإرسال رسالة",
-  "Integration_Advanced_Settings": "الإعدادات المتقدمة",
   "Integration_added": "تمت إضافة التكامل",
+  "Integration_Advanced_Settings": "الإعدادات المتقدمة",
   "Integration_History_Cleared": "تم مسح سجل الدمج بنجاح",
   "Integration_Incoming_WebHook": "واردة التكامل WebHook",
   "Integration_New": "التكامل الجديد",
-  "Integrations_Outgoing_Type_FileUploaded": "تم رفع الملف",
-  "Integrations_Outgoing_Type_RoomArchived": "تمت أرشفة الغرفة",
-  "Integrations_Outgoing_Type_RoomCreated": "تم إنشاء الغرفة (عامة أو خاصة)",
-  "Integrations_Outgoing_Type_RoomJoined": "انضم مستخدم للغرفة",
-  "Integrations_Outgoing_Type_RoomLeft": "غادر مستخدم الغرفة",
-  "Integrations_Outgoing_Type_SendMessage": "تم إرسال الرسالة",
-  "Integrations_Outgoing_Type_UserCreated": "تم إنشاء المستخدم",
   "Integration_Outgoing_WebHook": "المنتهية ولايته التكامل WebHook",
-  "Integration_Outgoing_WebHook_History_Trigger_Step": "خطوة المُشغّل الأخيرة",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "الرسائل المرسلة في خطوة الإعداد",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "الرسائل المرسلة في خطوة استجابة العملية",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "تم نقل البيانات للدمج",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "تم إرسال البيانات عبر الرابط",
-  "Integration_Outgoing_WebHook_History_Http_Response_Error": "خطأ في استجابة HTTP",
   "Integration_Outgoing_WebHook_History_Http_Response": "استجابة HTTP",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "خطأ في استجابة HTTP",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "الرسائل المرسلة في خطوة الإعداد",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "الرسائل المرسلة في خطوة استجابة العملية",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "خطوة المُشغّل الأخيرة",
   "Integration_Retry_Count": "إعادة العد",
   "Integration_Retry_Count_Description": "كم مرة يجب إعادة محاولة الدمج في حالة فشل استجابة الرابط؟",
   "Integration_Retry_Delay": "إعادة محاولة التأخير",
   "Integration_Run_When_Message_Is_Edited": "التشغيل عند التعديل",
-  "Integration_Word_Trigger_Placement": "استبدال الكلمة في كل موضع",
   "Integration_updated": "تم تحديث التكامل",
+  "Integration_Word_Trigger_Placement": "استبدال الكلمة في كل موضع",
   "Integrations": "التكامل",
+  "Integrations_Outgoing_Type_FileUploaded": "تم رفع الملف",
+  "Integrations_Outgoing_Type_RoomArchived": "تمت أرشفة الغرفة",
+  "Integrations_Outgoing_Type_RoomCreated": "تم إنشاء الغرفة (عامة أو خاصة)",
+  "Integrations_Outgoing_Type_RoomJoined": "انضم مستخدم للغرفة",
+  "Integrations_Outgoing_Type_RoomLeft": "غادر مستخدم الغرفة",
+  "Integrations_Outgoing_Type_SendMessage": "تم إرسال الرسالة",
+  "Integrations_Outgoing_Type_UserCreated": "تم إنشاء المستخدم",
   "InternalHubot": "Hubot الداخلية",
   "InternalHubot_ScriptsToLoad": "مخطوطات لتحميل",
   "InternalHubot_ScriptsToLoad_Description": "الرجاء إدخال قائمة مفصولة بفواصل من مخطوطات لتحميل من https://github.com/github/hubot-scripts/tree/master/src/scripts",
@@ -716,16 +770,12 @@
   "Jitsi_Chrome_Extension": "الكروم تمديد إيد",
   "Jitsi_Enable_Channels": "تمكين في القنوات",
   "join": "انضم",
+  "join-without-join-code": "الانضمام بدون كود الانضمام",
   "Join_audio_call": "انضم للاتصال الصوتي",
   "Join_Chat": "الانضمام للدردشة",
   "Join_default_channels": "تاريخ القنوات الافتراضية",
   "Join_the_Community": "إنظم للمجتمع",
   "Join_the_given_channel": "انضم للقناة",
-  "Show_the_keyboard_shortcut_list": "عرض قائمة اختصارات لوحة المفاتيح",
-  "Open_channel_user_search": "`%s`- فتح قناة/ بحث المستخدم",
-  "Edit_previous_message": "`%s` تعديل الرسالة السابقة",
-  "Move_beginning_message": "`%s` الانتقال إلى بداية الرسالة",
-  "Move_end_message": "`%s` الانتقال إلى نهاية الرسالة",
   "Join_video_call": "انضم للاتصال المرئي",
   "Joined": "المنضم إليها",
   "Jump": "الانتقال السريع ل",
@@ -778,6 +828,9 @@
   "LDAP_Enable_Description": "محاولة استخدام LDAP للمصادقة.",
   "LDAP_Encryption": "التشفير",
   "LDAP_Encryption_Description": "طريقة التشفير المستخدمة لتأمين الاتصالات إلى خادم LDAP. ومن الأمثلة `plain` (بدون تشفير)،` SSL / LDAPS` (مشفرة من البداية)، و`StartTLS` (الترقية إلى الاتصالات المشفرة مرة واحدة متصلة).",
+  "LDAP_Group_Filter_Group_Member_Format": "صيغة عضو المجموعة",
+  "LDAP_Group_Filter_Group_Name": "اسم المجموعة",
+  "LDAP_Group_Filter_Group_Name_Description": "اسم المجموعة التي تنتمي للمستخدم",
   "LDAP_Host": "مضيف",
   "LDAP_Host_Description": "المضيف LDAP، على سبيل المثال `ldap.example.com` أو` 10.0.0.30`.",
   "LDAP_Idle_Timeout": "انتهاء مدة عدم النشاط (بالملي ثانية)",
@@ -798,9 +851,6 @@
   "LDAP_Use_Custom_Domain_Search_Description": "إرسال الفلتر الخاص للمستخدمين البحث في خادم LDAP.",
   "LDAP_Username_Field": "اسم المستخدم الميدان",
   "LDAP_Username_Field_Description": "التي المجال سوف تستخدم * اسم المستخدم * للمستخدمين الجدد. اتركه فارغا لاستخدام اسم المستخدم على علم صفحة تسجيل الدخول. <br/> يمكنك استخدام العلامات قالب جدا، مثل `#{givenName}.#{sn}`. <br/> القيمة الافتراضية هي `sAMAccountName`.",
-  "LDAP_Group_Filter_Group_Member_Format": "صيغة عضو المجموعة",
-  "LDAP_Group_Filter_Group_Name": "اسم المجموعة",
-  "LDAP_Group_Filter_Group_Name_Description": "اسم المجموعة التي تنتمي للمستخدم",
   "Least_Amount": "المقدار الأقل",
   "Leave_Group_Warning": "هل أنت متأكد من أنك تريد مغادرة المجموعة \"%s\"؟",
   "Leave_Private_Warning": "هل أنت متأكد من أنك تريد مغادرة المحادثة مع \"%s\"؟",
@@ -838,6 +888,7 @@
   "Login_with": "تسجيل الدخول بـ %s",
   "Logout": "تسجيل خروج",
   "Logout_Others": "تسجيل الخروج من الأجهزة الأخرى",
+  "mail-messages": "رسلائل البريد",
   "Mail_Message_Invalid_emails": "لقد قدمت رسائل البريد الإلكتروني واحدة أو أكثر غير صالحة:٪ ق",
   "Mail_Message_Missing_to": "يجب عليك اختيار واحد أو أكثر من المستخدمين أو تقديم واحدة أو أكثر من عناوين البريد الإلكتروني، مفصولة بفواصل.",
   "Mail_Message_No_messages_selected_select_all": "لم تقم بتحديد أي رسالة. هل تريد أن <a href='#' class='select-all'>تحدد جميع</a> الرسائل الظاهرة؟",
@@ -848,6 +899,10 @@
   "Mailer_body_tags": "<b>يجب</b> عليك استخدام[unsubscribe] للارتباط إلغاء الاشتراك. <br /> يمكنك استخدام [name]، [fname]، [lname] عن الاسم الكامل للمستخدم، الاسم الأول أو اسم العائلة، على التوالي. <br /> يمكنك استخدام [email] للبريد الإلكتروني الخاص بالمستخدم.",
   "Mailing": "المراسلات",
   "Make_Admin": "جعل مدير",
+  "manage-emoji": "إدارة الرموز التعبيرية",
+  "manage-emoji_description": "التصريح بإدارة الرموز التعبيرية في الخادم",
+  "manage-sounds": "إدارة الأصوات",
+  "manage-sounds_description": "التصريح بإدارة أصوات الخادم",
   "Manager_added": "تمت إضافة المدير",
   "Manager_removed": "إزالة مدير",
   "Managing_assets": "إدارة الأصول",
@@ -861,6 +916,7 @@
   "Markdown_SupportSchemesForLink_Description": "قائمة مفصولة بفواصل من مخططات سمح",
   "Max_length_is": "الحد الأقصى للطول هو %s",
   "Members_List": "قائمة الأعضاء",
+  "mention-all": "ذكر الجميع",
   "Mentions": "تنويهات",
   "Mentions_default": "تنويهات (افتراضي)",
   "Message": "رسالة",
@@ -902,17 +958,17 @@
   "Message_ShowEditedStatus": "عرض حالة الحذف",
   "Message_ShowFormattingTips": "اظهار نصائح التنسيق",
   "Message_starring": "تمييز الرسالة",
-  "Message_TimeFormat": "تنسيق الوقت",
   "Message_TimeAndDateFormat": "صيغة الوقت والتاريخ",
-  "Message_TimeFormat_Description": "انظر أيضا: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeAndDateFormat_Description": "انظر أيضاً: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
+  "Message_TimeFormat": "تنسيق الوقت",
+  "Message_TimeFormat_Description": "انظر أيضا: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "رسالة طويلة جدا",
   "Message_VideoRecorderEnabled": "تم تفعيل مُسجّل الفيديو",
   "Messages": "الرسائل",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "وسوف يتم نشر الرسائل التي يتم إرسالها إلى الواردة WebHook هنا.",
   "Meta": "ميتا",
-  "Meta_fb_app_id": "معرف تطبيق الفيسبوك",
   "Meta_custom": "وسوم الميتا المُخصصة",
+  "Meta_fb_app_id": "معرف تطبيق الفيسبوك",
   "Meta_google-site-verification": "Google Site Verification",
   "Meta_language": "اللغة",
   "Meta_msvalidate01": "MSValidate.01",
@@ -925,8 +981,12 @@
   "More_direct_messages": "المزيد من الرسائل الخاصة",
   "More_groups": "المزيد من المجموعات الخاصة",
   "More_unreads": "المزيد غير مقروءة",
+  "Move_beginning_message": "`%s` الانتقال إلى بداية الرسالة",
+  "Move_end_message": "`%s` الانتقال إلى نهاية الرسالة",
   "Msgs": "رسائل",
   "multi": "متعدد",
+  "mute-user": "كتم المستخدم",
+  "mute-user_description": "التصريح بكتم المستخدمين الآخرين في نفس القناة",
   "Mute_someone_in_room": "إسكات شخص في الغرفة",
   "Mute_user": "اسكات المستخدم",
   "Muted": "صامتة",
@@ -961,9 +1021,9 @@
   "No_mentions_found": "لا يوجد تنويهات",
   "No_pinned_messages": "لا توجد رسائل مثبتة",
   "No_results_found": "لا توجد نتائج",
+  "No_snippet_messages": "دون مقتطفات",
   "No_starred_messages": "لا توجد رسائل مميزة",
   "No_such_command": "لا يوجد أي أمر كهذا: `/__command__`",
-  "No_snippet_messages": "دون مقتطفات",
   "No_user_with_username_%s_was_found": "لا يوجد مستخدم باسم <strong>\"%s\"</strong>",
   "Nobody_available": "لا يوجد أي شخص متاح",
   "Node_version": "نسخة العقدة",
@@ -976,8 +1036,8 @@
   "Nothing_found": "لا يوجد شيء",
   "Notification_Duration": "مدة التنبيهات",
   "Notifications": "الإشعارات",
-  "Notify_all_in_this_room": "إخطار جميع من في هذه الغرفة",
   "Notify_active_in_this_room": "إبلاغ المستخدمين النشطين في هذه الغرفة",
+  "Notify_all_in_this_room": "إخطار جميع من في هذه الغرفة",
   "Num_Agents": "وكلاء",
   "Number_of_messages": "عدد الرسائل",
   "OAuth_Application": "أوث التطبيق",
@@ -990,9 +1050,11 @@
   "Office_hours_enabled": "تم تفعيل ساعات الدوام في المكتب",
   "Office_hours_updated": "تم تحديث ساعات الدوام في المكتب",
   "Offline": "غير متصل",
+  "Offline_DM_Email": "لقد تم بعث برسالة مباشرة من قبل __user__",
   "Offline_form": "شكل متواجد حاليا",
   "Offline_form_unavailable_message": "شكل متواجد حاليا رسالة غير متوفرة",
   "Offline_Link_Message": "الذهاب إلى الرسالة",
+  "Offline_Mention_Email": "تم التنويه باسمك بواسطة __user__ في #__room__",
   "Offline_message": "رسالة متواجد حاليا",
   "Offline_success_message": "رسالة نجاح متواجد حاليا",
   "Offline_unavailable": "غير متوفر حاليا",
@@ -1002,16 +1064,17 @@
   "Only_you_can_see_this_message": "يمكنك أنت فقط رؤية هذه الرسالة",
   "Oops!": "عذرا",
   "Open": "فتح",
+  "Open_channel_user_search": "`%s`- فتح قناة/ بحث المستخدم",
   "Open_days_of_the_week": "أيام الدوام",
   "Open_Livechats": "فتح الدردشة المباشرة",
+  "Open_your_authentication_app_and_enter_the_code": "شغّل تطبيق المصادقة وادخل الكود. تستطيع أيضاً استخدام أحد النسخ الاحتياطية للأكواد",
   "Opened": "افتتح",
   "Opened_in_a_new_window": "مفتوح في نافذة جديدة",
   "Opens_a_channel_group_or_direct_message": "فتح قناة، أو مجموعة أو رسالة مباشرة",
   "optional": "اختياري",
   "or": "أو",
-  "Open_your_authentication_app_and_enter_the_code": "شغّل تطبيق المصادقة وادخل الكود. تستطيع أيضاً استخدام أحد النسخ الاحتياطية للأكواد",
-  "Order": "طلب",
   "Or_talk_as_anonymous": "تحدث كشخص مجهول",
+  "Order": "طلب",
   "OS_Arch": "بنية النظام",
   "OS_Cpus": "عدد أنوية النظام",
   "OS_Freemem": "الذاكرة الحرة",
@@ -1036,117 +1099,8 @@
   "People": "الناس",
   "Permalink": "الرابط الثابت",
   "Permissions": "التصريحات",
-  "access-mailer": "الدخول إلى نافذة البريد",
-  "access-mailer_description": "التصريح بإرسال إيميلات دفعة واحدة إلى كل المستخدمين",
-  "access-permissions": "الدخول إلى صفحة الصلاحيات والأذونات",
-  "access-permissions_description": "تعديل الصلاحيات للأدوار المختلفة",
-  "add-user": "إضافة مستخدم",
-  "add-user_description": "التصريح بإضافة مستخدمين جدد إلى الخادم عبر نافذة المستخدمين",
-  "add-user-to-any-c-room": "إضافة مستخدم لأي قناة عامة",
-  "add-user-to-any-c-room_description": "التصريح بإضافة مستخدم إلى أي قناة عامة",
-  "add-user-to-any-p-room": "إضافة مستخدم لأي قناة خاصة",
-  "add-user-to-any-p-room_description": "التصريح بإضافة مستخدم إلى أي قناة خاصة",
-  "archive-room": "أرشفة الغرفة",
-  "archive-room_description": "التصريح بأرشفة القناة",
-  "assign-admin-role": "تعيين دور المدير",
-  "assign-admin-role_description": "التصريح بمنح المستخدمين الآخرين دور المدير",
-  "auto-translate": "ترجمة تلقائية",
-  "auto-translate_description": "التصريح باستخدام أداة الترجمة التلقائية",
-  "ban-user": "حظر المستخدم",
-  "ban-user_description": "التصريح لحظر مستخدم من القناة",
-  "bulk-create-c": "إنشاء قنوات دفعة واحدة",
-  "bulk-create-c_description": "التصريح بإنشاء قنوات دفعة واحدة",
-  "bulk-register-user": "إنشاء قنوات دفعة واحدة",
-  "bulk-register-user_description": "التصريح بإنشاء قنوات دفعة واحدة",
-  "create-c_description": "التصريح بإنشاء قنوات عامة",
-  "create-d": "إنشاء رسائل مباشرة",
-  "create-d_description": "التصريح بالبدء بإرسال رسائل مباشرة",
-  "create-p": "إنشاء قنوات خاصة",
-  "create-p_description": "التصريح بإنشاء قنوات خاصة",
-  "create-user": "إنشاء مستخدم",
-  "create-user_description": "التصريح بإنشاء مستخدمين",
-  "delete-c": "حذف قنوات عامة",
-  "delete-c_description": "التصريح بحذف قنوات عامة",
-  "delete-d": "حذف رسائل مباشرة",
-  "delete-d_description": "التصريح بحذف الرسائل العامة",
-  "delete-p": "حذف القنوات الخاصة",
-  "delete-p_description": "التصريح بحذف القنوات الخاصة",
-  "delete-message": "حذف الرسائل",
-  "delete-message_description": "التصريح بحذف رسالة في غرفة",
-  "delete-user": "حذف مسخدم",
-  "delete-user_description": "التصريح بحذف المستخدمين",
-  "edit-message": "تعديل الرسالة",
-  "edit-message_description": "التصريح بتعديل رسالة في غرفة",
-  "edit-other-user-active-status": "تعديل حالة المستخدمين النشطين الآخرين",
-  "edit-other-user-active-status_description": "التصريح بتفعيل أو إلغاء تفعيل الحسابات الأخرى",
-  "edit-other-user-info": "تعديل معلومات المستخدمين الآخرين",
-  "edit-other-user-info_description": "التصريح بتغيير الاسم، أو اسم المستخدم أو عنوان البريد الإلكتروني",
-  "edit-other-user-password": "تعديل كلمات مرور المستخدمين الآخرين",
-  "edit-other-user-password_description": "التصريح بتعديل كلمات المرور للأشخاص. يتطلب تعديل تصريح معلومات المستخدم الأخرى",
-  "edit-privileged-setting": "تعديل إعدادات الامتيازات",
-  "edit-privileged-setting_description": "التصريح بتعديل الإعدادات",
-  "edit-room": "تعديل الرسالة",
-  "force-delete-message": "فرض حذف الرسالة",
-  "force-delete-message_description": "التصريح بحذف رسالة بتخطي كل القيود",
-  "join-without-join-code": "الانضمام بدون كود الانضمام",
-  "mail-messages": "رسلائل البريد",
-  "manage-emoji": "إدارة الرموز التعبيرية",
-  "manage-emoji_description": "التصريح بإدارة الرموز التعبيرية في الخادم",
-  "manage-sounds": "إدارة الأصوات",
-  "manage-sounds_description": "التصريح بإدارة أصوات الخادم",
-  "mention-all": "ذكر الجميع",
-  "mute-user": "كتم المستخدم",
-  "mute-user_description": "التصريح بكتم المستخدمين الآخرين في نفس القناة",
   "pin-message": "تثبيت الرسالة",
   "pin-message_description": "التصريح بتثبيت الرسالة في قناة",
-  "post-readonly": "نشر في وضع القراءة فقط",
-  "post-readonly_description": "التصريح بنشر رسالة في قناة في وضع القراءة فقط",
-  "preview-c-room": "عرض القناة العامة",
-  "preview-c-room_description": "التصريح بعرض محتوى القناة العامة قبل الانضمام",
-  "remove-user": "حذف المستخدم",
-  "remove-user_description": "التصريح بحذف مستخدم من غرفة دردشة",
-  "run-import": "تشغيل الاستيراد",
-  "run-import_description": "التصريح لتشغيل المستورد",
-  "run-migration": "تشغيل الترحيل",
-  "run-migration_description": "التصريح لتشغيل الترحيل",
-  "save-others-livechat-room-info": "حفظ معلومات غرف الدردشة المباشرة الأخرى",
-  "save-others-livechat-room-info_description": "التصريح بحفظ المعلومات من قنوات الدردشة الأخرى",
-  "set-moderator": "تعيين المشرف",
-  "set-moderator_description": "التصريح بتعيين المستخدمين الآخرين كمشرف القناة",
-  "set-owner": "تعيين المسؤول",
-  "set-owner_description": "التصريح بتعيين المستخدمين الآخرين كمسؤول القناة",
-  "set-react-when-readonly": "وضع تفاعل في حالة القراءة فقط",
-  "set-react-when-readonly_description": "التصريح بوضع قابلية التفاعل مع الرسائل في قناة في وضع القراءة فقط",
-  "set-readonly": "وضع للقراءة فقط",
-  "set-readonly_description": "التصريح بوضع القناة في وضع القراءة فقط",
-  "snippet-message": "مقتطف الرسالة",
-  "snippet-message_description": "التصريح بإنشاء مقتطف رسالة",
-  "unarchive-room": "إلغاء أرشفة الغرفة",
-  "view-c-room": "عرض القناة العامة",
-  "view-c-room_description": "التصريح بعرض القناة العامة",
-  "view-d-room": "عرض الرسائل المباشرة",
-  "view-d-room_description": "التصريح بعرض الرسائل المباشرة",
-  "view-full-other-user-info": "عرض كل معلومات المستخدم",
-  "view-history": "عرض السجل",
-  "view-history_description": "التصريح لعرض سجل القناة",
-  "view-join-code": "عرض كود الانضمام",
-  "view-join-code_description": "التصريح بعرض كود الانضمام للقناة",
-  "view-joined-room": "عرض الغرفة التي تم الانضمام إليها",
-  "view-joined-room_description": "التصريح بعرض القنوات التي تم الانضمام إليها",
-  "view-l-room": "عرض غرف الدردشة المباشرة",
-  "view-l-room_description": "التصريح بعرض كل قنوات الدردشة المباشرة",
-  "view-livechat-manager": "عرض مدير الدردشة المباشرة",
-  "view-livechat-rooms_description": "التصريح بعرض قنوات الدردشة المباشرة الأخرى",
-  "view-logs": "عرض السجلات",
-  "view-logs_description": "التصريخ بعرض سجلات الخادم",
-  "view-p-room": "عرض الغرفة الخاصة",
-  "view-privileged-setting": "عرض إعدادات الامتيازات",
-  "view-privileged-setting_description": "التصريح بعرض الإعدادات",
-  "view-other-user-channels": "عرض قنوات المستخدمين الآخرين",
-  "view-other-user-channels_description": "التصريح بعرض قنوات المستخدمين الآخرين",
-  "view-room-administration": "عرض إدارة الغرفة",
-  "view-statistics": "عرض الإحصائيات",
-  "view-user-administration": "عرض المستخدم المدير",
   "Pin_Message": "تثبيث الرسالة",
   "Pinned_a_message": "دبس رسالة:",
   "Pinned_Messages": "رسائل مثبتة",
@@ -1157,10 +1111,10 @@
   "Please_add_a_comment": "الرجاء إضافة تعليق",
   "Please_add_a_comment_to_close_the_room": "يرجى إضافة تعليق لإغلاق الغرفة",
   "Please_answer_survey": "يرجى ان نتوقف لحظة للرد على مسح سريع حول هذه الدردشة",
+  "please_enter_valid_domain": "الرجاء إدخال اسم مجال صالح",
   "Please_enter_value_for_url": "الرجاء إدخال قيمة للرابط من صورتك.",
   "Please_enter_your_new_password_below": "الرجاء إدخال كلمة المرور الجديدة أدناه:",
   "Please_enter_your_password": "الرجاء إعادة إدخال كلمة المرور",
-  "please_enter_valid_domain": "الرجاء إدخال اسم مجال صالح",
   "Please_fill_a_label": "يرجى ملء التسمية",
   "Please_fill_a_name": "الرجاء تعبئة اسم",
   "Please_fill_a_username": "يرجى ملء اسم المستخدم",
@@ -1173,11 +1127,15 @@
   "Please_wait_while_your_account_is_being_deleted": "الرجاء اﻹنتظار جاري حذف حسابك....",
   "Please_wait_while_your_profile_is_being_saved": "الرجاء اﻹنتظار ... جاري حفظ ملفك الشخصي...",
   "Port": "ميناء",
+  "post-readonly": "نشر في وضع القراءة فقط",
+  "post-readonly_description": "التصريح بنشر رسالة في قناة في وضع القراءة فقط",
   "Post_as": "منصب",
   "Post_to_Channel": "أضف إلى القناة",
   "Post_to_s_as_s": "آخر <strong>إلى %s</strong> <strong>ك %s</strong>",
   "Preferences": "التفضيلات",
   "Preferences_saved": "تم حفظ التفضيلات",
+  "preview-c-room": "عرض القناة العامة",
+  "preview-c-room_description": "التصريح بعرض محتوى القناة العامة قبل الانضمام",
   "Privacy": "الخصوصية",
   "Private": "خاص",
   "Private_Group": "مجموعة خاصة",
@@ -1219,8 +1177,8 @@
   "Read_only_group": "مجموعة في القراءة فقط",
   "Record": "سجل",
   "Redirect_URI": "إعادة توجيه URI",
-  "Refresh_oauth_services": "تحديث خدمات OAuth",
   "Refresh_keys": "تحديث المفاتيح",
+  "Refresh_oauth_services": "تحديث خدمات OAuth",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "تحديث الصفحة بعد تثبيت لتمكين مشاركة الشاشة",
   "Regenerate_codes": "إعادة توليد الأكواد",
   "Register": "تسجيل حساب جديد",
@@ -1231,6 +1189,8 @@
   "Release": "إطلاق سراح",
   "Reload": "إعادة تحميل",
   "Remove": "إزالة",
+  "remove-user": "حذف المستخدم",
+  "remove-user_description": "التصريح بحذف مستخدم من غرفة دردشة",
   "Remove_Admin": "إزالة مدير",
   "Remove_as_moderator": "إزالة كمشرف",
   "Remove_as_owner": "إزالة كمالك",
@@ -1240,16 +1200,16 @@
   "Remove_someone_from_room": "إزالة شخص من الغرفة",
   "Removed": "تمت اﻹزالة",
   "Reply": "رد",
-  "Reporting": "تقديم التقرير",
   "Report_Abuse": "التبليغ عن إساءة استخدام",
   "Report_exclamation_mark": "تقرير!",
   "Report_sent": "تم اسال القرير",
   "Report_this_message_question_mark": "أبلغ عن هذه الرسالة؟",
+  "Reporting": "تقديم التقرير",
   "Require_password_change": "تتطلب تغيير كلمة المرور",
   "Resend_verification_email": "اعد إرسال بريد التحقق",
   "Reset": "إعادة التعيين",
-  "Reset_section_settings": "إعادة ضبط إعدادات القسم",
   "Reset_password": "إعادة تعيين كلمة السر",
+  "Reset_section_settings": "إعادة ضبط إعدادات القسم",
   "Restart": "إعادة التشغيل",
   "Restart_the_server": "إعادة تشغيل السيرفر",
   "Retry_Count": "تعداد إعادة المحاولة",
@@ -1265,10 +1225,9 @@
   "room_changed_privacy": "تم تغيير نوع الغرفة إلى: <em>__room_type__</em> بواسطة <em>__user_by__</em>",
   "room_changed_topic": "تم تغيير موضوع الغرفة إلى: <em>__room_topic__</em> بواسطة <em>__user_by__</em>",
   "Room_description_changed_successfully": "تم تغيير وصف الغرفة بنجاح",
-  "Room_has_been_deleted": "تم حذف الغرفة",
   "Room_has_been_archived": "تم أرشفة الغرفة",
+  "Room_has_been_deleted": "تم حذف الغرفة",
   "Room_has_been_unarchived": "تم إلغاء أرشفة الغرفة",
-  "Room_type_of_default_rooms_cant_be_changed": "هذه غرفة افتراضية. لا يُمكن تغيير المكتوب. الرجاء الاتصال بالمدير!",
   "Room_Info": "معلومات الغرفة",
   "room_is_blocked": "تم حظر هذه الغرفة",
   "room_is_read_only": "يُمكن قراءة دردشة هذه الغرفة فقط",
@@ -1279,10 +1238,15 @@
   "Room_password_changed_successfully": "تم تغيير كلمة مرور الغرفة بنجاح",
   "Room_topic_changed_successfully": "تغيير موضوع الغرفة بنجاح",
   "Room_type_changed_successfully": "تم تغيير نوع الغرفة بنجاح",
+  "Room_type_of_default_rooms_cant_be_changed": "هذه غرفة افتراضية. لا يُمكن تغيير المكتوب. الرجاء الاتصال بالمدير!",
   "Room_unarchived": "غرفة نشطة",
   "Room_uploaded_file_list": "قائمة الملفات",
   "Room_uploaded_file_list_empty": "لا يوجد ملفات.",
   "Rooms": "الغرف",
+  "run-import": "تشغيل الاستيراد",
+  "run-import_description": "التصريح لتشغيل المستورد",
+  "run-migration": "تشغيل الترحيل",
+  "run-migration_description": "التصريح لتشغيل الترحيل",
   "Running_Instances": "تشغيل مثيلات",
   "S_new_messages_since_s": "% رسالة جديدة منذ %",
   "SAML": "SAML",
@@ -1290,11 +1254,13 @@
   "SAML_Custom_Entry_point": "عرف نقطة إدخال",
   "SAML_Custom_Generate_Username": "توليد اسم المستخدم",
   "SAML_Custom_Issuer": "المصدر مخصص",
+  "SAML_Custom_Private_Key": "محتويات المفتاح الخاص",
   "SAML_Custom_Provider": "مزود مخصص",
   "SAML_Custom_Public_Cert": "محتويات الشهادة العامة",
-  "SAML_Custom_Private_Key": "محتويات المفتاح الخاص",
   "Saturday": "السبت",
   "Save": "حفظ",
+  "save-others-livechat-room-info": "حفظ معلومات غرف الدردشة المباشرة الأخرى",
+  "save-others-livechat-room-info_description": "التصريح بحفظ المعلومات من قنوات الدردشة الأخرى",
   "Save_changes": "لحفظ التغييرات",
   "Save_Mobile_Bandwidth": "توفير استهلاك الانترنت",
   "Save_to_enable_this_action": "حفظ لتمكين هذا العمل",
@@ -1338,6 +1304,14 @@
   "Served_By": "مُشغّل بوساطة ",
   "Service": "خدمة",
   "Service_account_key": "مفتاح حساب الخدمة",
+  "set-moderator": "تعيين المشرف",
+  "set-moderator_description": "التصريح بتعيين المستخدمين الآخرين كمشرف القناة",
+  "set-owner": "تعيين المسؤول",
+  "set-owner_description": "التصريح بتعيين المستخدمين الآخرين كمسؤول القناة",
+  "set-react-when-readonly": "وضع تفاعل في حالة القراءة فقط",
+  "set-react-when-readonly_description": "التصريح بوضع قابلية التفاعل مع الرسائل في قناة في وضع القراءة فقط",
+  "set-readonly": "وضع للقراءة فقط",
+  "set-readonly_description": "التصريح بوضع القناة في وضع القراءة فقط",
   "Set_as_moderator": "إضافة كمشرف",
   "Set_as_owner": "إضافة إلى مالك",
   "Settings": "اﻹعدادات",
@@ -1353,8 +1327,9 @@
   "Show_only_online": "عرض المتصلين فقط",
   "Show_preregistration_form": "عرض استمارة التسجيل المسبق",
   "Show_queue_list_to_all_agents": "إظهار قائمة صف الانتظار لكل الموظفين",
+  "Show_the_keyboard_shortcut_list": "عرض قائمة اختصارات لوحة المفاتيح",
   "Showing_archived_results": "<p>عرض <b>%s</b> نتائج مؤرشفة</p>",
-  "Showing_online_users": "معروض <b>__total_showing__</b> من __total__ عضو",
+  "Showing_online_users": "<b> معروض:</b> __total_showing__, <b>على الانترنت:</b> __online__, <b>عضو:</b> __total__",
   "Showing_results": "<p>معروض <b>%s</b> نتائج</p>",
   "Sign_in_to_start_talking": "قم بتسجيل الدخول للبدء بالدردشة",
   "since_creation": "منذ %s",
@@ -1380,6 +1355,8 @@
   "SMTP_Port": "منفذ SMTP",
   "SMTP_Test_Button": "إعدادات اختبار SMTP",
   "SMTP_Username": "اسم المستخدم SMTP",
+  "snippet-message": "مقتطف الرسالة",
+  "snippet-message_description": "التصريح بإنشاء مقتطف رسالة",
   "Snippet_Added": "تم الإنشاء في %s",
   "Snippet_Messages": "مقتطفات الرسائل",
   "Sound": "الصوت",
@@ -1410,8 +1387,8 @@
   "Stats_Total_Livechat_Rooms": "غرف الدردشة المباشرة الكلية",
   "Stats_Total_Messages": "مجموع الرسائل",
   "Stats_Total_Messages_Channel": "عدد الرسائل الكلي في القنوات",
-  "Stats_Total_Messages_PrivateGroup": "عدد الرسائل الكلي في المجموعات الخاصة",
   "Stats_Total_Messages_Direct": "عدد الرسائل الكلية في الرسائل المباشرة",
+  "Stats_Total_Messages_PrivateGroup": "عدد الرسائل الكلي في المجموعات الخاصة",
   "Stats_Total_Private_Groups": "عدد المجموعات الخاصة",
   "Stats_Total_Rooms": "عدد الغرف",
   "Stats_Total_Users": "عدد الأعضاء",
@@ -1447,32 +1424,32 @@
   "The_user_will_be_removed_from_s": "سيتم إزالة المستخدم من %s",
   "The_user_wont_be_able_to_type_in_s": "المستخدم لن يكون قادرا على كتابة في٪ الصورة",
   "Theme": "موضوع",
-  "theme-color-transparent-darker": "شفاف أكثر قتماً",
-  "theme-color-transparent-dark": "شفاف قاتم",
-  "theme-color-transparent-light": "شفاف فاتح",
-  "theme-color-transparent-lighter": "شفاف أفتح",
-  "theme-color-transparent-lightest": "شفاف الأكثر فتحاً",
+  "theme-color-component-color": "لون التركيبة",
   "theme-color-content-background-color": "المحتوى لون الخلفية",
+  "theme-color-custom-scrollbar-color": "مخصص شريط التمرير اللون",
+  "theme-color-error-color": "لون الخطأ",
+  "theme-color-info-font-color": "معلومات لون الخط",
+  "theme-color-link-font-color": "رابط لون الخط",
+  "theme-color-pending-color": "لون الانتظار",
+  "theme-color-primary-action-color": "لون الإجراء الرئيسي",
   "theme-color-primary-background-color": "الابتدائي لون الخلفية",
   "theme-color-primary-font-color": "الابتدائية لون الخط",
-  "theme-color-primary-action-color": "لون الإجراء الرئيسي",
+  "theme-color-secondary-action-color": "لون الإجراء الثانوي",
   "theme-color-secondary-background-color": "الثانوية لون الخلفية",
   "theme-color-secondary-font-color": "الثانوية لون الخط",
-  "theme-color-secondary-action-color": "لون الإجراء الثانوي",
-  "theme-color-component-color": "لون التركيبة",
-  "theme-color-success-color": "لون النجاح",
-  "theme-color-pending-color": "لون الانتظار",
-  "theme-color-error-color": "لون الخطأ",
   "theme-color-selection-color": "لون الاختيار",
-  "theme-color-tertiary-background-color": "التعليم العالي لون الخلفية",
-  "theme-color-tertiary-font-color": "التعليم العالي لون الخط",
-  "theme-color-link-font-color": "رابط لون الخط",
-  "theme-color-info-font-color": "معلومات لون الخط",
-  "theme-color-custom-scrollbar-color": "مخصص شريط التمرير اللون",
   "theme-color-status-away": "لون حالة بعيد",
   "theme-color-status-busy": "لون حالة مشغول",
   "theme-color-status-offline": "حاليا وضع اللون",
   "theme-color-status-online": "الحالة عبر الإنترنت اللون",
+  "theme-color-success-color": "لون النجاح",
+  "theme-color-tertiary-background-color": "التعليم العالي لون الخلفية",
+  "theme-color-tertiary-font-color": "التعليم العالي لون الخط",
+  "theme-color-transparent-dark": "شفاف قاتم",
+  "theme-color-transparent-darker": "شفاف أكثر قتماً",
+  "theme-color-transparent-light": "شفاف فاتح",
+  "theme-color-transparent-lighter": "شفاف أفتح",
+  "theme-color-transparent-lightest": "شفاف الأكثر فتحاً",
   "theme-color-unread-notification-color": "غير مقروء الإخطارات اللون",
   "theme-custom-css": "لغة تنسيق ويب حسب الطلب",
   "There_are_no_agents_added_to_this_department_yet": "لا يوجد وكلاء مضافون لهذا القسم",
@@ -1484,7 +1461,6 @@
   "This_is_a_push_test_messsage": "هذا هو بإرسال رسالة اختبار الضغط",
   "This_room_has_been_archived_by__username_": "تم أرشفة هذه الغرفة التي __username__",
   "This_room_has_been_unarchived_by__username_": "تم إلغاء أرشفة هذه الغرفة التي __username__",
-  "Two-factor_authentication_is_currently_disabled": "المصادقة بخطوتين غير مُفعّل حالياً",
   "Thursday": "الخميس",
   "Time_in_seconds": "الوقت بالثواني",
   "Title": "العنوان",
@@ -1495,15 +1471,16 @@
   "to_see_more_details_on_how_to_integrate": "لمعرفة المزيد من التفاصيل حول كيفية دمج.",
   "To_users": "إلى",
   "Topic": "الموضوع",
-  "Travel_and_Places": "سفر و أماكن",
   "Transcript_Enabled": "سؤال المستخدم إذا أراد تحويل الدردشة لنص كتابي قبل الإغلاق",
   "Translated": "تمت الترجمة",
   "Translations": "الترجمات",
+  "Travel_and_Places": "سفر و أماكن",
   "Trigger_removed": "الزناد إزالة",
   "Trigger_Words": "الكلمات الزناد",
   "Triggers": "محفزات",
   "True": "نعم",
   "Tuesday": "الثلاثاء",
+  "Two-factor_authentication_is_currently_disabled": "المصادقة بخطوتين غير مُفعّل حالياً",
   "Type": "النوع",
   "Type_your_email": "اكتب بريدك الالكتروني",
   "Type_your_message": "اكتب رسالتك",
@@ -1514,6 +1491,7 @@
   "UI_Use_Name_Avatar": "استخدم أول حرفين من الاسم الكامل لتوليد الصورة الرمزية",
   "UI_Use_Real_Name": "استخدم اسمك الحقيقي",
   "Unarchive": "إزالة من الأرشيف",
+  "unarchive-room": "إلغاء أرشفة الغرفة",
   "Unblock_User": "إلغاء حظر المستخدم",
   "Unmute_someone_in_room": "إلغاء إسكات شخص في هذه الغرفة",
   "Unmute_user": "إلغاء اسكات المستخدم",
@@ -1600,9 +1578,9 @@
   "UTF8_Names_Validation_Description": "لا تسمح باستخدام رموز خاصة و مسافات. يمكنك استخدام العلامات التالية - _  . لكن لا تسمح بهن في نهاية الاسم.",
   "Validate_email_address": "التحقق من صحة البريد الإلكتروني",
   "Verification": "التحقق",
+  "Verification_Email": "انقر <a href=\"[Verification_Url]\">هنا</a> لتأكيد حسابك.",
   "Verification_email_sent": "تم ارسال رسالة التحقق",
   "Verification_Email_Subject": "Site_Name] - تأكيد حسابك",
-  "Verification_Email": "انقر <a href=\"[Verification_Url]\">هنا</a> لتأكيد حسابك.",
   "Verified": "التحقق",
   "Verify": "التحقق",
   "Version": "الإصدار",
@@ -1610,6 +1588,31 @@
   "Video_Conference": "مؤتمر عبر الفيديو",
   "Videocall_declined": "تم إلغاء اتصال الفيديو",
   "Videocall_enabled": "تم تفعيل الاتصال عبر الفيديو",
+  "view-c-room": "عرض القناة العامة",
+  "view-c-room_description": "التصريح بعرض القناة العامة",
+  "view-d-room": "عرض الرسائل المباشرة",
+  "view-d-room_description": "التصريح بعرض الرسائل المباشرة",
+  "view-full-other-user-info": "عرض كل معلومات المستخدم",
+  "view-history": "عرض السجل",
+  "view-history_description": "التصريح لعرض سجل القناة",
+  "view-join-code": "عرض كود الانضمام",
+  "view-join-code_description": "التصريح بعرض كود الانضمام للقناة",
+  "view-joined-room": "عرض الغرفة التي تم الانضمام إليها",
+  "view-joined-room_description": "التصريح بعرض القنوات التي تم الانضمام إليها",
+  "view-l-room": "عرض غرف الدردشة المباشرة",
+  "view-l-room_description": "التصريح بعرض كل قنوات الدردشة المباشرة",
+  "view-livechat-manager": "عرض مدير الدردشة المباشرة",
+  "view-livechat-rooms_description": "التصريح بعرض قنوات الدردشة المباشرة الأخرى",
+  "view-logs": "عرض السجلات",
+  "view-logs_description": "التصريخ بعرض سجلات الخادم",
+  "view-other-user-channels": "عرض قنوات المستخدمين الآخرين",
+  "view-other-user-channels_description": "التصريح بعرض قنوات المستخدمين الآخرين",
+  "view-p-room": "عرض الغرفة الخاصة",
+  "view-privileged-setting": "عرض إعدادات الامتيازات",
+  "view-privileged-setting_description": "التصريح بعرض الإعدادات",
+  "view-room-administration": "عرض إدارة الغرفة",
+  "view-statistics": "عرض الإحصائيات",
+  "view-user-administration": "عرض المستخدم المدير",
   "View_All": "مشاهدة الكل",
   "View_Logs": "عرض سجلات",
   "View_mode": "اسلوب العرض",
@@ -1642,13 +1645,13 @@
   "Would_you_like_to_return_the_inquiry": "هل ترغب بإعادة الطلب؟",
   "Yes": "نعم",
   "Yes_archive_it": "نعم، قم بأرشفته!",
-  "Yes_unarchive_it": "نعم! قم بإلغاء أرشفته!",
   "Yes_clear_all": "نعم، حذف الكل!",
   "Yes_delete_it": "نعم، أحذف!",
   "Yes_hide_it": "نعم، إخفاء!",
   "Yes_leave_it": "نعم، مغادرة!",
   "Yes_mute_user": "نعم، المستعمل أخرس!",
   "Yes_remove_user": "نعم، إزالة المستخدم!",
+  "Yes_unarchive_it": "نعم! قم بإلغاء أرشفته!",
   "You": "أنت",
   "you_are_in_preview_mode_of": "انت في وضع المعاينة لقناة # <strong>__room_name__</strong>",
   "You_are_logged_in_as": "لقد تم تسجيل دخولك كما",
@@ -1683,4 +1686,4 @@
   "your_message_optional": "رسالتك (اختياري)",
   "Your_password_is_wrong": "كلمة السر خاطئة",
   "Your_push_was_sent_to_s_devices": "وقد أرسلت دفعك إلى أجهزة٪ الصورة"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json
index a711ee39109..f5e21b382dd 100644
--- a/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -12,6 +12,10 @@
   "Accept": "Accepta",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Acceptar sol·licituds de xat en viu entrant encara que no hi hagi agents en línia",
   "Accept_with_no_online_agents": "Acceptar sense agents en línia",
+  "access-mailer": "Accedir a la pantalla d'enviament",
+  "access-mailer_description": "Permís per enviar correu-e massiu a tots els usuaris",
+  "access-permissions": "Accés a la pantalla de permisos",
+  "access-permissions_description": "Modifica permisos per a diversos rols",
   "Access_not_authorized": "Accés no autoritzat",
   "Access_Token_URL": "URL Access Token",
   "Accessing_permissions": "L'accés als permisos",
@@ -34,6 +38,7 @@
   "Accounts_BlockedUsernameList": "Llista de noms d'usuari bloquejats",
   "Accounts_BlockedUsernameList_Description": "Llista  separada per comes de noms d'usuari bloquejats (no distingeix majúscules/minúscules)",
   "Accounts_CustomFields_Description": "Ha de ser un objecte JSON vàlid on les claus són els noms dels camps i contenen un diccionari amb les opcions del camp. Exemple:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code> ",
+  "Accounts_CustomFieldsToShowInUserInfo": "Camps personalitzats a mostrar a l'informació d'usuari",
   "Accounts_DefaultUsernamePrefixSuggestion": "Prefix suggerit per al nom d'usuari per defecte",
   "Accounts_denyUnverifiedEmail": "Denegar correu electrònic sense verificar",
   "Accounts_EmailVerification": "Verificació de correu electrònic",
@@ -95,6 +100,8 @@
   "Accounts_OAuth_Meteor_callback_url": "URL de retorn (callback) de Meteor",
   "Accounts_OAuth_Meteor_id": "Meteor ID",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_host": "Host del servidor intermediari (proxy)",
+  "Accounts_OAuth_Proxy_services": "Serveis del servidor intermediari (proxy)",
   "Accounts_OAuth_Twitter": "Inici de sessió amb Twitter",
   "Accounts_OAuth_Twitter_callback_url": "URL de retorn (callback) de Twitter",
   "Accounts_OAuth_Twitter_id": "Twitter ID",
@@ -104,8 +111,6 @@
   "Accounts_OAuth_Wordpress_id": "Wordpress ID",
   "Accounts_OAuth_Wordpress_secret": "Wordpress Secret",
   "Accounts_PasswordReset": "Restablir contrasenya",
-  "Accounts_OAuth_Proxy_host": "Host del servidor intermediari (proxy)",
-  "Accounts_OAuth_Proxy_services": "Serveis del servidor intermediari (proxy)",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Rols per defecte per als serveis d'autenticació",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Rols per defecte (separats per comes) que s'assignaran als usuaris quan es registrin a través dels serveis d'autenticació",
   "Accounts_Registration_AuthenticationServices_Enabled": "Registre mitjançant serveis d'autenticació",
@@ -118,6 +123,7 @@
   "Accounts_RegistrationForm_SecretURL_Description": "Cal proporcionar una cadena de text aleatori que s'afegirà a l'URL de registre. Exemple: https://demo.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Requerir el nom per registrar-se",
   "Accounts_RequirePasswordConfirmation": "Requereix confirmació de la contrasenya",
+  "Accounts_SearchFields": "Camps a considerar a la cerca",
   "Accounts_SetDefaultAvatar": "Avatar per defecte",
   "Accounts_SetDefaultAvatar_Description": "Prova de determinar l'avatar per defecte basant-se en el compte d'OAuth o bé Gravatar",
   "Accounts_ShowFormLogin": "Mostra inici de sessió basat en formulari",
@@ -129,9 +135,20 @@
   "Activate": "Activa",
   "Activity": "Activitat",
   "Add": "Afegeix",
+  "add-oauth-service": "Afegir servei Oauth",
+  "add-oauth-service_description": "Permís per afegir nous serveis Oauth",
+  "add-user": "Afegir usuari",
+  "add-user-to-any-c-room": "Afegir usuari a canal públic",
+  "add-user-to-any-c-room_description": "Permís per afegir un usuari a qualsevol canal públic",
+  "add-user-to-any-p-room": "Afegir usuari a canal privat",
+  "add-user-to-any-p-room_description": "Permís per afegir un usuari a qualsevol canal privat",
+  "add-user-to-joined-room": "Afegir usuari a canal on unit",
+  "add-user-to-joined-room_description": "Permís per afegir un usuari a un canal on està unit",
+  "add-user_description": "Permís per afegir nous usuaris al servidor via la pantalla d'usuaris",
   "Add_agent": "Afegeix agent",
   "Add_custom_oauth": "Afegeix OAuth personalitzat",
   "Add_Domain": "Afegir domini",
+  "Add_files_from": "Afegeix arxius de",
   "Add_manager": "Afegeix supervisor",
   "Add_Role": "Afegeix rol",
   "Add_user": "Afegeix usuari",
@@ -143,6 +160,7 @@
   "Additional_emails": "Correus electrònics addicionals",
   "Additional_Feedback": "Retroalimentació addicional",
   "Administration": "Administració",
+  "Adult_images_are_not_allowed": "Les imatges per a adults no són permeses",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "Després de l'autenticació OAuth2, els usuaris seran redirigits a aquesta URL",
   "Agent": "Agent",
   "Agent_added": "Agent afegit",
@@ -179,8 +197,8 @@
   "API_Drupal_URL": "Adreça URL del servidor de Drupal",
   "API_Drupal_URL_Description": "Exemple: https://domini.com (sense la barra final)",
   "API_Embed": "Incrusta (embed)",
-  "API_Embed_UserAgent": "Incrusta user agent de la consulta",
   "API_Embed_Description": "Activa o no les previsualitzacions d'enllaços quan un usuari publica l'enllaç a un web.",
+  "API_Embed_UserAgent": "Incrusta user agent de la consulta",
   "API_EmbedCacheExpirationDays": "Caducitat de la memòria cau de les incrustacions (en dies)",
   "API_EmbedDisabledFor": "Deshabilitar la incrustació per als usuaris",
   "API_EmbedDisabledFor_Description": "Llista de noms d'usuari separats per comes",
@@ -211,20 +229,28 @@
   "Application_updated": "Aplicació actualitzada",
   "Apply_and_refresh_all_clients": "Aplicar i refrescar tots els clients",
   "Archive": "Arxiu",
+  "archive-room": "Arxivar sala",
+  "archive-room_description": "Permís per arxivar un canal",
   "are_also_typing": "també estan escrivint",
   "are_typing": "estan escrivint",
   "Are_you_sure": "N'estàs segur?",
   "Are_you_sure_you_want_to_delete_your_account": "Estàs segur d'eliminar el teu compte?",
+  "assign-admin-role": "Assignar rol d'administrador",
+  "assign-admin-role_description": "Permís per assignar el rol d'administrador a altres usuaris",
   "Assign_admin": "Assignant admin",
   "at": "a",
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Fitxer pujat",
   "Attribute_handling": "Tractament d'atributs",
+  "Audio_message": "Missatge d'àudio",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
   "Authorization_URL": "URL d'autorització",
   "Authorize": "Autoritzar",
+  "auto-translate": "Auto-traducció",
+  "auto-translate_description": "Permís per utilitzar l'eina d'auto-traducció",
   "Auto_Load_Images": "Carregar automàticament les imatges",
+  "Auto_Translate": "Autotraducció",
   "AutoLinker_Email": "Auto-enllaça correu-e",
   "AutoLinker_Phone": "Auto-enllaça telèfon",
   "AutoLinker_Phone_Description": "Enllaça automàticament per als números de telèfon. Per exemple: `(123) 456-7890`",
@@ -235,10 +261,9 @@
   "AutoLinker_Urls_www": "Auto-enllaça URL 'www'",
   "AutoLinker_UrlsRegExp": "Auto-enllaça URL d'expressions regulars",
   "Automatic_Translation": "Traducció automàtica",
-  "Auto_Translate": "Autotraducció",
+  "AutoTranslate_Change_Language_Description": "Canviar l'idioma d'autotraducció no traduirà els missatges anteriors.",
   "AutoTranslate_Enabled": "Activa autotraducció",
   "AutoTranslate_Enabled_Description": "Activar l'autotraducció permetrà a qui tingui el permís <code class=\"inline\">auto-translate</code> veure els missatges traduïts automàticament a l'idioma que seleccioni. Pot tenir càrrecs suplementaris, veure la <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">Documentació de Google</a>",
-  "AutoTranslate_Change_Language_Description": "Canviar l'idioma d'autotraducció no traduirà els missatges anteriors.",
   "AutoTranslate_GoogleAPIKey": "API Key Google",
   "Available": "En línia",
   "Available_agents": "Agents disponibles",
@@ -254,11 +279,14 @@
   "Away_male": "Absent",
   "Back": "Torna",
   "Back_to_applications": "Torna a les aplicacions",
-  "Back_to_integrations": "Torna a les integracions",
+  "Back_to_chat": "Torna al xat",
   "Back_to_integration_detail": "Tornar al detall de la integració",
+  "Back_to_integrations": "Torna a les integracions",
   "Back_to_login": "Torna a identificar-me",
   "Back_to_permissions": "Torna a permisos",
   "Backup_codes": "Codis de recuperació",
+  "ban-user": "Banejar usuari",
+  "ban-user_description": "Permís per banejar un usuari d'un canal",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Característica Beta. Requereix que la videoconferència estigui activa.",
   "Block_User": "Bloqueja usuari",
   "Body": "Cos",
@@ -269,6 +297,10 @@
   "Branch": "Branca",
   "Broadcast_Connected_Instances": "Difusió de les instàncies connectades",
   "Bugsnag_api_key": "Clau API Bugsnag",
+  "bulk-create-c": "Crear canals en massa",
+  "bulk-create-c_description": "Permís per a crear canals en massa",
+  "bulk-register-user": "Crear canals en massa",
+  "bulk-register-user_description": "Permís per a crear canals en massa",
   "busy": "ocupat",
   "Busy": "Ocupat",
   "busy_female": "ocupada",
@@ -276,7 +308,6 @@
   "busy_male": "ocupat",
   "Busy_male": "Ocupat",
   "by": "per",
-  "Content": "Contingut",
   "cache_cleared": "Memòria cau esborrada",
   "Cancel": "Cancel·la",
   "Cancel_message_input": "Cancel·la",
@@ -302,18 +333,21 @@
   "CAS_version_Description": "Només utilitzis una versió CAS suportada pel teu servei CAS SSO.",
   "CDN_PREFIX": "Prefix CDN",
   "Certificates_and_Keys": "Certificats i claus",
-  "Changing_email": "Canvi de correu-e",
   "Change_Room_Type": "Canvi de tipus de sala",
+  "Changing_email": "Canvi de correu-e",
   "channel": "canal",
   "Channel": "Canal",
   "Channel_already_exist": "El canal `#%s` ja existeix.",
-  "Channel_created": "Canal `#%s` creat.",
+  "Channel_already_exist_static": "El canal ja existeix.",
   "Channel_already_Unarchived": "El canal `#%s` ja es troba desarxivat.",
   "Channel_Archived": "El canal `#%s` s'ha arxivat correctament.",
+  "Channel_created": "Canal `#%s` creat.",
   "Channel_doesnt_exist": "El canal `#%s` no existeix",
+  "Channel_name": "Nom del canal",
   "Channel_to_listen_on": "Canal on escoltar",
   "Channel_Unarchived": "El canal `#%s` s'ha desarxivat correctament.",
   "Channels": "Canals",
+  "Channels_are_where_your_team_communicate": "Els canals són on es comunica el teu equip",
   "Channels_list": "Llista de canals públics",
   "Chat_button": "botó de xat",
   "Chat_closed": "Xat tancat",
@@ -327,19 +361,23 @@
   "Choose_messages": "Tria missatges",
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Tria l'àlies que apareixerà abans del nom d'usuari als missatges.",
   "Choose_the_username_that_this_integration_will_post_as": "Tria el nom d'usuari amb el qual aquesta integració publicarà.",
+  "clean-channel-history": "Esborrar l'historial de canal",
+  "clean-channel-history_description": "Permís per esborrar l'historial dels canals",
   "clear": "Esborra",
+  "Clear_all_unreads_question": "Esborrar tots els missatges no llegits?",
   "clear_cache_now": "Esborra la memòria cau ara",
   "clear_history": "Esborra l'historial",
-  "Clear_all_unreads_question": "Esborrar tots els missatges no llegits?",
   "Click_here": "Fes clic aquí",
   "Click_here_for_more_info": "Fes clic aquí per a més informació",
-  "UI_Click_Direct_Message": "Clica per crear un missatge directe",
-  "UI_Click_Direct_Message_Description": "Evita obrir la pestanya del perfil, vés directe a la conversa",
   "Client_ID": "Client ID",
   "Client_Secret": "Client Secret",
   "Clients_will_refresh_in_a_few_seconds": "Els clients es refrescaran en breus instants",
   "close": "tanca",
   "Close": "Tanca",
+  "close-livechat-room": "Tancar sala de xat en viu",
+  "close-livechat-room_description": "Permís per tancar el canal de xat en viu actiu",
+  "close-others-livechat-room": "Tancar sala de xat en viu",
+  "close-others-livechat-room_description": "Permís per tancar altres canals de xat en viu",
   "Closed": "Tancat",
   "Closed_by_visitor": "Tancat pel visitant",
   "Closing_chat": "Tancant xat",
@@ -349,6 +387,7 @@
   "Comment_to_leave_on_closing_session": "Comentari a deixar en tancar la sessió",
   "Compact": "Compacte",
   "Confirm_password": "Confirma la contrasenya",
+  "Content": "Contingut",
   "Conversation": "Conversa",
   "Conversation_closed": "Conversa tancada: __comment__.",
   "Convert_Ascii_Emojis": "Converteix ASCII a Emoji",
@@ -359,13 +398,21 @@
   "Count": "Compta",
   "Cozy": "Acollidor",
   "Create": "Crea",
+  "create-c": "Crear canals públics",
+  "create-c_description": "Permís per crear canals públics",
+  "create-d": "Crear missatges directes",
+  "create-d_description": "Permís per a iniciar missatges directes",
+  "create-p": "Crear canals privats",
+  "create-p_description": "Permís per crear canals privats",
+  "create-user": "Crear usuari",
+  "create-user_description": "Permís per crear usuaris",
   "Create_A_New_Channel": "Crea un nou canal",
   "Create_new": "Crea nou",
   "Created_at": "Creat a",
   "Created_at_s_by_s": "Creat a <strong>%s</strong> per <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "Creat el <strong>%s</strong> per <strong>%s</strong> i disparat per <strong>%s</strong>",
-  "CROWD_Reject_Unauthorized": "Rebutja no autoritzat",
   "CRM_Integration": "Integració CRM",
+  "CROWD_Reject_Unauthorized": "Rebutja no autoritzat",
   "Current_Chats": "Xats actuals",
   "Current_Status": "Estat actual",
   "Custom": "Personalitzat",
@@ -381,10 +428,9 @@
   "Custom_Fields": "Camps personalitzats",
   "Custom_oauth_helper": "Per configurar el proveïdor OAuth, heu d'establir un URL de retorn (callback). Useu <pre>%s</pre>.",
   "Custom_oauth_unique_name": "Nom únic de OAuth personalitzat",
-  "Custom_Scripts": "Scripts personalitzats",
   "Custom_Script_Logged_In": "Script personalitzat per als usuaris en identificar-se",
   "Custom_Script_Logged_Out": "Script personalitzat per als usuaris en sortir",
-  "Custom_Sounds": "Sons personalitzats",
+  "Custom_Scripts": "Scripts personalitzats",
   "Custom_Sound_Add": "Afegir so personalitzat",
   "Custom_Sound_Delete_Warning": "L'eliminació d'un so no es pot revertir.",
   "Custom_Sound_Error_Invalid_Sound": "So invàlid",
@@ -392,6 +438,7 @@
   "Custom_Sound_Has_Been_Deleted": "El so personalitzat s'ha esborrat.",
   "Custom_Sound_Info": "Informació del so personalitzat",
   "Custom_Sound_Saved_Successfully": "So personalitzat guardat correctament",
+  "Custom_Sounds": "Sons personalitzats",
   "Custom_Translations": "Traduccions personalitzades",
   "Custom_Translations_Description": "Ha de ser un objecte JSON vàlid on les claus són el codi de l'idioma i contenen un diccionari de clau i traducció. Exemple:<br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"ca\": {\n  \"Channels\": \"Sales\"\n }\n}</code> ",
   "CustomSoundsFilesystem": "Sistema d'arxius dels sons personalitzats",
@@ -406,6 +453,16 @@
   "Decline": "Rebutja",
   "Default": "Per defecte",
   "Delete": "Elimina",
+  "delete-c": "Esborrar canals públics",
+  "delete-c_description": "Permís per esborrar canals públics",
+  "delete-d": "Esborrar missatges directes",
+  "delete-d_description": "Permís per esborrar missatges directes",
+  "delete-message": "Esborrar missatge",
+  "delete-message_description": "Permís per esborrar un missatge d'una sala",
+  "delete-p": "Esborrar canals privats",
+  "delete-p_description": "Permís per esborrar canals privats",
+  "delete-user": "Esborrar usuari",
+  "delete-user_description": "Permís per esborrar usuaris",
   "Delete_message": "Esborra missatge",
   "Delete_my_account": "Esborra el meu compte",
   "Delete_Room_Warning": "Eliminar una sala de xat esborra tots els missatges que conté. Aquesta acció no es pot desfer.",
@@ -427,6 +484,19 @@
   "Different_Style_For_User_Mentions": "Estil diferent per les mencions d'usuari",
   "Direct_message_someone": "Envia un missatge directe a algú",
   "Direct_Messages": "Missatges directes",
+  "Direct_Reply": "Resposta directa",
+  "Direct_Reply_Debug": "Debug resposta directa",
+  "Direct_Reply_Delete": "Esborra correus-e interceptats",
+  "Direct_Reply_Enable": "Activa resposta directa",
+  "Direct_Reply_Frequency": "Freqüència de comprovació de correu-e",
+  "Direct_Reply_Frequency_Description": "(en minuts, per defecte/mínim 2)",
+  "Direct_Reply_Host": "Host de resposta directa",
+  "Direct_Reply_IgnoreTLS": "Ignorar TLS",
+  "Direct_Reply_Password": "Contrasenya",
+  "Direct_Reply_Port": "Port de resposta directa",
+  "Direct_Reply_Protocol": "Protocol de resposta directa",
+  "Direct_Reply_Separator": "Separador",
+  "Direct_Reply_Username": "Nom d'usuari",
   "Disable_Notifications": "Desactiva notificacions",
   "Disable_two-factor_authentication": "Desactiva l'autenticació de dos factors",
   "Display_offline_form": "Mostra el formulari de fora de línia",
@@ -436,6 +506,7 @@
   "Domain_added": "Domini afegit",
   "Domain_removed": "Domini eliminat",
   "Domains": "dominis",
+  "Domains_allowed_to_embed_the_livechat_widget": "Llista separada per comes dels dominis on es permet incloure el xat en viu. Deixeu en blanc per permetre'ls tots.",
   "Download_Snippet": "Descarrega",
   "Drop_to_upload_file": "Arrossega un arxiu aquí per pujar-lo",
   "Dry_run": "Prova de funcionament",
@@ -446,8 +517,21 @@
   "Duplicate_private_group_name": "Ja hi ha un grup privat amb el nom '%s'",
   "Duration": "Durada",
   "Edit": "Edita",
+  "edit-message": "Editar missatge",
+  "edit-message_description": "Permís per editar un missatge d'una sala",
+  "edit-other-user-active-status": "Editar l'estat actiu d'un altre usuari",
+  "edit-other-user-active-status_description": "Permís per activar o desactivar altres comptes",
+  "edit-other-user-info": "Editar la informació d'un altre usuari",
+  "edit-other-user-info_description": "Permís per canviar el nom, el nom d'usuari o l'adreça de correu-e d'altres usuaris",
+  "edit-other-user-password": "Editar la contrasenya d'un altre usuari",
+  "edit-other-user-password_description": "Permís per modificar la contrasenya d'altres usuaris. Requereix el permís edit-other-user-info.",
+  "edit-privileged-setting": "Editar opcions privilegiades",
+  "edit-privileged-setting_description": "Permís per editar la configuració",
+  "edit-room": "Editar sala",
+  "edit-room_description": "Permís per editar el nom d'una sala, el tema, el tipus (privada o pública) o l'estat (actiu o arxivat)",
   "Edit_Custom_Field": "Edita camp personalitzat",
   "Edit_Department": "Edita departament",
+  "Edit_previous_message": "`%s` - Edita el missatge anterior",
   "Edit_Trigger": "Edita disparador",
   "edited": "editat",
   "Editing_room": "Edició de sala",
@@ -471,24 +555,22 @@
   "Empty_title": "Títol buit",
   "Enable": "Activa",
   "Enable_Desktop_Notifications": "Activa notificacions d'escriptori",
+  "Enable_Svg_Favicon": "Activa el favicon SVG",
   "Enable_two-factor_authentication": "Activa l'autenticació de dos factors",
   "Enabled": "Activa",
-  "Enable_Svg_Favicon": "Activa el favicon SVG",
   "Encrypted_message": "Missatge xifrat",
   "End_OTR": "Finalitza OTR",
-  "Enter_authentication_code": "Entra el codi d'autenticació",
-  "Enter_Alternative": "Mode alternatiu (envia amb Enter + Ctrl/Alt/Shift/CMD)",
   "Enter_a_regex": "Introdueix una RegExp",
   "Enter_a_room_name": "Introdueix un nom de sala",
   "Enter_a_username": "Introdueix un nom d'usuari",
+  "Enter_Alternative": "Mode alternatiu (envia amb Enter + Ctrl/Alt/Shift/CMD)",
+  "Enter_authentication_code": "Entra el codi d'autenticació",
   "Enter_Behaviour": "Comportament de la tecla Enter",
   "Enter_Behaviour_Description": "Canvia si la tecla Enter envia el missatge o fa un salt de línia",
   "Enter_name_here": "Introdueix el nom aquí",
   "Enter_Normal": "Mode normal (envia amb Enter)",
   "Enter_to": "Entra a",
   "Error": "Error",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: El Rocket.Chat requereix <em>oplog tailing</em> quan corre en múltiples instàncies",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Si us plau, assegureu-vos que MongoDB és en mode ReplicaSet i la variable d'entorn MONGO_OPLOG_URL està definida correctament al servidor d'aplicacions",
   "error-action-not-allowed": "__action__ no permès",
   "error-application-not-found": "Aplicació no trobada",
   "error-archived-duplicate-name": "Ja hi ha un canal arxivat amb el nom '__room_name__'",
@@ -500,6 +582,7 @@
   "error-could-not-change-username": "No s'ha pogut canviar el nom d'usuari",
   "error-delete-protected-role": "No es pot eliminar un rol protegit",
   "error-department-not-found": "Departament no trobat",
+  "error-direct-message-file-upload-not-allowed": "Compartició d'arxius no permesa als missatges directes",
   "error-duplicate-channel-name": "Ja hi ha un canal amb el nom '%s' ",
   "error-email-domain-blacklisted": "El domini de l'adreça electrònica és a la llista negra",
   "error-email-send-failed": "Error en l'intent d'enviament de correu-e: __message__",
@@ -521,7 +604,6 @@
   "error-invalid-email-address": "Adreça de correu-e invàlida",
   "error-invalid-file-height": "Alçada de la imatge invàlida",
   "error-invalid-file-type": "Tipus d'arxiu no vàlid",
-  "error-direct-message-file-upload-not-allowed": "Compartició d'arxius no permesa als missatges directes",
   "error-invalid-file-width": "Amplada de la imatge invàlida",
   "error-invalid-from-address": "Adreça invàlida al camp 'De'.",
   "error-invalid-integration": "Integració no vàlida",
@@ -556,18 +638,21 @@
   "error-the-field-is-required": "Es requereix el camp __field__.",
   "error-too-many-requests": "Error, massa peticions. Si us plau, més a poc a poc. Heu d'esperar __seconds__ segons abans de reintentar-ho.",
   "error-user-is-not-activated": "L'usuari no ha estat activat",
+  "error-user-limit-exceeded": "El nombre d'usuaris per invitar al canal #channel_name supera el límit establert per l'administrador",
   "error-user-not-in-room": "L'usuari no es troba en aquesta sala",
   "error-user-registration-disabled": "El registre d'usuaris està desactivat",
-  "error-user-limit-exceeded": "El nombre d'usuaris per invitar al canal #channel_name supera el límit establert per l'administrador",
   "error-user-registration-secret": "El registre d'usuaris només es permet a través d'URL secret",
   "error-you-are-last-owner": "Ets l'últim propietari. Si us plau, estableix un nou propietari abans de sortir de la sala.",
   "Error_changing_password": "Error en canviar la contrasenya",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: El Rocket.Chat requereix <em>oplog tailing</em> quan corre en múltiples instàncies",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Si us plau, assegureu-vos que MongoDB és en mode ReplicaSet i la variable d'entorn MONGO_OPLOG_URL està definida correctament al servidor d'aplicacions",
   "Esc_to": "Esc a",
   "Event_Trigger": "Disparador d'esdeveniments",
   "Event_Trigger_Description": "Selecciona quin tipus d'esdeveniment desencadenarà aquesta integració WebHook de sortida",
   "every_30_minutes": "Cada 30 minuts",
   "every_hour": "Cada hora",
   "every_six_hours": "Cada 6 hores",
+  "Everyone_can_access_this_channel": "Qualsevol pot accedir a aquest canal",
   "Example_s": "Exemple: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Excloure bots",
   "Exclude_Botnames_Description": "No processar missatges de bots el nom dels quals encaixa amb l'expressió regular superior. Si es deixa en blanc, tots els missatges dels bots es propagaran.",
@@ -583,8 +668,8 @@
   "File_type_is_not_accepted": "El tipus de fitxer no s'accepta.",
   "File_uploaded": "Fitxer pujat",
   "FileUpload": "Pujar arxius",
-  "FileUpload_Enabled": "Habilita pujar arxius",
   "FileUpload_Disabled": "Les pujades de fitxers estan desactivades.",
+  "FileUpload_Enabled": "Habilita pujar arxius",
   "FileUpload_Enabled_Direct": "Compartició d'arxius activa als missatges directes",
   "FileUpload_File_Empty": "Arxiu buit",
   "FileUpload_FileSystemPath": "Ruta dels arxius",
@@ -604,28 +689,32 @@
   "FileUpload_S3_AWSAccessKeyId": "Access Key",
   "FileUpload_S3_AWSSecretAccessKey": "Secret Key",
   "FileUpload_S3_Bucket": "Bucket Name",
-  "FileUpload_S3_SignatureVersion": "Signature Version",
-  "FileUpload_S3_ForcePathStyle": "Force Path Style",
   "FileUpload_S3_BucketURL": "Bucket URL",
   "FileUpload_S3_CDN": "Domini CDN per descàrregues",
+  "FileUpload_S3_ForcePathStyle": "Force Path Style",
   "FileUpload_S3_Region": "Regió S3",
+  "FileUpload_S3_SignatureVersion": "Signature Version",
   "FileUpload_S3_URLExpiryTimeSpan": "Caducitat de les URL",
   "FileUpload_S3_URLExpiryTimeSpan_Description": "Temps després el qual les adreces d'Amazon S3 generades deixaran de ser vàlides (en segons). Si s'estableix a menys de 5 segons, aquest camp serà ignorat.",
   "FileUpload_Storage_Type": "Tipus d'emmagatzematge",
+  "First_Channel_After_Login": "Primer canal després del login",
   "Flags": "Indicadors",
   "Follow_social_profiles": "Segueix els nostres perfils, fes-nos un fork a GitHub i comparteix la teva opinió sobre Rocket.Chat al nostre tauler de Trello.",
+  "Fonts": "Fonts",
   "Food_and_Drink": "Menjar i beure",
   "Footer": "Peu de pàgina",
-  "Fonts": "Fonts",
+  "Footer_Direct_Reply": "Peu quan resposta directa està activa",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Per a la seva seguretat, ha de tornar a introduir la contrasenya per continuar",
+  "force-delete-message": "Forçar esborrar missatge",
+  "force-delete-message_description": "Permís per esborrar un missatge ignorant totes les restriccions",
   "Force_Disable_OpLog_For_Cache": "Força la inhabilitació de OpLog per la cache",
   "Force_Disable_OpLog_For_Cache_Description": "No s'utilitzarà OpLog per sincronitzar la cache tot i estar disponible",
   "Force_SSL": "Força SSL",
   "Force_SSL_Description": "*Atenció!* _Force SSL_ mai ha de ser usat amb servidor intermediari invers. Si s'utilitza un proxy invers, s'ha de fer la redirecció AL PROXY. Aquesta opció existeix per a les instal·lacions tipus Heroku, que no permeten la configuració de redireccions al proxy invers.",
   "Forgot_password": "No recordes la contrasenya?",
   "Forgot_Password_Description": "És possible utilitzar els marcadors: <br/><ul><li>[Forgot_Password_Url] per a l'adreça URL de recuperació de contrasenya.</li><li>[name], [fname], [lname] per al nom complet de l'usuari, nom o cognom, respectivament.</li><li>[email] per a l'adreça de correu electrònic de l'usuari.</li><li>[Site_Name] i [Site_URL] pel nom del lloc web i de l'adreça URL, respectivament.</li></ul>",
-  "Forgot_Password_Email_Subject": "[Site_Name] - Recuperació de contrasenya",
   "Forgot_Password_Email": "Fes clic <a href=\"[Forgot_Password_Url]\">aquí</a> per restablir la teva contrasenya.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Recuperació de contrasenya",
   "Forgot_password_section": "No recordo la contrasenya",
   "Forward": "Remetre",
   "Forward_chat": "Remetre xat",
@@ -641,9 +730,26 @@
   "Give_a_unique_name_for_the_custom_oauth": "Estableix un nom únic per al OAuth personalitzat",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Bateja l'aplicació. El nom escollit serà visible als usuaris.",
   "Global": "Global",
+  "Google_Vision_usage_limit_exceeded": "S'ha excedit el límit d'ús de Google Vision",
   "GoogleCloudStorage": "Emmagatzematge Google Cloud",
   "GoogleNaturalLanguage_ServiceAccount_Description": "Arxiu JSON amb la clau del compte de servei (\"Service account key\"). Pots trobar més informació [aquí](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
   "GoogleTagManager_id": "ID de Google Tag Manager",
+  "GoogleVision_Block_Adult_Images": "Bloqueja imatges per a adults",
+  "GoogleVision_Block_Adult_Images_Description": "El bloqueig d'imatges per a adults no funcionarà una vegada s'hagi arribat al límit mensual.",
+  "GoogleVision_Current_Month_Calls": "Nombre trucades mes actual",
+  "GoogleVision_Enable": "Activa Google Vision",
+  "GoogleVision_Max_Monthly_Calls": "Nombre màxim trucades mensuals",
+  "GoogleVision_Max_Monthly_Calls_Description": "Utilitza 0 per il·limitat",
+  "GoogleVision_ServiceAccount": "Compte del servei Google Vision",
+  "GoogleVision_ServiceAccount_Description": "Crea una server key (en format JSON) i enganxa el contingut JSON aquí",
+  "GoogleVision_Type_Document": "Detecció de documents de text",
+  "GoogleVision_Type_Faces": "Detecció de cares",
+  "GoogleVision_Type_Labels": "Detecció d'etiquetes",
+  "GoogleVision_Type_Landmarks": "Detecció geogràfica",
+  "GoogleVision_Type_Logos": "Detecció de logos",
+  "GoogleVision_Type_Properties": "Detecció de propietats (color)",
+  "GoogleVision_Type_SafeSearch": "Detecció SafeSearch",
+  "GoogleVision_Type_Similar": "Cerca imatges similars",
   "Group_mentions_only": "Només mencions de grup",
   "Guest_Pool": "Llista de clients",
   "Hash": "Hash",
@@ -656,9 +762,9 @@
   "Hide_flextab": "Amaga la barra lateral dreta amb un clic",
   "Hide_Group_Warning": "Segur que voleu ocultar el grup \"%s\"?",
   "Hide_Private_Warning": "Segur que voleu ocultar la discussió amb \"%s\"?",
+  "Hide_roles": "Amaga rols",
   "Hide_room": "Oculta sala",
   "Hide_Room_Warning": "Segur que voleu ocultar la sala \"%s\"?",
-  "Hide_roles": "Amaga rols",
   "Hide_Unread_Room_Status": "Amaga l'estat de sales no llegides",
   "Hide_usernames": "Oculta els noms d'usuari",
   "Highlights": "Ressalta",
@@ -686,13 +792,17 @@
   "Iframe_Integration_send_enable_Description": "Envia esdeveniments a la finestra pare",
   "Iframe_Integration_send_target_origin": "Envia l'origen a l'objectiu",
   "Iframe_Integration_send_target_origin_Description": "Origens amb prefix del protocol on les comandes són enviades. Exemple 'https://localhost', o * per permetre enviar a qualsevol lloc.",
+  "IMAP_intercepter_already_running": "L'interceptador IMAP ja està executant-se",
+  "IMAP_intercepter_Not_running": "L'interceptador IMAP no està executant-se",
+  "Impersonate_user": "Suplantar usuari",
+  "Impersonate_user_description": "Quan s'activa, la integració publica com a l'usuari que ha desencadenat la integració",
   "Importer_Archived": "Arxivat",
   "Importer_CSV_Information": "L'importador CSV requereix un format específic, si us plau llegiu la documentació sobre com estructurar l'arxiu .zip:",
-  "Importer_HipChatEnterprise_Information": "L'arxiu pujat ha de ser un tar.gz desencriptat. Si us plau, llegiu la documentació per a més informació:",
-  "Importer_HipChatEnterprise_BetaWarning": "Tingueu en compte que aquest sistema d'importació encara està en desenvolupament. Si us plau, notifiqueu-nos a GitHub els errors que es produeixin:",
   "Importer_done": "Importació completa!",
   "Importer_finishing": "Finalitza la importació.",
   "Importer_From_Description": "Importa les dades de __from__ a Rocket.Chat.",
+  "Importer_HipChatEnterprise_BetaWarning": "Tingueu en compte que aquest sistema d'importació encara està en desenvolupament. Si us plau, notifiqueu-nos a GitHub els errors que es produeixin:",
+  "Importer_HipChatEnterprise_Information": "L'arxiu pujat ha de ser un tar.gz desencriptat. Si us plau, llegiu la documentació per a més informació:",
   "Importer_import_cancelled": "Importació cancel·lada.",
   "Importer_import_failed": "S'ha produït un error durant la importació.",
   "Importer_importing_channels": "Important els canals.",
@@ -709,7 +819,8 @@
   "Importer_setup_error": "S'ha produït un error en configurar l'importador.",
   "Importer_Source_File": "Selecció de fitxer d'origen",
   "Incoming_Livechats": "LiveChats entrants",
-  "inline_code": "inline_code",
+  "Incoming_WebHook": "WebHook entrant",
+  "inline_code": "codi inline",
   "Install_Extension": "Instal·lar complement",
   "Install_FxOs": "Instal·lar el Rocket.Chat al Firefox",
   "Install_FxOs_done": "Perfecte! Ja pots utilitzar el Rocket.Chat mitjançant la icona de l'escriptori.",
@@ -719,52 +830,49 @@
   "Installed_at": "Instal·lat a",
   "Instance_Record": "Registre d'instància",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instruccions als visitants, ompliu el formulari per enviar un missatge",
-  "Impersonate_user": "Suplantar usuari",
-  "Impersonate_user_description": "Quan s'activa, la integració publica com a l'usuari que ha desencadenat la integració",
-  "Incoming_WebHook": "WebHook entrant",
-  "Integration_Advanced_Settings": "Configuració avançada",
   "Integration_added": "La integració s'ha afegit",
+  "Integration_Advanced_Settings": "Configuració avançada",
   "Integration_History_Cleared": "L'historial d'integracions s'ha esborrat correctament",
   "Integration_Incoming_WebHook": "Integració WebHook d'entrada",
   "Integration_New": "Nova integració",
-  "Integrations_Outgoing_Type_FileUploaded": "Arxiu pujat",
-  "Integrations_Outgoing_Type_RoomArchived": "Sala arxivada",
-  "Integrations_Outgoing_Type_RoomCreated": "Sala creada (pública i privada)",
-  "Integrations_Outgoing_Type_RoomJoined": "L'usuari ha entrat a la sala",
-  "Integrations_Outgoing_Type_RoomLeft": "L'usuari ha sortit de la sala",
-  "Integrations_Outgoing_Type_SendMessage": "Missatge enviat",
-  "Integrations_Outgoing_Type_UserCreated": "Usuari creat",
   "Integration_Outgoing_WebHook": "Integració WebHook de sortida",
   "Integration_Outgoing_WebHook_History": "Historial d'integracions WebHook de sortida",
-  "Integration_Outgoing_WebHook_No_History": "Aquesta integració WebHook de sortida encara no té cap historial registrat.",
-  "Integration_Outgoing_WebHook_History_Time_Triggered": "Quan s'ha disparat la integració",
-  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Quan ha acabat o emès un error",
-  "Integration_Outgoing_WebHook_History_Trigger_Step": "Darrer pas del disparador",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Missatges enviats durant el pas de preparació",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Missatges enviats durant el procés de la resposta",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Dades passades a la integració",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Dades passades a l'adreça URL",
-  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Error HTTP de resposta",
-  "Integration_Outgoing_WebHook_History_Http_Response": "Resposta HTML",
   "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Error Stacktrace",
-  "Integration_Retry_Failed_Url_Calls": "Reintenta peticions d'URL fallades",
-  "Integration_Retry_Failed_Url_Calls_Description": "Si la petició a l'adreça URL falla, la integració ha d'esperar un temps raonable abans de reintentar-la?",
+  "Integration_Outgoing_WebHook_History_Http_Response": "Resposta HTML",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Error HTTP de resposta",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Missatges enviats durant el pas de preparació",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Missatges enviats durant el procés de la resposta",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Quan ha acabat o emès un error",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Quan s'ha disparat la integració",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "Darrer pas del disparador",
+  "Integration_Outgoing_WebHook_No_History": "Aquesta integració WebHook de sortida encara no té cap historial registrat.",
   "Integration_Retry_Count": "Comptador de reintents",
   "Integration_Retry_Count_Description": "Quantes vegades s'ha de reintentar la integració si la petició a l'adreça URL falla?",
   "Integration_Retry_Delay": "Temps de reintent",
   "Integration_Retry_Delay_Description": "Quin algorisme de retard de reintent s'ha d'utilitzar? <code class=\"inline\">10^x</code> o <code class=\"inline\">2^x</code> o <code class=\"inline\">x*2</code>",
+  "Integration_Retry_Failed_Url_Calls": "Reintenta peticions d'URL fallades",
+  "Integration_Retry_Failed_Url_Calls_Description": "Si la petició a l'adreça URL falla, la integració ha d'esperar un temps raonable abans de reintentar-la?",
   "Integration_Run_When_Message_Is_Edited": "Executa en edicions",
   "Integration_Run_When_Message_Is_Edited_Description": "Aquesta integració s'ha d'executar quan el missatge s'edita? Desactivar aquesta opció farà que la integració només s'executi en <strong>missatges nous</strong> .",
+  "Integration_updated": "La integració s'ha actualitzat.",
   "Integration_Word_Trigger_Placement": "Posició indeterminada de paraula",
   "Integration_Word_Trigger_Placement_Description": "S'hauria d'activar el disparador quan la paraula es troba en un lloc de la frase fora del començament?",
-  "Integration_updated": "La integració s'ha actualitzat.",
   "Integrations": "Integracions",
   "Integrations_for_all_channels": "Introdueix <strong>all_public_channels</strong> per escoltar a totes les sales públiques, <strong>all_private_groups</strong> per escoltar a tots els grups privats i <strong>all_direct_messages</strong> per escoltar tots els missatges directes.",
+  "Integrations_Outgoing_Type_FileUploaded": "Arxiu pujat",
+  "Integrations_Outgoing_Type_RoomArchived": "Sala arxivada",
+  "Integrations_Outgoing_Type_RoomCreated": "Sala creada (pública i privada)",
+  "Integrations_Outgoing_Type_RoomJoined": "L'usuari ha entrat a la sala",
+  "Integrations_Outgoing_Type_RoomLeft": "L'usuari ha sortit de la sala",
+  "Integrations_Outgoing_Type_SendMessage": "Missatge enviat",
+  "Integrations_Outgoing_Type_UserCreated": "Usuari creat",
   "InternalHubot": "Hubot intern",
-  "InternalHubot_ScriptsToLoad": "Seqüències d'ordres (scripts) per carregar",
-  "InternalHubot_ScriptsToLoad_Description": "Si us plau, introduiu una llista separada per comes de scripts per carregar des de la carpeta personalitzada",
   "InternalHubot_PathToLoadCustomScripts": "Carpeta des d'on carregar els scripts",
   "InternalHubot_reload": "Recarrega els scripts",
+  "InternalHubot_ScriptsToLoad": "Seqüències d'ordres (scripts) per carregar",
+  "InternalHubot_ScriptsToLoad_Description": "Si us plau, introduiu una llista separada per comes de scripts per carregar des de la carpeta personalitzada",
   "InternalHubot_Username_Description": "Ha de ser un nom d'usuari vàlid d'un bot registrat al servidor.",
   "Invalid_confirm_pass": "La confirmació de la contrasenya no coincideix amb la contrasenya",
   "Invalid_email": "L'adreça de correu-e és invàlida",
@@ -786,44 +894,40 @@
   "Invitation_Subject": "Assumpte de la invitació",
   "Invitation_Subject_Default": "Se us ha convidat a [Site_Name]",
   "Invite_user_to_join_channel": "Convidar un usuari a unir-se a aquest canal",
-  "Invite_user_to_join_channel_all_to": "Invita a tots els usuaris d'aquest canal a unir-se a [#channel]",
   "Invite_user_to_join_channel_all_from": "Invita a tots els usuaris del canal [#channel] a unir-se a aquest canal",
+  "Invite_user_to_join_channel_all_to": "Invita a tots els usuaris d'aquest canal a unir-se a [#channel]",
   "Invite_Users": "Convidar usuaris",
-  "is_also_typing": "també està escrivint",
-  "is_also_typing_female": "també està escrivint",
-  "is_also_typing_male": "també està escrivint",
-  "is_typing": "està escrivint",
-  "is_typing_female": "està escrivint",
-  "is_typing_male": "està escrivint",
   "IRC_Channel_Join": "Resposta de la comanda JOIN.",
   "IRC_Channel_Leave": "Resposta de la comanda PART.",
-  "IRC_Description": "L'IRC (Internet Relay Chat) és una eina de comunicació per a grups basada en text. Els usuaris s'uneixen a sales/canals de xat per a comunicar-se. L'IRC també suporta missatges privats entre usuaris i compartició de fitxers. Aquest paquet integra aquestes funcionalitats amb Rocket.Chat.",
-  "IRC_Enabled": "Integrar suport IRC. Canviar aquest valor requereix reiniciar el Rocket.Chat.",
-  "IRC_Private_Message": "Resposta de la comanda PRIVMSG.",
   "IRC_Channel_Users": "Resposta de la comanda NAMES.",
   "IRC_Channel_Users_End": "Final de la resposta de la comanda NAMES.",
+  "IRC_Description": "L'IRC (Internet Relay Chat) és una eina de comunicació per a grups basada en text. Els usuaris s'uneixen a sales/canals de xat per a comunicar-se. L'IRC també suporta missatges privats entre usuaris i compartició de fitxers. Aquest paquet integra aquestes funcionalitats amb Rocket.Chat.",
+  "IRC_Enabled": "Integrar suport IRC. Canviar aquest valor requereix reiniciar el Rocket.Chat.",
   "IRC_Hostname": "Servidor d'IRC on connectar.",
   "IRC_Login_Fail": "Resposta en cas de connexió al servidor d'IRC fallida.",
   "IRC_Login_Success": "Resposta en cas de connexió al servidor d'IRC reeixida.",
   "IRC_Message_Cache_Size": "Límit de memòria d'intercanvi (cache) per manegar els missatges sortints.",
   "IRC_Port": "Port on unir-se al servidor d'IRC.",
+  "IRC_Private_Message": "Resposta de la comanda PRIVMSG.",
   "IRC_Quit": "Resposta en sortir de la sessió d'IRC.",
+  "is_also_typing": "també està escrivint",
+  "is_also_typing_female": "també està escrivint",
+  "is_also_typing_male": "també està escrivint",
+  "is_typing": "està escrivint",
+  "is_typing_female": "està escrivint",
+  "is_typing_male": "està escrivint",
   "It_works": "Funciona",
   "italics": "cursiva",
   "Jitsi_Chrome_Extension": "ID d'extensió del Chrome",
   "Jitsi_Enable_Channels": "Activa als canals",
   "join": "Unir-se",
+  "join-without-join-code": "Unir-se sense el codi",
+  "join-without-join-code_description": "Permís per unir-se a canals amb codi d'unió actiu sense tenir-lo",
   "Join_audio_call": "Unir-se a la trucada",
   "Join_Chat": "Uneix-te al xat",
   "Join_default_channels": "Unir-se als canals predeterminats",
   "Join_the_Community": "Uneix-te a la comunitat",
   "Join_the_given_channel": "Unir-se al canal proporcionat",
-  "Show_the_keyboard_shortcut_list": "Mostra la llista de dreceres de teclat",
-  "Open_channel_user_search": "`%s` - Obre canal / Cerca usuari",
-  "Edit_previous_message": "`%s` - Edita el missatge anterior",
-  "Move_beginning_message": "`%s` - Anar al principi del missatge",
-  "Move_end_message": "`%s` - Anar al final del missatge",
-  "New_line_message_compose_input": "`%s` - Nova línia a l'entrada de missatge",
   "Join_video_call": "Unir-se a la videotrucada",
   "Joined": "Unit",
   "Jump": "Vés",
@@ -836,6 +940,19 @@
   "Katex_Enabled_Description": "Permetre l'ús de <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">katex</a> per a la composició tipogràfica de matemàtiques en els missatges",
   "Katex_Parenthesis_Syntax": "Permetre Parèntesi Sintaxi",
   "Katex_Parenthesis_Syntax_Description": "Permetre l'ús de \\ [bloc katex \\] \\ sintaxi i (en línia katex \\)",
+  "Keyboard_Shortcuts_Edit_Previous_Message": "Edita missatge anterior",
+  "Keyboard_Shortcuts_Keys_1": "<kbd>Ctrl</kbd> + <kbd>p</kbd>",
+  "Keyboard_Shortcuts_Keys_2": "<kbd>Fletxa amunt</kbd>",
+  "Keyboard_Shortcuts_Keys_3": "<kbd>Cmd</kbd> (o <kbd>Alt</kbd>) + <kbd>Fletxa esquerra</kbd>",
+  "Keyboard_Shortcuts_Keys_4": "<kbd>Cmd</kbd> (o <kbd>Alt</kbd>) + <kbd>Fletxa amunt</kbd>",
+  "Keyboard_Shortcuts_Keys_5": "<kbd>Cmd</kbd> (o <kbd>Alt</kbd>) + <kbd>Fletxa dreta</kbd>",
+  "Keyboard_Shortcuts_Keys_6": "<kbd>Cmd</kbd> (o <kbd>Alt</kbd>) + <kbd>Fletxa avall</kbd>",
+  "Keyboard_Shortcuts_Keys_7": "<kbd>Shift</kbd> + <kbd>Enter</kbd>",
+  "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "Moure's al principi del missatge",
+  "Keyboard_Shortcuts_Move_To_End_Of_Message": "Moure's al final del missatge",
+  "Keyboard_Shortcuts_New_Line_In_Message": "Nova línia al camp d'entrada de missatge",
+  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Canal obert / Cerca d'usuari",
+  "Keyboard_Shortcuts_Title": "Dreceres de teclat",
   "Knowledge_Base": "Centre de suport",
   "Label": "Etiqueta",
   "Language": "Idioma",
@@ -876,6 +993,18 @@
   "LDAP_Enable_Description": "Intentar utilitzar LDAP com a mètode d'autenticació",
   "LDAP_Encryption": "Xifrat",
   "LDAP_Encryption_Description": "Mètode de xifrat utilitzat per a la comunicació segura cap al servidor LDAP. Alguns exemples 'sense xifrat', 'SSL / LDAPS (xifrat des de l'inici), i' StartTLS '(actualitzar a comunicacions xifrades una vegada connectat).",
+  "LDAP_Group_Filter_Enable": "Activa el filtre de grups d'usuaris LDAP",
+  "LDAP_Group_Filter_Enable_Description": "Restringeix l'accés a usuaris d'un grup LDAP <br/>Útil per a servidors OpenLDAP sense capes que permetin filtres *memberOf*",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Atribut ID de grup (Group ID)",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Exemple: *OpenLDAP:*cn",
+  "LDAP_Group_Filter_Group_Member_Attribute": "Atribut Membre de grup (Group Member)",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Exemple: *OpenLDAP:*uniqueMember",
+  "LDAP_Group_Filter_Group_Member_Format": "Format Membre de grup (Group Member)",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "Exemple: *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
+  "LDAP_Group_Filter_Group_Name": "Nom del grup",
+  "LDAP_Group_Filter_Group_Name_Description": "Nom del grup on pertany l'usuari",
+  "LDAP_Group_Filter_ObjectClass": "Grup ObjectClass",
+  "LDAP_Group_Filter_ObjectClass_Description": "L'*objectclass* que identifica als grups.<br/> Exemple: OpenLDAP:groupOfUniqueNames",
   "LDAP_Host": "Amfitrió (host) ",
   "LDAP_Host_Description": "Amfitrió (host) LDAP, exemple: `ldap.exemple.com` o `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Temps d'espera inactiu (ms)",
@@ -892,7 +1021,7 @@
   "LDAP_Sync_User_Data": "Sincronitzar dades d'usuari",
   "LDAP_Sync_User_Data_Description": "Mantenir les dades de l'usuari sincronitzades amb el servidor quan s'identifiqui (ex: nom, adreça de correu, etcètera).",
   "LDAP_Sync_User_Data_FieldMap": "Mapatge de camps de dades d'usuari",
-  "LDAP_Sync_User_Data_FieldMap_Description": "Configura com els camps del compte d'usuari (com el de correu-e) s'omplen des del registre LDAP (un cop trobat).<br/>A tall d'exemple, `{\"cn\":\"name\", \"mail\":\"email\"}` triarà el nom des de l'atribut `cn`, i l'adreça-e des de l'atribut `mail`. Addicionalment, és possible utilitzar variables, per exemple: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` utilitza una combinació del nom de pila i del cognom per al camp `name` de l'usuari de rocket chat. <br/>Camps disponibles a Rocket.Chat: `name` i `email`.",
+  "LDAP_Sync_User_Data_FieldMap_Description": "Configura com els camps del compte d'usuari (com el de correu-e) s'omplen des del registre LDAP (un cop trobat).<br/>A tall d'exemple, `{\"cn\":\"name\", \"mail\":\"email\"}` triarà el nom des de l'atribut `cn`, i l'adreça-e des de l'atribut `mail`. Addicionalment, és possible utilitzar variables, per exemple: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` utilitza una combinació del nom de pila i del cognom per al camp `name` de l'usuari de rocket chat. <br/>Camps disponibles a Rocket.Chat: `name`, `email` i `customFields`.",
   "LDAP_Sync_Users": "Sincronització d'usuaris",
   "LDAP_Test_Connection": "Prova la connexió",
   "LDAP_Unique_Identifier_Field": "Camp d'identificador únic",
@@ -901,18 +1030,6 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Escriviu el vostre propi filtre per cercar usuaris al servidor LDAP.",
   "LDAP_Username_Field": "Camp del nom d'usuari",
   "LDAP_Username_Field_Description": "El camp que s'utilitzarà com a nom d'usuari (*username*) per als nous usuaris. Deixar en blanc per a utilitzar el nom d'usuari proporcionat durant l'inici de sessió.<br/>També es poden utilitzar plantilles d'etiqueta, com `#{givenName}.#{sn}`.<br/>El valor per defecte és `sAMAccountName`.",
-  "LDAP_Group_Filter_Enable": "Activa el filtre de grups d'usuaris LDAP",
-  "LDAP_Group_Filter_Enable_Description": "Restringeix l'accés a usuaris d'un grup LDAP <br/>Útil per a servidors OpenLDAP sense capes que permetin filtres *memberOf*",
-  "LDAP_Group_Filter_ObjectClass": "Grup ObjectClass",
-  "LDAP_Group_Filter_ObjectClass_Description": "L'*objectclass* que identifica als grups.<br/> Exemple: OpenLDAP:groupOfUniqueNames",
-  "LDAP_Group_Filter_Group_Id_Attribute": "Atribut ID de grup (Group ID)",
-  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Exemple: *OpenLDAP:*cn",
-  "LDAP_Group_Filter_Group_Member_Attribute": "Atribut Membre de grup (Group Member)",
-  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Exemple: *OpenLDAP:*uniqueMember",
-  "LDAP_Group_Filter_Group_Member_Format": "Format Membre de grup (Group Member)",
-  "LDAP_Group_Filter_Group_Member_Format_Description": "Exemple: *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
-  "LDAP_Group_Filter_Group_Name": "Nom del grup",
-  "LDAP_Group_Filter_Group_Name_Description": "Nom del grup on pertany l'usuari",
   "Least_Amount": "Quantitat mínima",
   "Leave_Group_Warning": "Segur que vols abandonar el grup \"%s\"?",
   "Leave_Private_Warning": "Segur que vols sortir de la conversa amb \"%s\"?",
@@ -924,7 +1041,6 @@
   "List_of_Direct_Messages": "Llista de missatges directes",
   "Livechat_agents": "Agents de xat en viu",
   "Livechat_AllowedDomainsList": "Dominis permesos al xat en viu",
-  "Domains_allowed_to_embed_the_livechat_widget": "Llista separada per comes dels dominis on es permet incloure el xat en viu. Deixeu en blanc per permetre'ls tots.",
   "Livechat_Dashboard": "Tauler de xat en viu",
   "Livechat_enabled": "Xat en viu actiu",
   "Livechat_forward_open_chats": "Reenviament de xats oberts",
@@ -945,7 +1061,7 @@
   "Load_more": "Carrega'n més",
   "Loading...": "Carregant...",
   "Loading_more_from_history": "Carregant-ne més des de l'historial",
-  "Loading_suggestion": "Carregant suggeriments...",
+  "Loading_suggestion": "Carregant suggeriments",
   "Localization": "Localització",
   "Log_Exceptions_to_Channel": "Registra excepcions al canal",
   "Log_Exceptions_to_Channel_Description": "Canal que rebrà les excepcions capturades. Deixar en blanc per ignorar-les.",
@@ -958,6 +1074,8 @@
   "Login_with": "Inicia sessió amb %s",
   "Logout": "Tanca sessió",
   "Logout_Others": "Tanca les sessions obertes en altres llocs",
+  "mail-messages": "Missatges via correu-e",
+  "mail-messages_description": "Permís per utilitzar l'opció d'enviament de missatges via correu-e",
   "Mail_Message_Invalid_emails": "S'ha proporcionat almenys una adreça de correu-e invàlida: %s",
   "Mail_Message_Missing_to": "Ha de seleccionar almenys un usuari o proporcionar almenys una adreça de correu electrònic, separades per comes.",
   "Mail_Message_No_messages_selected_select_all": "No s'ha seleccionat cap missatge. Vols <a href='#' class='select-all'>seleccionar tots</a> els missatges visibles?",
@@ -969,6 +1087,18 @@
   "Mailing": "Enviament",
   "Make_Admin": "Fes admin",
   "Make_sure_you_have_a_copy_of_your_codes": "Assegura't de tenir una còpia dels teus codis: __codes__ Si perds accés a la teva app d'autenticació, pots utilitzar un d'aquests codis per entrar.",
+  "manage-assets": "Gestionar recursos",
+  "manage-assets_description": "Permís per gestionar els recursos del servidor",
+  "manage-emoji": "Gestionar emoticones",
+  "manage-emoji_description": "Permís per gestionar les emoticones del servidor",
+  "manage-integrations": "Gestionar les integracions",
+  "manage-integrations_description": "Permís per gestionar les integracions del servidor",
+  "manage-oauth-apps": "Gestionar apps Oauth",
+  "manage-oauth-apps_description": "Permís per gestionar les apps Oauth del servidor",
+  "manage-own-integrations": "Gestionar les pròpies integracions",
+  "manage-own-integrations_description": "Permís per permetre als usuaris crear i editar les seves pròpies integracions o webhooks",
+  "manage-sounds": "Gestionar sons",
+  "manage-sounds_description": "Permís per gestionar els sons del servidor",
   "Manager_added": "Supervisor afegit",
   "Manager_removed": "Supervisor eliminat",
   "Managing_assets": "Gestió de recursos",
@@ -980,12 +1110,16 @@
   "Mark_as_read": "Marca llegit/s",
   "Mark_as_unread": "Marca com a no llegit",
   "Markdown_Headers": "Permetre encapçalaments Markdown als missatges",
+  "Markdown_Parser": "Parsejador Markdown",
   "Markdown_SupportSchemesForLink": "Markdown detecta scheme:// com a enllaç",
   "Markdown_SupportSchemesForLink_Description": "Llista dels scheme:// permesos separats per comes",
   "Max_length_is": "La llargada màxima és %s",
   "Members_List": "Llista de membres",
+  "mention-all": "Mencionar tots",
+  "mention-all_description": "Permís per utilitzar la menció @all",
   "Mentions": "Mencions",
   "Mentions_default": "Mencions (per defecte)",
+  "Mentions_only": "Només mencions",
   "Message": "Missatge",
   "Message_AllowBadWordsFilter": "Permet el filtratge de paraulotes",
   "Message_AllowDeleting": "Permet l'eliminació de missatges",
@@ -1025,24 +1159,25 @@
   "Message_pinning": "Fixació de missatges",
   "Message_QuoteChainLimit": "Màxim nombre de cites encadenades",
   "Message_removed": "Missatge eliminat",
+  "Message_sent_by_email": "Missatge enviat via correu-e",
   "Message_SetNameToAliasEnabled": "Establir un nom d'usuari com àlies al missatge",
   "Message_SetNameToAliasEnabled_Description": "Només si encara no s'ha establert àlies. Els àlies dels missatges antics no es canvien si l'usuari ha canviat el nom.",
   "Message_ShowDeletedStatus": "Mostra l'estat 'eliminat'",
   "Message_ShowEditedStatus": "Mostra l'estat 'editat'",
   "Message_ShowFormattingTips": "Mostra suggeriments de formatació",
   "Message_starring": "Destacar missatges",
-  "Message_TimeFormat": "Format d'hora",
   "Message_TimeAndDateFormat": "Format de data i hora",
-  "Message_TimeFormat_Description": "Veure: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeAndDateFormat_Description": "Veure també: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
+  "Message_TimeFormat": "Format d'hora",
+  "Message_TimeFormat_Description": "Veure: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Missatge massa llarg",
   "Message_VideoRecorderEnabled": "Gravadora de vídeo activa",
   "Message_VideoRecorderEnabledDescription": "Requereix que els fitxers de tipus 'video/webm' siguin admesos a la configuració de  'Puja fitxers'.",
   "Messages": "Missatges",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Els missatges enviats al WebHook d'entrada seran publicats aquí.",
   "Meta": "Meta",
-  "Meta_fb_app_id": "App ID de Facebook",
   "Meta_custom": "Etiquetes Meta personalitzades",
+  "Meta_fb_app_id": "App ID de Facebook",
   "Meta_google-site-verification": "Verificació del lloc web a Google (google-site-verification)",
   "Meta_language": "Idioma",
   "Meta_msvalidate01": "MSValidate.01",
@@ -1057,12 +1192,18 @@
   "More_direct_messages": "Més missatges directes",
   "More_groups": "Més grups privats",
   "More_unreads": "Més per llegir",
+  "Move_beginning_message": "`%s` - Anar al principi del missatge",
+  "Move_end_message": "`%s` - Anar al final del missatge",
   "Msgs": "Missatges",
   "multi": "multi",
+  "multi_line": "línia múltiple",
+  "mute-user": "Silenciar usuari",
+  "mute-user_description": "Permís per silenciar altres usuaris del mateix canal",
   "Mute_someone_in_room": "Silenciar algú a la sala",
   "Mute_user": "Silencia l'usuari",
   "Muted": "Silenciat",
   "My_Account": "El meu compte",
+  "My_location": "La meva localització",
   "n_messages": "%s missatges",
   "N_new_messages": "%s nous",
   "Name": "Nom",
@@ -1074,14 +1215,15 @@
   "New_Custom_Field": "Nou camp personalitzat",
   "New_Department": "Nou departament",
   "New_integration": "Nova integració",
+  "New_line_message_compose_input": "`%s` - Nova línia a l'entrada de missatge",
   "New_logs": "Nous registres log",
   "New_Message_Notification": "Nova notificació de missatges",
   "New_messages": "Nous missatges",
   "New_password": "Nova contrasenya",
   "New_role": "Nou rol",
   "New_Room_Notification": "Nova notificació de sala",
-  "New_videocall_request": "Nova petició de vídeo trucada",
   "New_Trigger": "Nou disparador",
+  "New_videocall_request": "Nova petició de vídeo trucada",
   "No_available_agents_to_transfer": "No hi ha agents disponibles per a transferir",
   "No_channel_with_name_%s_was_found": "No s'ha trobat cap canal amb el nom <strong>\"%s\"</strong>!",
   "No_channels_yet": "Encara no ets a cap canal.",
@@ -1094,9 +1236,9 @@
   "No_mentions_found": "Cap menció trobada",
   "No_pinned_messages": "Cap missatge fixat.",
   "No_results_found": "No s'han trobat resultats",
+  "No_snippet_messages": "Cap retall",
   "No_starred_messages": "Cap missatge destacat.",
   "No_such_command": "Comanda `/__command__` no trobada.",
-  "No_snippet_messages": "Cap retall",
   "No_user_with_username_%s_was_found": "No s'ha trobat cap usuari amb el nom <strong>\"%s\"</strong>!",
   "Nobody_available": "Ningú disponible",
   "Node_version": "Versió de Node",
@@ -1108,13 +1250,13 @@
   "Nothing": "Res",
   "Nothing_found": "No s'ha trobat res",
   "Notification_Desktop_Default_For": "Mostra notificacions d'escriptori per",
-  "Notification_Mobile_Default_For": "Notificacions push mòbil per",
   "Notification_Duration": "Duració de la notificació",
+  "Notification_Mobile_Default_For": "Notificacions push mòbil per",
   "Notifications": "Notificacions",
   "Notifications_Muted_Description": "Si esculls silenciar-ho tot, no veuràs la sala destacada a la llista quan hi hagi nous missatges, excepte si són mencions. Silenciar les notificacions sobreescriurà les opcions de notificació.",
   "Notifications_Sound_Volume": "Volum del so de notificacions",
-  "Notify_all_in_this_room": "Notifica a tothom d'aquest canal",
   "Notify_active_in_this_room": "Notifica als usuaris actius d'aquesta sala",
+  "Notify_all_in_this_room": "Notifica a tothom d'aquest canal",
   "Num_Agents": "# d'agents",
   "Number_of_messages": "Nombre de missatges",
   "OAuth_Application": "Aplicació OAuth",
@@ -1127,9 +1269,11 @@
   "Office_hours_enabled": "Horari d'obertura actiu",
   "Office_hours_updated": "Horari actualitzat",
   "Offline": "Fora de línia",
+  "Offline_DM_Email": "__user__ us ha enviat un missatge directe",
   "Offline_form": "formulari en línia",
   "Offline_form_unavailable_message": "Missatge de formulari fora de línia no disponible",
   "Offline_Link_Message": "VÉS AL MISSATGE",
+  "Offline_Mention_Email": "__user__ us ha mencionat a la sala #__room__",
   "Offline_message": "missatge fora de línia",
   "Offline_success_message": "Fora de línia correcte",
   "Offline_unavailable": "Fora de línia no disponible",
@@ -1139,17 +1283,18 @@
   "Only_you_can_see_this_message": "Només tu pots veure aquest missatge",
   "Oops!": "Ui!",
   "Open": "Obre",
+  "Open_channel_user_search": "`%s` - Obre canal / Cerca usuari",
   "Open_days_of_the_week": "Dies d'obertura",
   "Open_Livechats": "LiveChats oberts",
+  "Open_your_authentication_app_and_enter_the_code": "Obre l'app d'autenticació i entra el codi. També pots utilitzar un dels codis de recuperació.",
   "Opened": "Obert",
   "Opened_in_a_new_window": "Obert en una nova finestra.",
   "Opens_a_channel_group_or_direct_message": "Obrir un canal, grup o missatge directe",
   "optional": "opcional",
-  "Use_minor_colors": "Utilitza la paleta de colors secundària (per defecte s'hereta de la primària)",
   "or": "o",
-  "Open_your_authentication_app_and_enter_the_code": "Obre l'app d'autenticació i entra el codi. També pots utilitzar un dels codis de recuperació.",
-  "Order": "Ordre",
   "Or_talk_as_anonymous": "O parla com a anònim",
+  "Order": "Ordre",
+  "Original": "Original",
   "OS_Arch": "Arquitectura del sistema",
   "OS_Cpus": "Recompte de CPU",
   "OS_Freemem": "Memòria RAM lliure",
@@ -1175,173 +1320,32 @@
   "People": "Gent",
   "Permalink": "Enllaç permanent (Permalink)",
   "Permissions": "Permisos",
-  "access-mailer": "Accedir a la pantalla d'enviament",
-  "access-mailer_description": "Permís per enviar correu-e massiu a tots els usuaris",
-  "access-permissions": "Accés a la pantalla de permisos",
-  "access-permissions_description": "Modifica permisos per a diversos rols",
-  "add-oauth-service": "Afegir servei Oauth",
-  "add-oauth-service_description": "Permís per afegir nous serveis Oauth",
-  "add-user": "Afegir usuari",
-  "add-user_description": "Permís per afegir nous usuaris al servidor via la pantalla d'usuaris",
-  "add-user-to-any-c-room": "Afegir usuari a canal públic",
-  "add-user-to-any-c-room_description": "Permís per afegir un usuari a qualsevol canal públic",
-  "add-user-to-any-p-room": "Afegir usuari a canal privat",
-  "add-user-to-any-p-room_description": "Permís per afegir un usuari a qualsevol canal privat",
-  "add-user-to-joined-room": "Afegir usuari a canal on unit",
-  "add-user-to-joined-room_description": "Permís per afegir un usuari a un canal on està unit",
-  "archive-room": "Arxivar sala",
-  "archive-room_description": "Permís per arxivar un canal",
-  "assign-admin-role": "Assignar rol d'administrador",
-  "assign-admin-role_description": "Permís per assignar el rol d'administrador a altres usuaris",
-  "auto-translate": "Auto-traducció",
-  "auto-translate_description": "Permís per utilitzar l'eina d'auto-traducció",
-  "ban-user": "Banejar usuari",
-  "ban-user_description": "Permís per banejar un usuari d'un canal",
-  "bulk-create-c": "Crear canals en massa",
-  "bulk-create-c_description": "Permís per a crear canals en massa",
-  "bulk-register-user": "Crear canals en massa",
-  "bulk-register-user_description": "Permís per a crear canals en massa",
-  "clean-channel-history": "Esborrar l'historial de canal",
-  "clean-channel-history_description": "Permís per esborrar l'historial dels canals",
-  "close-livechat-room": "Tancar sala de xat en viu",
-  "close-livechat-room_description": "Permís per tancar el canal de xat en viu actiu",
-  "close-others-livechat-room": "Tancar sala de xat en viu",
-  "close-others-livechat-room_description": "Permís per tancar altres canals de xat en viu",
-  "create-c": "Crear canals públics",
-  "create-c_description": "Permís per crear canals públics",
-  "create-d": "Crear missatges directes",
-  "create-d_description": "Permís per a iniciar missatges directes",
-  "create-p": "Crear canals privats",
-  "create-p_description": "Permís per crear canals privats",
-  "create-user": "Crear usuari",
-  "create-user_description": "Permís per crear usuaris",
-  "delete-c": "Esborrar canals públics",
-  "delete-c_description": "Permís per esborrar canals públics",
-  "delete-d": "Esborrar missatges directes",
-  "delete-d_description": "Permís per esborrar missatges directes",
-  "delete-p": "Esborrar canals privats",
-  "delete-p_description": "Permís per esborrar canals privats",
-  "delete-message": "Esborrar missatge",
-  "delete-message_description": "Permís per esborrar un missatge d'una sala",
-  "delete-user": "Esborrar usuari",
-  "delete-user_description": "Permís per esborrar usuaris",
-  "edit-message": "Editar missatge",
-  "edit-message_description": "Permís per editar un missatge d'una sala",
-  "edit-other-user-active-status": "Editar l'estat actiu d'un altre usuari",
-  "edit-other-user-active-status_description": "Permís per activar o desactivar altres comptes",
-  "edit-other-user-info": "Editar la informació d'un altre usuari",
-  "edit-other-user-info_description": "Permís per canviar el nom, el nom d'usuari o l'adreça de correu-e d'altres usuaris",
-  "edit-other-user-password": "Editar la contrasenya d'un altre usuari",
-  "edit-other-user-password_description": "Permís per modificar la contrasenya d'altres usuaris. Requereix el permís edit-other-user-info.",
-  "edit-privileged-setting": "Editar opcions privilegiades",
-  "edit-privileged-setting_description": "Permís per editar la configuració",
-  "edit-room": "Editar sala",
-  "edit-room_description": "Permís per editar el nom d'una sala, el tema, el tipus (privada o pública) o l'estat (actiu o arxivat)",
-  "force-delete-message": "Forçar esborrar missatge",
-  "force-delete-message_description": "Permís per esborrar un missatge ignorant totes les restriccions",
-  "join-without-join-code": "Unir-se sense el codi",
-  "join-without-join-code_description": "Permís per unir-se a canals amb codi d'unió actiu sense tenir-lo",
-  "mail-messages": "Missatges via correu-e",
-  "mail-messages_description": "Permís per utilitzar l'opció d'enviament de missatges via correu-e",
-  "manage-assets": "Gestionar recursos",
-  "manage-assets_description": "Permís per gestionar els recursos del servidor",
-  "manage-emoji": "Gestionar emoticones",
-  "manage-emoji_description": "Permís per gestionar les emoticones del servidor",
-  "manage-integrations": "Gestionar les integracions",
-  "manage-integrations_description": "Permís per gestionar les integracions del servidor",
-  "manage-oauth-apps": "Gestionar apps Oauth",
-  "manage-oauth-apps_description": "Permís per gestionar les apps Oauth del servidor",
-  "manage-own-integrations": "Gestionar les pròpies integracions",
-  "manage-own-integrations_description": "Permís per permetre als usuaris crear i editar les seves pròpies integracions o webhooks",
-  "manage-sounds": "Gestionar sons",
-  "manage-sounds_description": "Permís per gestionar els sons del servidor",
-  "mention-all": "Mencionar tots",
-  "mention-all_description": "Permís per utilitzar la menció @all",
-  "mute-user": "Silenciar usuari",
-  "mute-user_description": "Permís per silenciar altres usuaris del mateix canal",
   "pin-message": "Fixar missatge",
   "pin-message_description": "Permís per fixar un missatge en un canal",
-  "post-readonly": "Publicar on només lectura",
-  "post-readonly_description": "Permís per publicar un missatge en canal de només lectura",
-  "preview-c-room": "Previsualitzar canal públic",
-  "preview-c-room_description": "Permís per veure els continguts d'un canal públic abans d'unir-s'hi",
-  "remove-user": "Expulsar usuari",
-  "remove-user_description": "Permís per expulsar un usuari d'una sala",
-  "run-import": "Executar importació",
-  "run-import_description": "Permís per executar els importadors",
-  "run-migration": "Executar migració",
-  "run-migration_description": "Permís per executar les migracions",
-  "save-others-livechat-room-info": "Guardar info altres xats en viu",
-  "save-others-livechat-room-info_description": "Permís per guardar informació d'altres canals de xat en viu",
-  "set-moderator": "Assignar moderador",
-  "set-moderator_description": "Permís per assignar altres usuaris com a moderadors d'un canal",
-  "set-owner": "Assignar propietari",
-  "set-owner_description": "Permís per assignar altres usuaris com a propietaris d'un canal",
-  "set-react-when-readonly": "Reaccions quan només lectura",
-  "set-react-when-readonly_description": "Permís per poder afegir reaccions a missatges en canals de només lectura",
-  "set-readonly": "Fer només lectura",
-  "set-readonly_description": "Permís per fer un canal de només lectura",
-  "snippet-message": "Retalls de missatge",
-  "snippet-message_description": "Permís per crear retalls de missatge",
-  "unarchive-room": "Desarxivar sala",
-  "unarchive-room_description": "Permís per desarxivar canals",
-  "user-generate-access-token": "Usuaris generen Access Tokens",
-  "user-generate-access-token_description": "Permís perquè els usuaris puguin generar access tokens",
-  "view-c-room": "Veure canal públic",
-  "view-c-room_description": "Permís per veure canals públics",
-  "view-d-room": "Veure missatges directes",
-  "view-d-room_description": "Permís per veure missatges directes",
-  "view-full-other-user-info": "Veure tota la info d'usuaris",
-  "view-full-other-user-info_description": "Permís per veure el perfil complet d'altres usuaris, incloent la data de creació del compte, el darrer accés, etcètera.",
-  "view-history": "Veure historial",
-  "view-history_description": "Permís per veure l'historial del canal",
-  "view-join-code": "Veure el codi per unir-se",
-  "view-join-code_description": "Permís per veure el codi per unir-se al canal",
-  "view-joined-room": "Veure sales on unit",
-  "view-joined-room_description": "Permís per veure els canals on actualment s'està unit",
-  "view-l-room": "Veure sales de xat en viu",
-  "view-l-room_description": "Permís per veure els canals de xat en viu",
-  "view-livechat-manager": "Veure el gestor de xats en viu",
-  "view-livechat-manager_description": "Permís per veure gestors d'altres xats en viu",
-  "view-livechat-rooms": "Veure xats en viu",
-  "view-livechat-rooms_description": "Permís per veure altres canals de xat en viu",
-  "view-logs": "Veure registres",
-  "view-logs_description": "Permís per veure els registres del servidor",
-  "view-p-room": "Veure sala privada",
-  "view-p-room_description": "Permís per veure canals privats",
-  "view-privileged-setting": "Veure opcions privilegiades",
-  "view-privileged-setting_description": "Permís per a veure la configuració",
-  "view-other-user-channels": "Veure canals d'altres usuaris",
-  "view-other-user-channels_description": "Permís per veure canals que pertanyen a altres usuaris",
-  "view-room-administration": "Veure administració de sala",
-  "view-room-administration_description": "Permís per veure estadístiques de missatges públics, privats i directes. No inclou veure converses o arxius",
-  "view-statistics": "Veure estadístiques",
-  "view-statistics_description": "Permís per veure estadístiques del sistema com el nombre d'usuaris autenticats, el nombre de sales o informació del sistema operatiu",
-  "view-user-administration": "Veure administració d'usuaris",
-  "view-user-administration_description": "Permís per veure una llista de només lectura parcial dels comptes d'usuari actualment autenticats al sistema. Amb aquest permís no és possible veure informació dels comptes d'usuari.",
   "Pin_Message": "Fixa missatge",
   "Pinned_a_message": "S'ha fixat un missatge:",
   "Pinned_Messages": "Missatges fixats",
-  "PiwikAnalytics_siteId_Description": "L'ID de lloc a utilitzar per a la identificació d'aquest lloc. Exemple: 17",
   "PiwikAdditionalTrackers": "Llocs piwik addicionals",
-  "PiwikAnalytics_prependDomain": "Prefixa domini",
-  "PiwikAnalytics_prependDomain_Description": "Prefixa el domini del lloc al títol de la pàgina",
   "PiwikAnalytics_cookieDomain": "Tots els subdominis",
   "PiwikAnalytics_cookieDomain_Description": "Segueix visitants per tots els subdominis",
   "PiwikAnalytics_domains": "Amaga enllaços de sortida",
+  "PiwikAnalytics_prependDomain": "Prefixa domini",
+  "PiwikAnalytics_prependDomain_Description": "Prefixa el domini del lloc al títol de la pàgina",
+  "PiwikAnalytics_siteId_Description": "L'ID de lloc a utilitzar per a la identificació d'aquest lloc. Exemple: 17",
   "PiwikAnalytics_url_Description": "L'adreça URL on es troba el Piwik, assegureu-vos d'incloure la barra del final. Exemple: //piwik.rocket.chat/",
   "Placeholder_for_email_or_username_login_field": "Indicatiu per al camp d'inici de sessió (correu electrònic o nom d'usuari)",
   "Placeholder_for_password_login_field": "Indicatiu per al camp de contrasenya (inici de sessió)",
   "Please_add_a_comment": "Si us plau, afegeix un comentari",
   "Please_add_a_comment_to_close_the_room": "Si us plau, afegeix un comentari per tancar la sala",
   "Please_answer_survey": "Si us plau, permeti'ns un moment per una breu enquesta sobre aquest xat",
+  "please_enter_valid_domain": "Si us plau introduiu un domini vàlid",
   "Please_enter_value_for_url": "Si us plau introdueix l'adreça URL del teu avatar.",
   "Please_enter_your_new_password_below": "Si us plau, introdueix a continuació la nova contrasenya:",
   "Please_enter_your_password": "Si us plau, introdueix la teva contrasenya",
-  "please_enter_valid_domain": "Si us plau introduiu un domini vàlid",
   "Please_fill_a_label": "Si us plau, omple una etiqueta",
   "Please_fill_a_name": "Si us plau, introdueix un nom",
   "Please_fill_a_username": "Si us plau, escull un nom d'usuari",
+  "Please_fill_all_the_information": "Si us plau, omple tota la informació",
   "Please_fill_name_and_email": "Si us plau, omple el nom i l'adreça electrònica",
   "Please_select_an_user": "Si us plau seleccioneu un usuari",
   "Please_select_enabled_yes_or_no": "Si us plau, selecciona SÍ o NO",
@@ -1351,19 +1355,27 @@
   "Please_wait_while_your_account_is_being_deleted": "Si us plau, espera mentre s'elimina el compte...",
   "Please_wait_while_your_profile_is_being_saved": "Si us plau, espera mentre el perfil es guarda...",
   "Port": "Port",
+  "post-readonly": "Publicar on només lectura",
+  "post-readonly_description": "Permís per publicar un missatge en canal de només lectura",
   "Post_as": "Publica com",
   "Post_to_Channel": "Publica al canal",
   "Post_to_s_as_s": "Publica a <strong>%s</strong> com <strong>%s</strong>",
   "Preferences": "Preferències",
   "Preferences_saved": "Preferències guardades",
+  "preview-c-room": "Previsualitzar canal públic",
+  "preview-c-room_description": "Permís per veure els continguts d'un canal públic abans d'unir-s'hi",
   "Privacy": "Privacitat",
   "Private": "Privat",
+  "Private_Channel": "Canal privat",
   "Private_Group": "Grup privat",
   "Private_Groups": "Grups privats",
   "Private_Groups_list": "Llista de grups privats",
   "Profile": "Perfil",
+  "Profile_details": "Detalls del perfil",
+  "Profile_picture": "Foto del perfil",
   "Profile_saved_successfully": "Perfil guardat correctament",
   "Public": "Públic",
+  "Public_Channel": "Canal públic",
   "Push": "Push (notificacions)",
   "Push_apn_cert": "Certificat APN",
   "Push_apn_dev_cert": "Certificat APN de desenvolupador (Dev)",
@@ -1397,8 +1409,8 @@
   "Read_only_group": "Grup de només lectura",
   "Record": "Gravar",
   "Redirect_URI": "URI de redireccionament (Redirect URI)",
-  "Refresh_oauth_services": "Refresca serveis OAuth",
   "Refresh_keys": "Refresca les claus",
+  "Refresh_oauth_services": "Refresca serveis OAuth",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "Per poder compartir la pantalla refresqui la pàgina després de la instal·lació ",
   "Regenerate_codes": "Regenera codis",
   "Register": "Crea un compte nou",
@@ -1409,26 +1421,28 @@
   "Release": "Llançament",
   "Reload": "Recarrega",
   "Remove": "Esborrar",
+  "remove-user": "Expulsar usuari",
+  "remove-user_description": "Permís per expulsar un usuari d'una sala",
   "Remove_Admin": "Treu admin",
+  "Remove_as_leader": "Treure de líder",
   "Remove_as_moderator": "Treu de moderador",
   "Remove_as_owner": "Treu de propietari",
-  "Remove_as_leader": "Treure de líder",
   "Remove_custom_oauth": "Esborra OAuth personalitzat",
   "Remove_from_room": "Treu-lo de la sala",
   "Remove_last_admin": "Eliminant el darrer admin",
   "Remove_someone_from_room": "Treu algú de la sala",
   "Removed": "Eliminat",
   "Reply": "Resposta",
-  "Reporting": "Informes",
   "Report_Abuse": "Informar d'un abús",
   "Report_exclamation_mark": "Informa!",
   "Report_sent": "Informe enviat",
   "Report_this_message_question_mark": "Informar d'aquest missatge?",
+  "Reporting": "Informes",
   "Require_password_change": "Requerir el canvi de la contrasenya",
   "Resend_verification_email": "Reenviar el correu-e de verificació",
   "Reset": "Reinicialitza (reset)",
-  "Reset_section_settings": "Reinicialitza els ajustos de la secció",
   "Reset_password": "Reinicialitza la contrasenya",
+  "Reset_section_settings": "Reinicialitza els ajustos de la secció",
   "Restart": "Reinicia (restart)",
   "Restart_the_server": "Reinicia el servidor",
   "Retry_Count": "Comptador de reintents",
@@ -1445,12 +1459,11 @@
   "room_changed_description": "Descripció de la sala canviada a: <em>__room_description__</em> per <em>__user_by__</em>.",
   "room_changed_privacy": "Tipus de sala canviat a: <em>__room_type__</em> per <em>__user_by__</em>.",
   "room_changed_topic": "Tema de la sala canviat a: <em>__room_topic__</em> per <em>__user_by__</em>.",
+  "Room_default_change_to_private_will_be_default_no_more": "Aquest és un canal per defecte i canviar-lo a grup privat farà que deixi de ser-ho. Voleu continuar?",
   "Room_description_changed_successfully": "Descripció de la sala canviada correctament",
-  "Room_has_been_deleted": "La sala s'ha eliminat",
   "Room_has_been_archived": "La sala s'ha arxivat",
+  "Room_has_been_deleted": "La sala s'ha eliminat",
   "Room_has_been_unarchived": "La sala s'ha desarxivat",
-  "Room_type_of_default_rooms_cant_be_changed": "Aquesta és una sala per defecte i no es pot canviar el tipus, si us plau consulta-ho amb l'administrador.",
-  "Room_default_change_to_private_will_be_default_no_more": "Aquest és un canal per defecte i canviar-lo a grup privat farà que deixi de ser-ho. Voleu continuar?",
   "Room_Info": "Informació de la sala",
   "room_is_blocked": "Aquesta sala està bloquejada",
   "room_is_read_only": "Aquesta sala és de només lectura",
@@ -1461,10 +1474,15 @@
   "Room_password_changed_successfully": "Contrasenya de la sala canviada correctament",
   "Room_topic_changed_successfully": "El tema de la sala s'ha canviat correctament",
   "Room_type_changed_successfully": "El tipus de sala s'ha canviat correctament",
+  "Room_type_of_default_rooms_cant_be_changed": "Aquesta és una sala per defecte i no es pot canviar el tipus, si us plau consulta-ho amb l'administrador.",
   "Room_unarchived": "La sala s'ha desarxivat",
   "Room_uploaded_file_list": "Llista d'arxius pujats",
   "Room_uploaded_file_list_empty": "No hi ha cap arxiu.",
   "Rooms": "Sales",
+  "run-import": "Executar importació",
+  "run-import_description": "Permís per executar els importadors",
+  "run-migration": "Executar migració",
+  "run-migration_description": "Permís per executar les migracions",
   "Running_Instances": "Instàncies executant-se",
   "S_new_messages_since_s": "%s nous des de: %s",
   "Same_Style_For_Mentions": "Mateix estil per a mencions",
@@ -1474,12 +1492,14 @@
   "SAML_Custom_Generate_Username": "Generar nom d'usuari",
   "SAML_Custom_IDP_SLO_Redirect_URL": "Redirecció URL IDP SLO",
   "SAML_Custom_Issuer": "Emissor (issuer) personalitzat",
+  "SAML_Custom_Private_Key": "Contingut de la clau privada",
   "SAML_Custom_Provider": "Proveïdor (provider) personalitzat",
   "SAML_Custom_Public_Cert": "Contingut del certificat públic",
-  "SAML_Custom_Private_Key": "Contingut de la clau privada",
   "Sandstorm_Powerbox_Share": "Comparteix un gra de Sandstorm",
   "Saturday": "dissabte",
   "Save": "Desa",
+  "save-others-livechat-room-info": "Guardar info altres xats en viu",
+  "save-others-livechat-room-info_description": "Permís per guardar informació d'altres canals de xat en viu",
   "Save_changes": "Desa els canvis",
   "Save_Mobile_Bandwidth": "Estalvia ample de banda mòbil",
   "Save_to_enable_this_action": "Desa per activar els canvis",
@@ -1500,8 +1520,8 @@
   "Select_a_user": "Selecciona un usuari",
   "Select_an_avatar": "Selecciona un avatar",
   "Select_file": "Selecciona un arxiu",
-  "Select_service_to_login": "Selecciona un servei per iniciar sessió i carregar la teva imatge o puja una foto del teu ordinador",
   "Select_role": "Selecciona un rol",
+  "Select_service_to_login": "Selecciona un servei per iniciar sessió i carregar la teva imatge o puja una foto del teu ordinador",
   "Select_user": "Selecciona usuari",
   "Select_users": "Selecciona els usuaris",
   "Selected_agents": "Agents seleccionats",
@@ -1525,9 +1545,17 @@
   "Served_By": "Servit per",
   "Service": "Servei",
   "Service_account_key": "Service account key",
+  "set-moderator": "Assignar moderador",
+  "set-moderator_description": "Permís per assignar altres usuaris com a moderadors d'un canal",
+  "set-owner": "Assignar propietari",
+  "set-owner_description": "Permís per assignar altres usuaris com a propietaris d'un canal",
+  "set-react-when-readonly": "Reaccions quan només lectura",
+  "set-react-when-readonly_description": "Permís per poder afegir reaccions a missatges en canals de només lectura",
+  "set-readonly": "Fer només lectura",
+  "set-readonly_description": "Permís per fer un canal de només lectura",
+  "Set_as_leader": "Posar com a líder",
   "Set_as_moderator": "Fes-lo moderador",
   "Set_as_owner": "Fes-lo propietari",
-  "Set_as_leader": "Posar com a líder",
   "Settings": "Configuració",
   "Settings_updated": "S'ha actualitzat la configuració",
   "Share_Location_Title": "Compartir localització?",
@@ -1541,9 +1569,11 @@
   "Show_only_online": "Veure només connectats",
   "Show_preregistration_form": "Veure formulari de pre-registre",
   "Show_queue_list_to_all_agents": "Mostra la cua a tots els agents",
+  "Show_the_keyboard_shortcut_list": "Mostra la llista de dreceres de teclat",
   "Showing_archived_results": "<p>Mostrant <b>%s</b> resultats arxivats</p>",
   "Showing_online_users": "Mostrant-ne <b>__total_showing__</b>, En línia: __online__, Total: __total__ usuaris",
   "Showing_results": "<p>Mostrant <b>%s</b> resultats</p>",
+  "Sidebar_list_mode": "Mode de la barra lateral de la llista de canals",
   "Sign_in_to_start_talking": "Identifica't per començar a parlar",
   "since_creation": "des de %s",
   "Site_Name": "Nom del lloc",
@@ -1551,11 +1581,11 @@
   "Site_Url_Description": "Exemple: https://xat.domini.com",
   "Skip": "Salta",
   "SlackBridge_error": "Hi ha hagut un error a SlackBridge mentre importava els missatges a %s: %s",
+  "SlackBridge_finish": "SlackBridge ha finalitat la importació a %s. Si us plau, refresqueu per veure tots els missatges.",
   "SlackBridge_Out_All": "SlackBridge Out de tot",
   "SlackBridge_Out_All_Description": "Envia els missatges de tots els canals que existeixen a Slack i en els quals el bot s'ha unit",
   "SlackBridge_Out_Channels": "SlackBridge Out de canals",
   "SlackBridge_Out_Channels_Description": "Escull els canals dels quals es reenviaran els missatges a Slack",
-  "SlackBridge_finish": "SlackBridge ha finalitat la importació a %s. Si us plau, refresqueu per veure tots els missatges.",
   "SlackBridge_Out_Enabled": "SlackBridge Out actiu",
   "SlackBridge_Out_Enabled_Description": "Escull si SlackBridge ha de reenviar els missatges a Slack",
   "SlackBridge_start": "@%s ha iniciat una importació SlackBridge a `#%s`. Us avisarem quan finalitzi.",
@@ -1582,11 +1612,15 @@
   "SMTP_Port": "Port SMTP",
   "SMTP_Test_Button": "Prova la configuració del SMTP",
   "SMTP_Username": "Usuari SMTP",
+  "snippet-message": "Retalls de missatge",
+  "snippet-message_description": "Permís per crear retalls de missatge",
   "Snippet_Added": "Creat %s",
   "Snippet_Messages": "Retalls de missatges",
   "Snippeted_a_message": "S'ha creat un retall de missatge __snippetLink__",
+  "Sort_by_activity": "Ordena per activitat",
   "Sound": "So",
   "Sound_File_mp3": "Fitxer de so (mp3)",
+  "Split_by_categories": "Separa per categories",
   "SSL": "SSL",
   "Star_Message": "Destacar un missatge",
   "Starred_Messages": "Missatges destacats",
@@ -1613,9 +1647,9 @@
   "Stats_Total_Livechat_Rooms": "Total de sales de xat en viu",
   "Stats_Total_Messages": "Total de missatges",
   "Stats_Total_Messages_Channel": "Total de missatges a canals",
-  "Stats_Total_Messages_PrivateGroup": "Total de missatges a grups privats",
   "Stats_Total_Messages_Direct": "Total de missatges a missatges directes",
   "Stats_Total_Messages_Livechat": "Total de missatges a xats en viu",
+  "Stats_Total_Messages_PrivateGroup": "Total de missatges a grups privats",
   "Stats_Total_Private_Groups": "Total de grups privats",
   "Stats_Total_Rooms": "Total de sales",
   "Stats_Total_Users": "Total d'usuaris",
@@ -1640,6 +1674,7 @@
   "Take_it": "Agafa'l!",
   "TargetRoom": "Sala de destí",
   "TargetRoom_Description": "Sala que rebrà els missatges resultants de les execucions d'aquest esdeveniment. Només es permet una sala de destí i aquesta ha d'existir.",
+  "Team": "Equip",
   "Test_Connection": "Prova de connexió",
   "Test_Desktop_Notifications": "Prova de notificacions d'escriptori",
   "Thank_you_exclamation_mark": "Gràcies!",
@@ -1655,32 +1690,32 @@
   "The_user_will_be_removed_from_s": "L'usuari s'eliminarà de %s",
   "The_user_wont_be_able_to_type_in_s": "L'usuari no podrà escriure a %s",
   "Theme": "Aparença",
-  "theme-color-transparent-darker": "Transparent més fosc",
-  "theme-color-transparent-dark": "Transparent fosc",
-  "theme-color-transparent-light": "Transparent clar",
-  "theme-color-transparent-lighter": "Transparent més clar",
-  "theme-color-transparent-lightest": "Transparent el més clar",
+  "theme-color-component-color": "Color de component",
   "theme-color-content-background-color": "Color del fons del contingut",
+  "theme-color-custom-scrollbar-color": "Color personalitzat de barra de desplaçament",
+  "theme-color-error-color": "Color d''Error'",
+  "theme-color-info-font-color": "Color del text d'informació",
+  "theme-color-link-font-color": "Color del text dels enllaços",
+  "theme-color-pending-color": "Color de 'Pendent'",
+  "theme-color-primary-action-color": "Color d'acció principal",
   "theme-color-primary-background-color": "Color primari del fons",
   "theme-color-primary-font-color": "Color primari del text",
-  "theme-color-primary-action-color": "Color d'acció principal",
+  "theme-color-secondary-action-color": "Color d'acció secundària",
   "theme-color-secondary-background-color": "Color secundari del fons",
   "theme-color-secondary-font-color": "Color secundari del text",
-  "theme-color-secondary-action-color": "Color d'acció secundària",
-  "theme-color-component-color": "Color de component",
-  "theme-color-success-color": "Color de 'Correcte'",
-  "theme-color-pending-color": "Color de 'Pendent'",
-  "theme-color-error-color": "Color d''Error'",
   "theme-color-selection-color": "Color de selecció",
-  "theme-color-tertiary-background-color": "Color terciari del fons",
-  "theme-color-tertiary-font-color": "Color terciari del text",
-  "theme-color-link-font-color": "Color del text dels enllaços",
-  "theme-color-info-font-color": "Color del text d'informació",
-  "theme-color-custom-scrollbar-color": "Color personalitzat de barra de desplaçament",
   "theme-color-status-away": "Color de l'estat absent",
   "theme-color-status-busy": "Color de l'estat ocupat",
   "theme-color-status-offline": "Color de l'estat desconnectat",
   "theme-color-status-online": "Color de l'estat connectat",
+  "theme-color-success-color": "Color de 'Correcte'",
+  "theme-color-tertiary-background-color": "Color terciari del fons",
+  "theme-color-tertiary-font-color": "Color terciari del text",
+  "theme-color-transparent-dark": "Transparent fosc",
+  "theme-color-transparent-darker": "Transparent més fosc",
+  "theme-color-transparent-light": "Transparent clar",
+  "theme-color-transparent-lighter": "Transparent més clar",
+  "theme-color-transparent-lightest": "Transparent el més clar",
   "theme-color-unread-notification-color": "Color de les notificacions de no llegit",
   "theme-custom-css": "CSS personalitzat",
   "theme-font-body-font-family": "Font Family del Body",
@@ -1693,11 +1728,6 @@
   "This_is_a_push_test_messsage": "Això és un missatge push de prova",
   "This_room_has_been_archived_by__username_": "__username__ ha arxivat aquesta sala.",
   "This_room_has_been_unarchived_by__username_": "__username__ ha desarxivat aquesta sala.",
-  "Two-factor_authentication": "Autenticació de dos factors",
-  "Two-factor_authentication_disabled": "Autenticació de dos factors desactivada",
-  "Two-factor_authentication_enabled": "Autenticació de dos factors activada",
-  "Two-factor_authentication_is_currently_disabled": "L'autenticació de dos factors actualment està desactivada",
-  "Two-factor_authentication_native_mobile_app_warning": "ATENCIÓ: Un cop activat això, no es podrà fer login des de les aplicacions mòbils natives (Rocket.Chat+) utilitzant la contrasenya fins que aquestes implementin el 2FA.",
   "Thursday": "dijous",
   "Time_in_seconds": "Temps en segons",
   "Title": "Títol",
@@ -1709,39 +1739,49 @@
   "To_users": "Per als usuaris",
   "Toggle_original_translated": "Canvia original/traducció",
   "Topic": "Tema",
-  "Travel_and_Places": "Viatges i llocs",
   "Transcript_Enabled": "Pregunta als visitants si volen rebre la transcripció del xat després de tancar-lo",
   "Transcript_message": "Missatge a mostrar per a la pregunta sobre la transcripció",
   "Transcript_of_your_livechat_conversation": "Transcripció de la conversa de xat en viu.",
   "Translated": "Traduït",
   "Translations": "Traduccions",
+  "Travel_and_Places": "Viatges i llocs",
   "Trigger_removed": "Disparador eliminat",
   "Trigger_Words": "Paraules d'activació",
   "Triggers": "Activadors (triggers)",
   "True": "Sí",
   "Tuesday": "dimarts",
+  "Two-factor_authentication": "Autenticació de dos factors",
+  "Two-factor_authentication_disabled": "Autenticació de dos factors desactivada",
+  "Two-factor_authentication_enabled": "Autenticació de dos factors activada",
+  "Two-factor_authentication_is_currently_disabled": "L'autenticació de dos factors actualment està desactivada",
+  "Two-factor_authentication_native_mobile_app_warning": "ATENCIÓ: Un cop activat això, no es podrà fer login des de les aplicacions mòbils natives (Rocket.Chat+) utilitzant la contrasenya fins que aquestes implementin el 2FA.",
   "Type": "Tipus",
   "Type_your_email": "Escrigui el seu correu electrònic",
   "Type_your_message": "Introduïu el missatge",
   "Type_your_name": "Escriu el teu nom",
   "Type_your_new_password": "Escriu la nova contrasenya",
   "UI_Allow_room_names_with_special_chars": "Permet caràcters especials als noms de sala",
+  "UI_Click_Direct_Message": "Clica per crear un missatge directe",
+  "UI_Click_Direct_Message_Description": "Evita obrir la pestanya del perfil, vés directe a la conversa",
   "UI_DisplayRoles": "Mostra rols",
   "UI_Merge_Channels_Groups": "Uneix grups privats amb canals",
   "UI_Unread_Counter_Style": "Estil de comptador de no-llegits",
   "UI_Use_Name_Avatar": "Utilitza les inicials del nom complet per generar l'avatar per defecte",
   "UI_Use_Real_Name": "Utilitza el nom real",
   "Unarchive": "Desarxiva",
+  "unarchive-room": "Desarxivar sala",
+  "unarchive-room_description": "Permís per desarxivar canals",
   "Unblock_User": "Desbloqueja usuari",
   "Unmute_someone_in_room": "Torna a donar veu a algú de la sala",
   "Unmute_user": "Dóna veu a l'usuari",
   "Unnamed": "Sense nom",
   "Unpin_Message": "Desfixa el missatge",
   "Unread_Count": "Comptador de no llegits",
-  "Unread_Tray_Icon_Alert": "Icona d'alerta de no llegits a la safata",
+  "Unread_Count_DM": "Comptador de no-llegits per als missatges directes",
   "Unread_Messages": "Missatges no llegits",
   "Unread_Rooms": "Sales no llegides",
   "Unread_Rooms_Mode": "Mode de sales no llegides",
+  "Unread_Tray_Icon_Alert": "Icona d'alerta de no llegits a la safata",
   "Unstar_Message": "Esborra el destacat",
   "Updated_at": "Actualitzat el",
   "Upload_file_description": "Descripció de l'arxiu",
@@ -1755,17 +1795,21 @@
   "Use_Emojis": "Utilitza emojis",
   "Use_Global_Settings": "Usa la configuració global",
   "Use_initials_avatar": "Utilitza les inicials del nom d'usuari",
+  "Use_minor_colors": "Utilitza la paleta de colors secundària (per defecte s'hereta de la primària)",
   "Use_service_avatar": "Utilitza l'avatar de %s",
   "Use_this_username": "Utilitza aquest nom d'usuari",
   "Use_uploaded_avatar": "Utilitza l'avatar pujat",
   "Use_url_for_avatar": "Utilitza una URL per l'avatar",
   "Use_User_Preferences_or_Global_Settings": "Usa les preferències d'usuari o la configuració global",
+  "User": "Usuari",
+  "user-generate-access-token": "Usuaris generen Access Tokens",
+  "user-generate-access-token_description": "Permís perquè els usuaris puguin generar access tokens",
+  "User__username__is_now_a_leader_of__room_name_": "L'usuari __username__ ara és líder de __room_name__",
   "User__username__is_now_a_moderator_of__room_name_": "L'usuari __username__ ara és moderador de la sala __room_name__",
   "User__username__is_now_a_owner_of__room_name_": "L'usuari __username__ ara és un propietari de __room_name__",
-  "User__username__is_now_a_leader_of__room_name_": "L'usuari __username__ ara és líder de __room_name__",
+  "User__username__removed_from__room_name__leaders": "L'usuari __username__ ja no és líder de __room_name__",
   "User__username__removed_from__room_name__moderators": "L'usuari __username__ ja no és moderador de la sala __room_name__",
   "User__username__removed_from__room_name__owners": "L'usuari __username__ ja no és propietari de __room_name__",
-  "User__username__removed_from__room_name__leaders": "L'usuari __username__ ja no és líder de __room_name__",
   "User_added": "Usuari afegit",
   "User_added_by": "Usuari <em>__user_added__</em> afegit per <em>__user_by__</em>.",
   "User_added_successfully": "Usuari afegit correctament",
@@ -1826,16 +1870,49 @@
   "Validate_email_address": "Valida l'adreça de correu-e",
   "Verification": "Verificació",
   "Verification_Description": "És possible utilitzar els marcadors: <br/><ul><li>[Verification_Url] per a l'adreça URL de verificació.</li><li>[name], [fname], [lname] per al nom complet de l'usuari, nom o cognom, respectivament.</li><li>[email] per a l'adreça de correu electrònic de l'usuari.</li><li>[Site_Name] i [Site_URL] pel nom del lloc web i de l'adreça URL, respectivament.</li></ul>",
+  "Verification_Email": "Fes clic <a href=\"[Verification_Url]\">aquí</a> per verificar el teu compte.",
   "Verification_email_sent": "Missatge de correu-e de verificació enviat",
   "Verification_Email_Subject": "[Site_Name] - Verifica el teu compte",
-  "Verification_Email": "Fes clic <a href=\"[Verification_Url]\">aquí</a> per verificar el teu compte.",
   "Verified": "Verificat",
   "Verify": "Verifica",
   "Version": "Versió",
   "Video_Chat_Window": "Vídeo-xat",
   "Video_Conference": "Videoconferència",
+  "Video_message": "Missatge de vídeo",
   "Videocall_declined": "Vídeo trucada rebutjada.",
   "Videocall_enabled": "Vídeo trucada activa",
+  "view-c-room": "Veure canal públic",
+  "view-c-room_description": "Permís per veure canals públics",
+  "view-d-room": "Veure missatges directes",
+  "view-d-room_description": "Permís per veure missatges directes",
+  "view-full-other-user-info": "Veure tota la info d'usuaris",
+  "view-full-other-user-info_description": "Permís per veure el perfil complet d'altres usuaris, incloent la data de creació del compte, el darrer accés, etcètera.",
+  "view-history": "Veure historial",
+  "view-history_description": "Permís per veure l'historial del canal",
+  "view-join-code": "Veure el codi per unir-se",
+  "view-join-code_description": "Permís per veure el codi per unir-se al canal",
+  "view-joined-room": "Veure sales on unit",
+  "view-joined-room_description": "Permís per veure els canals on actualment s'està unit",
+  "view-l-room": "Veure sales de xat en viu",
+  "view-l-room_description": "Permís per veure els canals de xat en viu",
+  "view-livechat-manager": "Veure el gestor de xats en viu",
+  "view-livechat-manager_description": "Permís per veure gestors d'altres xats en viu",
+  "view-livechat-rooms": "Veure xats en viu",
+  "view-livechat-rooms_description": "Permís per veure altres canals de xat en viu",
+  "view-logs": "Veure registres",
+  "view-logs_description": "Permís per veure els registres del servidor",
+  "view-other-user-channels": "Veure canals d'altres usuaris",
+  "view-other-user-channels_description": "Permís per veure canals que pertanyen a altres usuaris",
+  "view-p-room": "Veure sala privada",
+  "view-p-room_description": "Permís per veure canals privats",
+  "view-privileged-setting": "Veure opcions privilegiades",
+  "view-privileged-setting_description": "Permís per a veure la configuració",
+  "view-room-administration": "Veure administració de sala",
+  "view-room-administration_description": "Permís per veure estadístiques de missatges públics, privats i directes. No inclou veure converses o arxius",
+  "view-statistics": "Veure estadístiques",
+  "view-statistics_description": "Permís per veure estadístiques del sistema com el nombre d'usuaris autenticats, el nombre de sales o informació del sistema operatiu",
+  "view-user-administration": "Veure administració d'usuaris",
+  "view-user-administration_description": "Permís per veure una llista de només lectura parcial dels comptes d'usuari actualment autenticats al sistema. Amb aquest permís no és possible veure informació dels comptes d'usuari.",
   "View_All": "Veure tot",
   "View_Logs": "Veure registre log",
   "View_mode": "Densitat de visualització",
@@ -1868,13 +1945,13 @@
   "Would_you_like_to_return_the_inquiry": "Vols retornar la sol·licitud?",
   "Yes": "Sí",
   "Yes_archive_it": "Sí, arxiva'l!",
-  "Yes_unarchive_it": "Sí, desarxiva'l!",
   "Yes_clear_all": "Sí, esborra!",
   "Yes_delete_it": "Sí, elimina!",
   "Yes_hide_it": "Sí, oculta!",
   "Yes_leave_it": "Sí, deixa-ho!",
   "Yes_mute_user": "Sí, silencia l'usuari!",
   "Yes_remove_user": "Sí, elimina l'usuari!",
+  "Yes_unarchive_it": "Sí, desarxiva'l!",
   "You": "Vostè",
   "you_are_in_preview_mode_of": "Estàs en mode vista prèvia del canal #<strong>__room_name__</strong>",
   "You_are_logged_in_as": "Sessió iniciada com",
@@ -1909,4 +1986,4 @@
   "your_message_optional": "el teu missatge (opcional)",
   "Your_password_is_wrong": "La contrasenya és incorrecta!",
   "Your_push_was_sent_to_s_devices": "La notificació push s'ha enviat a %s dispositius"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json
index 0face9fe43b..bbf07e9aec7 100644
--- a/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -12,6 +12,10 @@
   "Accept": "Přijmout",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Přijímat LiveChat požadavky i pokud není online žádný operátor",
   "Accept_with_no_online_agents": "Přijímat i bez aktivních operátorů",
+  "access-mailer": "Přístup k maileru",
+  "access-mailer_description": "Právo rozesílat hromadný email na všechny uživatele.",
+  "access-permissions": "Přístup k nastavení práv",
+  "access-permissions_description": "Měnít práva pro jednotlivé uživatelské role.",
   "Access_not_authorized": "Přístup není povolen",
   "Access_Token_URL": "Token přístupové adresy",
   "Accessing_permissions": "Přístup k oprávnění",
@@ -34,6 +38,7 @@
   "Accounts_BlockedUsernameList": "Zakázaná uživatelská jména",
   "Accounts_BlockedUsernameList_Description": "čárkou oddělený seznam uživatelských jmen (na velikosti písmen nezáleží)",
   "Accounts_CustomFields_Description": "Validní JSON obsahující klíče polí s nastavením. Například:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code>",
+  "Accounts_CustomFieldsToShowInUserInfo": "Vlastní pole zobrazená v uživatelském profilu",
   "Accounts_DefaultUsernamePrefixSuggestion": "Výchozí návrh prefixu uživatelského jména",
   "Accounts_denyUnverifiedEmail": "Zakázat neověřené e-mailové adresy",
   "Accounts_EmailVerification": "Ověření e-mailu",
@@ -95,6 +100,8 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor callback URL",
   "Accounts_OAuth_Meteor_id": "ID Meteor",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_host": "Proxy host",
+  "Accounts_OAuth_Proxy_services": "Proxy služby",
   "Accounts_OAuth_Twitter": "Twitter Přihlášení",
   "Accounts_OAuth_Twitter_callback_url": "Twitter callback URL",
   "Accounts_OAuth_Twitter_id": "Twitter ID",
@@ -104,8 +111,6 @@
   "Accounts_OAuth_Wordpress_id": "ID WordPress",
   "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "Obnovit heslo",
-  "Accounts_OAuth_Proxy_host": "Proxy host",
-  "Accounts_OAuth_Proxy_services": "Proxy služby",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Výchozí role pro autentikační služby",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Čárkou oddělené role, které budou přiděleny uživateli při registraci skrz autentikační služby",
   "Accounts_Registration_AuthenticationServices_Enabled": "Registrace pomocí zabezpečené služby",
@@ -118,6 +123,7 @@
   "Accounts_RegistrationForm_SecretURL_Description": "Vložte náhodný retězec, který bude přidán do vaší registrační URL. Příklad: https://demo.rocket.chat/register/[tajny_kod]",
   "Accounts_RequireNameForSignUp": "Vyžadovat jméno",
   "Accounts_RequirePasswordConfirmation": "Vyžadovat potvrzení hesla",
+  "Accounts_SearchFields": "Pole zohledněná ve vyhledávání",
   "Accounts_SetDefaultAvatar": "Nastavit výchozí avatar",
   "Accounts_SetDefaultAvatar_Description": "Pokusí se určit výchozí avatar na základě OAuth účtu nebo gravataru",
   "Accounts_ShowFormLogin": "Zobrazit formulářové přihlášení",
@@ -129,9 +135,20 @@
   "Activate": "Aktivovat",
   "Activity": "Aktivita",
   "Add": "Přidat",
+  "add-oauth-service": "Přidat Oauth službu",
+  "add-oauth-service_description": "Právo přidat novou Oauth službu",
+  "add-user": "Přidat uživatele",
+  "add-user-to-any-c-room": "Přidat uživatele do veřejných místností",
+  "add-user-to-any-c-room_description": "Právo přidat uživatele do jakékoliv veřejné místnosti",
+  "add-user-to-any-p-room": "Přidat uživatele do soukromých místností",
+  "add-user-to-any-p-room_description": "Právo přidat uživatele do jakékoliv soukromé místnosti",
+  "add-user-to-joined-room": "Přidat uživatele do místností ve kterých jsem",
+  "add-user-to-joined-room_description": "Právo přidat uživatele do jakékoliv aktuálně připojené místnosti",
+  "add-user_description": "Právo přidat nového uživatele přes seznam uživatelů",
   "Add_agent": "Přidat operátora",
   "Add_custom_oauth": "Přidat vlastní OAuth",
   "Add_Domain": "Přidat Doménu",
+  "Add_files_from": "Přidat soubory z",
   "Add_manager": "Přidat správce",
   "Add_Role": "Přidat roli",
   "Add_user": "Přidat uživatele",
@@ -143,6 +160,7 @@
   "Additional_emails": "Další e-maily",
   "Additional_Feedback": "Dodatečný Feedback",
   "Administration": "Administrace",
+  "Adult_images_are_not_allowed": "Obrázky nevhodné pro mladistvé nejsou povoleny",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "Po ověření OAuth2, budou uživatelé přesměrováni na tuto adresu URL",
   "Agent": "Operátor",
   "Agent_added": "Operátor přidán",
@@ -155,6 +173,7 @@
   "All_channels": "Všechny místnosti",
   "All_logs": "Všechny logy",
   "All_messages": "Všechny zprávy",
+  "All_users_in_the_channel_can_write_new_messages": "Všichni uživatelé v kanálu mohou psát nové zprávy",
   "Allow_Invalid_SelfSigned_Certs": "Umožnit neplatné či self-signed certifikáty",
   "Allow_Invalid_SelfSigned_Certs_Description": "Umožňují použít neplatné/self-signed SSL certifikáty pro ověření odkazů a náhledů.",
   "Allow_switching_departments": "Povolit uživateli změnit oddělení",
@@ -179,8 +198,8 @@
   "API_Drupal_URL": "Drupal URL Serveru",
   "API_Drupal_URL_Description": "Například: https://domain.com (bez lomítka na konci)",
   "API_Embed": "Náhled vložených odkazů",
-  "API_Embed_UserAgent": "User agent requestu na embed zdroj",
   "API_Embed_Description": "Zda zobrazit náhled stránky když uživatel pošle odkaz",
+  "API_Embed_UserAgent": "User agent requestu na embed zdroj",
   "API_EmbedCacheExpirationDays": "Počet dní expirace cache embed",
   "API_EmbedDisabledFor": "Zakázat vložený obsah pro uživatele",
   "API_EmbedDisabledFor_Description": "Čárkami oddělený seznam uživatelských jmen",
@@ -211,20 +230,31 @@
   "Application_updated": "Aplikace aktualizována",
   "Apply_and_refresh_all_clients": "Použít a aktualizovat všechny klienty",
   "Archive": "Archiv",
+  "archive-room": "Archivovat místnost",
+  "archive-room_description": "Právo archivovat místnost",
   "are_also_typing": "také píší",
   "are_typing": "píše",
   "Are_you_sure": "Jste si jisti?",
   "Are_you_sure_you_want_to_delete_your_account": "Jste si jisti, že chcete smazat svůj účet?",
+  "assign-admin-role": "Přiřadit roli administrátora",
+  "assign-admin-role_description": "Právo přiřadit roli administrátora dalším uživatelům",
   "Assign_admin": "Přiřadit administrátora",
   "at": "v",
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Soubor nahrán",
   "Attribute_handling": "Operace s atributy",
+  "Audio_message": "Audio zpráva",
+  "Audio_Notification_Value_Description": "Jakýkoliv z výchozích zvuků: beep, chelle, ding, droplet, highbell, seasons",
+  "Audio_Notifications_Default_Alert": "Výchozí zvuk upozornění audia",
+  "Audio_Notifications_Value": "Výchozí zvuk upozornění zprávy",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
   "Authorization_URL": "URL autorizace",
   "Authorize": "Povolit",
+  "auto-translate": "Auto překlad",
+  "auto-translate_description": "Právo používat automatické překládání",
   "Auto_Load_Images": "Automaticky načítat obrázky",
+  "Auto_Translate": "Automatický překlad",
   "AutoLinker_Email": "AutoLinkovat Email",
   "AutoLinker_Phone": "AutoLinkovat Telefon",
   "AutoLinker_Phone_Description": "Automaticky odkazovat na telefonní čísla. např `(123) 456-7890`",
@@ -235,10 +265,9 @@
   "AutoLinker_Urls_www": "AutoLinkovat adresy s 'www'",
   "AutoLinker_UrlsRegExp": "AutoLinkovat URL odpovídající regulárnímu výrazu",
   "Automatic_Translation": "Automatický překlad",
-  "Auto_Translate": "Automatický překlad",
+  "AutoTranslate_Change_Language_Description": "Změna jazyka automatického překladu nepřekládá předchozí zprávy.",
   "AutoTranslate_Enabled": "Povolit automatický překlad",
   "AutoTranslate_Enabled_Description": "Povolení automatického překladu umožní uživatelům s <code class=\"inline\">auto-translate</code> právy nechat si přeložit všechny zprávy do jejich jazyka. Služba je zpoplatněná, viz <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">dokumentace Google</a>.",
-  "AutoTranslate_Change_Language_Description": "Změna jazyka automatického překladu nepřekládá předchozí zprávy.",
   "AutoTranslate_GoogleAPIKey": "Google API klíč",
   "Available": "Dostupný",
   "Available_agents": "Dostupní operátoři",
@@ -254,11 +283,14 @@
   "Away_male": "Pryč",
   "Back": "Zpět",
   "Back_to_applications": "Zpět k aplikacím",
-  "Back_to_integrations": "Zpět k integracím",
+  "Back_to_chat": "Zpět do konverzace",
   "Back_to_integration_detail": "Zpět na detail integrace",
+  "Back_to_integrations": "Zpět k integracím",
   "Back_to_login": "Zpět na přihlašovací formulář",
   "Back_to_permissions": "Zpět na práva",
   "Backup_codes": "Záložní kódy",
+  "ban-user": "Zabanovat uživatele",
+  "ban-user_description": "Právo vykázat uživatele z místnosti",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta funkcionalita. Videohovory musí být povoleny.",
   "Block_User": "Blokovat uživatele",
   "Body": "Obsah",
@@ -269,6 +301,10 @@
   "Branch": "Větev",
   "Broadcast_Connected_Instances": "Připojené instance",
   "Bugsnag_api_key": "Bugsnag API klíč",
+  "bulk-create-c": "Hromadné vytvoření místností",
+  "bulk-create-c_description": "Právo hromadné vytvářet místnosti",
+  "bulk-register-user": "Hromadné vytvoření místností",
+  "bulk-register-user_description": "Právo hromadné vytvářet místnosti",
   "busy": "zaneprázdněný",
   "Busy": "Zaneprázdněný",
   "busy_female": "zaneprázdněná",
@@ -276,7 +312,6 @@
   "busy_male": "zaneprázdněný",
   "Busy_male": "Zaneprázdněný",
   "by": "od",
-  "Content": "Obsah",
   "cache_cleared": "Cache vyčistěna",
   "Cancel": "Zrušit",
   "Cancel_message_input": "Zrušit",
@@ -302,18 +337,22 @@
   "CAS_version_Description": "Zvolte verzi CAS podporovanou vaší CAS SSO službou",
   "CDN_PREFIX": "CDN Prefix",
   "Certificates_and_Keys": "Certifikáty a klíče",
-  "Changing_email": "Změna e-mailu",
   "Change_Room_Type": "Změna typu místnosti",
+  "Changing_email": "Změna e-mailu",
   "channel": "místnost",
   "Channel": "Místnost",
   "Channel_already_exist": "Místnost '#%s' již existuje.",
-  "Channel_created": "Místnost `#%s` byla vytvořena.",
+  "Channel_already_exist_static": "Místnost již existuje",
   "Channel_already_Unarchived": "Místnost `#%s` je již v odarchivovaném stavu",
   "Channel_Archived": "Místnost `#%s` byla úspěšně archivována",
+  "Channel_created": "Místnost `#%s` byla vytvořena.",
   "Channel_doesnt_exist": "Místnost `# %s` neexistuje.",
+  "Channel_name": "Název místnosti",
+  "Channel_Name_Placeholder": "Zadejte název místnosti...",
   "Channel_to_listen_on": "Poslouchat místnost",
   "Channel_Unarchived": "Místnost `#%s` byla úspěšně odarchivována",
   "Channels": "Místnosti",
+  "Channels_are_where_your_team_communicate": "Místnosti jsou pro komunikaci vašich týmů",
   "Channels_list": "Seznam veřejných místnosti",
   "Chat_button": "Chat Tlačítko",
   "Chat_closed": "Místnost uzavřena",
@@ -327,19 +366,23 @@
   "Choose_messages": "Výberte zprávy",
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Vyberte alias, který se objeví před uživatelským jménem ve zprávách.",
   "Choose_the_username_that_this_integration_will_post_as": "Vyberte uživatelské jméno, za které bude tato integrace posílat zprávy.",
+  "clean-channel-history": "Pročistit historii místnosti",
+  "clean-channel-history_description": "Právo pročistit historii místnosti",
   "clear": "Vyčistit",
+  "Clear_all_unreads_question": "Označit vše jako přečtené?",
   "clear_cache_now": "Vyčistit cache",
   "clear_history": "Smazat historii",
-  "Clear_all_unreads_question": "Označit vše jako přečtené?",
   "Click_here": "Klikněte zde",
   "Click_here_for_more_info": "Klikněte pro více infomací",
-  "UI_Click_Direct_Message": "Kliknutím vytvořit přímou zprávu",
-  "UI_Click_Direct_Message_Description": "Přeskočit záložku profilu a přejít přímo do konverzace",
   "Client_ID": "ID klienta",
   "Client_Secret": "Secret klienta",
   "Clients_will_refresh_in_a_few_seconds": "Klienti se obnoví během několika sekund",
   "close": "zavřít",
   "Close": "Zavřít",
+  "close-livechat-room": "Uzavřít LiveChat místnost (aktuální)",
+  "close-livechat-room_description": "Právo uzavřít svou LiveChat místnost",
+  "close-others-livechat-room": "Uzavřít LiveChat místnost (ostatní)",
+  "close-others-livechat-room_description": "Právo uzavřít ostatní LiveChat místnosti",
   "Closed": "Zavřeno",
   "Closed_by_visitor": "Ukončeno návštěvníkem",
   "Closing_chat": "Uzavření místnosti",
@@ -349,6 +392,7 @@
   "Comment_to_leave_on_closing_session": "Okomentovat odchod",
   "Compact": "Kompaktní",
   "Confirm_password": "Potvrďte heslo",
+  "Content": "Obsah",
   "Conversation": "Konverzace",
   "Conversation_closed": "Konverzace uzavřena: __comment__.",
   "Convert_Ascii_Emojis": "Převod ASCII na Emoji",
@@ -359,17 +403,25 @@
   "Count": "Počet",
   "Cozy": "Útulný",
   "Create": "Vytvořit",
+  "create-c": "Vytvářet veřejné místnosti",
+  "create-c_description": "Právo vytvářet veřejné místnosti",
+  "create-d": "Vytvářet soukromé zprávy",
+  "create-d_description": "Právo odesílat soukromé zprávy",
+  "create-p": "Vytvářet soukromé místnosti",
+  "create-p_description": "Právo vytvářet soukromé místnosti",
+  "create-user": "Vytvořit uživatele",
+  "create-user_description": "Právo vytvořit uživatele",
   "Create_A_New_Channel": "Vytvořit novou místnost",
   "Create_new": "Vytvořit nový",
   "Created_at": "Vytvořeno ",
   "Created_at_s_by_s": "Vytvořeno v <strong>%s</strong> <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "Vytvořeno ve <strong>%s</strong> <strong>%s</strong> vyvoláno <strong>%s</strong>",
-  "CROWD_Reject_Unauthorized": "Zamítnout neutorizované",
   "CRM_Integration": "Integrace CRM",
+  "CROWD_Reject_Unauthorized": "Zamítnout neutorizované",
   "Current_Chats": "Aktuální Místnosti",
   "Current_Status": "Aktuální stav",
   "Custom": "Vlastní",
-  "Custom_Emoji": "Vlastní emotikona",
+  "Custom_Emoji": "Vlastní emotikony",
   "Custom_Emoji_Add": "Přidat novou emotikonu",
   "Custom_Emoji_Added_Successfully": "Vlastní emotikona přidána",
   "Custom_Emoji_Delete_Warning": "Smazání emotikony nelze vzít zpět",
@@ -381,10 +433,9 @@
   "Custom_Fields": "Vlastní pole",
   "Custom_oauth_helper": "Při nastavování OAuth poskytovatele, budete muset nastavit callback URL. Použijte <pre> %s </pre> ,",
   "Custom_oauth_unique_name": "Název vlastní OAuth",
-  "Custom_Scripts": "Vlastní skripty",
   "Custom_Script_Logged_In": "Vlastní skripty pro přihlášené uživatele",
   "Custom_Script_Logged_Out": "Vlastní skripty pro odhlášené uživatele",
-  "Custom_Sounds": "Vlastní zvuky",
+  "Custom_Scripts": "Vlastní skripty",
   "Custom_Sound_Add": "Přidat vlastní zvuk",
   "Custom_Sound_Delete_Warning": "Smazání zvuku je nevratná operace.",
   "Custom_Sound_Error_Invalid_Sound": "Neplatný soubor zvuku",
@@ -392,6 +443,7 @@
   "Custom_Sound_Has_Been_Deleted": "Vlastní zvuk byl smazán.",
   "Custom_Sound_Info": "Informace vlastního zvuku",
   "Custom_Sound_Saved_Successfully": "Vlastní zvuk úspěšně uložen",
+  "Custom_Sounds": "Vlastní zvuky",
   "Custom_Translations": "Vlastní překlady",
   "Custom_Translations_Description": "Validní JSON obsahující slovník. Například <br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"pt\": {\n  \"Channels\": \"Salas\"\n }\n}</code>",
   "CustomSoundsFilesystem": "Filesystem vlastních zvuků",
@@ -406,6 +458,16 @@
   "Decline": "Zamítnout",
   "Default": "Výchozí",
   "Delete": "Smazat",
+  "delete-c": "Smazat veřejné místnosti",
+  "delete-c_description": "Právo smazat veřejné místnosti",
+  "delete-d": "Smazat přímé zprávy",
+  "delete-d_description": "Právo smazat přímé zprávy",
+  "delete-message": "Smazat zprávu",
+  "delete-message_description": "Právo smazat zprávu v místnosti",
+  "delete-p": "Smazat soukromé místnosti",
+  "delete-p_description": "Právo smazat soukromé místnosti",
+  "delete-user": "Smazat uživatele",
+  "delete-user_description": "Právo smazat uživatele",
   "Delete_message": "Smazat zprávu",
   "Delete_my_account": "Smazat můj účet",
   "Delete_Room_Warning": "Odstranění místnosti smaže všechny zprávy poslané v rámci místnosti. Tuto akci nelze vzít zpět!",
@@ -427,6 +489,22 @@
   "Different_Style_For_User_Mentions": "Odlišný styl pro zmínky",
   "Direct_message_someone": "Přímá zpráva někomu",
   "Direct_Messages": "Přímé zprávy",
+  "Direct_Reply": "Přímá odpověď",
+  "Direct_Reply_Debug": "Debugovat přímou odpověď",
+  "Direct_Reply_Debug_Description": "[Pozor] Povolení Debug módu znamená zobrazení hesla v čitelné podobě v admin konzoli",
+  "Direct_Reply_Delete": "Smazat zachycené emaily",
+  "Direct_Reply_Enable": "Povolit přímou odpověď",
+  "Direct_Reply_Frequency": "Frekvenkce kontroly emailu",
+  "Direct_Reply_Frequency_Description": "(v minutách, výchozí/minimálně 2 minuty)",
+  "Direct_Reply_Host": "Hostitel pro přímé odpovědi",
+  "Direct_Reply_IgnoreTLS": "Ignorovat TLS",
+  "Direct_Reply_Password": "Heslo",
+  "Direct_Reply_Port": "Port pro přímé odpovědi",
+  "Direct_Reply_Protocol": "Protokol pro přímé odpovědi",
+  "Direct_Reply_Separator": "Oddělovač",
+  "Direct_Reply_Separator_Description": "[Upravte pouze pokud přesně víte co děláte - konzultujte dokumentaci]<br/>Separátor mezi hlavní a tagovací částí emailu",
+  "Direct_Reply_Username": "Uživatelské jméno",
+  "Direct_Reply_Username_Description": "Prosím použijte celý email, tagování není povoleno a bude přepsáno",
   "Disable_Notifications": "Zakázat notifikace",
   "Disable_two-factor_authentication": "Zakázat dvoufázové ověření",
   "Display_offline_form": "Zobrazit offline formulář",
@@ -436,6 +514,7 @@
   "Domain_added": "Doména přidána",
   "Domain_removed": "Doména odebrána",
   "Domains": "Domény",
+  "Domains_allowed_to_embed_the_livechat_widget": "Čárkou oddělený seznam domén, kde se smí zobrazovat livechat. Pro povolení všech domén nechte prázdné",
   "Download_Snippet": "Stáhnout",
   "Drop_to_upload_file": "Pusťe soubor do okna pro jeho nahrání",
   "Dry_run": "Zkouška",
@@ -446,8 +525,21 @@
   "Duplicate_private_group_name": "Soukromá skupina s názvem ' %s' již existuje",
   "Duration": "Délka",
   "Edit": "Editovat",
+  "edit-message": "Editovat zprávu",
+  "edit-message_description": "Právo editovat zprávu v místnosti",
+  "edit-other-user-active-status": "Právo měnit aktivaci uživatelů",
+  "edit-other-user-active-status_description": "Právo povolit nebo zakázat jiné uživatelské účty",
+  "edit-other-user-info": "Upravit informace uživatelů",
+  "edit-other-user-info_description": "Právo měnit jméno, uživatelské jméno nebo email jiným uživatelům",
+  "edit-other-user-password": "Měnit hesla uživatelů",
+  "edit-other-user-password_description": "Právo měnit heslo jiným uživatelům. Vyžaduje právo `Upravit informace uživatelů`",
+  "edit-privileged-setting": "Měnit nastavení",
+  "edit-privileged-setting_description": "Právo měnit nastavení",
+  "edit-room": "Upravit místnost",
+  "edit-room_description": "Právo měnit jméno, téma, typ (soukromá/veřejná) a stav (aktivní/archivovaná) místnosti",
   "Edit_Custom_Field": "Upravit vlastní pole",
   "Edit_Department": "Upravit oddělení",
+  "Edit_previous_message": "`%s` - Editovat předchozí zprávu",
   "Edit_Trigger": "Upravit trigger",
   "edited": "upraveno",
   "Editing_room": "Úprava místnosti",
@@ -464,6 +556,7 @@
   "Email_Notification_Mode_All": "Každá zmínka / Přímá zpráva",
   "Email_Notification_Mode_Disabled": "Zakázáno",
   "Email_or_username": "E-mail nebo uživatelské jméno",
+  "Email_Placeholder": "Zadejte svou e-mailovou adresu...",
   "Email_subject": "Předmět",
   "Email_verified": "Email ověřen",
   "Emoji": "Emotikony",
@@ -471,24 +564,22 @@
   "Empty_title": "Prázdný název",
   "Enable": "Povolit",
   "Enable_Desktop_Notifications": "Aktivovat oznámení na ploše",
+  "Enable_Svg_Favicon": "Povolit SVG favikonu",
   "Enable_two-factor_authentication": "Povolit dvoufázové ověření",
   "Enabled": "Povoleno",
-  "Enable_Svg_Favicon": "Povolit SVG favikonu",
   "Encrypted_message": "Šifrovaná zpráva",
   "End_OTR": "Ukončit konverzaci mimo záznam",
-  "Enter_authentication_code": "Zadejte autentizační kód",
-  "Enter_Alternative": "Alternativní mód (odesílat po stisku Enter +  Ctrl/Alt/Shift/CMD)",
   "Enter_a_regex": "Zadejte regulární výraz",
   "Enter_a_room_name": "Zadejte název místnosti",
   "Enter_a_username": "Zadejte uživatelské jméno",
+  "Enter_Alternative": "Alternativní mód (odesílat po stisku Enter +  Ctrl/Alt/Shift/CMD)",
+  "Enter_authentication_code": "Zadejte autentizační kód",
   "Enter_Behaviour": "Chování klávesy enter",
   "Enter_Behaviour_Description": "Mění zda se po stisknutí klávesy enter odesílá zpráva nebo přidává nový řádek",
   "Enter_name_here": "Zadejte jméno",
   "Enter_Normal": "Normální mód (odeslání po stisku klávesy enter)",
   "Enter_to": "Enter",
   "Error": "Chyba",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Chyba: Rocket.Chat vyžaduje tail oplogu pokud běží na více instancích.",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Prověřte, že je MongoDB v ReplicaSet módu a proměnná prostředí MONGO_OPLOG_URL je na aplikačním serveru nastavena správně",
   "error-action-not-allowed": "__action__ není povolena",
   "error-application-not-found": "Aplikace nenalezena",
   "error-archived-duplicate-name": "Existuje archivovaná místnost s názvem '__room_name__'",
@@ -500,6 +591,7 @@
   "error-could-not-change-username": "Nelze změnit uživatelské jméno",
   "error-delete-protected-role": "Nelze odstranit chráněné role",
   "error-department-not-found": "Oddělení nebylo nalezeno",
+  "error-direct-message-file-upload-not-allowed": "Sdílení souborů není v přímé konverzaci povoleno",
   "error-duplicate-channel-name": "Místnost s názvem ' %s' již existuje",
   "error-email-domain-blacklisted": "E-mailová doména není povolena",
   "error-email-send-failed": "Nepodařilo se odeslat email: __message__",
@@ -521,7 +613,6 @@
   "error-invalid-email-address": "Nevalidní email",
   "error-invalid-file-height": "Neplatná výška souboru",
   "error-invalid-file-type": "Neplatný typ souboru",
-  "error-direct-message-file-upload-not-allowed": "Sdílení souborů není v přímé konverzaci povoleno",
   "error-invalid-file-width": "Neplatná šířka souboru",
   "error-invalid-from-address": "Špatná adresa FROM.",
   "error-invalid-integration": "Neplatná integrace",
@@ -556,18 +647,21 @@
   "error-the-field-is-required": "Je vyžadováno pole __field__.",
   "error-too-many-requests": "Chyba, příliš mnoho požadavků. Prosím zpomalte. Vyčkejte __seconds__ sekund před dalším pokusem.",
   "error-user-is-not-activated": "Uživatel není aktivován",
+  "error-user-limit-exceeded": "Počet uživatelů, které chcete pozvat do #channel_name překračuje maximální počet nastavený administrátorem",
   "error-user-not-in-room": "Uživatel není v této místnosti",
   "error-user-registration-disabled": "Registrace je zakázána",
-  "error-user-limit-exceeded": "Počet uživatelů, které chcete pozvat do #channel_name překračuje maximální počet nastavený administrátorem",
   "error-user-registration-secret": "Registrace uživatele je povolena pouze přes tajnou URL",
   "error-you-are-last-owner": "Jste poslední vlastníkem místnosti. Před opuštěním místnosti prosím nastavte nového vlastníka.",
   "Error_changing_password": "Chyba změny hesla",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Chyba: Rocket.Chat vyžaduje tail oplogu pokud běží na více instancích.",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Prověřte, že je MongoDB v ReplicaSet módu a proměnná prostředí MONGO_OPLOG_URL je na aplikačním serveru nastavena správně",
   "Esc_to": "Esc",
   "Event_Trigger": "Vyvolání události",
   "Event_Trigger_Description": "Zvolte jaký typ události vyvolá tuto odchozí webhook integraci",
   "every_30_minutes": "Jednou za 30 minut",
   "every_hour": "Jednou za hodinu",
   "every_six_hours": "Jednou za 6 hodin",
+  "Everyone_can_access_this_channel": "Tato místnost je přístupná všem",
   "Example_s": "Příklad: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Vyjmout boty",
   "Exclude_Botnames_Description": "Nepřevádět v potaz zprávy botu, jejichž jména odpovídají výše uvedenému regulárnímu výrazu. Pokud je pole prázdné, budou převedeny zprávy všech botů",
@@ -583,8 +677,8 @@
   "File_type_is_not_accepted": "Neplatný typ souboru",
   "File_uploaded": "Soubor nahrán",
   "FileUpload": "Nahrání souboru",
-  "FileUpload_Enabled": "Povolit nahrávání souborů",
   "FileUpload_Disabled": "Nahrávání souborů je zakázáno.",
+  "FileUpload_Enabled": "Povolit nahrávání souborů",
   "FileUpload_Enabled_Direct": "Nahrávání souborů povoleno v přímé konverzaci",
   "FileUpload_File_Empty": "Soubor je prázdný",
   "FileUpload_FileSystemPath": "Cesta pro nahrávané soubory",
@@ -604,28 +698,32 @@
   "FileUpload_S3_AWSAccessKeyId": "Přístupový klíč",
   "FileUpload_S3_AWSSecretAccessKey": "Tajný klíč",
   "FileUpload_S3_Bucket": "Název bucketu",
-  "FileUpload_S3_SignatureVersion": "Verze Signature",
-  "FileUpload_S3_ForcePathStyle": "Vynutit Path Style",
   "FileUpload_S3_BucketURL": "URL Bucketu",
   "FileUpload_S3_CDN": "CDN doména",
+  "FileUpload_S3_ForcePathStyle": "Vynutit Path Style",
   "FileUpload_S3_Region": "Region",
+  "FileUpload_S3_SignatureVersion": "Verze Signature",
   "FileUpload_S3_URLExpiryTimeSpan": "Časová expirace URL adres",
   "FileUpload_S3_URLExpiryTimeSpan_Description": "Doba po které URL adresy z Amazon S3 nebudou platné (v sekundách) Musí být více než 5 sekund jinak bude ignorováno",
   "FileUpload_Storage_Type": "Typ úložiště",
+  "First_Channel_After_Login": "Výchozí místnost po přihlášení",
   "Flags": "Vlajky",
   "Follow_social_profiles": "Sledujte naše sociální profily, forkněte si nás na githubu a sdílejte své myšlenky o rocket.chat app na našem Trello boardu.",
+  "Fonts": "Fonty",
   "Food_and_Drink": "Jídlo & pití",
   "Footer": "Zápatí",
-  "Fonts": "Fonty",
+  "Footer_Direct_Reply": "Patička pro přímé odpovědi",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Pro vaši bezpečnost, je nutné znovu zadat heslo pro pokračování",
+  "force-delete-message": "Smazat zprávu",
+  "force-delete-message_description": "Právo smazat zprávu přes všechna omezení",
   "Force_Disable_OpLog_For_Cache": "Vynucené vypnutí OpLogu pro cache",
   "Force_Disable_OpLog_For_Cache_Description": "I pokud je dostupný OpLog se nebude používat pro synchronizaci cache",
   "Force_SSL": "Vynutit SSL",
   "Force_SSL_Description": "* Pozor! * volba _Vynutit SSL_ by nikdy neměla být používána s reverzní proxy. Máte-li reverzní proxy, řešte přesměrování tam. Tato možnost je pouze pro služby jako Heroku které toto neumožňují",
   "Forgot_password": "Zapomněli jste heslo?",
   "Forgot_Password_Description": "Můžete použít následující zástupné symboly: <br/><ul><li>[Forgot_Password_Url] pro adresu stránky na obnovu hesla</li><li>[name] pro celé jméno, [fname] pro křestní jméno a [lname] pro příjmení uživatele.</li><li>[email] pro email uživatelé.</li><li>[Site_Name] pro název a [Site_URL] pro a URL stránky.</li></ul>",
-  "Forgot_Password_Email_Subject": "[Site_Name] - Obnova Hesla",
   "Forgot_Password_Email": "Klikněte na <a href=\"[Forgot_Password_Url]\">tento odkaz</a> pro obnovení vašeho hesla.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Obnova Hesla",
   "Forgot_password_section": "Zapomenuté heslo",
   "Forward": "Přeposlat",
   "Forward_chat": "Přeposlat konverzaci",
@@ -641,24 +739,42 @@
   "Give_a_unique_name_for_the_custom_oauth": "Zadejte jedinečný název pro vlastní OAuth",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Pojmenujte jak se bude aplikace jmenovat pro Vaše uživatele.",
   "Global": "Globální",
+  "Google_Vision_usage_limit_exceeded": "Kvóta pro použití Google Vision překročena",
   "GoogleCloudStorage": "Google Cloud Storage",
   "GoogleNaturalLanguage_ServiceAccount_Description": "JSON klíč účtu služby. Více informací naleznete [zde](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
   "GoogleTagManager_id": "ID Google tag manageru",
+  "GoogleVision_Block_Adult_Images": "Blokovat obrázky nevhodné pro mladistvé",
+  "GoogleVision_Block_Adult_Images_Description": "Blokování nevhodných obrázků nebude fungovat po dosažení měsíční kvóty",
+  "GoogleVision_Current_Month_Calls": "Počet hovorů v aktuálním měsíci",
+  "GoogleVision_Enable": "Povolit Google Vision",
+  "GoogleVision_Max_Monthly_Calls": "Maximum hovorů v měsíci",
+  "GoogleVision_Max_Monthly_Calls_Description": "Zadejte 0 pro neomezený počet",
+  "GoogleVision_ServiceAccount": "Účet Google Vision",
+  "GoogleVision_ServiceAccount_Description": "Vytvořte serverový klíč (JSON formát) a vložte jej zde",
+  "GoogleVision_Type_Document": "Detekce textu dokumentu",
+  "GoogleVision_Type_Faces": "Detekce obličejů",
+  "GoogleVision_Type_Labels": "Detekce štítků/popisků",
+  "GoogleVision_Type_Landmarks": "Detekce orientačních bodů",
+  "GoogleVision_Type_Logos": "Detekce loga",
+  "GoogleVision_Type_Properties": "Detekce vlastností (barev)",
+  "GoogleVision_Type_SafeSearch": "Detekce SafeSearch",
+  "GoogleVision_Type_Similar": "Vyhledat podobné obrázky",
   "Group_mentions_only": "Pouze notifikace skupiny",
   "Guest_Pool": "Skupina hostů",
   "Hash": "Hash",
   "Header": "Hlavička",
   "Header_and_Footer": "Hlavička a Patička",
   "Helpers": "Nápovědy",
-  "Hex_Color_Preview": "Hex kód barvy náhledu",
+  "Hex_Color_Preview": "Náhled barvy podle Hex kódu",
   "Hidden": "Schovaný",
   "Hide_Avatars": "Skrýt avatary",
   "Hide_flextab": "Schovat pravou nabídku po kliknutí",
   "Hide_Group_Warning": "Jste si jisti, že chcete skrýt skupiny \"%s\"?",
+  "Hide_Livechat_Warning": "Opravdu chcete skrýt LiveChat s \"%s\"?",
   "Hide_Private_Warning": "Jste si jisti, že chcete skrýt diskusi s \"%s\"?",
+  "Hide_roles": "Schovat role",
   "Hide_room": "Skrýt místnost",
   "Hide_Room_Warning": "Jste si jisti, že chcete skrýt místnost \"%s\"?",
-  "Hide_roles": "Schovat role",
   "Hide_Unread_Room_Status": "Schovat stav nepřečtených místností",
   "Hide_usernames": "Skrýt uživatelská jména",
   "Highlights": "Klíčová slova",
@@ -686,13 +802,17 @@
   "Iframe_Integration_send_enable_Description": "Odesílat události do původního okna",
   "Iframe_Integration_send_target_origin": "Odesílat cílovou doménu",
   "Iframe_Integration_send_target_origin_Description": "Jen stránky z povolených domén můžou čekat na události. `*` pro povolení všech domén. Lze vložit více hodnot oddělených `,`. Například `http://localhost,https://localhost`",
+  "IMAP_intercepter_already_running": "Zachytávání IMAP již běží",
+  "IMAP_intercepter_Not_running": "Zachytávání IMAP neběží",
+  "Impersonate_user": "Vydávat se za uživatele",
+  "Impersonate_user_description": "Pokud je povoleno, integrace posílá za uživatele, který ji vyvolal",
   "Importer_Archived": "Archivováno",
   "Importer_CSV_Information": "CSV import vyžaduje specifický formát. Informace o tom, jak strukturovat váš zip soubor najdete v dokumentaci:",
-  "Importer_HipChatEnterprise_Information": "Nahraný soubor musí být nešifrovaný tar.gz, Více informací naleznete v dokumentaci:",
-  "Importer_HipChatEnterprise_BetaWarning": "Mějte prosím na paměti, že tato funkcionalita je stále ve vývoji, prosím nahlašte nám jakékoliv chyby přes github:",
   "Importer_done": "Import dokončen!",
   "Importer_finishing": "Dokončuji import.",
   "Importer_From_Description": "Import dat __from__ do Rocket.Chat.",
+  "Importer_HipChatEnterprise_BetaWarning": "Mějte prosím na paměti, že tato funkcionalita je stále ve vývoji, prosím nahlašte nám jakékoliv chyby přes github:",
+  "Importer_HipChatEnterprise_Information": "Nahraný soubor musí být nešifrovaný tar.gz, Více informací naleznete v dokumentaci:",
   "Importer_import_cancelled": "Import zrušen.",
   "Importer_import_failed": "Došlo k chybě při importu.",
   "Importer_importing_channels": "Importuji místnosti.",
@@ -709,6 +829,7 @@
   "Importer_setup_error": "Při nastavování nástroje pro import došlo k chybě.",
   "Importer_Source_File": "Výběr zdrojového souboru",
   "Incoming_Livechats": "Příchozí požadavky na LiveChat",
+  "Incoming_WebHook": "Příchozí webhook",
   "inline_code": "vlozeny_kod",
   "Install_Extension": "Nainstalovat rozšíření",
   "Install_FxOs": "Nainstalovat Rocket.Chat do Vašeho Firefoxu",
@@ -719,52 +840,49 @@
   "Installed_at": "instalováno v",
   "Instance_Record": "ID Instance",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Pokyny pro Vaše návštěvníky k vyplnění formulář pro odeslání zprávy",
-  "Impersonate_user": "Vydávat se za uživatele",
-  "Impersonate_user_description": "Pokud je povoleno, integrace posílá za uživatele, který ji vyvolal",
-  "Incoming_WebHook": "Příchozí webhook",
-  "Integration_Advanced_Settings": "Pokročilé nastavení",
   "Integration_added": "Integrace byla přidána",
+  "Integration_Advanced_Settings": "Pokročilé nastavení",
   "Integration_History_Cleared": "Historie integrace smazána",
   "Integration_Incoming_WebHook": "Příchozí WebHook Integrace",
   "Integration_New": "Nová integrace",
-  "Integrations_Outgoing_Type_FileUploaded": "Soubor nahrán",
-  "Integrations_Outgoing_Type_RoomArchived": "Místnost archivována",
-  "Integrations_Outgoing_Type_RoomCreated": "Místnost vytvořena (veřejná a soukromá)",
-  "Integrations_Outgoing_Type_RoomJoined": "Uživatel se přidal do místnosti",
-  "Integrations_Outgoing_Type_RoomLeft": "Uživatel opustil místnost",
-  "Integrations_Outgoing_Type_SendMessage": "Zpráva odeslána",
-  "Integrations_Outgoing_Type_UserCreated": "Uživatel vytvořen",
   "Integration_Outgoing_WebHook": "Odchozí WebHook Integrace",
   "Integration_Outgoing_WebHook_History": "Historie odchozího webhooku",
-  "Integration_Outgoing_WebHook_No_History": "Tento odchozí webhook ještě nemá žádnou zaznamenanou historii",
-  "Integration_Outgoing_WebHook_History_Time_Triggered": "Čas spuštění intergrace",
-  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Čas skončení s chybou",
-  "Integration_Outgoing_WebHook_History_Trigger_Step": "Poslední spuštěný krok",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Zprávy odeslané v přípravném kroku",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Zprávy odeslané v zpracovacím kroku",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Data předána integraci",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Data předána na URL",
-  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Chyba HTTP odpovědi",
-  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP odpověď",
   "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Stacktrace chyby",
-  "Integration_Retry_Failed_Url_Calls": "Znovu zavolat neúspěšná volání",
-  "Integration_Retry_Failed_Url_Calls_Description": "Měla by integrace po rozumnou dobu zkusit odeslat volání znova pokud se předtím nezdařilo?",
+  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP odpověď",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Chyba HTTP odpovědi",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Zprávy odeslané v přípravném kroku",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Zprávy odeslané v zpracovacím kroku",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Čas skončení s chybou",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Čas spuštění intergrace",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "Poslední spuštěný krok",
+  "Integration_Outgoing_WebHook_No_History": "Tento odchozí webhook ještě nemá žádnou zaznamenanou historii",
   "Integration_Retry_Count": "Počet pokusů po neúspěšném volání",
   "Integration_Retry_Count_Description": "Kolikrát by se integrace měla znova pokusit volat URL pokud byl první pokus neúspěšný?",
   "Integration_Retry_Delay": "Čas prodlení opakování",
   "Integration_Retry_Delay_Description": "Jaký algoritmus prodlení by se měl použít?<code class=\"inline\">10^x</code>, <code class=\"inline\">2^x</code> nebo <code class=\"inline\">x*2</code>",
+  "Integration_Retry_Failed_Url_Calls": "Znovu zavolat neúspěšná volání",
+  "Integration_Retry_Failed_Url_Calls_Description": "Měla by integrace po rozumnou dobu zkusit odeslat volání znova pokud se předtím nezdařilo?",
   "Integration_Run_When_Message_Is_Edited": "Spustit při editaci",
   "Integration_Run_When_Message_Is_Edited_Description": "Měla by být integrace spuštěna po editaci zprávy? Pokud volbu vypnete, integrace se bude spouštět pouze pro <strong>nové</strong> zprávy.",
+  "Integration_updated": "Integrace byla aktualizována",
   "Integration_Word_Trigger_Placement": "Přepisování slov kdekoliv",
   "Integration_Word_Trigger_Placement_Description": "Mělo by se vyvolat pokud je slovo umístěno jinde než na začátku?",
-  "Integration_updated": "Integrace byla aktualizována",
   "Integrations": "Integrace",
   "Integrations_for_all_channels": "Zadejte <strong>all_public_channels</strong> pro poslouchání nad všemi otevřenými místnostmi, <strong>all_private_groups</strong> pro všechny soukromé místnosti a <strong>all_direct_messages</strong> pro poslouchání přímých konverzací",
+  "Integrations_Outgoing_Type_FileUploaded": "Soubor nahrán",
+  "Integrations_Outgoing_Type_RoomArchived": "Místnost archivována",
+  "Integrations_Outgoing_Type_RoomCreated": "Místnost vytvořena (veřejná a soukromá)",
+  "Integrations_Outgoing_Type_RoomJoined": "Uživatel se přidal do místnosti",
+  "Integrations_Outgoing_Type_RoomLeft": "Uživatel opustil místnost",
+  "Integrations_Outgoing_Type_SendMessage": "Zpráva odeslána",
+  "Integrations_Outgoing_Type_UserCreated": "Uživatel vytvořen",
   "InternalHubot": "Interní Hubot",
-  "InternalHubot_ScriptsToLoad": "Načíst skripty",
-  "InternalHubot_ScriptsToLoad_Description": "Prosím, zadejte čárkami oddělený seznam skriptů k načtení z https://github.com/github/hubot-scripts/tree/master/src/scripts umístěných ve vaší složce",
   "InternalHubot_PathToLoadCustomScripts": "Složka odkud načíst skripty",
   "InternalHubot_reload": "Znovu načíst skripty",
+  "InternalHubot_ScriptsToLoad": "Načíst skripty",
+  "InternalHubot_ScriptsToLoad_Description": "Prosím, zadejte čárkami oddělený seznam skriptů k načtení z https://github.com/github/hubot-scripts/tree/master/src/scripts umístěných ve vaší složce",
   "InternalHubot_Username_Description": "Musí být platné uživatelské jméno jednoho z botů registrovaných na tomto serveru.",
   "Invalid_confirm_pass": "Hesla nesouhlasí",
   "Invalid_email": "Zadaný e-mail je neplatný",
@@ -786,56 +904,70 @@
   "Invitation_Subject": "Předmět pozvánky",
   "Invitation_Subject_Default": "Byli jste pozváni na [Site_Name]",
   "Invite_user_to_join_channel": "Pozvat jednoho uživatele, aby se připojil k této místnosti",
-  "Invite_user_to_join_channel_all_to": "Pozvat všechny uživatele v této místnosti do [#channel]",
   "Invite_user_to_join_channel_all_from": "Pozvat všechny uživatele v [#channel] do této místnosti",
+  "Invite_user_to_join_channel_all_to": "Pozvat všechny uživatele v této místnosti do [#channel]",
   "Invite_Users": "Pozvat uživatele",
-  "is_also_typing": "také píše",
-  "is_also_typing_female": "také píše",
-  "is_also_typing_male": "také píše",
-  "is_typing": "píše",
-  "is_typing_female": "píše",
-  "is_typing_male": "píše",
   "IRC_Channel_Join": "Výstup JOIN příkazu",
   "IRC_Channel_Leave": "Výstup PART příkazu",
-  "IRC_Description": "Internet Relay Chat (IRC) je nástroj pro textovou komunikaci. Uživatelé komunikují otevřeně v unikátně pojmenovaných místnostech. IRC také podporuje přímé zprávy mezi dvěma uživateli a sdílení souborů. Tento modul integruje tyto vlastnosti do Rocket.Chatu.",
-  "IRC_Enabled": "Pokusit se integrovat IRC. Změna vyžaduje restart Rocket.Chatu",
-  "IRC_Private_Message": "Výstup PRIVMSG příkazu",
   "IRC_Channel_Users": "Výstup NAMES příkazu",
   "IRC_Channel_Users_End": "Konec výstupu NAMES příkazu",
+  "IRC_Description": "Internet Relay Chat (IRC) je nástroj pro textovou komunikaci. Uživatelé komunikují otevřeně v unikátně pojmenovaných místnostech. IRC také podporuje přímé zprávy mezi dvěma uživateli a sdílení souborů. Tento modul integruje tyto vlastnosti do Rocket.Chatu.",
+  "IRC_Enabled": "Pokusit se integrovat IRC. Změna vyžaduje restart Rocket.Chatu",
   "IRC_Hostname": "IRC server ke kterému se připojit",
   "IRC_Login_Fail": "Výstup nezdařeného připojení k IRC serveru",
   "IRC_Login_Success": "Výstup úspěšného připojení k IRC serveru",
   "IRC_Message_Cache_Size": "Limit cache pro zpracování odchozích zpráv",
   "IRC_Port": "Port k připojení na IRC serveru",
+  "IRC_Private_Message": "Výstup PRIVMSG příkazu",
   "IRC_Quit": "Výstup při rozpojení IRC session",
+  "is_also_typing": "také píše",
+  "is_also_typing_female": "také píše",
+  "is_also_typing_male": "také píše",
+  "is_typing": "píše",
+  "is_typing_female": "píše",
+  "is_typing_male": "píše",
+  "Issue_Links": "Odkazy na Issue tracker",
+  "IssueLinks_Incompatible": "Varování: nepovolujte tuto volbu současně s 'Náhled barvy podle Hex kódu'.",
+  "IssueLinks_LinkTemplate": "Šablona pro odkazy na issue",
+  "IssueLinks_LinkTemplate_Description": "Šablona pro odkazy na issue; %s bude nahrazeno číslem issue.",
   "It_works": "Funguje to",
   "italics": "kurzíva",
   "Jitsi_Chrome_Extension": "ID Chrome rozšíření",
   "Jitsi_Enable_Channels": "Povolit v místnostech",
   "join": "Připojit",
+  "join-without-join-code": "Připojit se i do místností bez kódu",
+  "join-without-join-code_description": "Právo přeskočit připojit bez zadávání kódu do místností, které jej vyžadují",
   "Join_audio_call": "Připojit k hovoru",
   "Join_Chat": "Připojit k chatu",
   "Join_default_channels": "Připojit se k výchozím místnostem",
   "Join_the_Community": "Zapojte se do komunity",
   "Join_the_given_channel": "Přidejte se k dané místnosti",
-  "Show_the_keyboard_shortcut_list": "Zobrazit klávesové zkratky",
-  "Open_channel_user_search": "`%s` - Otevřít místnost / Hledat uživatele",
-  "Edit_previous_message": "`%s` - Editovat předchozí zprávu",
-  "Move_beginning_message": "`%s` - Přejít na začátek zprávy",
-  "Move_end_message": "`%s` - Přejít na konec zprávy",
-  "New_line_message_compose_input": "`%s` - Přidat řádek v editačním okně",
   "Join_video_call": "Připojit k videohovoru",
   "Joined": "Připojil",
   "Jump": "Přejít",
   "Jump_to_first_unread": "Přejít na první nepřečtenou",
   "Jump_to_message": "Přejít na zprávu",
   "Jump_to_recent_messages": "Přejít na nedávné zprávy",
+  "Just_invited_people_can_access_this_channel": "Do této místnosti smí vstoupit pouze pozvaní lidé",
   "Katex_Dollar_Syntax": "Povolit Dollarovou syntaxi",
   "Katex_Dollar_Syntax_Description": "Povolit použití $$katex blok$$ aa $inline katex$  syntaxi",
   "Katex_Enabled": "Katex povolen",
   "Katex_Enabled_Description": "Umožnit použití <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">Katex</a> pro zápis matematiky ve zprávách",
   "Katex_Parenthesis_Syntax": "Povolit Parenthesis syntaxi",
   "Katex_Parenthesis_Syntax_Description": "Povolit použití \\[katex block\\] a \\(inline katex\\)  syntaxi",
+  "Keyboard_Shortcuts_Edit_Previous_Message": "Upravit předchozí zprávu",
+  "Keyboard_Shortcuts_Keys_1": "<kbd>Ctrl</kbd>+<kbd>p</kbd>",
+  "Keyboard_Shortcuts_Keys_2": "<kbd>Šipka nahoru</kbd>",
+  "Keyboard_Shortcuts_Keys_3": "<kbd>Command</kbd>(nebo <kbd>Alt</kbd>) + <kbd>šipka doleva</kbd>",
+  "Keyboard_Shortcuts_Keys_4": "<kbd>Command</kbd>(nebo <kbd>Alt</kbd>) + <kbd>šipka nahoru</kbd>",
+  "Keyboard_Shortcuts_Keys_5": "<kbd>Command</kbd>(nebo <kbd>Alt</kbd>) + <kbd>šipka doprava</kbd>",
+  "Keyboard_Shortcuts_Keys_6": "<kbd>Command</kbd>(nebo <kbd>Alt</kbd>) + <kbd>šipka dolů</kbd>",
+  "Keyboard_Shortcuts_Keys_7": "<kbd>Shift</kbd>+<kbd>Enter</kbd>",
+  "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "Přesunout na začátek zprávy",
+  "Keyboard_Shortcuts_Move_To_End_Of_Message": "Přesunout na konec zprávy",
+  "Keyboard_Shortcuts_New_Line_In_Message": "Nový řádek",
+  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Otevřít místnost / Vyhledat uživatele",
+  "Keyboard_Shortcuts_Title": "Klávesové zkratky",
   "Knowledge_Base": "Znalostní databáze",
   "Label": "Štítek",
   "Language": "Jazyk",
@@ -876,6 +1008,18 @@
   "LDAP_Enable_Description": "Pokusit se použít LDAP pro autentizaci.",
   "LDAP_Encryption": "Šifrování",
   "LDAP_Encryption_Description": "Metoda šifrování používaná k zabezpečené komunikace se serverem LDAP. Jako příklady lze uvést `plain` (bez šifrování),` SSL/LDAPS` (šifrovaný od začátku), a `StartTLS` (Šifrovaná komunikaci až po připojení).",
+  "LDAP_Group_Filter_Enable": "Povolit LDAP filtr uživatelské skupiny",
+  "LDAP_Group_Filter_Enable_Description": "Omezit přístup uživatelům z LDAP skupiny<br/>Hodí se pro OpenLDAP servery kde nelze použít *memberOf* filtr",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Atribut ID skupiny",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Např.: *OpenLDAP:*cn",
+  "LDAP_Group_Filter_Group_Member_Attribute": "Atribut uživatele skupiny",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Např.: *OpenLDAP:*uniqueMember",
+  "LDAP_Group_Filter_Group_Member_Format": "Formát uživatele skupiny",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "Např.: *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
+  "LDAP_Group_Filter_Group_Name": "Jméno skupiny",
+  "LDAP_Group_Filter_Group_Name_Description": "Jméno skupiny do které uživatel patří",
+  "LDAP_Group_Filter_ObjectClass": "ObjectClass Skupiny",
+  "LDAP_Group_Filter_ObjectClass_Description": "*objectclass* která identifikuje skupiny.<br/> Např. OpenLDAP:groupOfUniqueNames",
   "LDAP_Host": "Hostitel",
   "LDAP_Host_Description": "Hostitel LDAP, například `ldap.example.com` nebo 10.0.0.30`.",
   "LDAP_Idle_Timeout": "Prodleva nečinnosti (ms)",
@@ -901,20 +1045,9 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Napište svůj vlastní filtr pro vyhledávání uživatelů v LDAP serveru.",
   "LDAP_Username_Field": "Pole Uživatelského jména",
   "LDAP_Username_Field_Description": "Které pole budou použity jako *Jméno* pro nové uživatele. Ponechte prázdné pro použítí jména z přihlašovací stránky. <br/> Můžete použít šablony a tagy jako například `#{givenName}.#{sn}`.<br/>Výchozí hodnota je `sAMAccountName`.",
-  "LDAP_Group_Filter_Enable": "Povolit LDAP filtr uživatelské skupiny",
-  "LDAP_Group_Filter_Enable_Description": "Omezit přístup uživatelům z LDAP skupiny<br/>Hodí se pro OpenLDAP servery kde nelze použít *memberOf* filtr",
-  "LDAP_Group_Filter_ObjectClass": "ObjectClass Skupiny",
-  "LDAP_Group_Filter_ObjectClass_Description": "*objectclass* která identifikuje skupiny.<br/> Např. OpenLDAP:groupOfUniqueNames",
-  "LDAP_Group_Filter_Group_Id_Attribute": "Atribut ID skupiny",
-  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Např.: *OpenLDAP:*cn",
-  "LDAP_Group_Filter_Group_Member_Attribute": "Atribut uživatele skupiny",
-  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Např.: *OpenLDAP:*uniqueMember",
-  "LDAP_Group_Filter_Group_Member_Format": "Formát uživatele skupiny",
-  "LDAP_Group_Filter_Group_Member_Format_Description": "Např.: *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
-  "LDAP_Group_Filter_Group_Name": "Jméno skupiny",
-  "LDAP_Group_Filter_Group_Name_Description": "Jméno skupiny do které uživatel patří",
   "Least_Amount": "Nejmenším počet",
   "Leave_Group_Warning": "Jste si jisti, že chcete opustit skupinu \"%s\"?",
+  "Leave_Livechat_Warning": "Opravdu chcete opustit LiveChat s \"%s\"?",
   "Leave_Private_Warning": "Jste si jisti, že chcete opustit diskusi s \"%s\"?",
   "Leave_room": "Opustit místnost",
   "Leave_Room_Warning": "Jste si jisti, že chcete opustit místnost \"%s\"?",
@@ -924,7 +1057,6 @@
   "List_of_Direct_Messages": "Seznam přímých zpráv",
   "Livechat_agents": "LiveChat operátoři",
   "Livechat_AllowedDomainsList": "Povolené domény pro Livechat",
-  "Domains_allowed_to_embed_the_livechat_widget": "Čárkou oddělený seznam domén, kde se smí zobrazovat livechat. Pro povolení všech domén nechte prázdné",
   "Livechat_Dashboard": "LiveChat Přehled",
   "Livechat_enabled": "LiveChat povolen",
   "Livechat_forward_open_chats": "Předat otevřené chaty",
@@ -958,6 +1090,8 @@
   "Login_with": "Přihlášení pomocí %s",
   "Logout": "Odhlásit se",
   "Logout_Others": "Odhlášení ze všech ostatních míst",
+  "mail-messages": "Odeslat zprávy",
+  "mail-messages_description": "Právo odesílat zprávy",
   "Mail_Message_Invalid_emails": "Vložili jste jeden nebo více neplatných e-mailů: %s",
   "Mail_Message_Missing_to": "Musíte vybrat jednoho nebo více uživatelů nebo vložit jednu nebo více e-mailových adres oddělených čárkami.",
   "Mail_Message_No_messages_selected_select_all": "Nejsou vybrány žádné zprávy. Chcete <a href='#' class='select-all'>vybrat všechny</a> viditelné zprávy?",
@@ -969,6 +1103,18 @@
   "Mailing": "Mailing",
   "Make_Admin": "Změnit na Správce",
   "Make_sure_you_have_a_copy_of_your_codes": "Pečlivě is uschovejte kopii svých kódů: __codes__ Pokud ztratíte přístup ke své autentizační aplikaci, můžete jeden z nich použít k přihlášení.",
+  "manage-assets": "Spravovat statické zdroje",
+  "manage-assets_description": "Právo upravovat serverové statické soubory",
+  "manage-emoji": "Spravovat emotikony",
+  "manage-emoji_description": "Právo měnit emotikony",
+  "manage-integrations": "Spravovat integrace",
+  "manage-integrations_description": "Právo měnit integrace",
+  "manage-oauth-apps": "Spravovat Oauth aplikace",
+  "manage-oauth-apps_description": "Právo měnit Oauth aplikace",
+  "manage-own-integrations": "Spravovat vlastní integrace",
+  "manage-own-integrations_description": "Právo pro uživatele vytvářet a editovat vlastní integrace a webhooky",
+  "manage-sounds": "Spravovat zvuky",
+  "manage-sounds_description": "Právo měnit zvuky",
   "Manager_added": "Manažer přidán",
   "Manager_removed": "Manažer odstraněn",
   "Managing_assets": "Správa datových zdrojů",
@@ -980,10 +1126,19 @@
   "Mark_as_read": "Označit jako přečtené",
   "Mark_as_unread": "Označit jako nepřečtené",
   "Markdown_Headers": "Povolit markdown v nadpisech",
+  "Markdown_Marked_Breaks": "Povolit značky odřádkování",
+  "Markdown_Marked_GFM": "Povolit značky GFM",
+  "Markdown_Marked_Pedantic": "Povolit striktní značky",
+  "Markdown_Marked_SmartLists": "Povolit značky chytrých seznamů",
+  "Markdown_Marked_Smartypants": "Povolit Smartpants značky",
+  "Markdown_Marked_Tables": "Povolit značky tabulek",
+  "Markdown_Parser": "Parser markdownu",
   "Markdown_SupportSchemesForLink": "Schémata používaná pro automatické odkazy markdown",
   "Markdown_SupportSchemesForLink_Description": "Čárkami oddělený seznam povolených schémat",
   "Max_length_is": "Maximální délka je %s",
   "Members_List": "Seznam členů",
+  "mention-all": "Zmínit všechny",
+  "mention-all_description": "Právo použít `@all` zmínku",
   "Mentions": "Zmínky",
   "Mentions_default": "Zmínky (výchozí)",
   "Mentions_only": "Pouze zmínky",
@@ -1026,24 +1181,25 @@
   "Message_pinning": "Připnutí zprávy",
   "Message_QuoteChainLimit": "Maximální počet navazujících citací",
   "Message_removed": "Zpráva odstraněna",
+  "Message_sent_by_email": "Zpráva odeslaná emailem",
   "Message_SetNameToAliasEnabled": "Změnit uživatelské jméno ve zprávě na alias",
   "Message_SetNameToAliasEnabled_Description": "Jen pokud již není nastaven alias. Alias u starých zpráv nebude změněn",
   "Message_ShowDeletedStatus": "Zobrazit informaci o smazání",
   "Message_ShowEditedStatus": "Zobrazit informaci o editaci",
   "Message_ShowFormattingTips": "Zobrazit tipy na formátování",
   "Message_starring": "Ohvězdičkování zprávy",
-  "Message_TimeFormat": "Formát času",
   "Message_TimeAndDateFormat": "Formát data a času",
-  "Message_TimeFormat_Description": "Viz také: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeAndDateFormat_Description": "Viz <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
+  "Message_TimeFormat": "Formát času",
+  "Message_TimeFormat_Description": "Viz také: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Zpráva je příliš dlouhá",
   "Message_VideoRecorderEnabled": "Video nahrávání povoleno",
   "Message_VideoRecorderEnabledDescription": "Vyžaduje přidání 'video/webm' mezi povolené typy souborů v nastavení",
   "Messages": "Zprávy",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Zprávy, které jsou odesílány do příchozí WebHook integrace budou zveřejněny zde.",
   "Meta": "Meta informace",
-  "Meta_fb_app_id": "Facebook App Id",
   "Meta_custom": "Vlastní meta tagy",
+  "Meta_fb_app_id": "Facebook App Id",
   "Meta_google-site-verification": "Ověření stránek Google",
   "Meta_language": "Jazyk",
   "Meta_msvalidate01": "MSValidate.01",
@@ -1058,31 +1214,40 @@
   "More_direct_messages": "Více přímých konverzací",
   "More_groups": "Více Soukromých skupin",
   "More_unreads": "více nepřečtených",
+  "Move_beginning_message": "`%s` - Přejít na začátek zprávy",
+  "Move_end_message": "`%s` - Přejít na konec zprávy",
   "Msgs": "Zpr",
   "multi": "multi",
+  "multi_line": "více řádků",
+  "mute-user": "Ztišit uživatele",
+  "mute-user_description": "Právo ztišit jiné uživatele v aktuální místnosti",
   "Mute_someone_in_room": "Ztlumit zprávy od někoho v místnosti",
   "Mute_user": "Ztlumit uživatele",
   "Muted": "Ztlumeno",
   "My_Account": "Můj účet",
+  "My_location": "Moje poloha",
   "n_messages": " %s zpráv",
   "N_new_messages": " %s nových zpráv",
   "Name": "Jméno",
   "Name_cant_be_empty": "Jméno nemůže být prázdné",
   "Name_of_agent": "Jméno operátora",
   "Name_optional": "Jméno (volitelné)",
+  "Name_Placeholder": "Zadejte své jméno...",
   "Navigation_History": "Navigace Historie (posledních 20 stran)",
   "New_Application": "Nová aplikace",
   "New_Custom_Field": "Nové vlastní pole",
   "New_Department": "Nové oddělení",
   "New_integration": "Nová integrace",
+  "New_line_message_compose_input": "`%s` - Přidat řádek v editačním okně",
   "New_logs": "Nové logy",
   "New_Message_Notification": "Oznámením o nové zprávě",
   "New_messages": "Nové zprávy",
   "New_password": "Nové heslo",
+  "New_Password_Placeholder": "Zadejte nové heslo...",
   "New_role": "Nová role",
   "New_Room_Notification": "Oznámení o nové místnosti",
-  "New_videocall_request": "Nový požadavek videohovoru",
   "New_Trigger": "Nový trigger",
+  "New_videocall_request": "Nový požadavek videohovoru",
   "No_available_agents_to_transfer": "Žádní operátoři k dispozici",
   "No_channel_with_name_%s_was_found": "Nebyla nalezena žádná místnost s názvem <strong>\"%s\"</strong>!",
   "No_channels_yet": "Zatím nejste v žádné místnosti.",
@@ -1095,9 +1260,9 @@
   "No_mentions_found": "Nenalezeny žádné zmínky",
   "No_pinned_messages": "Žádné zprávy nejsou připnuté",
   "No_results_found": "Nebyly nalezeny žádné výsledky",
+  "No_snippet_messages": "Žádné předvolby",
   "No_starred_messages": "Žádné zprávy s hvězdičkou",
   "No_such_command": "Příkaz `__comand__` neexistuje",
-  "No_snippet_messages": "Žádné předvolby",
   "No_user_with_username_%s_was_found": "Nebyl nalezen žádný uživatel s uživatelským jménem <strong>\"%s\"</strong>!",
   "Nobody_available": "Nikdo není dostupný",
   "Node_version": "Verze Node",
@@ -1109,15 +1274,15 @@
   "Nothing": "Nic",
   "Nothing_found": "Nic nalezeno",
   "Notification_Desktop_Default_For": "Zobrazit oznámení na ploše",
-  "Notification_Mobile_Default_For": "Zasílat mobilní notifikace",
   "Notification_Duration": "Délka zobrazení oznámení",
+  "Notification_Mobile_Default_For": "Zasílat mobilní notifikace",
   "Notifications": "Oznámení",
-  "Notifications_Muted_Description": "Pokud ztišíte všechno, neuvidíte zvýrazněné místnosti s novými zprávami, krom zmínek. Ztišení notifikací přetěží nastavení notifikací v jednotlivých místnostech.",
   "Notifications_Max_Room_Members": "Maximální počet uživatelů v místnosti pro zakázání zmínky všech",
   "Notifications_Max_Room_Members_Description": "Pokud počet uživatelů v místnosti překročí zadané číslo, notifikace všech (@all) nebude povolena. Uživatelé si toto nastavení mohou individuálně změnit. (0 možnost zakáže)",
+  "Notifications_Muted_Description": "Pokud ztišíte všechno, neuvidíte zvýrazněné místnosti s novými zprávami, krom zmínek. Ztišení notifikací přetěží nastavení notifikací v jednotlivých místnostech.",
   "Notifications_Sound_Volume": "Hlasitost zvuku notifikace",
-  "Notify_all_in_this_room": "Oznámit všem v této místnosti",
   "Notify_active_in_this_room": "Notifikovat aktivní uživatele v místnosti",
+  "Notify_all_in_this_room": "Oznámit všem v této místnosti",
   "Num_Agents": "# Operátorů",
   "Number_of_messages": "Počet zpráv",
   "OAuth_Application": "OAuth Aplikace",
@@ -1130,31 +1295,35 @@
   "Office_hours_enabled": "Otevírací doba povolena",
   "Office_hours_updated": "Otevírací doba aktualizována",
   "Offline": "Offline",
+  "Offline_DM_Email": "Předmět emailu přímé zprávy",
+  "Offline_Email_Subject_Description": "Můžete použít následující značky:<br/><ul><li>[Site_Name] pro název aplikace, [Site_URL] pro URL aplikace, [User] pro uživatele a [Room] pro místnost<li/></ul>",
   "Offline_form": "Offline formulář",
   "Offline_form_unavailable_message": "Zpráva nedostupného offline formuláře",
   "Offline_Link_Message": "PŘEJÍT NA ZPRÁVU",
-  "Offline_Mention_Email": "Zmínka od __user__ v #__room__",
-  "Offline_Mention_All_Email": "Zpráva od __user__ v místnosti #__room__",
+  "Offline_Mention_All_Email": "Předmět emailu zmínky všech",
+  "Offline_Mention_Email": "Předmět emailu zmínky",
   "Offline_message": "Offline zprávy",
   "Offline_success_message": "Zpráva pro offline úspěšnou akci",
   "Offline_unavailable": "Offline nedostupný",
   "On": "Zapnuto",
   "Online": "Online",
+  "Only_authorized_users_can_write_new_messages": "Pouze autorizovaní uživatelé mohou psát nové zprávy",
   "Only_On_Desktop": "Desktopový mód (stisk klávesy enter odesílá pouze na desktopu)",
   "Only_you_can_see_this_message": "Pouze Vy vidíte tuto zprávu",
   "Oops!": "Oops",
   "Open": "Otevřít",
+  "Open_channel_user_search": "`%s` - Otevřít místnost / Hledat uživatele",
   "Open_days_of_the_week": "Otevírací doba přes týden",
   "Open_Livechats": "Otevřené livechaty",
+  "Open_your_authentication_app_and_enter_the_code": "Otevřete autentizační aplikaci a zadejte vygenerovaný kód. Můžete použít jeden ze svých záložních kódů.",
   "Opened": "Otevřený",
   "Opened_in_a_new_window": "Otevřeno v novém okně",
   "Opens_a_channel_group_or_direct_message": "Otevře místnost, skupinu nebo přímou zprávu",
   "optional": "volitelný",
-  "Use_minor_colors": "Použít nevýraznou barevnou baletu (ve výchozím stavu podědí výraznou paletu)",
   "or": "nebo",
-  "Open_your_authentication_app_and_enter_the_code": "Otevřete autentizační aplikaci a zadejte vygenerovaný kód. Můžete použít jeden ze svých záložních kódů.",
-  "Order": "Objednat",
   "Or_talk_as_anonymous": "Vydávat sezaanonyma",
+  "Order": "Objednat",
+  "Original": "Originál",
   "OS_Arch": "Architektura OS",
   "OS_Cpus": "Počet CPU OS",
   "OS_Freemem": "Volná paměť OS",
@@ -1180,175 +1349,34 @@
   "People": "Lidé",
   "Permalink": "Trvalý odkaz",
   "Permissions": "Oprávnění",
-  "access-mailer": "Přístup k maileru",
-  "access-mailer_description": "Právo rozesílat hromadný email na všechny uživatele.",
-  "access-permissions": "Přístup k nastavení práv",
-  "access-permissions_description": "Měnít práva pro jednotlivé uživatelské role.",
-  "add-oauth-service": "Přidat Oauth službu",
-  "add-oauth-service_description": "Právo přidat novou Oauth službu",
-  "add-user": "Přidat uživatele",
-  "add-user_description": "Právo přidat nového uživatele přes seznam uživatelů",
-  "add-user-to-any-c-room": "Přidat uživatele do veřejných místností",
-  "add-user-to-any-c-room_description": "Právo přidat uživatele do jakékoliv veřejné místnosti",
-  "add-user-to-any-p-room": "Přidat uživatele do soukromých místností",
-  "add-user-to-any-p-room_description": "Právo přidat uživatele do jakékoliv soukromé místnosti",
-  "add-user-to-joined-room": "Přidat uživatele do místností ve kterých jsem",
-  "add-user-to-joined-room_description": "Právo přidat uživatele do jakékoliv aktuálně připojené místnosti",
-  "archive-room": "Archivovat místnost",
-  "archive-room_description": "Právo archivovat místnost",
-  "assign-admin-role": "Přiřadit roli administrátora",
-  "assign-admin-role_description": "Právo přiřadit roli administrátora dalším uživatelům",
-  "auto-translate": "Auto překlad",
-  "auto-translate_description": "Právo používat automatické překládání",
-  "ban-user": "Zabanovat uživatele",
-  "ban-user_description": "Právo vykázat uživatele z místnosti",
-  "bulk-create-c": "Hromadné vytvoření místností",
-  "bulk-create-c_description": "Právo hromadné vytvářet místnosti",
-  "bulk-register-user": "Hromadné vytvoření místností",
-  "bulk-register-user_description": "Právo hromadné vytvářet místnosti",
-  "clean-channel-history": "Pročistit historii místnosti",
-  "clean-channel-history_description": "Právo pročistit historii místnosti",
-  "close-livechat-room": "Uzavřít LiveChat místnost (aktuální)",
-  "close-livechat-room_description": "Právo uzavřít svou LiveChat místnost",
-  "close-others-livechat-room": "Uzavřít LiveChat místnost (ostatní)",
-  "close-others-livechat-room_description": "Právo uzavřít ostatní LiveChat místnosti",
-  "create-c": "Vytvářet veřejné místnosti",
-  "create-c_description": "Právo vytvářet veřejné místnosti",
-  "create-d": "Vytvářet soukromé zprávy",
-  "create-d_description": "Právo odesílat soukromé zprávy",
-  "create-p": "Vytvářet soukromé místnosti",
-  "create-p_description": "Právo vytvářet soukromé místnosti",
-  "create-user": "Vytvořit uživatele",
-  "create-user_description": "Právo vytvořit uživatele",
-  "delete-c": "Smazat veřejné místnosti",
-  "delete-c_description": "Právo smazat veřejné místnosti",
-  "delete-d": "Smazat přímé zprávy",
-  "delete-d_description": "Právo smazat přímé zprávy",
-  "delete-p": "Smazat soukromé místnosti",
-  "delete-p_description": "Právo smazat soukromé místnosti",
-  "delete-message": "Smazat zprávu",
-  "delete-message_description": "Právo smazat zprávu v místnosti",
-  "delete-user": "Smazat uživatele",
-  "delete-user_description": "Právo smazat uživatele",
-  "edit-message": "Editovat zprávu",
-  "edit-message_description": "Právo editovat zprávu v místnosti",
-  "edit-other-user-active-status": "Právo měnit aktivaci uživatelů",
-  "edit-other-user-active-status_description": "Právo povolit nebo zakázat jiné uživatelské účty",
-  "edit-other-user-info": "Upravit informace uživatelů",
-  "edit-other-user-info_description": "Právo měnit jméno, uživatelské jméno nebo email jiným uživatelům",
-  "edit-other-user-password": "Měnit hesla uživatelů",
-  "edit-other-user-password_description": "Právo měnit heslo jiným uživatelům. Vyžaduje právo `Upravit informace uživatelů`",
-  "edit-privileged-setting": "Měnit nastavení",
-  "edit-privileged-setting_description": "Právo měnit nastavení",
-  "edit-room": "Upravit místnost",
-  "edit-room_description": "Právo měnit jméno, téma, typ (soukromá/veřejná) a stav (aktivní/archivovaná) místnosti",
-  "force-delete-message": "Smazat zprávu",
-  "force-delete-message_description": "Právo smazat zprávu přes všechna omezení",
-  "join-without-join-code": "Připojit se i do místností bez kódu",
-  "join-without-join-code_description": "Právo přeskočit připojit bez zadávání kódu do místností, které jej vyžadují",
-  "mail-messages": "Odeslat zprávy",
-  "mail-messages_description": "Právo odesílat zprávy",
-  "manage-assets": "Spravovat statické zdroje",
-  "manage-assets_description": "Právo upravovat serverové statické soubory",
-  "manage-emoji": "Spravovat emotikony",
-  "manage-emoji_description": "Právo měnit emotikony",
-  "manage-integrations": "Spravovat integrace",
-  "manage-integrations_description": "Právo měnit integrace",
-  "manage-oauth-apps": "Spravovat Oauth aplikace",
-  "manage-oauth-apps_description": "Právo měnit Oauth aplikace",
-  "manage-own-integrations": "Spravovat vlastní integrace",
-  "manage-own-integrations_description": "Právo pro uživatele vytvářet a editovat vlastní integrace a webhooky",
-  "manage-sounds": "Spravovat zvuky",
-  "manage-sounds_description": "Právo měnit zvuky",
-  "mention-all": "Zmínit všechny",
-  "mention-all_description": "Právo použít `@all` zmínku",
-  "mute-user": "Ztišit uživatele",
-  "mute-user_description": "Právo ztišit jiné uživatele v aktuální místnosti",
   "pin-message": "Připnout zprávu",
   "pin-message_description": "Právo připnout zprávu",
-  "post-readonly": "Napsat do místnosti pouze ke čtení",
-  "post-readonly_description": "Právo napsat do místnosti pouze ke čtení",
-  "preview-c-room": "Náhled veřejné místnosti",
-  "preview-c-room_description": "Právo zobrazit obsah veřejné místnosti před připojení do ní",
-  "remove-user": "Odebrat uživatele",
-  "remove-user_description": "Právo odebrat uživatele z místnosti",
-  "run-import": "Pustit import",
-  "run-import_description": "Právo spustit importovací proces",
-  "run-migration": "Pustit migraci",
-  "run-migration_description": "Právo spustit migraci",
-  "save-others-livechat-room-info": "Upravit informace LiveChat místnosti",
-  "save-others-livechat-room-info_description": "Právo upravit informace jiné LiveChat místnosti",
-  "set-moderator": "Nastavit moderátora",
-  "set-moderator_description": "Právo nastavit uživatele jako moderátora místnosti",
-  "set-owner": "Nastavit vlastníka",
-  "set-owner_description": "Právo nastavit uživatele jako vlastníka místnosti",
-  "set-react-when-readonly": "Reagovat na zprávy v místnostech ke čtení",
-  "set-react-when-readonly_description": "Právo reagovat na zprávy v místnostech pouze ke čtení",
-  "set-readonly": "Nastavit pouze ke čtení",
-  "set-readonly_description": "Právo změni místnost na pouze ke čtení",
-  "snippet-message": "Šablona zprávy",
-  "snippet-message_description": "Právo vytvořit šablonu zprávy",
-  "unarchive-room": "Odarchivovat místnost",
-  "unarchive-room_description": "Právo odarchivovat místnost",
-  "user-generate-access-token": "Přístupový token uživatelů",
-  "user-generate-access-token_description": "Právo vytvářet uživatelský přístupový token",
-  "view-c-room": "Zobrazit veřejné místnosti",
-  "view-c-room_description": "Právo zobrazit veřejnou místnost",
-  "view-d-room": "Zobrazit soukromé zprávy",
-  "view-d-room_description": "Právo zobrazit soukromé zprávy",
-  "view-full-other-user-info": "Zobrazit veškeré informace uživatele",
-  "view-full-other-user-info_description": "Právo zobrazit veškeré informace uživatele včetně data vytvoření, posledního přihlášení, atd.",
-  "view-history": "Zobrazit historii",
-  "view-history_description": "Právo zobrazit historii místnosti",
-  "view-join-code": "Zobrazit kód místnosti",
-  "view-join-code_description": "Právo zobrazit kód místnosti",
-  "view-joined-room": "Zobrazit připojené místnosti",
-  "view-joined-room_description": "Právo zobrazit aktuálně připojené místnosti",
-  "view-l-room": "Zobrazit LiveChat místnosti",
-  "view-l-room_description": "Právo zobrazit LiveChat místnosti",
-  "view-livechat-manager": "Zobrazit LiveChat manažera",
-  "view-livechat-manager_description": "Právo zobrazit ostatní LiveChat manažery",
-  "view-livechat-rooms": "Zobrazit ostatní LiveChat místnosti",
-  "view-livechat-rooms_description": "Právo zobrazit ostatní LiveChat místnosti",
-  "view-logs": "Zobrazit logy",
-  "view-logs_description": "Právo zobrazit serverové logy",
-  "view-p-room": "Zobrazit soukromou místnost",
-  "view-p-room_description": "Právo zobrazit soukromou místnost",
-  "view-privileged-setting": "Zobrazit nastavení",
-  "view-privileged-setting_description": "Právo zobrazit nastavení",
-  "view-other-user-channels": "Zobrazit místnosti uživatelů",
-  "view-other-user-channels_description": "Právo zobrazit místnosti vlastněné ostatními uživateli",
-  "view-room-administration": "Zobrazit administraci místností",
-  "view-room-administration_description": "Právo zobrazit statistiky veřejných i soukromých místností a přímých konverzací. Nezahrnuje právo zobrazit obsah nebo archiv.",
-  "view-statistics": "Zobrazit statistiky",
-  "view-statistics_description": "Právo zobrazit statistiky jako počet přihlášených uživatelů, počet místností, informace o operačním systému",
-  "view-user-administration": "Zobrazit administraci uživatelů",
-  "view-user-administration_description": "Zobrazit částečný seznam (pouze ke čtení) uživatelů přihlášených do systému. Přes toto právo nelze přistupovat k informacím ostatních uživatelů",
   "Pin_Message": "Připnout zprávu",
   "Pinned_a_message": "Připnuta zpráva:",
   "Pinned_Messages": "Připnuté zprávy",
-  "PiwikAnalytics_siteId_Description": "ID webu k identifikaci těchto stránek (Např: 17)",
   "PiwikAdditionalTrackers": "Dalši Piwik stránky",
   "PiwikAdditionalTrackers_Description": "Zde vložte další Piwik stránky a jejich ID v následujícím formátu:\n [ { \"trackerURL\" : \"https://moje.piwik.domena2/\", \"siteId\" : 2 }, { \"trackerURL\" : \"https://moje.piwik.domena3/\", \"siteId\" : 3 } ]",
-  "PiwikAnalytics_prependDomain": "Přidat doménu",
-  "PiwikAnalytics_prependDomain_Description": "Přidat doménu do názvu stránky pro trackování",
   "PiwikAnalytics_cookieDomain": "Všechny subdomény",
   "PiwikAnalytics_cookieDomain_Description": "Sledovat uživatele napříč všemi subdoménami",
   "PiwikAnalytics_domains": "Skrýt odchozí odkazy",
   "PiwikAnalytics_domains_Description": "Pro report odchozích odkazů skrýt kliky na známé URL.\nDomény vkládejte na nový řádek bez oddělovacích znaků",
+  "PiwikAnalytics_prependDomain": "Přidat doménu",
+  "PiwikAnalytics_prependDomain_Description": "Přidat doménu do názvu stránky pro trackování",
+  "PiwikAnalytics_siteId_Description": "ID webu k identifikaci těchto stránek (Např: 17)",
   "PiwikAnalytics_url_Description": "Url Piwik vaší instance, nezapomeňte zahrnout koncové lomítko. Příklad: //piwik.rocket.chat/",
   "Placeholder_for_email_or_username_login_field": "Zástupný text pro pole e-mailu nebo uživatelského jména v přihlášení",
   "Placeholder_for_password_login_field": "Zástupný text pro pole hesla v přihlášení",
   "Please_add_a_comment": "Prosím, přidejte komentář",
   "Please_add_a_comment_to_close_the_room": "Pro uzavření místnosti prosím přidejte komentář",
   "Please_answer_survey": "Věnujte prosím chvilku času ohodnocení chatu.",
+  "please_enter_valid_domain": "Prosím zadejte platnou doménu",
   "Please_enter_value_for_url": "Prosím, zadejte URL Vašeho avataru.",
   "Please_enter_your_new_password_below": "Níže zadejte své nové heslo:",
   "Please_enter_your_password": "Zadejte prosím své současné heslo",
-  "please_enter_valid_domain": "Prosím zadejte platnou doménu",
   "Please_fill_a_label": "Prosím, vyplňte štítek",
   "Please_fill_a_name": "Prosím vyplňte název",
   "Please_fill_a_username": "Prosím vyplňte uživatelské jméno",
+  "Please_fill_all_the_information": "Prosím vyplňte všechny informace",
   "Please_fill_name_and_email": "Prosím vyplňte jméno a e-mail",
   "Please_select_an_user": "Prosím vyberte uživatele",
   "Please_select_enabled_yes_or_no": "Zvolte hodnotu pro povoleno",
@@ -1358,19 +1386,27 @@
   "Please_wait_while_your_account_is_being_deleted": "Prosím čekejte, mažu Váš účet",
   "Please_wait_while_your_profile_is_being_saved": "Počkejte prosím, ukládám Váš účet",
   "Port": "Port",
+  "post-readonly": "Napsat do místnosti pouze ke čtení",
+  "post-readonly_description": "Právo napsat do místnosti pouze ke čtení",
   "Post_as": "Odeslat jako",
   "Post_to_Channel": "Odeslat do místnosti",
   "Post_to_s_as_s": "Příspěvek do <strong>%s</strong> jako <strong>%s</strong>",
   "Preferences": "Nastavení",
   "Preferences_saved": "Nastavení uloženo",
+  "preview-c-room": "Náhled veřejné místnosti",
+  "preview-c-room_description": "Právo zobrazit obsah veřejné místnosti před připojení do ní",
   "Privacy": "Soukromí",
   "Private": "Privátní",
+  "Private_Channel": "Privátní místnost",
   "Private_Group": "Soukromá skupina",
   "Private_Groups": "Soukromé skupiny",
   "Private_Groups_list": "Seznam Soukromých skupin",
   "Profile": "Profil",
+  "Profile_details": "Detail profilu",
+  "Profile_picture": "Profilový obrázek",
   "Profile_saved_successfully": "Profil byl úspěšně uložen",
   "Public": "Veřejné",
+  "Public_Channel": "Veřejná místnost",
   "Push": "Notifikace",
   "Push_apn_cert": "APN Certifikát",
   "Push_apn_dev_cert": "APN DEV certifikát",
@@ -1394,6 +1430,7 @@
   "quote": "citovat",
   "Quote": "Citovat",
   "Random": "Náhodný",
+  "RDStation_Token": "RD Station Token",
   "React_when_read_only": "Povolit reakce",
   "React_when_read_only_changed_successfully": "Povolit reakce po úspěšné změně povolení ke čtení",
   "Reacted_with": "zanechal/a reakci",
@@ -1404,8 +1441,8 @@
   "Read_only_group": "Skupina pouze pro čtení",
   "Record": "Záznam",
   "Redirect_URI": "URI Přesměrování",
-  "Refresh_oauth_services": "Obnovit služby OAuth",
   "Refresh_keys": "Obnovit klíče",
+  "Refresh_oauth_services": "Obnovit služby OAuth",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "Po instalaci obnovte stránku aby sdílení stránky fungovalo",
   "Regenerate_codes": "Přegenerovat záložní kódy",
   "Register": "Zaregistrovat nový účet",
@@ -1416,26 +1453,28 @@
   "Release": "Verze",
   "Reload": "Znovu načíst",
   "Remove": "Odstranit",
+  "remove-user": "Odebrat uživatele",
+  "remove-user_description": "Právo odebrat uživatele z místnosti",
   "Remove_Admin": "Odebrat Správce",
+  "Remove_as_leader": "Odebrat pozici vedoucího",
   "Remove_as_moderator": "Odebrat moderátora",
   "Remove_as_owner": "Odebrat vlastníka",
-  "Remove_as_leader": "Odebrat pozici vedoucího",
   "Remove_custom_oauth": "Odebrat vlastní OAuth",
   "Remove_from_room": "Odebrat z místnosti",
   "Remove_last_admin": "Odebrat posledního administrátora",
   "Remove_someone_from_room": "Odeberte někoho z místnosti",
   "Removed": "Odebráno",
   "Reply": "Odpověď",
-  "Reporting": "Reporting",
   "Report_Abuse": "Nahlásit zneužití",
   "Report_exclamation_mark": "Nahlásit!",
   "Report_sent": "Nahlášení odesláno",
   "Report_this_message_question_mark": "Nahlásit tuto zprávu?",
+  "Reporting": "Reporting",
   "Require_password_change": "Vyžadovat změnu hesla",
   "Resend_verification_email": "Opětovné zaslání ověřovacího e-mailu",
   "Reset": "Obnovit",
-  "Reset_section_settings": "Obnovit výchozí nastavení sekce",
   "Reset_password": "Obnovit heslo",
+  "Reset_section_settings": "Obnovit výchozí nastavení sekce",
   "Restart": "Restartovat",
   "Restart_the_server": "Restartovat server",
   "Retry_Count": "Počet opakování",
@@ -1452,12 +1491,11 @@
   "room_changed_description": "Popis místnosti změněn na: <em>__room_description__</em> uživatelem <em>__user_by__</em>",
   "room_changed_privacy": "<em>__user_by__</em> změnil/a typ místnosti na: <em>__room_type__</em>",
   "room_changed_topic": "<em>__user_by__</em> změnil/a téma místnosti na: <em>__room_topic__</em>",
+  "Room_default_change_to_private_will_be_default_no_more": "Tato místnost je výchozí a pokud bude změněna na privátní, již nebude moci být mezi výchozími. Přesto změnit?",
   "Room_description_changed_successfully": "Popis místnosti změněn",
-  "Room_has_been_deleted": "Místnost smazána",
   "Room_has_been_archived": "Místnost byla archivována",
+  "Room_has_been_deleted": "Místnost smazána",
   "Room_has_been_unarchived": "Místnost již není archivována",
-  "Room_type_of_default_rooms_cant_be_changed": "Tato místnost je výchozí a proto nelze změnit její typ. Výchozí místnosti může upravovat administrátor.",
-  "Room_default_change_to_private_will_be_default_no_more": "Tato místnost je výchozí a pokud bude změněna na privátní, již nebude moci být mezi výchozími. Přesto změnit?",
   "Room_Info": "Informace o místnosti",
   "room_is_blocked": "Místnost je blokována",
   "room_is_read_only": "Tato místnost je pouze pro čtení",
@@ -1468,10 +1506,15 @@
   "Room_password_changed_successfully": "Heslo místnosti úspěšně změněno",
   "Room_topic_changed_successfully": "Téma místnosti úspěšně změněno",
   "Room_type_changed_successfully": "Typ místnosti úspěšně změněn",
+  "Room_type_of_default_rooms_cant_be_changed": "Tato místnost je výchozí a proto nelze změnit její typ. Výchozí místnosti může upravovat administrátor.",
   "Room_unarchived": "Místnost odarchivována",
   "Room_uploaded_file_list": "Seznam souborů",
   "Room_uploaded_file_list_empty": "Žádné soubory k dispozici.",
   "Rooms": "Místnosti",
+  "run-import": "Pustit import",
+  "run-import_description": "Právo spustit importovací proces",
+  "run-migration": "Pustit migraci",
+  "run-migration_description": "Právo spustit migraci",
   "Running_Instances": "Spuštěných instancí",
   "S_new_messages_since_s": "%s nových zprávy od %s",
   "Same_Style_For_Mentions": "Stejný styl pro zmínky",
@@ -1481,12 +1524,14 @@
   "SAML_Custom_Generate_Username": "Generovat uživatelské jméno",
   "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO přesměrovací URL",
   "SAML_Custom_Issuer": "Vlastní vydavatel",
+  "SAML_Custom_Private_Key": "Obsah privátního klíče",
   "SAML_Custom_Provider": "Vlastní poskytovatel",
   "SAML_Custom_Public_Cert": "Obsah veřejného certifikátu",
-  "SAML_Custom_Private_Key": "Obsah privátního klíče",
   "Sandstorm_Powerbox_Share": "Sdílet Sandstorm grain",
   "Saturday": "Sobota",
   "Save": "Uložit",
+  "save-others-livechat-room-info": "Upravit informace LiveChat místnosti",
+  "save-others-livechat-room-info_description": "Právo upravit informace jiné LiveChat místnosti",
   "Save_changes": "Uložit změny",
   "Save_Mobile_Bandwidth": "Šetřit mobilní data",
   "Save_to_enable_this_action": "Uložte pro povolení akce",
@@ -1507,8 +1552,8 @@
   "Select_a_user": "Vyberte uživatele",
   "Select_an_avatar": "Vyberte avatar",
   "Select_file": "Zvolte soubor",
-  "Select_service_to_login": "Vyberte službu pro přihlášení k načtení obrázků nebo nahrejte obrázek přímo z Vašeho počítače",
   "Select_role": "Zvolit roli",
+  "Select_service_to_login": "Vyberte službu pro přihlášení k načtení obrázků nebo nahrejte obrázek přímo z Vašeho počítače",
   "Select_user": "Vybrat uživatele",
   "Select_users": "Vybrat uživatele",
   "Selected_agents": "Vybraní operátoři",
@@ -1532,9 +1577,17 @@
   "Served_By": "Poskytovatel",
   "Service": "Služba",
   "Service_account_key": "Klíč účty služby",
+  "set-moderator": "Nastavit moderátora",
+  "set-moderator_description": "Právo nastavit uživatele jako moderátora místnosti",
+  "set-owner": "Nastavit vlastníka",
+  "set-owner_description": "Právo nastavit uživatele jako vlastníka místnosti",
+  "set-react-when-readonly": "Reagovat na zprávy v místnostech ke čtení",
+  "set-react-when-readonly_description": "Právo reagovat na zprávy v místnostech pouze ke čtení",
+  "set-readonly": "Nastavit pouze ke čtení",
+  "set-readonly_description": "Právo změni místnost na pouze ke čtení",
+  "Set_as_leader": "Nastavit vedoucícho",
   "Set_as_moderator": "Nastavit jako moderátora",
   "Set_as_owner": "Nastavit jako vlastníka",
-  "Set_as_leader": "Nastavit vedoucícho",
   "Settings": "Nastavení",
   "Settings_updated": "Nastavení aktualizováno",
   "Share_Location_Title": "Sdílet polohu",
@@ -1548,9 +1601,11 @@
   "Show_only_online": "Pouze on-line",
   "Show_preregistration_form": "Ukázat před-registrační formulář",
   "Show_queue_list_to_all_agents": "Zobrazit frontu všech operátorů",
+  "Show_the_keyboard_shortcut_list": "Zobrazit klávesové zkratky",
   "Showing_archived_results": "<p> <b>Zobrazeno %s</b> archivovaných výsledků </p>",
   "Showing_online_users": "Viditelných <b>__total_showing__</b> z __total__ uživatelů",
   "Showing_results": "<p>Zobrazeno <b>%s</b> výsledků</p>",
+  "Sidebar_list_mode": "Mód postraního panelu",
   "Sign_in_to_start_talking": "Pro konverzaci se přihlašte",
   "since_creation": "od %s",
   "Site_Name": "Jméno stránky",
@@ -1558,11 +1613,11 @@
   "Site_Url_Description": "Například: https://chat.domain.com/",
   "Skip": "Přeskočit",
   "SlackBridge_error": "SlackBridge narazil na chybu při importu zpráv ve %s: %s",
+  "SlackBridge_finish": "Slackbridge dokončil import zpráv ve %s. Prosím obnovte stránku pro zobrazení všech zpráv.",
   "SlackBridge_Out_All": "Slackbridge Odesílat Vše",
   "SlackBridge_Out_All_Description": "Odesílat zprávy ze všech místností které existují i na slacku a bot je v nich připojen",
   "SlackBridge_Out_Channels": "Slackbridge Odesílat místnosti",
   "SlackBridge_Out_Channels_Description": "Vyberte které místnosti budou odesílány",
-  "SlackBridge_finish": "Slackbridge dokončil import zpráv ve %s. Prosím obnovte stránku pro zobrazení všech zpráv.",
   "SlackBridge_Out_Enabled": "SlackBridge Odesáílání povoleno",
   "SlackBridge_Out_Enabled_Description": "Zvolit zda by měl SlackBridge také odesílat zprávy zpět do Slacku",
   "SlackBridge_start": "@%s spustil import přes SlackBridge ve `#%s`. Dáme vědět až to bude hotové.",
@@ -1589,11 +1644,15 @@
   "SMTP_Port": "Port SMTP",
   "SMTP_Test_Button": "Test nastavení SMTP",
   "SMTP_Username": "Uživatelské jméno SMTP",
+  "snippet-message": "Šablona zprávy",
+  "snippet-message_description": "Právo vytvořit šablonu zprávy",
   "Snippet_Added": "Vytvořeno v %s",
   "Snippet_Messages": "Předvolené zprávy",
   "Snippeted_a_message": "Vytvořena předvolená zpráva __snippetLink__",
+  "Sort_by_activity": "Řadit podle aktivity",
   "Sound": "Zvuk",
   "Sound_File_mp3": "Soubor zvuku (mp3)",
+  "Split_by_categories": "Rozdělit podle kategorií",
   "SSL": "SSL",
   "Star_Message": "Ohvězdičkovat zprávu",
   "Starred_Messages": "Zprávy s hvězdičkou",
@@ -1620,9 +1679,9 @@
   "Stats_Total_Livechat_Rooms": "Celkem Livechat místností",
   "Stats_Total_Messages": "Celkem zpráv",
   "Stats_Total_Messages_Channel": "Celkem zpráv ve veřejných místnostech",
-  "Stats_Total_Messages_PrivateGroup": "Celkem zpráv v soukromých skupinách",
   "Stats_Total_Messages_Direct": "Celkem zpráv v přímých konverzacích",
   "Stats_Total_Messages_Livechat": "Celkem zpráv v Livechatech",
+  "Stats_Total_Messages_PrivateGroup": "Celkem zpráv v soukromých skupinách",
   "Stats_Total_Private_Groups": "Celkem Soukromých skupin",
   "Stats_Total_Rooms": "Celkem místností",
   "Stats_Total_Users": "Celkem uživatelů",
@@ -1647,6 +1706,7 @@
   "Take_it": "Převzít",
   "TargetRoom": "Cílová místnost",
   "TargetRoom_Description": "Místnost do které budou odeslány zprávy po spuštění dané události. Je povolena pouze jedna místnost, který musí existovat.",
+  "Team": "Team",
   "Test_Connection": "Test připojení",
   "Test_Desktop_Notifications": "Test Oznámení na ploše",
   "Thank_you_exclamation_mark": "Děkujeme!",
@@ -1662,32 +1722,32 @@
   "The_user_will_be_removed_from_s": "Uživatel bude odstraněn z %s",
   "The_user_wont_be_able_to_type_in_s": "Uživatel nebude moci psát v %s",
   "Theme": "Barevné nastavení",
-  "theme-color-transparent-darker": "Průhledná tmavší",
-  "theme-color-transparent-dark": "Průhledná tmavá",
-  "theme-color-transparent-light": "Průhledná světlá",
-  "theme-color-transparent-lighter": "Průhledná světlejší",
-  "theme-color-transparent-lightest": "Průhledná nejsvětlejší",
+  "theme-color-component-color": "Barva komponenty",
   "theme-color-content-background-color": "Barva pozadí obsahu",
+  "theme-color-custom-scrollbar-color": "Vlastní barva posuvníku",
+  "theme-color-error-color": "Barva chybové akce",
+  "theme-color-info-font-color": "Barva písma Informace",
+  "theme-color-link-font-color": "Barva písma odkazů",
+  "theme-color-pending-color": "Barva čekající akce",
+  "theme-color-primary-action-color": "Primární barva akce",
   "theme-color-primary-background-color": "Primární Barva pozadí",
   "theme-color-primary-font-color": "Primární Barva písma",
-  "theme-color-primary-action-color": "Primární barva akce",
+  "theme-color-secondary-action-color": "Sekundární barva akce",
   "theme-color-secondary-background-color": "Sekundární Barva pozadí",
   "theme-color-secondary-font-color": "Sekundární Barva písma",
-  "theme-color-secondary-action-color": "Sekundární barva akce",
-  "theme-color-component-color": "Barva komponenty",
-  "theme-color-success-color": "Barva zdařené akce",
-  "theme-color-pending-color": "Barva čekající akce",
-  "theme-color-error-color": "Barva chybové akce",
   "theme-color-selection-color": "Barva výběru",
-  "theme-color-tertiary-background-color": "Terciární Barva pozadí",
-  "theme-color-tertiary-font-color": "Terciární Barva písma",
-  "theme-color-link-font-color": "Barva písma odkazů",
-  "theme-color-info-font-color": "Barva písma Informace",
-  "theme-color-custom-scrollbar-color": "Vlastní barva posuvníku",
   "theme-color-status-away": "Barva stavu 'pryč'",
   "theme-color-status-busy": "Barva stavu 'zaneprázdněn'",
   "theme-color-status-offline": "Barva stavu Offline",
   "theme-color-status-online": "Barva stavu Online",
+  "theme-color-success-color": "Barva zdařené akce",
+  "theme-color-tertiary-background-color": "Terciární Barva pozadí",
+  "theme-color-tertiary-font-color": "Terciární Barva písma",
+  "theme-color-transparent-dark": "Průhledná tmavá",
+  "theme-color-transparent-darker": "Průhledná tmavší",
+  "theme-color-transparent-light": "Průhledná světlá",
+  "theme-color-transparent-lighter": "Průhledná světlejší",
+  "theme-color-transparent-lightest": "Průhledná nejsvětlejší",
   "theme-color-unread-notification-color": "Barva Nepřečtených upozornění",
   "theme-custom-css": "Vlastní CSS",
   "theme-font-body-font-family": "Font obsahu",
@@ -1700,11 +1760,6 @@
   "This_is_a_push_test_messsage": "Toto je testovací notifikace",
   "This_room_has_been_archived_by__username_": "Tato místnost byla archivována uživatelem __username__",
   "This_room_has_been_unarchived_by__username_": "Tato místnost byla úspěšně odarchivována uživatelem __username__",
-  "Two-factor_authentication": "Dvoufázové ověření",
-  "Two-factor_authentication_disabled": "Dvoufázová ověření zakázáno",
-  "Two-factor_authentication_enabled": "Dvoufázové ověření povoleno",
-  "Two-factor_authentication_is_currently_disabled": "Dvoufázová ověření je momentálně zakázáno",
-  "Two-factor_authentication_native_mobile_app_warning": "UPOZORNĚNÍ: Pokud povolíte dvoufázové ověření, nebudete se moci přihlásit přes nativní mobilní aplikace (Rocket.Chat+) dokud v těchto nebude 2FA implementována.",
   "Thursday": "Čtvrtek",
   "Time_in_seconds": "Čas v sekundách",
   "Title": "Název",
@@ -1716,29 +1771,38 @@
   "To_users": "Uživatelům",
   "Toggle_original_translated": "Zobrazit originál/překlad",
   "Topic": "Téma",
-  "Travel_and_Places": "Cestování & Místa",
   "Transcript_Enabled": "Zeptat se po skončení chatu, zda uživateli odeslat kopii konverzace",
   "Transcript_message": "Zpráva kterou zobrazit jako dotaz zda odeslat kopii konverzace",
   "Transcript_of_your_livechat_conversation": "Kopie Vaší LiveChat konverzace",
   "Translated": "Přeloženo",
   "Translations": "Překlady",
+  "Travel_and_Places": "Cestování & Místa",
   "Trigger_removed": "Trigger odstraněn",
   "Trigger_Words": "Klíčová slova",
   "Triggers": "Trigery",
   "True": "Ano",
   "Tuesday": "Úterý",
+  "Two-factor_authentication": "Dvoufázové ověření",
+  "Two-factor_authentication_disabled": "Dvoufázová ověření zakázáno",
+  "Two-factor_authentication_enabled": "Dvoufázové ověření povoleno",
+  "Two-factor_authentication_is_currently_disabled": "Dvoufázové ověření je momentálně zakázáno",
+  "Two-factor_authentication_native_mobile_app_warning": "UPOZORNĚNÍ: Pokud povolíte dvoufázové ověření, nebudete se moci přihlásit přes nativní mobilní aplikace (Rocket.Chat+) dokud v těchto nebude 2FA implementována.",
   "Type": "Typ",
   "Type_your_email": "Zadejte svůj e-mail",
   "Type_your_message": "Napište zprávu",
   "Type_your_name": "Zadejte své jméno",
   "Type_your_new_password": "Zadejte nové heslo",
   "UI_Allow_room_names_with_special_chars": "Povolit speciální znaky v názvech místností",
+  "UI_Click_Direct_Message": "Kliknutím vytvořit přímou zprávu",
+  "UI_Click_Direct_Message_Description": "Přeskočit záložku profilu a přejít přímo do konverzace",
   "UI_DisplayRoles": "Zobrazit Role",
   "UI_Merge_Channels_Groups": "Sloučit privátní skupiny s místnostmi",
   "UI_Unread_Counter_Style": "Styl počítadla nepřečtených zpráv",
   "UI_Use_Name_Avatar": "Použít iniciály celého jména uživatele pro výchozí avatar",
   "UI_Use_Real_Name": "Použít skutečné jméno",
   "Unarchive": "Zrušit archivaci",
+  "unarchive-room": "Odarchivovat místnost",
+  "unarchive-room_description": "Právo odarchivovat místnost",
   "Unblock_User": "Odblokovat uživatele",
   "Unmute_someone_in_room": "Zrušit ztlumení někoho v místnosti",
   "Unmute_user": "Zrušit ztlumení uživatele",
@@ -1746,10 +1810,10 @@
   "Unpin_Message": "Odepnout Zprávu",
   "Unread_Count": "Počet nepřečtených",
   "Unread_Count_DM": "Počet nepřečtených přímých zpráv",
-  "Unread_Tray_Icon_Alert": "Ikona v oznamovací oblasti upozorňuje na nepřečtené zprávy",
   "Unread_Messages": "Nepřečtěné zprávy",
   "Unread_Rooms": "Nepřečtené místnosti",
   "Unread_Rooms_Mode": "Mód Nepřečtených místností",
+  "Unread_Tray_Icon_Alert": "Ikona v oznamovací oblasti upozorňuje na nepřečtené zprávy",
   "Unstar_Message": "Odebrat hvězdičku",
   "Updated_at": "Poslední aktualizace",
   "Upload_file_description": "Popis souboru",
@@ -1763,17 +1827,21 @@
   "Use_Emojis": "Použít emotikony",
   "Use_Global_Settings": "Použít obecné nastavení",
   "Use_initials_avatar": "Použít iniciály Vašeho jména",
+  "Use_minor_colors": "Použít nevýraznou barevnou baletu (ve výchozím stavu podědí výraznou paletu)",
   "Use_service_avatar": "Použijte avatar z %s",
   "Use_this_username": "Použít toto uživatelské jméno",
   "Use_uploaded_avatar": "Použít nahraný avatar",
   "Use_url_for_avatar": "Použijte avatar z URL",
   "Use_User_Preferences_or_Global_Settings": "Použít nastavení uživatele nebo obecné nastavení",
+  "User": "Uživatel",
+  "user-generate-access-token": "Přístupový token uživatelů",
+  "user-generate-access-token_description": "Právo vytvářet uživatelský přístupový token",
+  "User__username__is_now_a_leader_of__room_name_": "Uživatel __username__ je nyní vedoucím místnosti __room_name__",
   "User__username__is_now_a_moderator_of__room_name_": "Uživatel __username__ je nyní moderátorem __room_name__",
   "User__username__is_now_a_owner_of__room_name_": "Uživatel __username__ je nyní vlastníkem __room_name__",
-  "User__username__is_now_a_leader_of__room_name_": "Uživatel __username__ je nyní vedoucím místnosti __room_name__",
+  "User__username__removed_from__room_name__leaders": "Uživatel __username__ byl odebrán z vedoucích místnosti __room_name__",
   "User__username__removed_from__room_name__moderators": "Uživatel __username__ odebrán z moderátorů __room_name__",
   "User__username__removed_from__room_name__owners": "Uživatel __username__ odebrán z vlastníků __room_name__",
-  "User__username__removed_from__room_name__leaders": "Uživatel __username__ byl odebrán z vedoucích místnosti __room_name__",
   "User_added": "Přidán uživatel",
   "User_added_by": "<em>__user_by__</em> přidal uživatele <em>__user_added__</em>.",
   "User_added_successfully": "Uživatel byl úspěšně přidán",
@@ -1823,6 +1891,7 @@
   "Username_invalid": "<strong>%s</strong> není platné uživatelské jméno, <br/> použijte pouze písmena, číslice, tečky, pomlčky a podtržítka",
   "Username_is_already_in_here": "`@%s` už je zde.",
   "Username_is_not_in_this_room": "Uživatel `#%s` není v této místnosti.",
+  "Username_Placeholder": "Zadejte uživatelská jména...",
   "Username_title": "Registrovat uživatelské jméno",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ chce spustit OTR (konverzaci mimo záznam). Chcete ji přijmout?",
   "Users": "Uživatelé",
@@ -1834,16 +1903,50 @@
   "Validate_email_address": "Validovat email",
   "Verification": "Ověření",
   "Verification_Description": "Můžete použít následující zástupné symboly: <br/><ul><li>[Verification_Url] pro adresu potvrzení.</li><li>[name] pro celé jméno, [fname] pro křestní jméno a [lname] pro příjmení uživatele.</li><li>[email] pro email uživatelé.</li><li>[Site_Name] pro název a [Site_URL] pro a URL stránky.</li></ul>",
+  "Verification_Email": "Klikněte na <a href=\"[Verification_Url]\">tento odkaz</a> pro potvrzení svého účtu.",
   "Verification_email_sent": "Ověřovací email odeslán",
   "Verification_Email_Subject": "[Site_Name] - Potvrďte svůj účet",
-  "Verification_Email": "Klikněte na <a href=\"[Verification_Url]\">tento odkaz</a> pro potvrzení svého účtu.",
   "Verified": "Ověřený",
   "Verify": "Ověřit",
   "Version": "Verze",
   "Video_Chat_Window": "Video chat",
   "Video_Conference": "Video konference",
+  "Video_message": "Video zpráva",
   "Videocall_declined": "Videohovor odmítnut",
   "Videocall_enabled": "Videohovor povolen",
+  "view-c-room": "Zobrazit veřejné místnosti",
+  "view-c-room_description": "Právo zobrazit veřejnou místnost",
+  "view-d-room": "Zobrazit soukromé zprávy",
+  "view-d-room_description": "Právo zobrazit soukromé zprávy",
+  "view-full-other-user-info": "Zobrazit veškeré informace uživatele",
+  "view-full-other-user-info_description": "Právo zobrazit veškeré informace uživatele včetně data vytvoření, posledního přihlášení, atd.",
+  "view-history": "Zobrazit historii",
+  "view-history_description": "Právo zobrazit historii místnosti",
+  "view-join-code": "Zobrazit kód místnosti",
+  "view-join-code_description": "Právo zobrazit kód místnosti",
+  "view-joined-room": "Zobrazit připojené místnosti",
+  "view-joined-room_description": "Právo zobrazit aktuálně připojené místnosti",
+  "view-l-room": "Zobrazit LiveChat místnosti",
+  "view-l-room_description": "Právo zobrazit LiveChat místnosti",
+  "view-livechat-manager": "Zobrazit LiveChat manažera",
+  "view-livechat-manager_description": "Právo zobrazit ostatní LiveChat manažery",
+  "view-livechat-rooms": "Zobrazit ostatní LiveChat místnosti",
+  "view-livechat-rooms_description": "Právo zobrazit ostatní LiveChat místnosti",
+  "view-logs": "Zobrazit logy",
+  "view-logs_description": "Právo zobrazit serverové logy",
+  "view-other-user-channels": "Zobrazit místnosti uživatelů",
+  "view-other-user-channels_description": "Právo zobrazit místnosti vlastněné ostatními uživateli",
+  "view-outside-room": "Zobrazit mimo povolenou místnost",
+  "view-p-room": "Zobrazit soukromou místnost",
+  "view-p-room_description": "Právo zobrazit soukromou místnost",
+  "view-privileged-setting": "Zobrazit nastavení",
+  "view-privileged-setting_description": "Právo zobrazit nastavení",
+  "view-room-administration": "Zobrazit administraci místností",
+  "view-room-administration_description": "Právo zobrazit statistiky veřejných i soukromých místností a přímých konverzací. Nezahrnuje právo zobrazit obsah nebo archiv.",
+  "view-statistics": "Zobrazit statistiky",
+  "view-statistics_description": "Právo zobrazit statistiky jako počet přihlášených uživatelů, počet místností, informace o operačním systému",
+  "view-user-administration": "Zobrazit administraci uživatelů",
+  "view-user-administration_description": "Zobrazit částečný seznam (pouze ke čtení) uživatelů přihlášených do systému. Přes toto právo nelze přistupovat k informacím ostatních uživatelů",
   "View_All": "Zobrazit vše",
   "View_Logs": "Zobrazit logy",
   "View_mode": "Režim zobrazení",
@@ -1876,13 +1979,13 @@
   "Would_you_like_to_return_the_inquiry": "Chcete požadavek zamítnout?",
   "Yes": "Ano",
   "Yes_archive_it": "Ano archivovat",
-  "Yes_unarchive_it": "Ano zrušit archivaci",
   "Yes_clear_all": "Ano, vyčistit všechny!",
   "Yes_delete_it": "Ano, smazat!",
   "Yes_hide_it": "Ano, skrýt!",
   "Yes_leave_it": "Ano, opustit!",
   "Yes_mute_user": "Ano, ztišit!",
   "Yes_remove_user": "Ano, odstranit!",
+  "Yes_unarchive_it": "Ano zrušit archivaci",
   "You": "Vy",
   "you_are_in_preview_mode_of": "Nacházíte se v režimu náhledu místnosti #<strong>__room_name__</strong>",
   "You_are_logged_in_as": "Jste přihlášeni jako",
@@ -1917,4 +2020,4 @@
   "your_message_optional": "vaše zpráva (nepovinná)",
   "Your_password_is_wrong": "Vaše heslo je špatně!",
   "Your_push_was_sent_to_s_devices": "Vaše notifikace byla odeslána do %s zařízení"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index 6cef152e0cc..0156a822440 100644
--- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -229,7 +229,7 @@
   "Channel_Archived": "Raum mit dem Namen '#%s' wurde erfolgreich archiviert",
   "Channel_doesnt_exist": "Der Raum `#%s` existiert nicht.",
   "Channel_Unarchived": "Raum mit dem Namen '#%s' ist nicht länger archiviert",
-  "Channels": "Kanäle (für alle einsehbar)",
+  "Channels": "Kanäle",
   "Channels_list": "Liste der Kanäle",
   "Chat_button": "Chatbutton",
   "Chat_closed": "Chat geschlossen",
@@ -369,6 +369,7 @@
   "error-could-not-change-username": "Konnte den Benutzernamen nicht ändern",
   "error-delete-protected-role": "Eine geschützte Rolle kann nicht gelöscht werden.",
   "error-department-not-found": "Abteilung konnte nicht gefunden werden.",
+  "error-direct-message-file-upload-not-allowed": "Dateiaustausch ist in direkten Nachrichten nicht möglich.",
   "error-duplicate-channel-name": "Ein Kanal mit dem Namen '__channel_name__' existiert bereits.",
   "error-email-domain-blacklisted": "Die Domain der E-Mail-Adresse ist blacklisted.",
   "error-field-unavailable": "<strong>__field__</strong> wird leider schon verwendet. ",
@@ -386,7 +387,6 @@
   "error-invalid-email": "Ungültige E-Mail-Adresse: __email__",
   "error-invalid-file-height": "Ungültige Dateihöhe",
   "error-invalid-file-type": "Ungültiges Dateiformat.",
-  "error-direct-message-file-upload-not-allowed": "Dateiaustausch ist in direkten Nachrichten nicht möglich.",
   "error-invalid-file-width": "Ungültige Dateibreite",
   "error-invalid-from-address": "Sie haben eine ungültige E-Mail-Adresse als Empfänger angegeben.",
   "error-invalid-integration": "Ungültige Integration",
@@ -526,13 +526,13 @@
   "Integration_added": "Die Integration wurde hinzugefügt.",
   "Integration_Incoming_WebHook": "Eingehende WebHook-Integration",
   "Integration_New": "Neue Integration",
-  "Integrations_Outgoing_Type_RoomJoined": "BenutzerIn hat den Raum betreten",
-  "Integrations_Outgoing_Type_RoomLeft": "BenutzerIn hat den Raum verlassen",
-  "Integrations_Outgoing_Type_UserCreated": "BenutzerIn angelegt.",
   "Integration_Outgoing_WebHook": "Ausgehende WebHook-Integration",
-  "Integration_Word_Trigger_Placement_Description": "Soll das auslösende Wort irgendwo im Satz stehen und nicht nur am Anfang? ",
   "Integration_updated": "Die Integration wurde aktualisiert.\n",
+  "Integration_Word_Trigger_Placement_Description": "Soll das auslösende Wort irgendwo im Satz stehen und nicht nur am Anfang? ",
   "Integrations": "Integrationen",
+  "Integrations_Outgoing_Type_RoomJoined": "BenutzerIn hat den Raum betreten",
+  "Integrations_Outgoing_Type_RoomLeft": "BenutzerIn hat den Raum verlassen",
+  "Integrations_Outgoing_Type_UserCreated": "BenutzerIn angelegt.",
   "InternalHubot": "Interner Hubot",
   "InternalHubot_ScriptsToLoad": "Zu ladende Skripte",
   "InternalHubot_ScriptsToLoad_Description": "Bitte geben Sie eine durch Kommata getrennte Liste von zu ladenden Skripten von https://github.com/github/hubot-scripts/tree/master/src/scripts an.",
@@ -795,8 +795,8 @@
   "Nothing_found": "Es wurde nichts gefunden.",
   "Notification_Duration": "Dauer der Benachrichtigung",
   "Notifications": "Benachrichtigungen",
-  "Notify_all_in_this_room": "Alle Benutzer in diesem Raum benachrichtigen",
   "Notify_active_in_this_room": "Aktive Benutzer/innen benachrichtigen",
+  "Notify_all_in_this_room": "Alle Benutzer in diesem Raum benachrichtigen",
   "Num_Agents": "# Agents",
   "Number_of_messages": "Anzahl der Nachrichten",
   "OAuth_Application": "OAuth-Anwendung",
@@ -807,8 +807,10 @@
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record-Gespräche sind für Ihren Browser oder Ihr Gerät nicht verfügbar.",
   "Office_hours_enabled": "Bürozeiten aktiviert",
   "Offline": "Offline",
+  "Offline_DM_Email": "Private Nachricht von __user__ erhalten.",
   "Offline_form": "Offline-Formular",
   "Offline_form_unavailable_message": "Nachricht, dass Offline Formular ungültig",
+  "Offline_Mention_Email": "Erwähnung durch  __user__ in #__room__.",
   "Offline_message": "Offline-Nachricht",
   "Offline_success_message": "Nachricht, dass Offline Nachricht erfolgreich",
   "Offline_unavailable": "offline - nicht verfügbar",
@@ -1084,19 +1086,19 @@
   "The_user_wont_be_able_to_type_in_s": "Der Benutzer kann nicht mehr in %s schreiben.",
   "Theme": "Theme",
   "theme-color-content-background-color": "Hintergrundfarbe des Inhalts",
+  "theme-color-custom-scrollbar-color": "Benutzerdefinierte Farbe der Scrollbar",
+  "theme-color-info-font-color": "Schriftfarbe von Informationen",
+  "theme-color-link-font-color": "Schriftfarbe des Links",
   "theme-color-primary-background-color": "Primäre Hintergrundfarbe ",
   "theme-color-primary-font-color": "Primäre Schriftfarbe",
   "theme-color-secondary-background-color": "Sekundäre Hintergrundfarbe",
   "theme-color-secondary-font-color": "Sekundäre Schriftfarbe",
-  "theme-color-tertiary-background-color": "Tertiäre Hintergrundfarbe ",
-  "theme-color-tertiary-font-color": "Tertiäre Schriftfarbe",
-  "theme-color-link-font-color": "Schriftfarbe des Links",
-  "theme-color-info-font-color": "Schriftfarbe von Informationen",
-  "theme-color-custom-scrollbar-color": "Benutzerdefinierte Farbe der Scrollbar",
   "theme-color-status-away": "Farbe des Status \"abwesend\"",
   "theme-color-status-busy": "Farbe des Status \"beschäftigt\"",
   "theme-color-status-offline": "Farbe des Status \"offline\"\n",
   "theme-color-status-online": "Farbe des Status \"online\"",
+  "theme-color-tertiary-background-color": "Tertiäre Hintergrundfarbe ",
+  "theme-color-tertiary-font-color": "Tertiäre Schriftfarbe",
   "theme-color-unread-notification-color": "Farbe von ungelesenen Benachrichtigungen",
   "theme-custom-css": "Benutzerdefiniertes CSS",
   "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt.",
@@ -1273,4 +1275,4 @@
   "your_message_optional": "ihre optionale Nachricht",
   "Your_password_is_wrong": "Falsches Passwort",
   "Your_push_was_sent_to_s_devices": "Die Push-Nachricht wurde an %s Geräte gesendet."
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index 651e7b28124..3e11c2c7296 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -11,14 +11,18 @@
   "__username__was_set__role__by__user_by_": "__username__ ist jetzt __role__, geändert durch __user_by__",
   "Accept": "Akzeptieren",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Akzeptiere eingehende Livechat-Anfragen auch wenn kein Agent online ist",
-  "Accept_with_no_online_agents": "Akzeptiere ohne Online Agenten",
+  "Accept_with_no_online_agents": "Auch annehmen, wenn keine Agenten online sind",
+  "access-mailer": "Zugriff auf den Mailer",
+  "access-mailer_description": "Berechtigung, Massen-E-Mails an alle Benutzer zu versenden.",
+  "access-permissions": "Zugriff auf die Berechtigungs-Übersicht",
+  "access-permissions_description": "Anpassen der Berechtigungen für die unterschiedlichen Rollen.",
   "Access_not_authorized": "Der Zugriff ist nicht gestattet.",
   "Access_Token_URL": "URL des Access-Token",
   "Accessing_permissions": "Zugriff auf Berechtigungen",
   "Account_SID": "Konto-SID",
   "Accounts": "Konten",
-  "Accounts_AllowAnonymousRead": "Erlaube Anonymes lesen",
-  "Accounts_AllowAnonymousWrite": "Erlaube Anonymes schreiben",
+  "Accounts_AllowAnonymousRead": "Erlaube anonymes Lesen",
+  "Accounts_AllowAnonymousWrite": "Erlaube anonymes Schreiben",
   "Accounts_AllowDeleteOwnAccount": "Benutzern erlauben, ihr Konto zu löschen",
   "Accounts_AllowedDomainsList": "Liste von erlaubten Domains",
   "Accounts_AllowedDomainsList_Description": "Durch Kommata getrennte Liste von erlaubten Domains",
@@ -33,15 +37,17 @@
   "Accounts_BlockedDomainsList_Description": "Kommata getrennte Liste von geblockten Domains",
   "Accounts_BlockedUsernameList": "Liste gesperrter Benutzernamen",
   "Accounts_BlockedUsernameList_Description": "Komma-getrennte Liste gesperrter Benutzernamen (case-insensitive)",
-  "Accounts_CustomFields_Description": "Valides JSON erwartet, in dem die Schlüssel die Feldnamen repräsentieren und ein Verzeichnis von Feldeinstellungen beinhalten. Beispiel: <br/>\n<code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code>",
+  "Accounts_CustomFields_Description": "Ein gültiges JSON, in dem die Schlüssel Sprachkürzel sind, die wiederum Tupel von Schlüssel und Übersetzungen enthalten. Beispiel: <br/>\n<code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code>",
+  "Accounts_CustomFieldsToShowInUserInfo": "Eigene Felder, die in der Benutzer-Information angezeigt werden sollen",
+  "Accounts_DefaultUsernamePrefixSuggestion": "Vorschlag für Präfix des Standard-Benutzernamens ",
   "Accounts_denyUnverifiedEmail": "Nicht verifizierte E-Mail-Adressen ablehnen",
   "Accounts_EmailVerification": "E-Mail-Verifizierung",
   "Accounts_EmailVerification_Description": "Um diese Funktion nutzen zu können, stellen Sie bitte sicher, dass ihre SMTP-Einstellungen korrekt sind.",
   "Accounts_Enrollment_Email": "Registrierungsmail",
   "Accounts_Enrollment_Email_Default": "<h2> Willkommen zu <h1>[Site_Name]</h1></h2><p>Besuchen Sie [Site_URL] und probieren Sie noch heute die beste Open-Source-Chat-Lösung aus.</p>",
-  "Accounts_Enrollment_Email_Description": "Sie können die folgenden Platzhalter verwenden: <br /><ul><li> [name], [fname], [lname] für den vollständigen Namen des Benutzers, Vornamen oder Nachnamen. </li><li> [email] für die E-Mail-Adresse des Benutzers. </li><li> [Site_Name] und [Site_URL] für den Anwendungsname und die URL. </li></ul>",
+  "Accounts_Enrollment_Email_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li> [name], [fname], [lname] für den vollständigen Namen, Vornamen oder Nachnamen des Benutzers. </li><li> [email] für die E-Mail-Adresse des Benutzers. </li><li> [Site_Name] und [Site_URL] für den Anwendungsnamen und die URL. </li></ul>",
   "Accounts_Enrollment_Email_Subject_Default": "Willkommen zu [Site_Name]",
-  "Accounts_ForgetUserSessionOnWindowClose": "Benutzer Session vergessen, wenn Fenster geschlossen wird",
+  "Accounts_ForgetUserSessionOnWindowClose": "Benutzer Session beenden, wenn das Fenster geschlossen wird",
   "Accounts_Iframe_api_method": "API-Methode",
   "Accounts_Iframe_api_url": "API-URL",
   "Accounts_iframe_enabled": "aktiviert",
@@ -61,11 +67,11 @@
   "Accounts_OAuth_Custom_Secret": "Geheimer Schlüssel",
   "Accounts_OAuth_Custom_Token_Path": "Pfad des Token",
   "Accounts_OAuth_Custom_Token_Sent_Via": "Token gesendet über",
-  "Accounts_OAuth_Custom_Username_Field": "Benutzernamen Feld",
-  "Accounts_OAuth_Drupal": "Login mit Drupal aktiviert",
-  "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth Redirect Url",
+  "Accounts_OAuth_Custom_Username_Field": "Feld für Benutzernamen",
+  "Accounts_OAuth_Drupal": "Anmeldung über Drupal",
+  "Accounts_OAuth_Drupal_callback_url": "Drupal OAuth Redirect Url",
   "Accounts_OAuth_Drupal_id": "Drupal oAuth2 Client ID",
-  "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Client Schlüssel",
+  "Accounts_OAuth_Drupal_secret": "Geheimer Drupal oAuth2 Client Schlüssel",
   "Accounts_OAuth_Facebook": "Anmeldung über Facebook erlauben",
   "Accounts_OAuth_Facebook_callback_url": "Facebook-Callback-URL",
   "Accounts_OAuth_Facebook_id": "Facebook-App-ID",
@@ -94,7 +100,9 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor-Callback-URL",
   "Accounts_OAuth_Meteor_id": "Meteor-ID",
   "Accounts_OAuth_Meteor_secret": "Geheimer Meteor Schlüssel",
-  "Accounts_OAuth_Twitter": "Anmeldung über Twitter erlauben",
+  "Accounts_OAuth_Proxy_host": "Proxy Host",
+  "Accounts_OAuth_Proxy_services": "Proxy Port",
+  "Accounts_OAuth_Twitter": "Anmeldung über Twitter",
   "Accounts_OAuth_Twitter_callback_url": "Twitter-Callback-URL",
   "Accounts_OAuth_Twitter_id": "Twitter-ID",
   "Accounts_OAuth_Twitter_secret": "Geheimer Twitter Schlüssel",
@@ -103,10 +111,8 @@
   "Accounts_OAuth_Wordpress_id": "WordPress-ID",
   "Accounts_OAuth_Wordpress_secret": "Geheimer WordPress Schlüssel",
   "Accounts_PasswordReset": "Passwort zurücksetzen",
-  "Accounts_OAuth_Proxy_host": "Proxy Host",
-  "Accounts_OAuth_Proxy_services": "Proxy Service",
-  "Accounts_Registration_AuthenticationServices_Default_Roles": "Standardrolle für Authentifizierungsdienste",
-  "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Standardrollen die Benutzern zugewiesen werden, die sich über Authentifizierungsdienste registrieren",
+  "Accounts_Registration_AuthenticationServices_Default_Roles": "Standardrolle bei Nutzung von Authentifizierungsdiensten",
+  "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Standardrollen, die Benutzern zugewiesen werden, wenn diese sich über Authentifizierungsdienste registrieren",
   "Accounts_Registration_AuthenticationServices_Enabled": "Anmeldung mit Authentifizierungsdiensten",
   "Accounts_RegistrationForm": "Anmeldeformular",
   "Accounts_RegistrationForm_Disabled": "Deaktiviert",
@@ -117,8 +123,9 @@
   "Accounts_RegistrationForm_SecretURL_Description": "Sie müssen eine zufällige Zeichenfolge, die der Registrierungs-URL hinzugefügt wird, angeben. Beispiel: https://demo.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Namen für die Anmeldung verlangen",
   "Accounts_RequirePasswordConfirmation": "Passwortbestätigung erforderlich",
-  "Accounts_SetDefaultAvatar": "Standard Avatar setzen",
-  "Accounts_SetDefaultAvatar_Description": "Versuche Standardavatar über OAuth oder Gravatar zu bestimmen",
+  "Accounts_SearchFields": "Felder, die in der Suche berücksichtigt werden sollen",
+  "Accounts_SetDefaultAvatar": "Standard-Avatar setzen",
+  "Accounts_SetDefaultAvatar_Description": "Versuche Standard-Avatar über OAuth oder Gravatar zu bestimmen",
   "Accounts_ShowFormLogin": "Anmeldeformular zeigen",
   "Accounts_UseDefaultBlockedDomainsList": "Standardliste für blockierte Domains verwenden",
   "Accounts_UseDNSDomainCheck": "DNS-Domain-Check verwenden",
@@ -128,10 +135,22 @@
   "Activate": "Aktivieren",
   "Activity": "Aktivität",
   "Add": "Hinzufügen",
+  "add-oauth-service": "OAuth-Dienst hinzufügen",
+  "add-oauth-service_description": "Berechtigung, einen neuen OAuth-Dienst hinzuzufügen",
+  "add-user": "Benutzer erstellen",
+  "add-user-to-any-c-room": "Füge Benutzer zu jedem öffentlichen Kanal hinzu",
+  "add-user-to-any-c-room_description": "Berechtigung, um Benutzer zu jedem öffentlichen Kanal hinzuzufügen",
+  "add-user-to-any-p-room": "Benutzer jedem privaten Kanal hinzufügen",
+  "add-user-to-any-p-room_description": "Berechtigung, Benutzer jedem privaten Kanal hinzuzufügen",
+  "add-user-to-joined-room": "Benutzer jedem beigetretenen Kanal hinzufügen",
+  "add-user-to-joined-room_description": "Berechtigung, Benutzer jedem beigetretenen Kanal hinzuzufügen",
+  "add-user_description": "Berechtigung, über den Benutzer-Bildschirm neue Nutzer anzulegen",
   "Add_agent": "Agent hinzufügen",
   "Add_custom_oauth": "Benutzerdefiniertes OAuth-Konto hinzufügen",
   "Add_Domain": "Domain hinzufügen",
+  "Add_files_from": "Dateien hinzufügen von",
   "Add_manager": "Manager hinzufügen",
+  "Add_Role": "Rolle hinzufügen",
   "Add_user": "BenutzerIn hinzufügen",
   "Add_User": "BenutzerIn hinzufügen",
   "Add_users": "BenutzerInnen hinzufügen",
@@ -141,24 +160,26 @@
   "Additional_emails": "Zusätzliche E-Mails",
   "Additional_Feedback": "Zusätzliches Feedback",
   "Administration": "Administration",
+  "Adult_images_are_not_allowed": "Nicht-jugendfreie Bilder sind nicht erlaubt",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "Nach der OAuth2-Authentifizierung werden die Benutzer auf diese URL weitergeleitet.",
   "Agent": "Agent",
   "Agent_added": "Der Agent wurde hinzugefügt.",
   "Agent_removed": "Der Agent wurde gelöscht.",
   "Alias": "Alias",
-  "Alias_Format": "Alias Format",
+  "Alias_Format": "Alias-Format",
   "Alias_Format_Description": "Nachricht von Slack mit einem Alias importieren; %s wird mit dem Benutzernamen ersetzt. Wenn Feld leer bleibt, wird kein Alias benutzt.",
   "Alias_Set": "Alias setzen",
   "All": "Alle",
   "All_channels": "Alle Kanäle",
   "All_logs": "Alle Protokolle",
   "All_messages": "Alle Nachrichten",
+  "All_users_in_the_channel_can_write_new_messages": "Alle Benutzer in diesem Kanal könne neue Nachrichten verfassen",
   "Allow_Invalid_SelfSigned_Certs": "Ungültige und selbstsignierte SSL-Zertifikate erlauben",
   "Allow_Invalid_SelfSigned_Certs_Description": "Ungültige und selbstsignierte SSL-Zertifikate für die Link-Validierung und die Vorschau zulassen.",
-  "Allow_switching_departments": "Erlaube Besuchern das wechseln von Abeteilungen",
+  "Allow_switching_departments": "Erlaube Besuchern, Abteilungen zu wechseln",
   "Always_open_in_new_window": "Immer in neuem Fenster öffnen",
-  "Analytics_features_enabled": "Funktionen aktiviert",
-  "Analytics_features_messages_Description": "Zeichnet benutzerdefinierte Ereignisse im Zusammenhang mit Aktionen eines Nutzer auf Nachrichten auf.",
+  "Analytics_features_enabled": "Aktivierte Funktionen",
+  "Analytics_features_messages_Description": "Zeichnet benutzerdefinierte Ereignisse im Zusammenhang mit Aktionen eines Nutzers in Nachrichten auf.",
   "Analytics_features_rooms_Description": "Zeichnet benutzerdefinierte Ereignisse im Zusammenhang mit Aktionen in einem Kanal oder einer Gruppe (erstellen, verlassen, löschen) auf.",
   "Analytics_features_users_Description": "Zeichnet benutzerdefinierte Ereignisse (Passwort-Reset-Zeiten, Profilbild ändern, etc) auf.",
   "Analytics_Google": "Google Analytics",
@@ -168,33 +189,38 @@
   "Animals_and_Nature": "Tiere & Natur",
   "Announcement": "Ankündigung",
   "API": "API",
-  "API_Allow_Infinite_Count": "Erlauben, alles zu bekommen",
-  "API_Allow_Infinite_Count_Description": "Erlaube Rückgabe von REST API Ergebnissen in einem einzigen Abruf",
+  "API_Allow_Infinite_Count": "Ergebnismenge nicht einschränken",
+  "API_Allow_Infinite_Count_Description": "Erlaube die Rückgabe von REST API Ergebnissen in einem einzigen Abruf",
   "API_Analytics": "Analytics",
   "API_CORS_Origin": "CORS Origin",
-  "API_Default_Count": "Standard Anzahl",
-  "API_Default_Count_Description": "Anzahl an Ergebnissen von REST API Anfragen wenn keine Anzahl übergeben wurde.",
+  "API_Default_Count": "Standard Limit",
+  "API_Default_Count_Description": "Die Anzahl an Ergebnissen von REST API Anfragen, wenn kein Limit angegeben wurde.",
   "API_Drupal_URL": "Drupal Server URL",
-  "API_Drupal_URL_Description": "Beispiel: https://domain.de (ohne schließenden /)",
-  "API_Embed": "Einbetten",
-  "API_Embed_Description": "Eingebettete Link Vorschau für Links die von Benutzern gepostet wurden aktiv.",
+  "API_Drupal_URL_Description": "Beispiel: https://domain.de (ohne abschließenden /)",
+  "API_Embed": "Link-Vorschauen einbetten",
+  "API_Embed_Description": "Eingebettete Link-Vorschau für Links, die von Benutzern gepostet wurden.",
+  "API_Embed_UserAgent": "User Agent des Requests übermitteln",
   "API_EmbedCacheExpirationDays": "Tage bis zum Ablauf den eingebetteten Caches",
   "API_EmbedDisabledFor": "Einbettungen für Benutzer deaktivieren",
-  "API_EmbedDisabledFor_Description": "Durch Kommata getrennte Liste von Benutzernamen",
+  "API_EmbedDisabledFor_Description": "Kommaseparierte Liste von Benutzernamen zum Einbetten von Link-Vorschauen",
   "API_EmbedIgnoredHosts": "Ignorierte Hosts einbetten",
   "API_EmbedIgnoredHosts_Description": "Kommagetrennte Liste von Hosts oder CIDR-Adressen, z. B. localhost, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16",
   "API_EmbedSafePorts": "Sichere Ports",
   "API_EmbedSafePorts_Description": "Kommagetrennte Liste der Ports, für die eine Vorschau erlaubt ist.",
-  "API_Enable_CORS": "Aktiviere CORS",
-  "API_Enable_Direct_Message_History_EndPoint": "Aktiviere den Endpunkt  für den Verlauf von Direkt Nachrichten",
+  "API_Enable_CORS": "CORS",
+  "API_Enable_Direct_Message_History_EndPoint": "Endpunkt für den Verlauf von Direktnachrichten",
+  "API_Enable_Direct_Message_History_EndPoint_Description": "Aktiviere `/api/v1/im.history.others`. Hierüber ist es möglich, Direktnachrichten einzusehen, an denen der Benutzer nicht beteiligt ist.",
+  "API_Enable_Shields": "Aktiviere Shields",
+  "API_Enable_Shields_Description": "Mache Shields über `/api/v1/shields.svg` abrufbar",
   "API_GitHub_Enterprise_URL": "Server-URL",
   "API_GitHub_Enterprise_URL_Description": "Beispiel: http://domain.com (ohne Schrägstrich am Ende)",
   "API_Gitlab_URL": "GitLab-URL",
-  "API_Shield_Types": "Shield Typ",
+  "API_Shield_Types": "Shield Typen",
+  "API_Shield_Types_Description": "Shields-Typen. Konfiguration mit einer Komma-separierten-Liste. Optionen: `online`, `channel` oder `*` für \"Alles\"",
   "API_Token": "API-Token",
-  "API_Upper_Count_Limit": "Max. Anzahl an Einträgen",
-  "API_Upper_Count_Limit_Description": "Max. Anzahl an Einträgen die die REST API zurückliefen soll (sofern ohne Einschränkung)? ",
-  "API_User_Limit": "User Limit für das Hinzufügen aller Benutzer auf Kanal",
+  "API_Upper_Count_Limit": "Maximales Limit",
+  "API_Upper_Count_Limit_Description": "Max. Anzahl an Einträgen, die das REST API zurückliefen soll (sofern nicht weiter eingeschränkt)",
+  "API_User_Limit": "Limit für das Hinzufügen aller Benutzer zu einem Kanal",
   "API_Wordpress_URL": "Wordpress-URL",
   "Apiai_Key": "Api.ai-Schlüssel",
   "Apiai_Language": "Api.ai-Sprache",
@@ -204,31 +230,45 @@
   "Application_updated": "Die Anwendung wurde aktualisiert.",
   "Apply_and_refresh_all_clients": "Anwenden und alle Clients aktualisieren",
   "Archive": "Archivieren",
+  "archive-room": "Kanal archivieren",
+  "archive-room_description": "Berechtigung, einen Kanal zu archivieren",
   "are_also_typing": "schreiben auch",
   "are_typing": "schreiben",
   "Are_you_sure": "Sind Sie sicher?",
   "Are_you_sure_you_want_to_delete_your_account": "Sind Sie sicher, dass Sie Ihr Konto löschen möchten?",
+  "assign-admin-role": "Administratorrolle zuordnen",
+  "assign-admin-role_description": "Berechtigung, Administratorrolle zuzuordnen",
   "Assign_admin": "Admin zuweisen",
   "at": "am",
+  "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Datei hochgeladen",
-  "Attribute_handling": "Behandlung von Attributen",
+  "Attribute_handling": "Behandlung von Eigenschaften",
+  "Audio_message": "Audio-Nachricht",
+  "Audio_Notification_Value_Description": "Dies kann einer der Standard-Töne (beep, chelle, ding, droplet, highbell, seasons) oder jeder eigene Ton sein",
+  "Audio_Notifications_Default_Alert": "Akustische Benachrichtigung bei",
+  "Audio_Notifications_Value": "Akustische Benachrichtigung: Ton",
   "Auth_Token": "Auth-Token",
   "Author": "Autor",
   "Authorization_URL": "Autorisierungs-URL",
   "Authorize": "Berechtigen",
+  "auto-translate": "Automatische Übersetzung",
+  "auto-translate_description": "Berechtigung, die automatische Überstzung zu verwenden",
   "Auto_Load_Images": "Automatisches Laden der Bilder",
-  "AutoLinker_Email": "AutoLinker E-Mail",
-  "AutoLinker_Phone": "AutoLinker Telefonnummern",
+  "Auto_Translate": "Automatische Übersetzung",
+  "AutoLinker_Email": "AutoLinker für E-Mail-Adressen",
+  "AutoLinker_Phone": "AutoLinker für Telefonnummern",
   "AutoLinker_Phone_Description": "Telefonnummern automatisch verlinken. z.B. `(123) 456-7890`",
-  "AutoLinker_StripPrefix": "AutoLinker-Strip-Prefix",
+  "AutoLinker_StripPrefix": "AutoLinker Präfix entfernen",
   "AutoLinker_StripPrefix_Description": "Kurze Anzeige. z.B. https://rocket.chat => rocket.chat",
-  "AutoLinker_Urls_Scheme": "Schema des AutoLinker: // URLs",
+  "AutoLinker_Urls_Scheme": "Schema des AutoLinkers: // URLs",
   "AutoLinker_Urls_TLD": "AutoLinker TLD-URLs",
   "AutoLinker_Urls_www": "AutoLinker \"www\"-URLs",
   "AutoLinker_UrlsRegExp": "AutoLinker RegExp für URLs",
   "Automatic_Translation": "Automatische Übersetzung",
-  "Auto_Translate": "Auto-Übersetzung",
-  "AutoTranslate_Enabled": "Aktiviere die Automatische Übersetzung",
+  "AutoTranslate_Change_Language_Description": "Das Verändern der Option zur automatischen Übersetzung übersetzt keine Nachrichten aus der Vergangenheit.",
+  "AutoTranslate_Enabled": "Automatische Übersetzung",
+  "AutoTranslate_Enabled_Description": "Die Aktivierung der automatischen Übersetzung ermöglicht es Benutzern mit der entsprechenden Berechtigung (<code class=\"inline\">auto-translate</code>, Nachrichten immer in Ihrer Sprache übersetzt zu lesen. Hierfür fallen potentiell Gebühren an (s. <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">Google-Dokumentation</a>.",
+  "AutoTranslate_GoogleAPIKey": "Google API-Schlüssel",
   "Available": "Verfügbar",
   "Available_agents": "Verfügbare Agenten",
   "Avatar": "Profilbild",
@@ -243,83 +283,116 @@
   "Away_male": "Abwesend",
   "Back": "Zurück",
   "Back_to_applications": "Zurück zu den Anwendungen",
-  "Back_to_integrations": "Zurück zu Integrationen",
-  "Back_to_integration_detail": "Zurück zu den Integrations Details",
+  "Back_to_chat": "Zurück zum Chat",
+  "Back_to_integration_detail": "Zurück zu den Integrations-Details",
+  "Back_to_integrations": "Zurück zu den Integrationen",
   "Back_to_login": "Zurück zum Login",
   "Back_to_permissions": "Zurück zu den Berechtigungen",
+  "Backup_codes": "Backup-Schlüssel",
+  "ban-user": "Benutzer verbannen",
+  "ban-user_description": "Berechtigung, einen Benutzer aus einem Kanal zu verbannen",
+  "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta-Funktion: Basiert darauf, dass Video-Konferenzen aktiviert sind.",
   "Block_User": "BenutzerIn sperren",
-  "Body": "Body",
+  "Body": "Textkörper",
   "bold": "fett",
   "bot_request": "Bot-Anfrage",
   "BotHelpers_userFields": "Benutzerfelder",
   "BotHelpers_userFields_Description": "CSV-Datei mit Benutzerfeldern die von Bot-Methoden genutzt werden dürfen.",
   "Branch": "Zweig",
+  "Broadcast_Connected_Instances": "Broadcast an verbundene Instanzen",
+  "Bugsnag_api_key": "Bugsnag API-Schlüssel",
+  "bulk-create-c": "Massen-Anlage von Kanälen",
+  "bulk-create-c_description": "Berechtigung zur Massen-Anlage von Kanälen",
+  "bulk-register-user": "Massen-Registrierung von Benutzern",
+  "bulk-register-user_description": "Berechtigung zur Massen-Registrierung von Benutzern",
   "busy": "beschäftigt",
   "Busy": "Beschäftigt",
   "busy_female": "beschäftigt",
   "Busy_female": "Beschäftigt",
   "busy_male": "beschäftigt",
   "Busy_male": "Beschäftigt",
-  "by": "durch",
-  "Content": "Inhalt",
+  "by": "von",
   "cache_cleared": "Zwischenspeicher gelöscht",
   "Cancel": "Abbrechen",
   "Cancel_message_input": "Abbrechen",
   "Cannot_invite_users_to_direct_rooms": "Benutzer können nicht in private Nachrichtenräume eingeladen werden.",
-  "CAS_autoclose": "Login Pupp automatisch schließen",
-  "CAS_base_url_Description": "Haupt URL des externen Singe Sign On Services e.g: https://sso.example.undef/sso/",
+  "Cannot_open_conversation_with_yourself": "Ein Selbstgespräch kann nicht gestartet werden",
+  "CAS_autoclose": "Login-Popup automatisch schließen",
+  "CAS_base_url": "SSO-Base-URL",
+  "CAS_base_url_Description": "Basis-URL des externen Singe Sign On Services e.g: https://sso.example.undef/sso/",
   "CAS_button_color": "Hintergrundfarbe des Login-Buttons",
   "CAS_button_label_color": "Farbe des Login-Button-Texts",
   "CAS_button_label_text": "Text des Login-Buttons",
   "CAS_enabled": "Aktiviert",
-  "CAS_login_url_Description": "Login URL des externen Singe Sign On Services e.g: https://sso.example.undef/sso/login",
-  "CAS_popup_height": "Höhe des Login Pop Up",
-  "CAS_popup_width": "Breite des Login Pop Up",
+  "CAS_Login_Layout": "CAS-Login-Layout",
+  "CAS_login_url": "SSO-Login-URL",
+  "CAS_login_url_Description": "Login URL des externen Single-Sign-On Services, bspw. https://sso.example.undef/sso/login",
+  "CAS_popup_height": "Höhe des Login-Popups",
+  "CAS_popup_width": "Breite des Login-Popups",
   "CAS_Sync_User_Data_Enabled": "Benutzerdaten immer synchronisieren",
+  "CAS_Sync_User_Data_Enabled_Description": "Beim Login immer CAS-Benutzerdaten in die entsprechenden Attribute synchronisieren. Hinweis: Attribute werden beim Anlegen des Kontos in jedem Fall synchronisiert.",
+  "CAS_Sync_User_Data_FieldMap": "Attribut-Map",
+  "CAS_Sync_User_Data_FieldMap_Description": "Verwenden Sie dieses JSON um interne Attribut (key) aus externen Attributen (value) zu erstellen. Externe Attribut-Namen, die mit  '%' umschlossen sind, werden in value-Strings interpoliert.<br/>Beispiel: `{\\\"email\\\"\\\"%email%\\\", \\\"name\\\"\\\"%firstname%, %lastname%\\\"}`<br/><br/>Die Attribut-Map wird immer interpoliert. In CAS 1.0 ist nur das `username`-Attribut verfügbar. Mögliche interne Attribute sind username, name, email, rooms; rooms ist eine Komma-separierte Liste von Räumen, denen der Benutzer nach der Erstellung seines Kontos hinzugefügt wird. Beispielsweise würde {\\\"rooms\\\" \\\"%Team%,%Abteilung%\\\"} CAS-basierte Nutzerkonten zu den Räumen mit den Namen Team und Abteilung hinzufügen.",
+  "CAS_version": "CAS Version",
+  "CAS_version_Description": "Verwenden Sie nur eine CAS-Version, die von Ihrem CAS-SSO-Provider unterstützt wird.",
   "CDN_PREFIX": "CDN-Präfix",
   "Certificates_and_Keys": "Zertifikate und Schlüssel",
+  "Change_Room_Type": "Ändere den Typ des Raums",
   "Changing_email": "E-Mail-Adresse ändern",
-  "Change_Room_Type": "Ändere den Raum Typ",
   "channel": "Kanal",
   "Channel": "Kanal",
   "Channel_already_exist": "Der Kanal '#%s' ist bereits vorhanden.",
-  "Channel_created": "Channel `#%s` angelegt.",
+  "Channel_already_exist_static": "Der Kanal existiert bereits",
   "Channel_already_Unarchived": "Kanal mit dem Namen '#%s' ist bereits im unarchivierten Zustand",
   "Channel_Archived": "Kanal mit dem Namen '#%s' wurde erfolgreich archiviert",
+  "Channel_created": "Kanal `#%s` wurde angelegt.",
   "Channel_doesnt_exist": "Der Kanal `#%s` existiert nicht.",
+  "Channel_name": "Kanalname",
+  "Channel_Name_Placeholder": "Bitte geben Sie einen Namen für den Kanal ein",
+  "Channel_to_listen_on": "Kanal, auf dem gehört werden soll",
   "Channel_Unarchived": "Kanal mit dem Namen '#%s' ist nicht länger archiviert",
   "Channels": "Kanäle",
+  "Channels_are_where_your_team_communicate": "In Kanälen kommuniziert Ihr Team.",
   "Channels_list": "Liste der öffentlichen Kanäle",
-  "Chat_button": "Chatbutton",
+  "Chat_button": "Chat-Button",
   "Chat_closed": "Chat geschlossen",
   "Chat_closed_successfully": "Chat erfolgreich geschlossen",
+  "Chat_Now": "Jetzt chaten",
   "Chat_window": "Chatfenster",
   "Chatops_Enabled": "ChatOps aktivieren",
   "Chatops_Title": "ChatOps-Panel",
   "Chatops_Username": "ChatOps-Benutzername",
   "Choose_a_room": "Raum auswählen",
   "Choose_messages": "Nachrichten auswählen",
-  "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Wählen Sie den Alias, der vor dem Benutzernamen in den Nachrichten angezeigt wird.",
-  "Choose_the_username_that_this_integration_will_post_as": "Wählen Sie den Benutzernamen, der die Integration veröffentlicht.",
-  "clear": "löschen",
+  "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Wählen Sie einen Alias, der vor dem Benutzernamen in Nachrichten angezeigt wird.",
+  "Choose_the_username_that_this_integration_will_post_as": "Wählen Sie den Benutzernamen, unter dem die Integration Nachrichten postet.",
+  "clean-channel-history": "Kanalhistorie löschen",
+  "clean-channel-history_description": "Berechtigung, die Historie aus Kanälen zu löschen",
+  "clear": "Löschen",
+  "Clear_all_unreads_question": "Möchten Sie alle ungelesenen Nachrichten löschen?",
   "clear_cache_now": "Zwischenspeicher jetzt leeren",
   "clear_history": "Verlauf löschen",
-  "Clear_all_unreads_question": "Möchten Sie alle ungelesenen Nachrichten löschen?",
   "Click_here": "Hier klicken",
-  "Click_here_for_more_info": "Hier klicken für weitere Informationen",
+  "Click_here_for_more_info": "Für weitere Informationen hier klicken",
   "Client_ID": "Client-ID",
-  "Client_Secret": "Client-Schlüssel",
+  "Client_Secret": "Client-Geheimnis",
   "Clients_will_refresh_in_a_few_seconds": "Clients werden in wenigen Sekunden aktualisiert",
   "close": "Schließen",
   "Close": "Schließen",
+  "close-livechat-room": "Livechat-Raum schließen",
+  "close-livechat-room_description": "Berechtigung, den aktuellen Livechat-Raum zu schließen",
+  "close-others-livechat-room": "Livechat-Raum schließen",
+  "close-others-livechat-room_description": "Berechtigung, andere Livechat-Räume zu schließen",
   "Closed": "Geschlossen",
   "Closed_by_visitor": "Durch Besucher geschlossen",
   "Closing_chat": "Schließe Chat",
   "Collapse_Embedded_Media_By_Default": "Eingebettete Medien standardmäßig ausblenden",
   "Color": "Farbe",
   "Commands": "Befehle",
+  "Comment_to_leave_on_closing_session": "Kommentar, der beim Schließen einer Konversation hinterlassen wird",
   "Compact": "Kompakt",
   "Confirm_password": "Bestätigen Sie Ihr Passwort.",
+  "Content": "Inhalt",
   "Conversation": "Gespräch",
   "Conversation_closed": "Gespräch geschlossen: __comment__.",
   "Convert_Ascii_Emojis": "ASCII zu Emoji konvertieren",
@@ -330,13 +403,23 @@
   "Count": "Zähler",
   "Cozy": "Angenehm",
   "Create": "Erstellen",
+  "create-c": "Öffentliche Kanäle anlegen",
+  "create-c_description": "Berechtigung, öffentliche Kanäle anzulegen",
+  "create-d": "Direktnachrichten anlegen",
+  "create-d_description": "Berechtigung, Direktnachrichten zu senden",
+  "create-p": "Private Kanäle anlegen",
+  "create-p_description": "Berechtigung, private Kanäle anzulegen",
+  "create-user": "Benutzer anlegen",
+  "create-user_description": "Berechtigung, Benutzer anzulegen",
   "Create_A_New_Channel": "Erstellen Sie einen neuen Kanal",
   "Create_new": "Neu erstellen",
   "Created_at": "Erstellt am",
   "Created_at_s_by_s": "Erstellt am <strong>%s</strong> von <strong>%s</strong>",
+  "Created_at_s_by_s_triggered_by_s": "Erstellt um <strong>%s</strong> von <strong>%s</strong>, angestoßen von <strong>%s</strong>",
+  "CRM_Integration": "CRM-Integration",
   "CROWD_Reject_Unauthorized": "Unauthorisierte ablehnen.",
-  "CRM_Integration": "CRM Integration",
   "Current_Chats": "Aktuelle Chats",
+  "Current_Status": "Aktueller Status",
   "Custom": "Benutzerdefiniert",
   "Custom_Emoji": "Benutzerdefinierte Emoji",
   "Custom_Emoji_Add": "Neuen Emoji hinzufügen",
@@ -346,21 +429,27 @@
   "Custom_Emoji_Error_Name_Or_Alias_Already_In_Use": "Der benutzerdefinierte Emoji oder einer seiner Aliase wird bereits verwendet.",
   "Custom_Emoji_Has_Been_Deleted": "Der benutzerdefinierte Emoji wurde gelöscht.",
   "Custom_Emoji_Info": "Benutzerdefinierter-Emoji-Info",
-  "Custom_Emoji_Updated_Successfully": "Benutzerdefinierter Emoji erfolgreich geupdatet.",
+  "Custom_Emoji_Updated_Successfully": "Benutzerdefinierter Emoji erfolgreich aktualisiert",
   "Custom_Fields": "Benutzerdefinierte Felder",
-  "Custom_oauth_helper": "Bei der Einrichtung muss eine Rückruf-URL angegeben werden. Benutze dafür folgende URL: <pre>%s</pre>",
+  "Custom_oauth_helper": "Bei der Einrichtung Ihres OAuth-Providers muss eine Rückruf-URL angegeben werden. Benutzen Sie dafür folgende URL: <pre>%s</pre>",
   "Custom_oauth_unique_name": "Name des OAuth-Kontos",
+  "Custom_Script_Logged_In": "Benutzerdefiniertes Skript für angemeldete Benutzer",
+  "Custom_Script_Logged_Out": "Benutzerdefiniertes Skript für abgemeldete Benutzer",
   "Custom_Scripts": "Benutzerdefinierte Skripte",
-  "Custom_Script_Logged_In": "Benutzerdefiniertes Script für angemeldete Benutzer",
-  "Custom_Script_Logged_Out": "Benutzerdefiniertes Script für abgemeldete Benutzer",
-  "Custom_Sounds": "Benutzerdefinierte Töne",
   "Custom_Sound_Add": "Benutzerdefinierte Töne hinzufügen",
   "Custom_Sound_Delete_Warning": "Ein gelöschter Ton kann nicht wiederhergestellt werden.",
   "Custom_Sound_Error_Invalid_Sound": "Fehlerhafter Ton",
+  "Custom_Sound_Error_Name_Already_In_Use": "Der Name für den eigenen Ton wird schon verwendet.",
+  "Custom_Sound_Has_Been_Deleted": "Der eigene Ton wurde gelöscht.",
+  "Custom_Sound_Info": "Info zu eigenen Tönen",
+  "Custom_Sound_Saved_Successfully": "Der eigene Ton wurde erfolgreich gespeichert",
+  "Custom_Sounds": "Benutzerdefinierte Töne",
   "Custom_Translations": "Benutzerdefinierte Übersetzungen",
+  "Custom_Translations_Description": "Ein gültiges JSON, in dem die Schlüssel Sprachkürzel sind, die wiederum Tupel von Schlüssel und Übersetzungen enthalten. Beispiel: <br/><code>{\\n \\\"en\\\"  {\\n  \\\"Channels\\\"  \\\"Rooms\\\"\\n },\\n \\\"de\\\"  {\\n  \\\"Channels\\\"  \\\"Räume\\\"\\n }\\n}</code>",
+  "CustomSoundsFilesystem": "Dateisystem für benutzerdefinierte Töne",
   "Dashboard": "Dashboard",
   "Date": "Datum",
-  "Date_From": "von",
+  "Date_From": "Von",
   "Date_to": "bis",
   "days": "Tage",
   "DB_Migration": "Datenbankmigration",
@@ -369,6 +458,16 @@
   "Decline": "ablehnen",
   "Default": "Voreinstellung",
   "Delete": "Löschen",
+  "delete-c": "Öffentliche Kanäle löschen",
+  "delete-c_description": "Berechtigung, öffentliche Kanäle zu löschen",
+  "delete-d": "Direktnachrichten löschen",
+  "delete-d_description": "Berechtigung, Direktnachrichten zu löschen",
+  "delete-message": "Nachricht löschen",
+  "delete-message_description": "Berechtigung, eine Nachricht in einem Raum zu löschen",
+  "delete-p": "Private Kanäle löschen",
+  "delete-p_description": "Berechtigung, private Kanäle zu löschen",
+  "delete-user": "Benutzer löschen",
+  "delete-user_description": "Berechtigung, einen Benutzer zu löschen",
   "Delete_message": "Nachricht löschen",
   "Delete_my_account": "Mein Konto löschen",
   "Delete_Room_Warning": "Beim Löschen eines Raums werden alle Nachrichten in diesem Raum unwiderruflich gelöscht.",
@@ -382,112 +481,154 @@
   "Desktop": "Desktop",
   "Desktop_Notification_Test": "Desktop-Benachrichtigungstest",
   "Desktop_Notifications": "Desktop-Benachrichtigungen",
+  "Desktop_Notifications_Default_Alert": "Desktop-Benachrichtigungen bei",
   "Desktop_Notifications_Disabled": "Desktop-Benachrichtigungen sind deaktiviert. Ändern Sie Ihre Browsereinstellungen, wenn Sie Benachrichtigungen erhalten wollen.",
   "Desktop_Notifications_Duration": "Desktop-Benachrichtigungsdauer",
   "Desktop_Notifications_Duration_Description": "Zeit in Sekunden für die Desktop-Benachrichtigungen angezeigt werden sollen. Dies kann OS X Notification Center beeinflussen. Geben Sie 0 ein, um die Standard-Browser-Einstellungen zu verwenden und OS X Notification Center nicht zu beeinflussen.",
   "Desktop_Notifications_Enabled": "Desktop-Benachrichtigungen sind aktiviert.",
+  "Different_Style_For_User_Mentions": "Anderer Stil für Benutzer-Erwähnungen",
   "Direct_message_someone": "Jemandem eine private Nachricht schicken",
   "Direct_Messages": "Private Nachrichten",
+  "Direct_Reply": "Direktantwort",
+  "Direct_Reply_Debug": "Direktantwort debuggen",
+  "Direct_Reply_Debug_Description": "[Achtung!] Das Aktivieren des Debug-Modus führt dazu, dass Ihr Passwort im Klartext in der Administrationskonsole erscheint.",
+  "Direct_Reply_Delete": "Abgefangene E-Mails löschen",
+  "Direct_Reply_Enable": "Direktantwort aktivieren",
+  "Direct_Reply_Frequency": "Frequenz, in der E-Mails überprüft werden",
+  "Direct_Reply_Frequency_Description": "(in Minuten, Standard/Minimum 2)",
+  "Direct_Reply_Host": "Host für Direktantworten",
+  "Direct_Reply_IgnoreTLS": "TLS ignorieren",
+  "Direct_Reply_Password": "Passwort",
+  "Direct_Reply_Port": "Port für Direktantworten",
+  "Direct_Reply_Protocol": "Protokoll für Direktantworten",
+  "Direct_Reply_Separator": "Trennzeichen",
+  "Direct_Reply_Separator_Description": "[Nur verändern, wenn Sie wirklich sicher sind, was Sie tun (s. Dokumentation)]<br/>Separator zwischen Base- und Tag-Teil der E-Mail",
+  "Direct_Reply_Username": "Benutzername",
+  "Direct_Reply_Username_Description": "Bitte verwenden Sie eine absolute E-Mail-Adresse. Tagging ist nicht erlaubt und würde überschrieben.",
   "Disable_Notifications": "Benachrichtigungen deaktivieren",
-  "Disable_two-factor_authentication": "2 Faktor Authentifizierung deaktivieren",
-  "Display_offline_form": "Offline Nachricht anzeigen",
-  "Displays_action_text": "Zeigt Aktionstext",
+  "Disable_two-factor_authentication": "Zwei-Faktor-Authentifizierung deaktivieren",
+  "Display_offline_form": "Formular für Offline-Kontakt anzeigen",
+  "Displays_action_text": "Zeigt den Aktionstext",
   "Do_you_want_to_change_to_s_question": "Möchten Sie dies zu <strong>%s</strong> ändern?",
   "Domain": "Domain",
+  "Domain_added": "Domäne hinzugefügt",
+  "Domain_removed": "Domäne entfernt",
   "Domains": "Domains",
+  "Domains_allowed_to_embed_the_livechat_widget": "Komma-separierte Liste der Domänen, in denen das Livechat-Widget eingebettet werden darf. Leer lassen, um keine Einschränkung vorzunehmen.",
+  "Download_Snippet": "Download",
   "Drop_to_upload_file": "Ablegen, um Datei hochzuladen",
   "Dry_run": "Probelauf",
-  "Dry_run_description": "Es wird nur eine E-Mail an die selbe Adresse wie im Feld Absender geschickt. Die E-Mailadresse muss einem gültigen Benutzer gehören.",
+  "Dry_run_description": "Es wird nur eine E-Mail an die Adresse aus dem Feld \"Absender\" geschickt. Die E-Mail-Adresse muss zu einem gültigen Benutzer gehören.",
   "Duplicate_archived_channel_name": "Ein archivierter Kanal mit dem Namen '%s' existiert bereits.",
   "Duplicate_archived_private_group_name": "Eine archivierte private Gruppe mit dem Namen '%s' existiert bereits.",
   "Duplicate_channel_name": "Ein Kanal mit dem Namen '%s' existiert bereits",
   "Duplicate_private_group_name": "Eine private Gruppe mit dem Namen '%s' existiert bereits.",
   "Duration": "Dauer",
   "Edit": "Bearbeiten",
+  "edit-message": "Nachricht bearbeiten",
+  "edit-message_description": "Berechtigung, eine Nachricht in einem Raum zu bearbeiten",
+  "edit-other-user-active-status": "Online-Status anderer Benutzer ändern",
+  "edit-other-user-active-status_description": "Berechtigung, den Online-Status anderer Benutzer zu ändern",
+  "edit-other-user-info": "Benutzer-Informationen Anderer ändern",
+  "edit-other-user-info_description": "Berechtigung, Benutzer-Informationen (Namen, Benutzernamen, E-Mail-Adresse) anderer Personen zu ändern",
+  "edit-other-user-password": "Passwort anderer Benutzer ändern",
+  "edit-other-user-password_description": "Berechtigung, das Passwort anderer Benutzer zu ändern. Dies erfordert die Berechtigung, die Benutzer-Informationen Anderer zu ändern.",
+  "edit-privileged-setting": "Besonders geschützte Einstellungen ändern",
+  "edit-privileged-setting_description": "Berechtigung, besonders geschützte Einstellungen zu ändern",
+  "edit-room": "Raum bearbeiten",
+  "edit-room_description": "Berechtigung, einen Raum zu bearbeiten (Name, Thema, Sichtbarkeit, Archivierung)",
   "Edit_Custom_Field": "Benutzerdefinierte Felder bearbeiten",
   "Edit_Department": "Abteilung bearbeiten",
+  "Edit_previous_message": "`%s` - Bearbeite vorherige Nachricht",
+  "Edit_Trigger": "Trigger bearbeiten",
   "edited": "bearbeitet",
   "Editing_room": "Raum bearbeiten",
   "Editing_user": "BenutzerIn bearbeiten",
   "Email": "E-Mail",
   "Email_address_to_send_offline_messages": "E-Mail-Adresse zum Senden von Offline-Nachrichten",
   "Email_already_exists": "Die E-Mail-Adresse existiert bereits.",
-  "Email_body": "Nachricht",
+  "Email_body": "E-Mail Textkörper",
   "Email_Change_Disabled": "Der Rocket.Chat-Administrator hat das Ändern der E-Mail-Adresse deaktiviert.",
-  "Email_Footer_Description": "Sie können die folgenden Platzhalter verwenden: <br /><ul><li> [Site_Name] und [Site_URL] für den Anwendungsname und die URL. </li></ul>",
+  "Email_Footer_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li> [Site_Name] und [Site_URL] für den Anwendungsname und die URL. </li></ul>",
   "Email_from": "Absender",
-  "Email_Header_Description": "Sie können die folgenden Platzhalter verwenden: <br /><ul><li> [Site_Name] und [Site_URL] für den Anwendungsname und die URL. </li></ul>",
+  "Email_Header_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li> [Site_Name] und [Site_URL] für den Anwendungsname und die URL. </li></ul>",
   "Email_Notification_Mode": "Offline-E-Mail-Benachrichtigungen",
   "Email_Notification_Mode_All": "Jede Erwähnung/DM",
   "Email_Notification_Mode_Disabled": "deaktiviert",
   "Email_or_username": "E-Mail-Adresse oder Nutzername",
+  "Email_Placeholder": "Bitte geben Sie Ihre E-Mail-Adresse ein",
   "Email_subject": "Betreff",
   "Email_verified": "Die E-Mail-Adresse wurde bestätigt.",
   "Emoji": "Emoji",
-  "Empty_title": "Es wurde kein Titel angegeben.",
+  "EmojiCustomFilesystem": "Dateisystem für eigene Emojis",
+  "Empty_title": "Leerer Titel",
   "Enable": "Aktivieren",
-  "Enable_Desktop_Notifications": "Aktivieren",
-  "Enable_two-factor_authentication": "2-Faktor Authentifizierung aktivieren",
+  "Enable_Desktop_Notifications": "Desktop-Benachrichtigungen",
+  "Enable_Svg_Favicon": "SVG Favicon",
+  "Enable_two-factor_authentication": "Zwei-Faktor-Authentifizierung aktivieren",
   "Enabled": "Aktiviert",
-  "Enable_Svg_Favicon": "SVG Favicon aktivieren",
   "Encrypted_message": "Verschlüsselte Nachricht",
   "End_OTR": "OTR beenden",
-  "Enter_a_regex": "Regex eingeben",
+  "Enter_a_regex": "Regulären Ausdruck eingeben",
   "Enter_a_room_name": "Raumnamen eingeben",
   "Enter_a_username": "Benutzernamen eingeben",
-  "Enter_Behaviour": "Verhalten der Enter-Taste:",
+  "Enter_Alternative": "Alternativer Modus (Senden mit Eingabetaste + Strg/Alt/Shift/Command)",
+  "Enter_authentication_code": "Dateisystem für eigene Emojis",
+  "Enter_Behaviour": "Verhalten der Eingabetaste:",
+  "Enter_Behaviour_Description": "Das verändert, ob die Eingabetaste eine Nachricht versendet oder einen Zeilenumbruch erzeugt",
   "Enter_name_here": "Namen hier eingeben",
   "Enter_Normal": "Normaler Modus (mit Eingabetaste senden)",
-  "Enter_to": "Enter-Taste:  ",
+  "Enter_to": "Eingabetaste:  ",
   "Error": "Fehler",
   "error-action-not-allowed": "__action__ ist nicht erlaubt",
   "error-application-not-found": "Anwendung nicht gefunden",
-  "error-archived-duplicate-name": "Es gibt einen archivierten Kanal mit dem Namen '__room_name__'",
+  "error-archived-duplicate-name": "Es gibt bereits einen archivierten Kanal mit dem Namen '__room_name__'",
   "error-avatar-invalid-url": "Ungültige Avatar-URL: __url__",
-  "error-avatar-url-handling": "Fehler beim Bearbeiten der Avatar-Einstellung von einer URL (__url__) für __username__",
+  "error-avatar-url-handling": "Fehler beim Übernehmen des Avatars- von URL  (__url__) für __username__",
   "error-cant-invite-for-direct-room": "Nutzer können nicht in private Nachrichtenräume eingeladen werden.",
   "error-could-not-change-email": "Konnte E-Mail-Adresse nicht ändern",
   "error-could-not-change-name": "Konnte den Namen nicht ändern",
   "error-could-not-change-username": "Konnte den Benutzernamen nicht ändern",
   "error-delete-protected-role": "Eine geschützte Rolle kann nicht gelöscht werden.",
   "error-department-not-found": "Abteilung konnte nicht gefunden werden.",
+  "error-direct-message-file-upload-not-allowed": "Dateiaustausch ist in direkten Nachrichten nicht möglich.",
   "error-duplicate-channel-name": "Ein Kanal mit dem Namen '__channel_name__' existiert bereits.",
-  "error-email-domain-blacklisted": "Die Domain der E-Mail-Adresse ist auf der Schwarzen Liste.",
+  "error-email-domain-blacklisted": "Die Domain der E-Mail-Adresse ist auf der schwarzen Liste.",
+  "error-email-send-failed": "Fehler beim Versuch, eine Email zu versenden:  __message__",
   "error-field-unavailable": "<strong>__field__</strong> wird leider schon verwendet. ",
   "error-file-too-large": "Die Datei ist zu groß",
-  "error-importer-not-defined": "Der Importer wurde nicht richtig definiert, eine Importklasse fehlt.",
+  "error-importer-not-defined": "Der Importer wurde nicht richtig definiert, die Importklasse fehlt.",
   "error-input-is-not-a-valid-field": "__input__ ist kein gültiges __field__",
   "error-invalid-actionlink": "Ungültiger Aktionslink",
   "error-invalid-arguments": "Ungültige Argumente",
-  "error-invalid-asset": "Ungültiger Wert",
+  "error-invalid-asset": "Ungültiges Asset",
   "error-invalid-channel": "Ungültiger Kanal.",
   "error-invalid-channel-start-with-chars": "Ungültiger Kanal. Beginnen Sie mit @ oder #",
   "error-invalid-custom-field": "Ungültiges benutzerdefiniertes Feld",
-  "error-invalid-custom-field-name": "Unzulässiger Name für ein benutzerdefiniertes Feld. Benutze nur Buchstaben, Nummern, Binde- und Unterstriche.",
-  "error-invalid-date": "Das eingegebene Datum ist fehlerhaft.",
+  "error-invalid-custom-field-name": "Unzulässiger Name für ein benutzerdefiniertes Feld. Benutzen Sie nur Buchstaben, Nummern, Binde- und Unterstriche.",
+  "error-invalid-date": "Das eingegebene Datum ist ungültig.",
   "error-invalid-description": "Ungültige Beschreibung",
   "error-invalid-domain": "Ungültige Domain",
   "error-invalid-email": "Ungültige E-Mail-Adresse: __email__",
-  "error-invalid-email-address": "Fehlerhafte E-Mail-Adresse",
-  "error-invalid-file-height": "Ungültige Dateihöhe",
+  "error-invalid-email-address": "Ungültige E-Mail-Adresse",
+  "error-invalid-file-height": "Ungültige Bildhöhe der Datei",
   "error-invalid-file-type": "Ungültiges Dateiformat",
-  "error-direct-message-file-upload-not-allowed": "Dateiaustausch ist in direkten Nachrichten nicht möglich.",
-  "error-invalid-file-width": "Ungültige Dateibreite",
+  "error-invalid-file-width": "Ungültige Bildhöhe der Datei",
   "error-invalid-from-address": "Sie haben eine ungültige E-Mail-Adresse als Empfänger angegeben.",
   "error-invalid-integration": "Ungültige Integration",
   "error-invalid-message": "Ungültige Nachricht",
   "error-invalid-method": "Ungültige Methode",
   "error-invalid-name": "Ungültiger Name",
   "error-invalid-password": "Falsches Passwort",
-  "error-invalid-redirectUri": "Ungültige redirectUri",
+  "error-invalid-redirectUri": "Ungültige Redirect-URI",
   "error-invalid-role": "Ungültige Rolle",
   "error-invalid-room": "Ungültiger Raum",
-  "error-invalid-room-name": "<strong>%s</strong> ist kein zulässiger Raumname.<br/>Verwenden Sie nur Buchstaben, Zahlen oder Binde- und Unterstriche.",
+  "error-invalid-room-name": "<strong>%s</strong> ist kein zulässiger Raumname",
   "error-invalid-room-type": "<strong>__type__</strong> ist kein gültiger Raumtyp.",
   "error-invalid-settings": "Ungültige Einstellungen übergeben",
   "error-invalid-subscription": "Ungültiges Abonnement",
   "error-invalid-token": "Ungültiger Token",
-  "error-invalid-triggerWords": "Ungültige triggerWords",
+  "error-invalid-triggerWords": "Ungültiges Trigger-Wort",
   "error-invalid-urls": "Ungültige URLs",
   "error-invalid-user": "Ungültiger Benutzer",
   "error-invalid-username": "Ungültiger Benutzername",
@@ -496,7 +637,7 @@
   "error-message-editing-blocked": "Nachrichten bearbeiten ist gesperrt",
   "error-message-size-exceeded": "Nachrichtengröße überschreitet Message_MaxAllowedSize",
   "error-missing-unsubscribe-link": "Sie müssen einen Link zum Abmelden vom Verteiler angeben.",
-  "error-no-tokens-for-this-user": "Es liegen keine Token für diesen Benutzer vor.",
+  "error-no-tokens-for-this-user": "Es liegen keine Tokens für diesen Benutzer vor",
   "error-not-allowed": "Nicht erlaubt",
   "error-not-authorized": "Nicht berechtigt",
   "error-push-disabled": "Push-Benachrichtigungen sind deaktiviert",
@@ -504,64 +645,85 @@
   "error-role-in-use": "Die Rolle kann nicht gelöscht werden, da sie gerade verwendet wird.",
   "error-role-name-required": "Ein Rollenname muss angegeben werden",
   "error-the-field-is-required": "Das Feld __field__ ist erforderlich.",
-  "error-too-many-requests": "Fehler, zu viele Anfragen. Bitte fahren Sie langsamer fort. Sie müssen __seconds__ Sekunden warten bevor Sie es erneut versuchen können.",
+  "error-too-many-requests": "Fehler, zu viele Anfragen. Bitte fahren Sie langsamer fort. Sie müssen __seconds__ Sekunden warten, bevor Sie es erneut versuchen können.",
   "error-user-is-not-activated": "Der Benutzer ist nicht aktiviert.",
+  "error-user-limit-exceeded": "Die Anzahl der Benutzer, die Sie hinzufügen wollen, übersteigt das vom Administrator gesetzte Limit.",
   "error-user-not-in-room": "Der Benutzer ist nicht in diesem Raum.",
   "error-user-registration-disabled": "Benutzerregistrierung ist deaktiviert",
   "error-user-registration-secret": "Benutzerregistrierung ist nur über geheime URL erlaubt",
   "error-you-are-last-owner": "Sie sind der letzte Besitzer. Bitte bestimmen Sie einen neuen Besitzer, bevor Sie den Raum verlassen.",
   "Error_changing_password": "Fehler beim Ändern des Passwortes",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Fehler: Rocket.Chat erfordert Oplog-Tailing, wenn es auf mehreren Instanzen läuft",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Bitte stellen Sie sicher, dass die MongoDB als Replicaset konfiguriert ist und die Umgebungsvariable  MONGO_OPLOG_URL korrekt auf Ihren Anwendungsservern gesetzt wurde.",
   "Esc_to": "Esc: ",
+  "Event_Trigger": "Event Trigger",
+  "Event_Trigger_Description": "Bitte wählen Sie aus, welche Eventarten diesen ausgehenden Webhook auslösen",
   "every_30_minutes": "alle 30 Minuten",
   "every_hour": "stündlich",
   "every_six_hours": "alle 6 Stunden",
+  "Everyone_can_access_this_channel": "Jeder kann auf diesen Kanal zugreifen",
   "Example_s": "Beispiel: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Bots ausschließen",
-  "Exclude_Botnames_Description": "Keine Nachrichten von Bots verbreiten, welche dem RegEx oben entsprechen. Wenn Feld leer bleibt, werden alle Nachrichten verbreitet.",
+  "Exclude_Botnames_Description": "Keine Nachrichten von Bots verbreiten, deren Name dem oben genannten regulären Ausdruck entsprechen. Wenn das Feld leer bleibt, werden alle Nachrichten verbreitet.",
   "False": "Nein",
-  "Favorite_Rooms": "Favorisierte Räume aktivieren",
+  "Favorite_Rooms": "Favoriten-Räume aktivieren",
   "Favorites": "Favoriten",
-  "Features_Enabled": "Funktionen aktiviert",
+  "Features_Enabled": "Aktivierte Funktionen",
   "Field": "Feld",
   "Field_removed": "Feld entfernt",
   "Field_required": "Feld erforderlich",
   "File_exceeds_allowed_size_of_bytes": "Die Datei ist größer als das erlaubte Maximum von __size__ Bytes",
   "File_not_allowed_direct_messages": "Dateiaustausch ist in direkten Nachrichten nicht möglich.",
-  "File_type_is_not_accepted": "Feldtyp nicht akzeptiert.",
-  "File_uploaded": "Datei hochladen",
+  "File_type_is_not_accepted": "Dateityp wir nicht akzeptiert.",
+  "File_uploaded": "Datei hochgeladen",
   "FileUpload": "Dateien hochladen",
-  "FileUpload_Enabled": "Hochladen von Dateien aktivieren",
   "FileUpload_Disabled": "Datei Uploads ",
+  "FileUpload_Enabled": "Hochladen von Dateien aktivieren",
   "FileUpload_Enabled_Direct": "Dateiaustausch ist in direkten Nachrichten möglich.",
   "FileUpload_File_Empty": "Datei ist leer",
   "FileUpload_FileSystemPath": "Systempfad",
+  "FileUpload_GoogleStorage_AccessId": "Google Storage Zugriffsschlüssel",
+  "FileUpload_GoogleStorage_AccessId_Description": "Der Zugriffsschlüssel liegt üblicherweise in Form einer E-Mail-Adresse vor, z. B. \"example-test@example.iam.gserviceaccount.com\"",
+  "FileUpload_GoogleStorage_Bucket": "Google Storage Bucket Name",
+  "FileUpload_GoogleStorage_Bucket_Description": "Der Name des Buckets, in welchen die Dateien hochgeladen werden sollen",
+  "FileUpload_GoogleStorage_Secret": "Google Storage Secret",
+  "FileUpload_GoogleStorage_Secret_Description": "Bitte folgen Sie <a href=\"https://github.com/CulturalMe/meteor-slingshot#google-cloud\">diesen Anweisungen</a> und fügen Sie das Ergebnis hier ein.",
   "FileUpload_MaxFileSize": "Max. Größe für hochgeladene Dateien (in Bytes)",
-  "FileUpload_MediaType_NotAccepted": "Medientypen werden nicht akzeptiert",
+  "FileUpload_MediaType_NotAccepted": "Medientyp wird nicht akzeptiert",
   "FileUpload_MediaTypeWhiteList": "Erlaubte Medientypen",
-  "FileUpload_MediaTypeWhiteListDescription": "Durch Kommata getrennte Liste von Medientypen. Um alle Medientypen zuzulassen, lassen Sie die Liste leer.",
+  "FileUpload_MediaTypeWhiteListDescription": "Kommaseparierte Liste von Medientypen. Um alle Medientypen zuzulassen, lassen Sie die Liste leer.",
   "FileUpload_ProtectFiles": "Hochgeladene Dateien schützen",
-  "FileUpload_ProtectFilesDescription": "Nur bestätigte Benutzer dürfen Dateien hochladen.",
-  "FileUpload_S3_Acl": "Amazon S3 acI",
+  "FileUpload_ProtectFilesDescription": "Nur authentifizierte Benutzer dürfen Dateien hochladen.",
+  "FileUpload_S3_Acl": "Amazon S3 ACL",
   "FileUpload_S3_AWSAccessKeyId": "Amazon S3 AWS-Access-Key-ID",
   "FileUpload_S3_AWSSecretAccessKey": "Amazon S3 AWS-Secret-Access-Key",
-  "FileUpload_S3_Bucket": "Amazon S3 Bucketname",
+  "FileUpload_S3_Bucket": "Amazon S3 Bucket-Name",
   "FileUpload_S3_BucketURL": "Bucket-URL",
   "FileUpload_S3_CDN": "CDN-Domain für Downloads",
+  "FileUpload_S3_ForcePathStyle": "Pfad-Stil forcieren",
   "FileUpload_S3_Region": "Region",
-  "FileUpload_S3_URLExpiryTimeSpan": "Ablaufdatum für URLs",
-  "FileUpload_S3_URLExpiryTimeSpan_Description": "Zeit nachdem Amazon S3 generierte URLs als nicht mehr gültig gelten. Wenn kleiner als fünf Sekunden, wird das Feld ignoriert.",
-  "FileUpload_Storage_Type": "Speichertyp",
+  "FileUpload_S3_SignatureVersion": "Signaturversion",
+  "FileUpload_S3_URLExpiryTimeSpan": "Verfallsdatum für URLs",
+  "FileUpload_S3_URLExpiryTimeSpan_Description": "Zeit, nach der Amazon S3 generierte URLs als nicht mehr gültig gelten. Wird ignoriert, wenn weniger als fünf Sekunden konfiguriert wurde",
+  "FileUpload_Storage_Type": "Speicherort",
+  "First_Channel_After_Login": "Erster Kanal nach dem Login",
   "Flags": "Flaggen",
-  "Follow_social_profiles": "Folge uns in sozialen Netzwerken, fork uns auf GitHub und teile deine Gedanken über die Rocket.Chat-App auf unserem Trello-Board.",
+  "Follow_social_profiles": "Folge uns in sozialen Netzwerken, forke uns auf GitHub und teile deine Meinung und Gedanken über die Rocket.Chat-App auf unserem Trello-Board.",
+  "Fonts": "Schriften",
   "Food_and_Drink": "Essen & Trinken",
   "Footer": "Fußzeile",
-  "Fonts": "Schriften",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Geben Sie zu Ihrer Sicherheit Ihr aktuelles Passwort ein um fortzufahren.",
+  "Footer_Direct_Reply": "Footer, wenn Direktantworten aktiviert sind",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Zu Ihrer Sicherheit wird Ihr aktuelles Passwort benötigt, bevor Sie fortfahren können",
+  "force-delete-message": "Nachricht forciert löschen",
+  "force-delete-message_description": "Berechtigung, eine Nachricht ohne weitere Prüfungen zu löschen",
+  "Force_Disable_OpLog_For_Cache": "\"Disable OpLog\" für Cache erzwingen",
+  "Force_Disable_OpLog_For_Cache_Description": "Selbst wenn OpLog vorhanden ist, wird es nicht zum Synchronisieren des Caches verwendet",
   "Force_SSL": "SSL erzwingen",
-  "Force_SSL_Description": "*Achtung!* _Force SSL_ solte niemals mit einem Reverse-Proxy verwendet werden. Falls Sie einen Reverse-Proxy verwenden, sollten Sie die Weiterleitung DORT einrichten. Dies Option existiert für Anwendungen wie Heroku, die keine Weiterleitungskonfigurationen für Reverse-Proxy erlauben.",
+  "Force_SSL_Description": "*Achtung!* _Force SSL_ sollte niemals mit einem Reverse-Proxy verwendet werden. Falls Sie einen Reverse-Proxy verwenden, sollten Sie die Weiterleitung dort einrichten. Dies Option existiert für Anwendungen wie Heroku, die keine Weiterleitungskonfigurationen für Reverse-Proxy erlauben.",
   "Forgot_password": "Passwort vergessen?",
-  "Forgot_Password_Email_Subject": "[Site_Name] - Passwort Wiederherstellung",
+  "Forgot_Password_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li>[Forgot_Password_Url] für die Passwort-Wiederherstellungs-URL.</li><li>[name], [fname], [lname] für den vollstandigen Namen, Vornamen oder Nachnamen des Benutzers</li><li>[email] für die E-Mail-Adresse des Benutzers.</li><li>[Site_Name] und [Site_URL] für den Anwendungsnamen und die URL der Anwendung</li></ul>",
   "Forgot_Password_Email": "<a href=\"[Forgot_Password_Url]\">Hier</a> Klicken um das Passwort zurückzusetzen.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Passwort-Wiederherstellung",
   "Forgot_password_section": "Passwort vergessen",
   "Forward": "Weiterleiten",
   "Forward_chat": "Chat weiterleiten",
@@ -570,29 +732,53 @@
   "Frequently_Used": "Häufig verwendet",
   "Friday": "Freitag",
   "From": "Absender",
-  "From_Email": "E-Mail Absender",
-  "From_email_warning": "<b>Warnung</b>: Der <b>Absender</b> ist Gegenstand deiner Mail-Server-Einstellungen.",
+  "From_Email": "E-Mail-Absender",
+  "From_email_warning": "<b>Warnung</b>: Der <b>Absender</b> ist wird aus den Mail-Server-Einstellungen übernommen.",
   "General": "Allgemeines",
   "github_no_public_email": "Sie haben keine öffentliche E-Mail-Adresse in Ihrem GitHub-Account.",
   "Give_a_unique_name_for_the_custom_oauth": "Geben Sie dem benutzerdefinierten OAuth-Konto einen eindeutigen Namen.",
-  "Give_the_application_a_name_This_will_be_seen_by_your_users": "Geben Sie der Anwendung einen Namen. Die Nutzer können den Namen sehen.",
+  "Give_the_application_a_name_This_will_be_seen_by_your_users": "Geben Sie der Anwendung einen Namen. Alle Nutzer können diesen Namen sehen.",
   "Global": "Global",
+  "Google_Vision_usage_limit_exceeded": "Nutzungsbeschränkung für Google Vision erreicht",
+  "GoogleCloudStorage": "Google Cloud Speicher",
+  "GoogleNaturalLanguage_ServiceAccount_Description": "Service-Konto SchlüsselDatei (JSON). Weiterführende Informationen dazu [hier](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
   "GoogleTagManager_id": "Google-Tag-Manager-ID",
-  "Guest_Pool": "Gästepool",
+  "GoogleVision_Block_Adult_Images": "Nicht-jugendfreie Fotos blocken",
+  "GoogleVision_Block_Adult_Images_Description": "Das Blocken von nicht-jugendfreien Fotos wird nicht mehr funktionieren, sobald das monatliche Limit erreicht ist.",
+  "GoogleVision_Current_Month_Calls": "Aufrufe des aktuellen Monats",
+  "GoogleVision_Enable": "Google Vision",
+  "GoogleVision_Max_Monthly_Calls": "Maximale Anzahl der monatlichen Aufrufe",
+  "GoogleVision_Max_Monthly_Calls_Description": "0 für unendlich",
+  "GoogleVision_ServiceAccount": "Google Vision Service Konto",
+  "GoogleVision_ServiceAccount_Description": "Erstelle einen Server-Key (JSON Format) und kopiere den JSON-String hier hinein",
+  "GoogleVision_Type_Document": "Texterkennung für Dokumente",
+  "GoogleVision_Type_Faces": "Gesichtserkennung",
+  "GoogleVision_Type_Labels": "Erkennung von Etiketten",
+  "GoogleVision_Type_Landmarks": "Erkennung von Wahrzeichen",
+  "GoogleVision_Type_Logos": "Erkennung von Logos",
+  "GoogleVision_Type_Properties": "Erkennung von (Farb-) Eigenschaften",
+  "GoogleVision_Type_SafeSearch": "SafeSearch-Erkennung",
+  "GoogleVision_Type_Similar": "Ähnliche Bilder suchen",
+  "Group_mentions_only": "Nur Gruppen-Erwähnungen",
+  "Guest_Pool": "Gäste-Pool",
   "Hash": "Hash",
   "Header": "Kopfzeile",
-  "Header_and_Footer": "Kopf und Fusszeile",
+  "Header_and_Footer": "Kopf- und Fusszeile",
+  "Helpers": "Helfer",
+  "Hex_Color_Preview": "Farbvorschau (Hex)",
   "Hidden": "Versteckt",
-  "Hide_Avatars": "Avatar verstecken",
+  "Hide_Avatars": "Avatare verstecken",
   "Hide_flextab": "Rechte Seitenleiste über Klick verstecken",
-  "Hide_Group_Warning": "Sind sie sicher, die Gruppe\"%s\" zu verstecken?",
-  "Hide_Private_Warning": "Sind sie sicher, das Gespräch mit \"%s\" zu verstecken?",
+  "Hide_Group_Warning": "Sind sie sicher, dass Sie die Gruppe \"%s\" verstecken wollen?",
+  "Hide_Livechat_Warning": "Sind Sie sich sicher, dass Sie den Livechat mit \"%s\" ausblenden wollen?",
+  "Hide_Private_Warning": "Sind sie sicher, dass Sie das Gespräch mit \"%s\" verstecken wollen?",
+  "Hide_roles": "Rollen nicht anzeigen",
   "Hide_room": "Raum verstecken",
-  "Hide_Room_Warning": "Sind sie sicher, den Raum \"%s\" zu verstecken?",
-  "Hide_roles": "Rollen verstecken",
+  "Hide_Room_Warning": "Sind sie sicher, dass Sie den Raum \"%s\" verstecken wollen?",
+  "Hide_Unread_Room_Status": "Ungelesen-Status des Raums nicht anzeigen",
   "Hide_usernames": "Benutzernamen ausblenden",
   "Highlights": "Hervorhebungen",
-  "Highlights_How_To": "Um benachrichtigt zu werden, wenn ein Wort oder Ausdruck erwähnt wird, fügen Sie ihn hier hinzu. Sie können Wörter und Ausdrücke mit Kommata trennen. Die Wörter zur Hervorhebung beachten die Groß- und Kleinschreibung nicht.",
+  "Highlights_How_To": "Um benachrichtigt zu werden, wenn ein Wort oder Ausdruck erwähnt wird, fügen Sie ihn hier hinzu. Sie können Wörter und Ausdrücke mit Kommata trennen. Groß- und Kleinschreibung wird hierbei nicht berücksichtig.",
   "Highlights_List": "Wörter hervorheben",
   "History": "Chronik",
   "Host": "Host",
@@ -600,19 +786,33 @@
   "Hours": "Stunden",
   "How_friendly_was_the_chat_agent": "Wie freundlich war der Chat-Agent?",
   "How_knowledgeable_was_the_chat_agent": "Wie sachkundig war der Chat-Agent?",
+  "How_long_to_wait_after_agent_goes_offline": "Wartedauer, bevor ein Agent in den Offline-Modus übergeht",
   "How_responsive_was_the_chat_agent": "Wie reaktionsschnell war der Chat-Agent?",
   "How_satisfied_were_you_with_this_chat": "Wie zufrieden waren Sie mit diesem Chat?",
-  "If_you_are_sure_type_in_your_password": "Wenn Sie sich sicher sind, geben Sie ihr Passwort ein.",
+  "How_to_handle_open_sessions_when_agent_goes_offline": "Behandlung von offenen Konversationen, wenn ein Agent Offline geht",
+  "If_this_email_is_registered": "Wenn es sich um eine registrierte E-Mail-Adresse handelt, werden wir an diese eine Anleitung zum Zurücksetzen des Passworts senden. Sollten Sie in Kürzen keine E-Mail erhalten, kommen Sie wieder und versuchen Sie es noch einmal.",
+  "If_you_are_sure_type_in_your_password": "Wenn Sie sich sicher sind, geben Sie ihr Passwort ein:",
   "If_you_are_sure_type_in_your_username": "Wenn Sie sich sicher sind, geben Sie Ihren Benutzernamen ein:",
+  "Iframe_Integration": "Iframe-Integration",
   "Iframe_Integration_receive_enable": "Empfang zulassen",
   "Iframe_Integration_receive_enable_Description": "Erlaube dem übergeordneten Fenster (parent window) Befehle an Rocket.Chat zu senden.",
+  "Iframe_Integration_receive_origin": "Herkunft für Empfang",
   "Iframe_Integration_receive_origin_Description": "Nur Seiten mit der angegebenen Herkunft erlauben Befehle abzusetzen. `*` für alle Seiten. Mehrere Werte können mittels `,` getrennt werden. Beispiel: `http://localhost,https://localhost`",
   "Iframe_Integration_send_enable": "Senden zulassen",
   "Iframe_Integration_send_enable_Description": "Sende Events an das übergeordnete Fenster (parent window)",
-  "Importer_Archived": "archiviert",
+  "Iframe_Integration_send_target_origin": "URL des Ziels, an das gesendet werden soll",
+  "Iframe_Integration_send_target_origin_Description": "Herkunfts-URL (inkl. Protokoll-Präfix), an die die Befehle gesendet werden sollen (bspw. 'https://localhost', oder *, um ein Senden nicht einzuschränken",
+  "IMAP_intercepter_already_running": "IMAP intercepter läuft bereits",
+  "IMAP_intercepter_Not_running": "IMAP intercepter läuft nicht",
+  "Impersonate_user": "Benutzeridentität übernehmen",
+  "Impersonate_user_description": "Wenn aktiviert, erstellt die Integration Nachrichten mit der Identität des Benutzers der die Integration ausgelöst hat",
+  "Importer_Archived": "Archiviert",
+  "Importer_CSV_Information": "Der CSV-Importer erfordert ein spezielles Format. Bitte lesen Sie die Dokumentation, wie die ZIP-Datei strukturiert sein muss:",
   "Importer_done": "Die Daten wurden erfolgreich importiert!",
   "Importer_finishing": "Import abgeschlossen.",
   "Importer_From_Description": "Importiert Daten von __from__ nach Rocket.Chat.",
+  "Importer_HipChatEnterprise_BetaWarning": "Bitte beachten Sie, dass sich dieser Importer noch in der Entwicklung befindet. Bitte berichten Sie über Fehler auf GitHub: ",
+  "Importer_HipChatEnterprise_Information": "Die hoch geladene Datei muss ein nicht-verschlüsseltes tar.gz sein. Bitte lesen Sie die Dokumentation für weiterführende Informationen.",
   "Importer_import_cancelled": "Der Import wurde abgebrochen.",
   "Importer_import_failed": "Während des Importierens ist ein Fehler aufgetreten.",
   "Importer_importing_channels": "Importiere die Kanäle.",
@@ -620,13 +820,16 @@
   "Importer_importing_started": "Starte den Importer.",
   "Importer_importing_users": "Importiere die Benutzer.",
   "Importer_not_in_progress": "Der Importer läuft derzeit nicht.",
+  "Importer_not_setup": "Der Importer ist nich richtig konfiguriert. Er lieferte keine Daten zurück",
   "Importer_Prepare_Restart_Import": "Import neu starten",
   "Importer_Prepare_Start_Import": "Import starten",
-  "Importer_Prepare_Uncheck_Archived_Channels": "Markierung für archivierte Kanäle entfernen",
-  "Importer_Prepare_Uncheck_Deleted_Users": "Gelöschte Nutzer deaktivieren",
-  "Importer_progress_error": "Fehler beim Erhalt des Verlaufs des Imports.",
+  "Importer_Prepare_Uncheck_Archived_Channels": "Archivierte Kanäle ignorieren",
+  "Importer_Prepare_Uncheck_Deleted_Users": "Gelöschte Nutzer beim Import ignorieren",
+  "Importer_progress_error": "Konnte den Fortschritt des Imports nicht ermitteln.",
   "Importer_setup_error": "Bei der Konfiguration des Importers ist ein Fehler aufgetreten.",
-  "Incoming_Livechats": "Eingehende livechats",
+  "Importer_Source_File": "Auswahl der Quelldatei",
+  "Incoming_Livechats": "Eingehende Livechats",
+  "Incoming_WebHook": "Eingehender Webhook",
   "inline_code": "Code",
   "Install_Extension": "Erweiterung installieren",
   "Install_FxOs": "Rocket.Chat in deinem Firefox-Browser aktivieren",
@@ -635,58 +838,106 @@
   "Install_FxOs_follow_instructions": "Bitte die Installation der App nach der Aufforderung mit \"Installieren\" bestätigen.",
   "Installation": "Installation",
   "Installed_at": "Installationsdatum",
+  "Instance_Record": "Datensatz",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Anweisungen an Ihre Besucher: Füllen Sie das Formular aus, um eine Nachricht zu senden.",
-  "Integration_Advanced_Settings": "Erweiterte Einstellungen",
   "Integration_added": "Die Integration wurde hinzugefügt.",
-  "Integration_Incoming_WebHook": "Eingehende WebHook-Integration",
+  "Integration_Advanced_Settings": "Erweiterte Einstellungen",
+  "Integration_History_Cleared": "Integrationshistorie erfolgreich gelöscht",
+  "Integration_Incoming_WebHook": "Eingehender WebHook",
   "Integration_New": "Neue Integration",
-  "Integrations_Outgoing_Type_FileUploaded": "Hochgeladene Dateien",
-  "Integrations_Outgoing_Type_RoomArchived": "Archivierte Räume",
-  "Integrations_Outgoing_Type_RoomCreated": "Raum erstellt (öffentlich und privat)",
-  "Integrations_Outgoing_Type_RoomJoined": "BenutzerIn hat den Raum betreten",
-  "Integrations_Outgoing_Type_RoomLeft": "BenutzerIn hat den Raum verlassen",
-  "Integrations_Outgoing_Type_SendMessage": "Nachricht gesendet",
-  "Integrations_Outgoing_Type_UserCreated": "BenutzerIn angelegt.",
-  "Integration_Outgoing_WebHook": "Ausgehende WebHook-Integration",
-  "Integration_Word_Trigger_Placement_Description": "Soll das auslösende Wort irgendwo im Satz stehen und nicht nur am Anfang? ",
+  "Integration_Outgoing_WebHook": "Ausgehender Webhook",
+  "Integration_Outgoing_WebHook_History": "Historie für ausgehende Webhooks",
+  "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Daten, die an die Integration übergeben wurden",
+  "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Daten, die an die URL gesendet wurden",
+  "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Fehler Stacktrace",
+  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP Response",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "HTTP Response Fehler",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Nachrichten, die vom Vorbereitungs-Schritt gesendet wurden",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Nachrichten, die vom Durchführungs-Schritt gesendet wurden",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Zeit des Fehlers oder der Beendigung",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Zeit, zu der die Integration ausgelöst wurde",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "Letzter Trigger-Schritt",
+  "Integration_Outgoing_WebHook_No_History": "Für diesen ausgehenden Webhook gibt es noch keine historischen Einträge",
+  "Integration_Retry_Count": "Anzahl der Wiederholungsversuche",
+  "Integration_Retry_Count_Description": "Wie häufig soll die Integration probiert werde, wenn der Aufruf der URL fehlschlägt?",
+  "Integration_Retry_Delay": "Verzögerung der Wiederholungsversuche",
+  "Integration_Retry_Delay_Description": "Welcher Verzögerungsalgorythmus soll verwendet werden? <code class=\"inline\">10^x</code> or <code class=\"inline\">2^x</code> or <code class=\"inline\">x*2</code>",
+  "Integration_Retry_Failed_Url_Calls": "URL-Aufrufe fehlerhafter Wiederholungsversuche",
+  "Integration_Retry_Failed_Url_Calls_Description": "Soll es die Integration bei Fehlversuchen nach einer angemessen Zeit erneut versuchen?",
+  "Integration_Run_When_Message_Is_Edited": "Beim Bearbeiten ausführen",
+  "Integration_Run_When_Message_Is_Edited_Description": "Soll die Integration ausgeführt werden, wenn eine Nachricht bearbeitet wurde? Wenn diese Option deaktiviert wurde, wird sie nur für <strong>neue</strong> Nachrichten ausgeführt werden.",
   "Integration_updated": "Die Integration wurde aktualisiert.\n",
+  "Integration_Word_Trigger_Placement": "Wörter können überall vorkommen",
+  "Integration_Word_Trigger_Placement_Description": "Soll das auslösende Wort irgendwo im Satz stehen können (und nicht nur am Anfang)? ",
   "Integrations": "Integrationen",
+  "Integrations_for_all_channels": "Geben Sie <strong>all_public_channels</strong> für alle öffentlichen Kanäle ein , <strong>all_private_groups</strong> für alle privaten Gruppen und <strong>all_direct_messages</strong> für Direktnachrichten.",
+  "Integrations_Outgoing_Type_FileUploaded": "Hochgeladene Datei",
+  "Integrations_Outgoing_Type_RoomArchived": "Archivierter Raum",
+  "Integrations_Outgoing_Type_RoomCreated": "Erstellter Raum (öffentlich und privat)",
+  "Integrations_Outgoing_Type_RoomJoined": "Benutzer hat den Raum betreten",
+  "Integrations_Outgoing_Type_RoomLeft": "Benutzer hat den Raum verlassen",
+  "Integrations_Outgoing_Type_SendMessage": "Nachricht gesendet",
+  "Integrations_Outgoing_Type_UserCreated": "Benutzer angelegt",
   "InternalHubot": "Interner Hubot",
+  "InternalHubot_PathToLoadCustomScripts": "Ordner, aus dem die Skripte geladen werden sollen",
+  "InternalHubot_reload": "Skripte erneut laden",
   "InternalHubot_ScriptsToLoad": "Zu ladende Skripte",
-  "InternalHubot_ScriptsToLoad_Description": "Bitte geben Sie eine durch Kommata getrennte Liste von zu ladenden Skripten von https://github.com/github/hubot-scripts/tree/master/src/scripts an.",
+  "InternalHubot_ScriptsToLoad_Description": "Bitte geben Sie eine durch Kommata getrennte Liste von zu ladenden Skripten aus Ihrem Ordner an.",
   "InternalHubot_Username_Description": "Dies muss ein gültiger Benutzername eines auf dem Server registrierten Bots sein.",
   "Invalid_confirm_pass": "Die Passwörter stimmen nicht überein.",
   "Invalid_email": "Die eingegebene E-Mail-Adresse ist ungültig.",
   "Invalid_Export_File": "Die angegebene Datei ist keine gültige %s Exportdatei.",
-  "Invalid_Import_File_Type": "Ungültiges Dateiformat zum Importieren.",
+  "Invalid_Import_File_Type": "Ungültiges Import-Dateiformat .",
   "Invalid_name": "Es muss ein Name angegeben werden.",
   "Invalid_notification_setting_s": "Ungültige Benachrichtigungseinstellung: %s",
   "Invalid_pass": "Es muss ein Passwort angegeben werden.",
-  "Invalid_room_name": "<strong>%s</strong> ist kein zulässiger Raumname.<br/> Verwenden Sie  nur Buchstaben, Zahlen oder Binde- und Unterstriche.",
+  "Invalid_room_name": "<strong>%s</strong> ist kein zulässiger Raumname",
   "Invalid_secret_URL_message": "Die angegebene URL ist ungültig.",
-  "Invalid_two_factor_code": "Fehlerhafter 2-Faktor Code",
+  "Invalid_setting_s": "Ungültige Einstellung: %s",
+  "Invalid_two_factor_code": "Fehlerhafter Zwei-Faktor-Code",
   "invisible": "unsichtbar",
   "Invisible": "Unsichtbar",
   "Invitation": "Einladung",
   "Invitation_HTML": "Einladungstext (HTML)",
   "Invitation_HTML_Default": "<h2> Sie wurden eingeladen zu <h1> [Site_Name] </h1></h2><p> Besuchen Sie zu [Site_URL] und probieren Sie heute die beste verfügbare Open-Source-Chat-Lösung aus! </p>",
-  "Invitation_HTML_Description": "Sie können die folgenden Platzhalter verwenden: <br /><ul><li> [email] für den Empfänger der E-Mail. </li><li> [Site_Name] und [Site_URL] jeweils für den Anwendungsnamen und die URL. </li></ul>",
-  "Invitation_Subject": "Einladungsbetreff",
+  "Invitation_HTML_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li> [email] für den Empfänger der E-Mail. </li><li> [Site_Name] und [Site_URL] jeweils für den Anwendungsnamen und die URL. </li></ul>",
+  "Invitation_Subject": "Betreff der Einladung",
   "Invitation_Subject_Default": "Sie wurden zu [Site_Name] eingeladen",
-  "Invite_user_to_join_channel": "BenutzerIn in diesen Kanal einladen",
+  "Invite_user_to_join_channel": "Benutzer in diesen Kanal einladen",
+  "Invite_user_to_join_channel_all_from": "Alle Benutzer des Kanals  [#channel] einladen, diesem Kanal zu folgen",
+  "Invite_user_to_join_channel_all_to": "Alle Benutzer dieses Kanals einladen, dem Kanal [#channel] zu folgen",
   "Invite_Users": "BenutzerInnen einladen",
+  "IRC_Channel_Join": "Ausgabe des JOIN-Befehls",
+  "IRC_Channel_Leave": "Ausgabe des PART-Befehls",
+  "IRC_Channel_Users": "Ausgabe des NAMES-Befehls",
+  "IRC_Channel_Users_End": "Ende der Ausgabe des NAMES-Befehls",
+  "IRC_Description": "Internet Relay Chat (IRC) ist ein text-basiertes Gruppen-Kommunikations-Werkzeug. \nDieses Paket integriert IRC-Funktionalität in Rocket.Chat",
+  "IRC_Enabled": "Versuche, IRC in Rocket.Chat zu integrieren. Eine Änderung dieser Einstellung erfordert einen Neustart des Rocket.Chat Servers.",
+  "IRC_Hostname": "Der IRC-Host, zu dem verbunden werden soll",
+  "IRC_Login_Fail": "Ausgabe nach der fehlerhaften Verbindung zum IRC-Server",
+  "IRC_Login_Success": "Ausgabe nach der erfolgreichen Verbindung zum IRC-Server",
+  "IRC_Message_Cache_Size": "Cache-Limit für ausgehende Nachrichten",
+  "IRC_Port": "Port des IRC-Host, zu dem verbunden werden soll",
+  "IRC_Private_Message": "Ausgabe des PRIVMSG-Befehls",
+  "IRC_Quit": "Ausgabe beim Beenden einer IRC-Session",
   "is_also_typing": "schreibt auch",
   "is_also_typing_female": "schreibt auch",
   "is_also_typing_male": "schreibt auch",
   "is_typing": "schreibt",
   "is_typing_female": "schreibt",
   "is_typing_male": "schreibt",
+  "Issue_Links": "Issue-Tracker Links",
+  "IssueLinks_Incompatible": "Warnung: Aktivieren Sie diese Einstellung nicht Zusammen mit der Farbvorschau (Hex).",
+  "IssueLinks_LinkTemplate": "Vorlage für Issue-Verknüpfungen",
+  "IssueLinks_LinkTemplate_Description": "Vorlage für Issue-Verknüpfungen; %s wird mit der Issue-Nummer ersetzt werden.",
   "It_works": "Es funktioniert",
   "italics": "kursiv",
   "Jitsi_Chrome_Extension": "Chrome Extension ID",
-  "Jitsi_Enable_Channels": "Aktivieren in Kanälen",
+  "Jitsi_Enable_Channels": "In Kanälen aktivieren",
   "join": "Beitreten",
-  "Join_audio_call": "Anruf beitreiten",
+  "join-without-join-code": "Ohne Code beitreten",
+  "join-without-join-code_description": "Berechtigung, Kanäle mit Zutrittscode auch ohne Code zu betreten",
+  "Join_audio_call": "Anruf beitreten",
   "Join_Chat": "Chat beitreten",
   "Join_default_channels": "Standardkanälen beitreten",
   "Join_the_Community": "Trete der Community bei",
@@ -696,13 +947,27 @@
   "Jump": "Springen",
   "Jump_to_first_unread": "Erste ungelesene Nachricht anzeigen",
   "Jump_to_message": "Diese Nachricht im Chat anzeigen",
-  "Jump_to_recent_messages": "Neue Nachricht im Chat anzeigen",
+  "Jump_to_recent_messages": "Erste neue Nachricht im Chat anzeigen",
+  "Just_invited_people_can_access_this_channel": "Nur eingeladene Benutzer können auf diesen Kanal zugreifen",
   "Katex_Dollar_Syntax": "Dollar-Syntax erlauben",
   "Katex_Dollar_Syntax_Description": "$$KaTeX Block$$ und $inline KaTeX$ Syntax erlauben",
   "Katex_Enabled": "Katex ist aktiviert.",
-  "Katex_Enabled_Description": "Erlauben von <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">KaTeX</a> für mathematischen Satz in Nachrichten",
+  "Katex_Enabled_Description": "Erlauben von <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">KaTeX</a> für mathematische Ausdrücke in Nachrichten",
   "Katex_Parenthesis_Syntax": "Klammer-Syntax erlauben",
   "Katex_Parenthesis_Syntax_Description": "\\[KaTeX Block\\] und \\ (inline KaTeX \\) Syntax erlauben",
+  "Keyboard_Shortcuts_Edit_Previous_Message": "Bearbeite vorherige Nachricht",
+  "Keyboard_Shortcuts_Keys_1": "<kbd>Strg</kbd> + <kbd>p</kbd>",
+  "Keyboard_Shortcuts_Keys_2": "<kbd>Pfeiltaste hoch</kbd>",
+  "Keyboard_Shortcuts_Keys_3": "<kbd>Command</kbd> (oder <kbd>Alt</kbd>) + <kbd>Pfeiltaste links</kbd>",
+  "Keyboard_Shortcuts_Keys_4": "<kbd>Command</kbd> (oder <kbd>Alt</kbd>) + <kbd>Pfeiltaste hoch</kbd>",
+  "Keyboard_Shortcuts_Keys_5": "<kbd>Command</kbd> (oder <kbd>Alt</kbd>) + <kbd>Pfeiltaste rechts</kbd>",
+  "Keyboard_Shortcuts_Keys_6": "<kbd>Command</kbd> (oder <kbd>Alt</kbd>) + <kbd>Pfeiltaste runter</kbd>",
+  "Keyboard_Shortcuts_Keys_7": "<kbd>Shift</kbd> + <kbd>Eingabetaste</kbd>",
+  "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "An den Anfang der Nachricht springen",
+  "Keyboard_Shortcuts_Move_To_End_Of_Message": "Ans Ende der Nachricht springen",
+  "Keyboard_Shortcuts_New_Line_In_Message": "Zeilenumbruch einfügen",
+  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Kanal öffnen / Nach Benutzer suchen",
+  "Keyboard_Shortcuts_Title": "Keyboard Shortcuts",
   "Knowledge_Base": "Wissensbasis",
   "Label": "Bezeichnung",
   "Language": "Sprache",
@@ -720,84 +985,113 @@
   "Layout_Terms_of_Service": "Nutzungsbedingungen",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA-Cert",
+  "LDAP_Connect_Timeout": "Verbindungs-Timeout (ms)",
   "LDAP_Custom_Domain_Search": "Benutzerdefinierte Domainsuche",
-  "LDAP_Custom_Domain_Search_Description": "Ein Teil aus JSON, welches Bindungs- und Verbindungsinformationen regelt und folgende Struktur besitzt: <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
+  "LDAP_Custom_Domain_Search_Description": "Ein Teil aus JSON, welches Verbindungsinformationen defiiniert und folgende Struktur besitzt: <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Standard-Domain",
-  "LDAP_Description": "LDAP ist ein  Frontend zu hierarchischen Datenbanken, die viele Unternehmen nutzen, um eine eine Einmalanmeldung (SSO) zu ermöglichen. Über SSO kann \"ein Benutzer nach einer einmaligen Authentifizierung an einem Arbeitsplatz auf alle Rechner und Dienste, für die er lokal berechtigt ist, am selben Arbeitsplatz zugreifen kann, ohne sich jedes Mal neu anmelden zu müssen\". Genauere Informationen zur Konfiguration von LDAP mit Konfigurationsbeispielen erhalten Sie unter folgendem Link: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "Domainbasis",
-  "LDAP_Domain_Base_Description": "Der volle Distinguished Name (DN) von einem LDAP-Unterverzeichnis, den Sie nach Benutzern und Gruppen durchsuchen möchten. SIe können so viele hinzufügen wie sie möchten. Jede Gruppe muss aber der selben Domainbasis angehören, in der sich die Benutzer befindet. Wenn Sie beschränkte Nutzergruppen angeben, werden nur Benutzer, die diesen Gruppen angehören, im Anwendungsbereich liegen. Wir empfehlen, die oberste Ebene des LDAP-Verzeichnisbaums als Domainbasis anzugeben und Suchfilter zu verwenden, um den Zugriff zu kontrollieren.",
-  "LDAP_Domain_Search_Filter": "Filter der Domainsuche",
+  "LDAP_Description": "LDAP ist eine hierarchische Datenbank, die viele Unternehmen nutzen, um eine eine Einmalanmeldung (SSO) zu ermöglichen. Über SSO kann \"ein Benutzer nach einer einmaligen Authentifizierung an einem Arbeitsplatz auf alle Rechner und Dienste, für die er lokal berechtigt ist, am selben Arbeitsplatz zugreifen kann, ohne sich jedes Mal neu anmelden zu müssen\". Genauere Informationen zur Konfiguration von LDAP mit Konfigurationsbeispielen erhalten Sie unter folgendem Link: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
+  "LDAP_Domain_Base": "Domain-Basis",
+  "LDAP_Domain_Base_Description": "Der volle Distinguished Name (DN) von einem LDAP-Unterverzeichnis, den Sie nach Benutzern und Gruppen durchsuchen möchten. Sie können so viele hinzufügen wie sie möchten. Jede Gruppe muss aber der selben Domainbasis angehören, in der sich die Benutzer befindet. Wenn Sie beschränkte Nutzergruppen angeben, werden nur Benutzer, die diesen Gruppen angehören, berücksichtig. Wir empfehlen, die oberste Ebene des LDAP-Verzeichnisbaums als Domainbasis anzugeben und Suchfilter zu verwenden, um Einschränkungen vorzunehmen.",
+  "LDAP_Domain_Search_Filter": "Filter der Domain-Suche",
   "LDAP_Domain_Search_Filter_Description": "Wenn angegeben, wird nur Benutzern, die dem Filter entsprechen, erlaubt, sich anzumelden. Wenn kein Filter angegeben ist, werden sich alle Benutzer in dem Bereich der angegebenen Domainbasis anmelden können.<br/>Ein Beispiel für Active-Directory: `memberOf=cn=ROCKET_CHAT,ou=General Groups`<br/>Ein Beispiel für OpenLDAP (erweiterbare Übereinstimmungssuche): `ou:dn:=ROCKET_CHAT`",
-  "LDAP_Domain_Search_Object_Category": "Objektkategorie der Domainsuche",
-  "LDAP_Domain_Search_Object_Category_Description": "Die *objectCategory*, die Ihre Nutzer identifizert. Lassen Sie das Feld leer, um *OpenLDAP* zu aktivieren. <br/> Beispiel: `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Objektklasse der Domainsuche",
+  "LDAP_Domain_Search_Object_Category": "Objektkategorie der Domain-Suche",
+  "LDAP_Domain_Search_Object_Category_Description": "Die *objectCategory*, die Ihre Nutzer identifizert. Lassen Sie das Feld bei der Nutzung von *OpenLDAP* leer. <br/> Beispiel: `person`, etc.",
+  "LDAP_Domain_Search_Object_Class": "Objektklasse der Domain-Suche",
   "LDAP_Domain_Search_Object_Class_Description": "Die *objectclass*, die Ihre Nutzer identifizert. <br/> Beispiel: `organizationalPerson`, `user`, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Passwort der Domainsuche",
+  "LDAP_Domain_Search_Password": "Passwort der Domain-Suche",
   "LDAP_Domain_Search_Password_Description": "Das Passwort für die Benuzer der Domainsuche",
-  "LDAP_Domain_Search_User": "Domain Search User",
+  "LDAP_Domain_Search_User": "Benutzer der Domain-Suche",
   "LDAP_Domain_Search_User_Description": "Der LDAP-Benutzer, der eine Benutzersuche durchführt, um andere Nutzer bei der Anmeldung zu authentifizieren. <br/>Dies ist in der Regel ein Servicekonto, welches für Drittintegrationen erstellt worden ist. Verwenden Sie einen vollen Namen, wie zum Beispiel `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search User ID",
-  "LDAP_Domain_Search_User_ID_Description": "Das LDAP-Attribut, welches den LDAP-Benutzer identifiziert, der sich zu authentifizieren versucht. Das Feld ist für die meisten Active-Directory-Installationen `sAMAccountName`, für andere LDAP-Lösungen wie OpenLDAP kann dieses jedoch auch `uid` sein. Sie können aber auch `mail` verwenden, um Benutzer mit Ihrer E-Mail-Adresse zu identifizieren oder jedes Attribut, das Sie möchten. <br/>Sie können mehrere Werte, getrennt mit Kommata, verwenden, um es Benutzern zu erlauben, sich mit mehreren Kennungen anzumelden, wie zum Beispiel einem Benutzernamen und der E-Mail-Adresse.",
-  "LDAP_Enable": "LDAP aktivieren",
-  "LDAP_Enable_Description": "LDAP für die Authentifizierung verwenden.",
+  "LDAP_Domain_Search_User_ID": "User ID der Domain-Suche",
+  "LDAP_Domain_Search_User_ID_Description": "Das LDAP-Attribut, welches den LDAP-Benutzer identifiziert, der sich zu authentifizieren versucht. Das Feld ist für die meisten Active-Directory-Installationen `sAMAccountName`, für andere LDAP-Lösungen wie OpenLDAP kann dieses jedoch auch `uid` sein. Sie können aber auch `mail` verwenden, um Benutzer mit Ihrer E-Mail-Adresse zu identifizieren - oder jedes Attribut, das Sie möchten. <br/>Sie können mehrere Werte, getrennt mit Kommata, verwenden, um es Benutzern zu erlauben, sich mit mehreren Kennungen anzumelden, wie zum Beispiel einem Benutzernamen und der E-Mail-Adresse.",
+  "LDAP_Enable": "LDAP",
+  "LDAP_Enable_Description": "LDAP zur Authentifizierung verwenden",
   "LDAP_Encryption": "Verschlüsselung",
-  "LDAP_Encryption_Description": "Die Verschlüsselungsmethode für sichere Kommunikation mit dem LDAP-Server. Die Beispiele enthalten `plain` (keine Verschlüsselung), `SSL/LDAPS` (von Anfang an verschlüsselt) und `StartTLS` (zur verschlüsselten Kommunikation wechseln, sobald verbunden)",
+  "LDAP_Encryption_Description": "Die Verschlüsselungsmethode für sichere Kommunikation mit dem LDAP-Server. Bspw. `plain` (keine Verschlüsselung), `SSL/LDAPS` (von Anfang an verschlüsselt) und `StartTLS` (zur verschlüsselten Kommunikation wechseln, sobald verbunden wurde)",
+  "LDAP_Group_Filter_Enable": "LDAP Benutzergruppen-Filter",
+  "LDAP_Group_Filter_Enable_Description": "Zugriff auf LDAP-Benutzergruppe beschränken.<br/>Diese Option ist hilfreich bei OpenLDAP-Servern, die den *memberOf*-Filter nicht unterstützen.",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Group-ID-Attibut",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Bspw. *OpenLDAP:*cn",
+  "LDAP_Group_Filter_Group_Member_Attribute": "Gruppenmitglieds-Attribut",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Bspw. *OpenLDAP:*uniqueMember",
+  "LDAP_Group_Filter_Group_Member_Format": "Gruppenmitglieds-Format",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "Bspw. *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
+  "LDAP_Group_Filter_Group_Name": "Gruppenname",
+  "LDAP_Group_Filter_Group_Name_Description": "Gruppe, zu der der Benutzer gehört",
+  "LDAP_Group_Filter_ObjectClass": "Gruppen-ObjectClass ",
+  "LDAP_Group_Filter_ObjectClass_Description": "Die *objectClass*, die Gruppen identifiziert.<br/>Bspw. OpenLDAP:groupOfUniqueNames",
   "LDAP_Host": "LDAP-Host",
-  "LDAP_Host_Description": "Der LDAP-Host, z.B. `ldap.example.com` oder `10.0.0.30`.",
+  "LDAP_Host_Description": "Der LDAP-Host, bspw. `ldap.example.com` oder `10.0.0.30`.",
+  "LDAP_Idle_Timeout": "Idle Timeout (ms)",
   "LDAP_Import_Users": "Importiere LDAP-Benutzer",
-  "LDAP_Merge_Existing_Users": "Verschmelze existierende Benutzer",
+  "LDAP_Import_Users_Description": "Importiert alle gefundenen LDAP-Benutzer.<br/>*Achtung!* Filteroption angeben , um nicht zu viele Benutzer zu importieren",
+  "LDAP_Login_Fallback": "Login Fallback",
+  "LDAP_Login_Fallback_Description": "Wenn der Login mit Hilfe von LDAP nicht erfolgreich war versuchen, mit dem lokalen Konto anzumelden. Das kann hilfreich sein, falls LDAP nicht verfügbar war.",
+  "LDAP_Merge_Existing_Users": "Verschmelze mit existierenden Benutzern",
+  "LDAP_Merge_Existing_Users_Description": "*Achtung!* Wenn beim Import aus LDAP ein lokaler Benutzer mit gleichem Namen bereits existiert, wird der lokale Benutzer mit den Einstellungen aus LDAP aktualisiert.",
   "LDAP_Port": "LDAP-Port",
-  "LDAP_Port_Description": "Port für den Zugriff auf LDAP. Beispiel: Port 389 oder 636 für LDAPS",
+  "LDAP_Port_Description": "Port für den LDAP-Zugriff, bspw.Port 389 oder 636 für LDAPS",
   "LDAP_Reject_Unauthorized": "Unberechtigte ablehnen",
   "LDAP_Sync_User_Avatar": "Profilbilder synchronisieren",
   "LDAP_Sync_User_Data": "Daten synchronisieren",
-  "LDAP_Sync_User_Data_Description": "Bei der Anmeldung die Benutzerdaten mit dem Server synchronisieren (Beispiel: Name, E-Mail).",
-  "LDAP_Sync_User_Data_FieldMap": "Nutzerdaten-Feldkarte",
-  "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurieren Sie, wie Benutzer-Account-Felder (wie die E-Mail-Adresse) aus einem LDAP-Datensatz (falls gefunden) geladen werden.<br/>Beispiel: {\"cn\":\"name\", \"mail\":\"email\"} nimmt einen von Menschen lesbaren Namen von dem cn-Attribut und die E-Mail-Adresse vom Mail-Attribut. Zusätzlich ist die Verwendung von Variablen möglich, wie z.B.: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }`. Hierbei wird eine Kombination des Vor- und Nachnamens verwendet.<br/>Verfügbare Felder in Rocket.Chat sind `name` und `email`.",
+  "LDAP_Sync_User_Data_Description": "Bei der Anmeldung die Benutzerdaten mit dem Server synchronisieren (Bspw. Name, E-Mail-Adresse).",
+  "LDAP_Sync_User_Data_FieldMap": "Zuordnung der Benutzer-Attribute",
+  "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurieren Sie, wie Benutzer-Account-Eigenschaften (wie die E-Mail-Adresse) aus einem LDAP-Datensatz (falls gefunden) geladen werden.<br/>Beispiel: {\"cn\":\"name\", \"mail\":\"email\"} nimmt einen von Menschen lesbaren Namen aus dem cn-Attribut und die E-Mail-Adresse aus dem Mail-Attribut. Zusätzlich ist die Verwendung von Variablen möglich, wie z.B.: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }`. Hierbei wird eine Kombination des Vor- und Nachnamens verwendet.<br/>Verfügbare Felder in Rocket.Chat sind `name` und `email`.",
   "LDAP_Sync_Users": "Benutzer synchronisieren",
-  "LDAP_Test_Connection": "Testverbindung",
-  "LDAP_Unique_Identifier_Field": "Eindeutige Kennung des Felds",
+  "LDAP_Test_Connection": "Verbindung prüfen",
+  "LDAP_Unique_Identifier_Field": "Feld für eindeutige Identifizierung",
   "LDAP_Unique_Identifier_Field_Description": "Dieses Feld wird verwendet, um LDAP-Nutzer und Rocket.Chat-Nutzer zu verbinden. Sie können mehrere Kommata-getrennte Werte angeben, um die Werte vom LDAP-Eintrag zu erhalten.<br/>Der Standardwert ist `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`.",
-  "LDAP_Use_Custom_Domain_Search": "Benutzerdefinierte Domainsuche verwenden",
+  "LDAP_Use_Custom_Domain_Search": "Benutzerdefinierte Domain-Suche verwenden",
   "LDAP_Use_Custom_Domain_Search_Description": "Schreiben Sie Ihren eigenen Filter, um Benutzer auf dem LDAP-Server zu suchen.",
-  "LDAP_Username_Field": "Nutzernamenfeld",
-  "LDAP_Username_Field_Description": "Geben Sie an, welches Feld als *Nutzername* für neue Benutzer verwendet werden soll. Lassen Sie das Feld leer, um den Nutzernamen zu verwenden, der auf der Anmeldeseite verwendet wird.<br/>Es können auch Template-Tags wie `#{givenNamen}.#{sn}` verwendet werden.<br/>Der Standardwert ist `sAMAccountName`.",
+  "LDAP_Username_Field": "Feld für den Benutzernamen",
+  "LDAP_Username_Field_Description": "Geben Sie an, welches Feld als *Benutzername* für neue Benutzer verwendet werden soll. Lassen Sie das Feld leer, um den Nutzernamen zu verwenden, der auf der Anmeldeseite verwendet wird.<br/>Es können auch Template-Tags wie `#{givenNamen}.#{sn}` verwendet werden.<br/>Der Standardwert ist `sAMAccountName`.",
   "Least_Amount": "Geringste Anzahl",
-  "Leave_Group_Warning": "Sind sie sicher, die Gruppe \"%s\" zu verlassen?",
-  "Leave_Private_Warning": "Sind sie sicher, das Gespräch mit \"%s\" zu verlassen?",
+  "Leave_Group_Warning": "Sind sie sicher, dass Sie die Gruppe \"%s\" verlassen wollen?",
+  "Leave_Livechat_Warning": "Sind Sie sich sicher, dass Sie den Livechat mit \"%s\" verlassen wollen?",
+  "Leave_Private_Warning": "Sind sie sicher, dass Sie das Gespräch mit \"%s\" verlassen wollen?",
   "Leave_room": "Raum verlassen",
-  "Leave_Room_Warning": "Sind sie sicher, den Raum \"%s\" zu verlassen?",
+  "Leave_Room_Warning": "Sind sie sicher, dass Sie den Raum \"%s\" verlassen wollen?",
   "Leave_the_current_channel": "Aktuellen Kanal verlassen",
-  "line": "Zeilen",
+  "line": "Zeile",
   "List_of_Channels": "Liste der Kanäle",
   "List_of_Direct_Messages": "Liste der Direktnachrichten",
-  "Livechat_agents": "LiveChat-Agent",
-  "Livechat_Dashboard": "LiveChat-Dashboard",
-  "Livechat_enabled": "LiveChat aktiviert",
-  "Livechat_forward_open_chats": "Offene Chats weiter leiten",
-  "Livechat_forward_open_chats_timeout": "Timeout (in Sekunden), um Chats weiterzuleiten",
+  "Livechat_agents": "Livechat-Agenten",
+  "Livechat_AllowedDomainsList": "Domänen, in denen der Livechat zulässig ist",
+  "Livechat_Dashboard": "Livechat-Dashboard",
+  "Livechat_enabled": "Livechat",
+  "Livechat_forward_open_chats": "Offene Chats weiterleiten",
+  "Livechat_forward_open_chats_timeout": "Timeout (in Sekunden), nach dem Chats weitergeleitet werden",
   "Livechat_guest_count": "Gästezähler",
-  "Livechat_managers": "LiveChat-Manager",
+  "Livechat_Inquiry_Already_Taken": "Livechat-Anfrage bereits übernommen",
+  "Livechat_managers": "Livechat-Manager",
   "Livechat_offline": "Livechat offline",
   "Livechat_online": "Livechat online",
-  "Livechat_room_count": "Livechat-Raumanzahl",
-  "Livechat_title": "LiveChat-Titel",
-  "Livechat_title_color": "Hintergrundfarbe des LiveChat-Titels",
-  "Livechat_Users": "LiveChat-Benutzer",
-  "Load_more": "Mehr laden",
+  "Livechat_open_inquiery_show_connecting": "Die \"Verbinden\"-Nachricht anstatt des Eingabefeldes anzeigen, wenn der Gast nicht mit einem Agenten verbunden ist.",
+  "Livechat_Queue": "Livechat-Warteschlange",
+  "Livechat_room_count": "Anzahl der Livechat-Räume",
+  "Livechat_Routing_Method": "Livechat Routing-Methode",
+  "Livechat_Take_Confirm": "Wollen Sie diesen Kunden annehmen?",
+  "Livechat_title": "Livechat-Titel",
+  "Livechat_title_color": "Hintergrundfarbe des Livechat-Titels",
+  "Livechat_Users": "Livechat-Benutzer",
+  "Load_more": "Weitere laden",
   "Loading...": "Wird geladen...",
-  "Loading_more_from_history": "Mehr Nachrichten aus dem Verlauf anzeigen",
-  "Loading_suggestion": "Vorschläge werden geladen...",
+  "Loading_more_from_history": "Weitere Nachrichten aus dem Verlauf anzeigen",
+  "Loading_suggestion": "Vorschläge werden geladen",
   "Localization": "Lokalisierung",
+  "Log_Exceptions_to_Channel": "Ausnahmen in einen Kanal schreiben",
+  "Log_Exceptions_to_Channel_Description": "Name eines Kanals, der alle abgefangenen Ausnahmen aufnimmt. Leer lassen, um sie nur ins Anwendungslog zu schreiben.",
   "Log_File": "Datei und Zeile anzeigen",
   "Log_Level": "Loglevel",
-  "Log_Package": "Paket zeigen",
-  "Log_View_Limit": "Begrenzung der Logansicht",
-  "Logged_out_of_other_clients_successfully": "Sie wurden erfolgreich von anderen Geräten abgemeldet.",
+  "Log_Package": "Paket anzeigen",
+  "Log_View_Limit": "Begrenzung der Log-Ansicht",
+  "Logged_out_of_other_clients_successfully": "Sie wurden erfolgreich von anderen Geräten abgemeldet",
   "Login": "Anmelden",
   "Login_with": "Anmelden mit %s",
   "Logout": "Abmelden",
   "Logout_Others": "Von anderen Geräten abmelden",
+  "mail-messages": "Nachrichten per E-Mail versenden",
+  "mail-messages_description": "Berechtigung, Nachrichten per E-Mail zu versenden",
   "Mail_Message_Invalid_emails": "Sie haben eine oder mehrere ungültige E-Mail-Adressen angegeben: %s",
   "Mail_Message_Missing_to": "Sie müssen einen/mehrere Benutzer auswählen oder eine/mehrere E-Mail-Adressen durch Kommata getrennt angeben.",
   "Mail_Message_No_messages_selected_select_all": "Sie haben keine Nachrichten ausgewählt. Möchten Sie <a href=\"#\" class=\"select-all\">alle</a> sichtbaren Nachrichten auswählen?",
@@ -805,163 +1099,231 @@
   "Mail_Messages_Instructions": "Wählen Sie aus, welche Nachrichten Sie per E-Mail senden möchten, indem Sie die Nachrichten anklicken. ",
   "Mail_Messages_Subject": "Hier ist ein ausgewählter Teil aus %s Nachrichten",
   "Mailer": "Mailer",
-  "Mailer_body_tags": "Sie <b>müssen</b> [unsubscribe] verwenden, um einen Link zum Abmelden aus dem Verteiler zur Verfügung zu stellen. <br /> Sie können [name] für den Vor- und Nachnamen, [fname] für den Vornamen oder [lname] für den Nachnamen des Benutzers verwenden. <br />Ebenfalls können Sie [email] verwenden, um die E-Mail-Adresse des Benutzers anzugeben.",
+  "Mailer_body_tags": "Sie <b>müssen</b> [unsubscribe] verwenden, um einen Link zum Abmelden aus dem Verteiler zur Verfügung zu stellen. <br/> Sie können [name] für den vollständigen Namen, [fname] für den Vornamen oder [lname] für den Nachnamen des Benutzers verwenden. <br/>Ebenfalls können Sie [email] verwenden, um die E-Mail-Adresse des Benutzers anzugeben.",
   "Mailing": "Mailing",
   "Make_Admin": "Benutzer zum Admin ernennen",
-  "Manager_added": "Der Manager wurde hinzugefügt.\n",
-  "Manager_removed": "Der Manager wurde gelöscht.",
-  "Managing_assets": "Assetverwaltung",
+  "Make_sure_you_have_a_copy_of_your_codes": "Stellen Sie sicher, dass Sie eine Kopie Ihrer Codes besitzen: __codes__ . Wenn Sie den Zugriff auf Ihre Authentifizierungs-App verlieden, können Sie sich mit Hilfe eines dieser Codes erneut anmelden.",
+  "manage-assets": "Assets verwalten",
+  "manage-assets_description": "Berechtigung, Assets (Stylesheets, Bilder, weitere Dateien) auf dem Server zu verwalten",
+  "manage-emoji": "Emojis verwalten",
+  "manage-emoji_description": "Berechtigung, Emojis zu verwalten",
+  "manage-integrations": "Integrationen verwalten",
+  "manage-integrations_description": "Berechtigung, die Integrationen des Servers zu verwalten",
+  "manage-oauth-apps": "OAuth-Anwendungen verwalten",
+  "manage-oauth-apps_description": "Berechtigung, OAuth-Anwendungen verwalten",
+  "manage-own-integrations": "Eigene Integrationen verwalten",
+  "manage-own-integrations_description": "Berechtigung, das Benutzer eigene Integrationen oder Webhooks erstellen und verwalten",
+  "manage-sounds": "Töne verwalten",
+  "manage-sounds_description": "Berechtigung, Töne zu verwalten",
+  "Manager_added": "Der Manager wurde hinzugefügt\n",
+  "Manager_removed": "Der Manager wurde gelöscht",
+  "Managing_assets": "Asset-Verwaltung",
   "Managing_integrations": "Integrationsverwaltung",
+  "MapView_Enabled": "Kartenansicht",
+  "MapView_Enabled_Description": "Das Aktivieren der Kartenansicht sorgt dafür, dass ein Button zum Teilen des aktuellen Ortes links des Eingabefeldes angezeigt wird.",
+  "MapView_GMapsAPIKey": "Google Static Maps API Schlüssel",
+  "MapView_GMapsAPIKey_Description": "Dieser kann kostenlos aus der Google-Entwickler-Konsole bezogen werden.",
   "Mark_as_read": "Als gelesen markieren",
   "Mark_as_unread": "Als ungelesen markieren",
   "Markdown_Headers": "Markdown-Überschriften",
-  "Markdown_SupportSchemesForLink": "Markdown-Support-System für Links",
-  "Markdown_SupportSchemesForLink_Description": "Kommata getrennte Liste von erlaubten Systemen",
+  "Markdown_Marked_Breaks": "Formatierte Umbrüche",
+  "Markdown_Marked_GFM": "Formatierung mit Github Flavoured Markdown (GFM)",
+  "Markdown_Marked_Pedantic": "Pedantisch Formatieren",
+  "Markdown_Marked_SmartLists": "Formatierte smarte Listen",
+  "Markdown_Marked_Smartypants": "Formatiere mit intelligenter Punktsetzung (\"Smartypants\")",
+  "Markdown_Marked_Tables": "Formatierte Tabellen",
+  "Markdown_Parser": "Markdown Parser",
+  "Markdown_SupportSchemesForLink": "Unterstützte Markdown- Schemata für Links",
+  "Markdown_SupportSchemesForLink_Description": "Kommata getrennte Liste von erlaubten Schemata",
+  "Max_length_is": "Maximale Länge ist %s",
   "Members_List": "Mitglieder",
+  "mention-all": "Alle erwähnen",
+  "mention-all_description": "Berechtigung, @all zur Erwähnung aller Kanalmitglieder zu verwenden",
   "Mentions": "Erwähnungen",
   "Mentions_default": "Erwähnungen (Standard)",
+  "Mentions_only": "Nur Erwähnungen",
   "Message": "Nachricht",
-  "Message_AllowBadWordsFilter": "Wortfilter für Nachrichten aktivieren",
-  "Message_AllowDeleting": "Das Löschen von Nachrichten erlauben",
-  "Message_AllowDeleting_BlockDeleteInMinutes": "Das Löschen von Nachrichten nach (n) Minuten sperren",
-  "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Geben Sie 0 ein, um keine Sperre zu setzen.",
+  "Message_AllowBadWordsFilter": "Wortfilter für Nachrichten verwenden",
+  "Message_AllowDeleting": "Löschen von Nachrichten erlauben",
+  "Message_AllowDeleting_BlockDeleteInMinutes": "Löschen von Nachrichten nach (n) Minuten sperren",
+  "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Geben Sie 0 ein, um keine Sperre zu setzen",
   "Message_AllowEditing": "Die Bearbeitung von Nachrichten erlauben",
-  "Message_AllowEditing_BlockEditInMinutes": "Bearbeiten von Nachrichten nach (in Minuten - 0 zum deaktivieren) blockieren ",
+  "Message_AllowEditing_BlockEditInMinutes": "Bearbeiten von Nachrichten nach (n) Minuten sperren",
   "Message_AllowEditing_BlockEditInMinutesDescription": "Geben Sie eine 0 ein, um das Bearbeiten von Nachrichten jederzeit zu erlauben.",
   "Message_AllowPinning": "Das Anheften von Nachrichten erlauben",
   "Message_AllowPinning_Description": "Benutzern das Anheften von Nachrichten in Kanälen erlauben",
-  "Message_AllowStarring": "Erlaube es, Nachrichten zu markieren",
-  "Message_AlwaysSearchRegExp": "Beim Suchen immer RegExp verwenden",
-  "Message_AlwaysSearchRegExp_Description": "Wir empfehlen `True` zu benutzen, wenn ihre Sprache für die <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">MongoDB-Textsuche</a> nicht unterstützt wird.",
+  "Message_AllowSnippeting": "Erlauben, Snippets aus Nachrichten zu erstellen",
+  "Message_AllowStarring": "Erlaube es, Nachrichten als Favoriten zu markieren",
+  "Message_AllowUnrecognizedSlashCommand": "Unerkannte Slash-Kommandos erlauben",
+  "Message_AlwaysSearchRegExp": "Beim Suchen immer reguläre Ausdrücke verwenden",
+  "Message_AlwaysSearchRegExp_Description": "Wir empfehlen diese Option, wenn ihre Sprache in der <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">MongoDB-Textsuche</a> nicht unterstützt wird.",
+  "Message_Attachments": "Nachrichten-Anhänge",
+  "Message_Attachments_GroupAttach": "Schaltflächen für Anhänge gruppieren",
+  "Message_Attachments_GroupAttachDescription": "Dies sorgt dafür, dass die Schaltflächen in einem erweiterbaren Menü untergebracht werden. So wird weniger Bildschirmplatz benötigt.",
   "Message_AudioRecorderEnabled": "Audioaufnahme aktivieren",
-  "Message_AudioRecorderEnabledDescription": "'audio/wav'-Dateien sind erforderlich, damit der Medientyp in den \"Dateien-Upload\"-Einstellungen akzeptiert wird.",
+  "Message_AudioRecorderEnabledDescription": "Dies erfoldert, dass 'audio/wav' ein erlaubter Medientyp in den \"Dateien-Upload\"-Einstellungen ist",
   "Message_BadWordsFilterList": "Wörter zur Blacklist hinzufügen",
-  "Message_BadWordsFilterListDescription": "Liste durch Kommata getrennter zu filternder Worte",
+  "Message_BadWordsFilterListDescription": "Kommaseparierte Liste zu filternder Worte",
   "Message_DateFormat": "Datumsformat",
-  "Message_DateFormat_Description": "Siehe auch: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
-  "Message_deleting_blocked": "Diese Nachricht kann nicht mehr gelöscht werden.",
+  "Message_DateFormat_Description": "Für mögliche Formate s. <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Dokumentation von Moment.js</a>",
+  "Message_deleting_blocked": "Diese Nachricht kann nicht mehr gelöscht werden",
   "Message_editing": "Bearbeiten von Nachrichten",
   "Message_GroupingPeriod": "Gruppierungsdauer (in Sekunden)",
-  "Message_GroupingPeriodDescription": "Nachrichten werden einer vorherigen Nachricht zugeordnet, wenn beide Nachrichten von dem gleichen Benutzer kommen und die abgelaufene Zeit kleiner als die mitgeteilte Zeit in Sekunden war.",
-  "Message_HideType_au": "\"Benutzer hinzugeben\" Nachrichten verstecken",
-  "Message_HideType_mute_unmute": "\"Benutzer stillgeschalten\" Nachrichten verstecken",
-  "Message_HideType_ru": "\"Benutzer entfernt\" Nachrichten verstecken",
-  "Message_HideType_uj": "\"Benutzer beigetreten\" Nachrichten verstecken",
-  "Message_HideType_ul": "\"Benutzer verlassen\" Nachrichten verstecken",
-  "Message_KeepHistory": "Nachrichtenverlauf behalten",
-  "Message_MaxAll": "Maximale Kanalgröße für ALL Nachricht",
-  "Message_MaxAllowedSize": "Maximal zulässige Größe der Nachrichten\n",
+  "Message_GroupingPeriodDescription": "Nachrichten werden einer vorherigen Nachricht zugeordnet, wenn beide Nachrichten von dem gleichen Benutzer kommen und die dazwischen liegende Dauer (in Sekunden) kleiner als die hier eingestellte war",
+  "Message_HideType_au": "\"Benutzer hinzugefügt\"-Nachricht deaktivieren",
+  "Message_HideType_mute_unmute": "\"Benutzer stillgeschaltet\"-Nachricht deaktivieren",
+  "Message_HideType_ru": "\"Benutzer entfernt\" -Nachricht deaktivieren",
+  "Message_HideType_uj": "\"Benutzer beigetreten\"-Nachricht deaktivieren",
+  "Message_HideType_ul": "\"Benutzer hat den Raum verlassen\"-Nachricht deaktivieren",
+  "Message_KeepHistory": "Bearbeitungshistorie für Nachrichten behalten",
+  "Message_MaxAll": "Maximale Kanalgröße für @all-Erwähnung",
+  "Message_MaxAllowedSize": "Maximal zulässige Größe der Nachrichten",
   "Message_pinning": "Anpinnen von Nachrichten",
-  "Message_removed": "Diese Nachricht wurde entfernt.",
-  "Message_SetNameToAliasEnabled": "In Nachricht Alias als Benutzername setzen",
-  "Message_SetNameToAliasEnabled_Description": "Nur wenn nicht als Alias gesetzt. Wird bei alten Nachrichten nicht geändert, falls Benutzer Name geändert hat.",
-  "Message_ShowDeletedStatus": "Löschstatus zeigen",
-  "Message_ShowEditedStatus": "Bearbeitungsstatus zeigen",
-  "Message_ShowFormattingTips": "Formatierungstipps anzeigen",
-  "Message_starring": "Markieren von Nachrichten",
+  "Message_QuoteChainLimit": "Maximale Anzahl von verketteten Zitaten",
+  "Message_removed": "Die Nachricht wurde entfernt",
+  "Message_sent_by_email": "Nachricht per E-Mail versendet",
+  "Message_SetNameToAliasEnabled": "Benutzernamen als Alias verwenden",
+  "Message_SetNameToAliasEnabled_Description": "Hat nur einen Effekt auf neue Nachrichten und falls kein expliziter Alias gesetzt wurde",
+  "Message_ShowDeletedStatus": "Löschstatus anzeigen",
+  "Message_ShowEditedStatus": "Bearbeitungsstatus anzeigen",
+  "Message_ShowFormattingTips": "Formatierungshilfe anzeigen",
+  "Message_starring": "Markieren von favorisierten Nachrichten",
+  "Message_TimeAndDateFormat": "Zeit- und Datumsformat",
+  "Message_TimeAndDateFormat_Description": "Für mögliche Formate s. <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Dokumentation von Moment.js</a>",
   "Message_TimeFormat": "Zeitformat",
-  "Message_TimeAndDateFormat": "Zeit und Datumsformat",
-  "Message_TimeFormat_Description": "Siehe auch: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
-  "Message_TimeAndDateFormat_Description": "Siehe auch: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
-  "Message_too_long": "Diese Nachricht ist zu lang.",
-  "Message_VideoRecorderEnabled": "Videoaufnahmen eingeschaltet",
-  "Message_VideoRecorderEnabledDescription": "Videoformat auf webm beim \"Datei hochladen\" einschränken? (Video abspielen funktioniert dann in fast allen Browsern)",
+  "Message_TimeFormat_Description": "Für mögliche Formate s. <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Dokumentation von Moment.js</a>",
+  "Message_too_long": "Die Nachricht ist zu lang",
+  "Message_VideoRecorderEnabled": "Videoaufnahme eingeschaltet",
+  "Message_VideoRecorderEnabledDescription": "Erfordert, dass der Medientyp 'video/webm' in den \"Datei-Upload\"-Einstellungen als Medientyp akzeptiert wird",
   "Messages": "Nachrichten",
-  "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Nachrichten, die an den eingehenden Webhook gesendet werden, werden hier veröffentlicht.",
+  "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Nachrichten, die an den eingehenden Webhook gesendet werden, werden hier veröffentlicht",
   "Meta": "Metadaten",
+  "Meta_custom": "Benutzerdefinierte Meta-Tags",
   "Meta_fb_app_id": "Facebook-App-ID",
-  "Meta_custom": "Benutzerdefinierte Meta Tags",
   "Meta_google-site-verification": "Google-Seiten-Verifizierung",
   "Meta_language": "Sprache",
   "Meta_msvalidate01": "MSValidate.01",
   "Meta_robots": "Roboter",
-  "Min_length_is": "Die minimale länge beträgt %s",
+  "Min_length_is": "Die minimale Länge beträgt %s",
   "minutes": "Minuten",
   "Mobile": "Mobil",
+  "Mobile_Notifications_Default_Alert": "Mobile Benachrichtigungen bei",
   "Monday": "Montag",
-  "Monitor_history_for_changes_on": "Verlaufsänderungen beobachten für",
-  "More_channels": "Mehr Kanäle",
-  "More_direct_messages": "Mehr Direktnachrichten",
+  "Monitor_history_for_changes_on": "Was soll für die Historie überwacht werden?",
+  "More_channels": "Weitere Kanäle",
+  "More_direct_messages": "Weitere Direktnachrichten",
   "More_groups": "Weitere private Gruppen",
-  "More_unreads": "Mehr ungelesene Nachrichten",
+  "More_unreads": "Weitere ungelesene Nachrichten",
+  "Move_beginning_message": "`%s` - Zum Anfang der Nachricht springen",
+  "Move_end_message": "`%s` - Zum Ende der Nachricht springen",
   "Msgs": "Nachrichten",
   "multi": "mehrere",
-  "Mute_someone_in_room": "Jemanden das Chatten in einem Raum verbieten",
-  "Mute_user": "Benutzern das Chatten verbieten",
+  "multi_line": "Mehrzeilig",
+  "mute-user": "Benutzer stumm schalten",
+  "mute-user_description": "Berechtigung, Benutzer in diesem Kanal stumm zu schalten",
+  "Mute_someone_in_room": "Jemandem in einem Raum das Chatten verbieten",
+  "Mute_user": "Einem Benutzer das Chatten verbieten",
   "Muted": "Stumm geschaltet",
   "My_Account": "Mein Konto",
+  "My_location": "Mein Ort",
   "n_messages": "%s Nachrichten",
   "N_new_messages": "%s neue Nachrichten",
   "Name": "Name",
-  "Name_cant_be_empty": "Es muss ein Name angegeben werden.",
-  "Name_of_agent": "Name des Agents",
+  "Name_cant_be_empty": "Es muss ein Name angegeben werden",
+  "Name_of_agent": "Name des Agenten",
   "Name_optional": "Name (optional)",
+  "Name_Placeholder": "Bitte geben sie Ihren Namen ein",
   "Navigation_History": "Navigationsverlauf",
   "New_Application": "Neue Anwendung",
   "New_Custom_Field": "Neues benutzerdefiniertes Feld",
   "New_Department": "Neue Abteilung",
   "New_integration": "Neue Integration",
-  "New_logs": "Neue Logdateien",
+  "New_line_message_compose_input": "`%s` - Zeilenumbruch einfügen",
+  "New_logs": "Neue Logs",
   "New_Message_Notification": "Neue-Nachricht-Benachrichtigung",
   "New_messages": "Neue Nachrichten",
   "New_password": "Neues Passwort",
+  "New_Password_Placeholder": "Bitte geben Sie ein neues Passwort ein",
   "New_role": "Neue Rolle",
   "New_Room_Notification": "Neuer-Raum-Benachrichtigung",
+  "New_Trigger": "Neuer Trigger",
+  "New_videocall_request": "Neuer Video-Anruf",
+  "No_available_agents_to_transfer": "Kein Agent verfügbar, an den übergeben werden kann",
   "No_channel_with_name_%s_was_found": "Es wurde kein Kanal mit dem Namen <strong>\"%s\"</strong> gefunden!",
-  "No_channels_yet": "Sie sind kein Mitglied eines Kanals.",
-  "No_direct_messages_yet": "Sie haben keine Gespräche gestartet.",
+  "No_channels_yet": "Sie sind bisher kein Mitglied eines Kanals",
+  "No_direct_messages_yet": "Sie haben bisher keine Konversationen gestartet",
   "No_Encryption": "Keine Verschlüsselung",
-  "No_group_with_name_%s_was_found": "Es wurde keine private Gruppe mit dem Namen <strong>\"%s\"</strong> gefunden!",
-  "No_groups_yet": "Sie sind kein Mitglied einer privaten Gruppe.",
-  "No_livechats": "Kein LiveChat vorhanden.",
-  "No_mentions_found": "Sie wurden bisher nirgendwo erwähnt.",
-  "No_pinned_messages": "Es wurden bisher keine Nachrichten fixiert.",
-  "No_results_found": "Keine Ergebnisse gefunden.",
-  "No_starred_messages": "Es wurden bisher keine Nachrichten markiert.",
-  "No_such_command": "Es gibt keinen Befehl: '/__command__'",
-  "No_user_with_username_%s_was_found": "Es wurde kein Benutzer mit dem Namen <strong>\"%s\"</strong> gefunden!",
+  "No_group_with_name_%s_was_found": "Es wurde keine private Gruppe mit dem Namen <strong>\"%s\"</strong> gefunden!",
+  "No_groups_yet": "Sie sind kein Mitglied einer privaten Gruppe",
+  "No_integration_found": "Keine Integration unter der angegebenen ID",
+  "No_livechats": "Kein Livechat vorhanden",
+  "No_mentions_found": "Sie wurden bisher nirgendwo erwähnt",
+  "No_pinned_messages": "Es wurden bisher keine Nachrichten fixiert",
+  "No_results_found": "Keine Ergebnisse gefunden",
+  "No_snippet_messages": "Keine Snippets vorhanden",
+  "No_starred_messages": "Es wurden bisher keine Nachrichten favorisiert",
+  "No_such_command": "Es gibt keinen Befehl '/__command__'",
+  "No_user_with_username_%s_was_found": "Es wurde kein Benutzer mit dem Namen <strong>\"%s\"</strong> gefunden!",
   "Nobody_available": "Es ist niemand verfügbar",
   "Node_version": "Node-Version",
+  "None": "Keine",
   "Normal": "Normal",
   "Not_authorized": "Nicht berechtigt",
   "Not_Available": "Nicht verfügbar",
-  "Not_found_or_not_allowed": "Nicht gefunden oder nicht erlaubt.",
+  "Not_found_or_not_allowed": "Nicht gefunden oder nicht zugelassen",
   "Nothing": "Nichts",
-  "Nothing_found": "Es wurde nichts gefunden.",
+  "Nothing_found": "Es wurde nichts gefunden",
+  "Notification_Desktop_Default_For": "Desktop-Benachrichtigungen anzeigen für",
   "Notification_Duration": "Benachrichtigungsdauer",
+  "Notification_Mobile_Default_For": "Mobile Benachrichtigungen anzeigen für",
   "Notifications": "Benachrichtigungen",
-  "Notify_all_in_this_room": "Alle Benutzer in diesem Raum benachrichtigen",
+  "Notifications_Max_Room_Members": "Maximale Anzahl der Raummitglieder, ab der alle Nachrichten-Benachrichtigungen deaktiviert werden",
+  "Notifications_Max_Room_Members_Description": "Maximale Anzahl der Raummitglieder, ab der alle Benachrichtigungen deaktiviert werden. Benutzer können weiterhin die Einstellung für den Raum ändern, um auf individueller Basis alle Nachrichten zu erhalten (0 deaktiviert die Einstellung)",
+  "Notifications_Muted_Description": "Wenn Sie sich entscheiden, alles stumm zu schalten, werden Sie keine Kennzeichnungen für neue Nachrichten in der Liste sehen. Ausgenommen davon sind Erwähnungen. Das Stummschalten der Benachrichtigungen überschreibt die Benachrichtigungseinstellungen.",
+  "Notifications_Sound_Volume": "Lautstärke des Benachrichtigungstons",
   "Notify_active_in_this_room": "Aktive Benutzer/innen benachrichtigen",
-  "Num_Agents": "# Agents",
+  "Notify_all_in_this_room": "Alle Benutzer in diesem Raum benachrichtigen",
+  "Num_Agents": "# Agenten",
   "Number_of_messages": "Nachrichtenanzahl",
   "OAuth_Application": "OAuth-Anwendung",
   "OAuth_Applications": "OAuth-Anwendungen",
   "Objects": "Objekte",
   "Off": "Aus",
   "Off_the_record_conversation": "Off-the-record-Gespräche",
-  "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record-Gespräche sind für Ihren Browser oder Ihr Gerät nicht verfügbar.",
+  "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record-Gespräche sind für Ihren Browser oder Ihr Gerät nicht verfügbar",
   "Office_Hours": "Bürozeiten",
   "Office_hours_enabled": "Bürozeiten aktiviert",
   "Office_hours_updated": "Bürozeiten aktualisiert",
   "Offline": "Offline",
+  "Offline_DM_Email": "Sie haben eine private Nachricht von __user__ erhalten.",
+  "Offline_Email_Subject_Description": "Sie können die folgenden Platzhalter verwenden:<br/><ul><li>[Site_Name], [Site_URL], [User] & [Room] für den Anwendungsnamen, URL, Benutzernamen und Raumnamen.<li/></ul>",
   "Offline_form": "Offline-Formular",
-  "Offline_form_unavailable_message": "Nachricht, dass Offline Formular ungültig",
-  "Offline_Link_Message": "gehe zur Nachricht",
+  "Offline_form_unavailable_message": "Nachricht, dass das Offline-Kontaktformular nicht verfügbar ist",
+  "Offline_Link_Message": "Zur Nachricht",
+  "Offline_Mention_All_Email": "E-Mail-Betreff für \"Alle Erwähnen\"",
+  "Offline_Mention_Email": "Sie wurden von __user__ in #__room__ erwähnt",
   "Offline_message": "Offline-Nachricht",
-  "Offline_success_message": "Nachricht, dass Offline Nachricht erfolgreich",
+  "Offline_success_message": "Nachricht, dass eine Offline-Nachricht erfolgreich war",
   "Offline_unavailable": "offline - nicht verfügbar",
   "On": "Ein",
   "Online": "Online",
-  "Only_On_Desktop": "Desktop Modus (senden mit der \"Enter\" Taste nur auf dem Desktop PC)",
-  "Only_you_can_see_this_message": "Nur Sie können diese Nachricht sehen.",
+  "Only_authorized_users_can_write_new_messages": "Nur Authentifizierte Benutzer können neue Nachrichten schreiben",
+  "Only_On_Desktop": "Desktop Modus (senden mit der Eingabeaste nur auf dem Desktop PC)",
+  "Only_you_can_see_this_message": "Nur Sie können diese Nachricht sehen",
   "Oops!": "Hoppla",
   "Open": "Öffnen",
-  "Open_Livechats": "Öffne Livechats",
+  "Open_channel_user_search": "`%s` - Kanal öffnen / Nach Benutzer suchen",
+  "Open_days_of_the_week": "Offene Wochentage",
+  "Open_Livechats": "Ofefne Livechats",
+  "Open_your_authentication_app_and_enter_the_code": "Öffnen Sie Ihre Authentifizierungs-App und geben Sie den Code ein. Sie können auch einen Ihrer Backup-Codes verwenden",
   "Opened": "Geöffnet",
-  "Opens_a_channel_group_or_direct_message": "Eröffnet einen Kanal, eine Gruppe oder Direktnachrichten",
+  "Opened_in_a_new_window": "In einem neuem Fenster geöffnet",
+  "Opens_a_channel_group_or_direct_message": "Öffnet einen Kanal, eine Gruppe oder Direktnachrichten",
   "optional": "optional",
   "or": "oder",
+  "Or_talk_as_anonymous": "Oder schreiben Sie anonym",
   "Order": "Auftrag",
+  "Original": "Original",
   "OS_Arch": "Architektur",
   "OS_Cpus": "CPU-Anzahl",
   "OS_Freemem": "Freier Arbeitsspeicher",
@@ -972,66 +1334,79 @@
   "OS_Type": "Betriebssystem",
   "OS_Uptime": "Systemlaufzeit",
   "others": "andere",
-  "OTR": "OTR",
-  "OTR_is_only_available_when_both_users_are_online": "OTR ist nur möglich, wenn beide Benutzer online sind.",
-  "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "URL, wo die Dateien hochgeladen werden. Die URL wird auch für Downloads verwendet, wenn keine CDN angegeben wird.",
+  "OTR": "OTR (Off-The-Record)",
+  "OTR_is_only_available_when_both_users_are_online": "OTR ist nur möglich, wenn beide Benutzer online sind",
+  "Outgoing_WebHook": "Ausgehender Webhook",
+  "Outgoing_WebHook_Description": "Daten aus Rocket.Chat heraus versenden.",
+  "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "URL, unter der die Dateien hochgeladen werden. Die URL wird auch für Downloads verwendet, wenn kein CDN angegeben wird",
   "Page_title": "Seitentitel",
   "Page_URL": "Seiten-URL",
   "Password": "Passwort",
-  "Password_Change_Disabled": "Der Administrator hat das Ändern des Passworts deaktiviert.",
-  "Password_changed_successfully": "Das Passwort wurde erfolgreich geändert.",
+  "Password_Change_Disabled": "Der Administrator hat das Ändern des Passworts deaktiviert",
+  "Password_changed_successfully": "Das Passwort wurde erfolgreich geändert",
   "Past_Chats": "Vergangene Chats",
   "Payload": "Nutzdaten",
   "People": "Menschen",
   "Permalink": "Permalink",
   "Permissions": "Berechtigungen",
+  "pin-message": "Nachricht anheften",
+  "pin-message_description": "Berechtigung, eine Nachricht in einem Kanal anzuheften",
   "Pin_Message": "Nachricht anheften",
-  "Pinned_a_message": "hat eine Nachricht angeheftet:",
-  "Pinned_Messages": "Fixierte Nachrichten",
-  "PiwikAnalytics_siteId_Description": "Die Website-ID zur Identifizierung dieser Website. Beispiel: 17",
+  "Pinned_a_message": "Eine Nachricht wurde angeheftet:",
+  "Pinned_Messages": "Gepinnte Nachrichten",
   "PiwikAdditionalTrackers": "Zusätzliche Piwik Websites",
   "PiwikAdditionalTrackers_Description": "Geben Sie hier weitere Piwik Website URLs und SiteIDs in folgendem Format an, wenn Sie dieselben Daten in verschiedene Piwik Instanzen tracken möchten: [ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]",
-  "PiwikAnalytics_prependDomain": "Domain voranstellen",
-  "PiwikAnalytics_prependDomain_Description": "Domain der Seite beim Tracken dem Seitentitel voranstellen",
   "PiwikAnalytics_cookieDomain": "Alle Subdomains",
-  "PiwikAnalytics_cookieDomain_Description": "Besucher aufzeichnen auf allen Subdomains",
+  "PiwikAnalytics_cookieDomain_Description": "Besucher auf allen Subdomains aufzeichnen",
   "PiwikAnalytics_domains": "Verberge ausgehende Links",
-  "PiwikAnalytics_domains_Description": "Verberge im Bericht über 'ausgehende Verweise' alle Klicks auf bekannte Alias-URLs. Bitte tragen Sie pro Zeile einen Domainnamen ein, verwenden Sie dabei keine Trennzeichen.",
-  "PiwikAnalytics_url_Description": "Die Piwik URL benötigt ein trailing slash. Beispiel: //piwik.rocket.chat/",
-  "Placeholder_for_email_or_username_login_field": "Platzhalter für das Feld der E-Mail-Adresse und des Benutzernamen",
-  "Placeholder_for_password_login_field": "Platzhalter für das Feld des Anmeldepassworts",
+  "PiwikAnalytics_domains_Description": "Verberge im Bericht über 'ausgehende Verweise' alle Klicks auf bekannte Alias-URLs. Tragen Sie pro Zeile einen Domainnamen ein, verwenden Sie dabei keine Trennzeichen.",
+  "PiwikAnalytics_prependDomain": "Domain voranstellen",
+  "PiwikAnalytics_prependDomain_Description": "Domain der Seite beim Tracken dem Seitentitel voranstellen",
+  "PiwikAnalytics_siteId_Description": "Die Site-ID zur Identifizierung dieser Website. Beispiel: 17",
+  "PiwikAnalytics_url_Description": "Die Piwik URL benötigt einen abschließenden Slash. Beispiel: //piwik.rocket.chat/",
+  "Placeholder_for_email_or_username_login_field": "Platzhalter für E-Mail-Adresse und den Benutzernamen",
+  "Placeholder_for_password_login_field": "Platzhalter für das Anmeldepassworts",
   "Please_add_a_comment": "Bitte fügen Sie einen Kommentar hinzu",
-  "Please_add_a_comment_to_close_the_room": "Bitte fügen Sie einen Kommentar hinzu, um den Raum zu schließen.",
-  "Please_answer_survey": "Bitte nehmen Sie sich einen Moment Zeit, um kurz einige Fragen zu dem Chat zu beantworten.",
-  "Please_enter_value_for_url": "Bitte geben Sie eine URL für Ihr Profilbild ein.",
+  "Please_add_a_comment_to_close_the_room": "Bitte fügen Sie einen Kommentar hinzu, um den Raum zu schließen",
+  "Please_answer_survey": "Bitte nehmen Sie sich einen Moment Zeit, um kurz einige Fragen zu dem Chat zu beantworten",
+  "please_enter_valid_domain": "Bitte eine gültige Domain eingeben",
+  "Please_enter_value_for_url": "Bitte geben Sie eine URL für Ihr Profilbild ein",
   "Please_enter_your_new_password_below": "Bitte geben Sie Ihr neues Passwort ein:",
   "Please_enter_your_password": "Bitte Passwort eingeben",
-  "please_enter_valid_domain": "Bitte eine valide Domain eingeben",
-  "Please_fill_a_label": "Bitte Bezeichnung ausfüllen",
-  "Please_fill_a_name": "Bitte geben Sie einen Namen ein.",
-  "Please_fill_a_username": "Bitte geben Sie einen Benutzernamen ein.",
-  "Please_fill_name_and_email": "Bitte geben Sie einen Namen und eine E-Mail-Adresse ein.",
+  "Please_fill_a_label": "Bitte Bezeichner ausfüllen",
+  "Please_fill_a_name": "Bitte geben Sie einen Namen ein",
+  "Please_fill_a_username": "Bitte geben Sie einen Benutzernamen ein",
+  "Please_fill_all_the_information": "Bitte alle Informationen ausfüllen",
+  "Please_fill_name_and_email": "Bitte geben Sie einen Namen und eine E-Mail-Adresse ein",
   "Please_select_an_user": "Bitte einen Benutzer auswählen",
-  "Please_select_enabled_yes_or_no": "Bitte wählen Sie eine Option für \"aktiviert\".",
+  "Please_select_enabled_yes_or_no": "Bitte wählen Sie aus, ob die Option aktiviert ist",
   "Please_wait": "Bitte warten",
-  "Please_wait_activation": "Bitte warten, der Vorgang kann einige Zeit in Anspruch nehmen.",
-  "Please_wait_while_OTR_is_being_established": "Bitte warten Sie, während OTR gestartet wird.",
-  "Please_wait_while_your_account_is_being_deleted": "Bitte warten Sie, während Ihr Konto gelöscht wird.",
-  "Please_wait_while_your_profile_is_being_saved": "Bitte warten Sie, während ihr Profil gespeichert wird...",
+  "Please_wait_activation": "Bitte warten, das kann einige Zeit in Anspruch nehmen",
+  "Please_wait_while_OTR_is_being_established": "Bitte warten Sie, während OTR gestartet wird",
+  "Please_wait_while_your_account_is_being_deleted": "Bitte warten Sie, während Ihr Konto gelöscht wird",
+  "Please_wait_while_your_profile_is_being_saved": "Bitte warten Sie, während ihr Profil gespeichert wird",
   "Port": "Port",
+  "post-readonly": "Schreibgeschützt posten",
+  "post-readonly_description": "Berechtigung, in einen schreibgeschützten Kanal zu posten",
   "Post_as": "Verschicken als",
   "Post_to_Channel": "Im Kanal veröffentlichen",
   "Post_to_s_as_s": "Versenden an <strong>%s</strong> als <strong>%s</strong>",
   "Preferences": "Einstellungen",
-  "Preferences_saved": "Die Einstellungen wurden gespeichert.",
+  "Preferences_saved": "Die Einstellungen wurden gespeichert",
+  "preview-c-room": "Vorschau für öffentliche Kanäle",
+  "preview-c-room_description": "Berechtigung, den Inhalt eines öffentlichen Kanals einzusehen, bevor diesem beigetreten wird",
   "Privacy": "Datenschutz",
-  "Private": "privat",
+  "Private": "Privat",
+  "Private_Channel": "Privater Kanal",
   "Private_Group": "Private Gruppe",
   "Private_Groups": "Private Gruppen",
   "Private_Groups_list": "Liste aller privaten Gruppen",
   "Profile": "Profil",
+  "Profile_details": "Profildetails",
+  "Profile_picture": "Profilbild",
   "Profile_saved_successfully": "Das Profil wurde erfolgreich gespeichert",
-  "Public": "öffentlich",
+  "Public": "Öffentlich",
+  "Public_Channel": "Öffentlicher Kanal",
   "Push": "Push-Nachrichten",
   "Push_apn_cert": "APN-Cert",
   "Push_apn_dev_cert": "APN-Dev-Cert",
@@ -1046,40 +1421,47 @@
   "Push_gcm_api_key": "GCM-API-Key",
   "Push_gcm_project_number": "GCM-Projektnummer",
   "Push_production": "Produktion",
-  "Push_show_message": "Nachricht in der Benachrichtigung zeigen",
-  "Push_show_username_room": "Kanal/Gruppe/Benutzername in der Benachrichtigung zeigen",
+  "Push_show_message": "Nachricht in der Benachrichtigung anzeigen",
+  "Push_show_username_room": "Kanal/Gruppe/Benutzername in der Benachrichtigung anzeigen",
   "Push_test_push": "Test",
   "Query": "Abfrage",
-  "Query_description": "Zusätzliche Bedingungen für die Bestimmung, an welche Benutzer die E-Mails gesendet werden sollen. Ausgetragene Benutzer werden automatisch aus der Abfrage entfernt. Es muss ein gültiger JSON sein. Beispiel: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
+  "Query_description": "Zusätzliche Einschränkung, an welche Benutzer die E-Mail gesendet werden soll. Benutzer, die nicht benachrichtigt werden wollen, werden automatisch aus der Abfrage entfernt. Es muss ein gültiges JSON sein. Beispiel: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
   "Queue": "Warteschlange",
-  "quote": "Zitat",
+  "quote": "zitieren",
   "Quote": "Zitieren",
   "Random": "Zufällig",
+  "RDStation_Token": "RD Station Token",
   "React_when_read_only": "Reaktionen erlauben",
+  "React_when_read_only_changed_successfully": "Reaktionen erlauben, wenn ein Kanal schreibgeschützt wurde",
   "Reacted_with": "Reagierte mit",
   "Reactions": "Reaktionen",
-  "Read_only": "Nur lesend",
-  "Read_only_channel": "Kanal nur lesbar",
-  "Read_only_group": "Nur lesbar Gruppe",
+  "Read_only": "Schreibgeschützt",
+  "Read_only_changed_successfully": "Erfolgreich schreibgeschützt",
+  "Read_only_channel": "Kanal schreibgeschützt",
+  "Read_only_group": "Schreibgeschützte Gruppe",
   "Record": "Aufnehmen",
   "Redirect_URI": "Weiterleitungs-URL",
-  "Refresh_oauth_services": "oAuth Service aktualisieren",
   "Refresh_keys": "Schlüssel aktualisieren",
-  "Refresh_your_page_after_install_to_enable_screen_sharing": "Aktualisieren Sie die Seite nach der Installation, um die Bildschirmübertragung zu aktivieren.",
+  "Refresh_oauth_services": "OAuth Services aktualisieren",
+  "Refresh_your_page_after_install_to_enable_screen_sharing": "Aktualisieren Sie die Seite nach der Installation, um die Bildschirmübertragung zu aktivieren",
   "Regenerate_codes": "Codes neu generieren",
   "Register": "Neues Konto registrieren",
   "Registration": "Registrierung",
-  "Registration_Succeeded": "Ihre Registrierung war erfolgreich.",
-  "Registration_via_Admin": "Registrierung via Admin",
+  "Registration_Succeeded": "Ihre Registrierung war erfolgreich",
+  "Registration_via_Admin": "Registrierung durch den Administrator",
   "Regular_Expressions": "Reguläre Ausdrücke",
-  "Release": "Veröffentlichung",
+  "Release": "Version",
+  "Reload": "Neu laden",
   "Remove": "Entfernen",
-  "Remove_Admin": "Admin entfernen",
+  "remove-user": "Benutzer entfernen",
+  "remove-user_description": "Berechtigung einen Benutzter aus einem Raum zu entfernen",
+  "Remove_Admin": "Administrator entfernen",
+  "Remove_as_leader": "Als Diskussionsleiter entfernen",
   "Remove_as_moderator": "Moderatorenrechte entfernen",
-  "Remove_as_owner": "als Besitzer entfernen",
+  "Remove_as_owner": "Als Besitzer entfernen",
   "Remove_custom_oauth": "OAuth-Konto entfernen",
   "Remove_from_room": "Aus dem Raum entfernen",
-  "Remove_last_admin": "Entferne den letzen Admin",
+  "Remove_last_admin": "Entferne den letzen Administrator",
   "Remove_someone_from_room": "Jemanden aus dem Raum entfernen",
   "Removed": "Entfernt",
   "Reply": "Antwort",
@@ -1087,72 +1469,91 @@
   "Report_exclamation_mark": "Melden!",
   "Report_sent": "Bericht gesendet",
   "Report_this_message_question_mark": "Diese Nachricht melden?",
+  "Reporting": "Berichtswesen",
   "Require_password_change": "Passwortänderung verlangen",
   "Resend_verification_email": "Bestätigungsmail erneut versenden",
   "Reset": "Zurücksetzen",
   "Reset_password": "Passwort zurücksetzen",
+  "Reset_section_settings": "Abschnittseinstellungen zurücksetzen",
   "Restart": "Neustart",
-  "Restart_the_server": "Server neustarten",
+  "Restart_the_server": "Server neu starten",
+  "Retry_Count": "Anzahl der Wiederholungsversuche",
   "Role": "Rolle",
   "Role_Editing": "Rolle bearbeiten",
-  "Role_removed": "Die Rolle wurde entfernt.",
+  "Role_removed": "Die Rolle wurde entfernt",
   "Room": "Raum",
+  "Room_announcement_changed_successfully": "Die Ankündigung des Raums wurde geändert",
   "Room_archivation_state": "Status",
-  "Room_archivation_state_false": "aktiv",
-  "Room_archivation_state_true": "archiviert",
-  "Room_archived": "Der Raum wurde archiviert.",
-  "room_changed_description": "Raumbeschreibung geändert auf <em>__room_description__</em> von <em>__user_by__</em>",
-  "room_changed_privacy": "Der Raum wurde von <em>__user_by__</em> zum/r <em>__room_type__</em> geändert.",
-  "room_changed_topic": "Das Thema des Raums wurde von <em>__user_by__</em> zu <em>__room_topic__</em> geändert.",
+  "Room_archivation_state_false": "Aktiv",
+  "Room_archivation_state_true": "Archiviert",
+  "Room_archived": "Der Raum wurde archiviert",
+  "room_changed_announcement": "Ankündigung des Raums wurde von <em>__user_by__</em> zu <em>__room_announcement__</em> geändert",
+  "room_changed_description": "Raumbeschreibung wurde von  von <em>__user_by__</em> zu <em>__room_description__</em> geändert",
+  "room_changed_privacy": "Der Raum wurde von <em>__user_by__</em> zum/r <em>__room_type__</em> geändert",
+  "room_changed_topic": "Das Thema des Raums wurde von <em>__user_by__</em> zu <em>__room_topic__</em> geändert",
+  "Room_default_change_to_private_will_be_default_no_more": "Das ist ein Standardkanal. Die Änderung zu einer privaten Gruppe führt dazu, dass er dies nicht mehr ist. Wollen Sie fortfahren?",
   "Room_description_changed_successfully": "Raumbeschreibung erfolgreich geändert",
-  "Room_has_been_deleted": "Der Raum wurde gelöscht.",
-  "Room_has_been_archived": "Der Raum wurde archiviert.",
-  "Room_has_been_unarchived": "Der Raum wurde dearchiviert.",
-  "Room_Info": "Raum",
-  "room_is_blocked": "Der räum ist geblockt",
-  "room_is_read_only": "Der Raum ist nur lesbar",
-  "room_name": "Raum Name",
-  "Room_name_changed": "<em>__user_by__</em> hat den Raumnamen zu  <em>__room_name__</em> geändert.",
-  "Room_name_changed_successfully": "Der Raumname wurde erfolgreich geändert.",
-  "Room_not_found": "Der Raum konnte nicht gefunden werden.",
-  "Room_password_changed_successfully": "Das Raum Passwort wurde erfolgreich geändert",
-  "Room_topic_changed_successfully": "Das Thema des Raums wurde erfolgreich geändert.",
-  "Room_type_changed_successfully": "Der Raumtyp wurde erfolgreich geändert.",
-  "Room_unarchived": "Der Raum wurde wiederhergestellt.",
+  "Room_has_been_archived": "Der Raum wurde archiviert",
+  "Room_has_been_deleted": "Der Raum wurde gelöscht",
+  "Room_has_been_unarchived": "Der Raum wurde aus dem Archiv geholt",
+  "Room_Info": "Rauminformation",
+  "room_is_blocked": "Der Raum ist blockiert",
+  "room_is_read_only": "Der Raum ist schreibgeschützt",
+  "room_name": "Raumname",
+  "Room_name_changed": "<em>__user_by__</em> hat den Raumnamen zu  <em>__room_name__</em> geändert.",
+  "Room_name_changed_successfully": "Der Raumname wurde erfolgreich geändert",
+  "Room_not_found": "Raum konnte nicht gefunden werden",
+  "Room_password_changed_successfully": "Das Raum-Passwort wurde erfolgreich geändert",
+  "Room_topic_changed_successfully": "Das Thema des Raums wurde erfolgreich geändert",
+  "Room_type_changed_successfully": "Der Raumtyp wurde erfolgreich geändert",
+  "Room_type_of_default_rooms_cant_be_changed": "Das ist ein Standardraum, dessen Typ nicht geändert werden kann. Bitte sprechen Sie mit Ihrem Administrator",
+  "Room_unarchived": "Der Raum wurde aus dem Archiv geholt",
   "Room_uploaded_file_list": "Dateien",
-  "Room_uploaded_file_list_empty": "Es wurden noch keine Dateien hochgeladen.",
+  "Room_uploaded_file_list_empty": "Es wurden noch keine Dateien hochgeladen",
   "Rooms": "Räume",
+  "run-import": "Import ausführen",
+  "run-import_description": "Berechtigung, Importe auszuführen",
+  "run-migration": "Migration ausführen",
+  "run-migration_description": "Berechtigung, Migrationen auszuführen",
   "Running_Instances": "Laufende Instanzen",
   "S_new_messages_since_s": "%s neue Nachrichten seit %s",
+  "Same_Style_For_Mentions": "Gleicher Stil für Erwähnungen",
   "SAML": "SAML",
   "SAML_Custom_Cert": "Benutzerdefiniertes Zertifikat",
-  "SAML_Custom_Entry_point": "Einsprungspunkt",
+  "SAML_Custom_Entry_point": "Einstiegspunkt",
   "SAML_Custom_Generate_Username": "Benutzernamen generieren",
+  "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO Redirect URL",
   "SAML_Custom_Issuer": "Benutzerdefinierter Aussteller",
+  "SAML_Custom_Private_Key": "Privater Schlüssel",
   "SAML_Custom_Provider": "Benutzerdefinierter Provider",
   "SAML_Custom_Public_Cert": "Öffentliches Zertifikat",
-  "SAML_Custom_Private_Key": "Privater Schlüssel",
+  "Sandstorm_Powerbox_Share": "Als Sandstorm Grain teilen",
   "Saturday": "Samstag",
   "Save": "Speichern",
+  "save-others-livechat-room-info": "Livechat-Informationen anderer Chats speichern",
+  "save-others-livechat-room-info_description": "Berechtigung, die Livechat-Informationen anderer Konversationen zu speichern",
   "Save_changes": "Änderungen speichern",
   "Save_Mobile_Bandwidth": "Mobiles Datenvolumen sparen",
-  "Save_to_enable_this_action": "Speichern Sie die Angaben, um die Testverbindung zu ermöglichen.",
+  "Save_to_enable_this_action": "Speichern Sie, um die Aktion zu aktivieren",
   "Saved": "Gespeichert",
   "Saving": "Speichern",
+  "Scan_QR_code": "Scanne den QR-Code mit einer Authenticator-App (wie Google Authenticator, Authy oder Duo). Danach wird ein sechsstelliger Code angezeigt, den Sie unten eingeben müssen.",
   "Scope": "Umfang",
   "Screen_Share": "Bildschirmübertragung",
-  "Script_Enabled": "Das Script ist aktiviert.",
+  "Script_Enabled": "Das Script wurde aktiviert",
   "Search": "Suche",
-  "Search_by_username": "Anhand des Nutzernamen suchen",
+  "Search_by_username": "Anhand des Nutzernamens suchen",
   "Search_Messages": "Nachrichten durchsuchen",
   "Search_Private_Groups": "Durchsuche private Gruppen",
   "seconds": "Sekunden",
-  "Secret_token": "Secret token",
+  "Secret_token": "Geheimes Token",
+  "Security": "Sicherheit",
   "Select_a_department": "Wählen Sie eine Abteilung",
   "Select_a_user": "Wählen Sie einen Benutzer",
   "Select_an_avatar": "Profilbild auswählen",
-  "Select_file": "Datei wählen",
-  "Select_service_to_login": "Wählen Sie einen Dienst zum Anmelden aus, um ein Bild auszuwählen oder ein Bild direkt von Ihrem Computer hochzuladen.",
+  "Select_file": "Datei auswählen",
+  "Select_role": "Eine Rolle auswählen",
+  "Select_service_to_login": "Wählen Sie einen Dienst zum Synchronisieren Ihres Profilbildes aus oder laden Sie ein Bild direkt von Ihrem Computer hoch ",
   "Select_user": "Benutzer auswählen",
   "Select_users": "Benutzer auswählen",
   "Selected_agents": "Ausgewählte Agenten",
@@ -1161,50 +1562,80 @@
   "Send_a_test_mail_to_my_user": "Eine Test-E-Mail an mich senden",
   "Send_a_test_push_to_my_user": "Eine Test-Push-Nachricht an mich senden",
   "Send_confirmation_email": "Bestätigungsmail versenden",
-  "Send_data_into_RocketChat_in_realtime": "Daten in Rocket.Chat in Echtzeit senden.",
+  "Send_data_into_RocketChat_in_realtime": "Daten an Rocket.Chat in Echtzeit senden",
   "Send_email": "E-Mail senden",
   "Send_invitation_email": "Einladung per E-Mail senden",
   "Send_invitation_email_error": "Sie haben keine gültige E-Mail-Adresse angegeben.",
-  "Send_invitation_email_info": "Sie können mehrere Einladungen per E-Mail gleichzeitig absenden.",
-  "Send_invitation_email_success": "Sie haben erfolgreich eine Einladung an folgende E-Mail-Adressen versendet:",
-  "Send_request_on_chat_close": "Anfrage senden, um Chatraum zu schließen.",
-  "Send_request_on_offline_messages": "Anfrage zu offline Nachrichten stellen",
-  "Send_Test": "Sende Test",
+  "Send_invitation_email_info": "Sie können mehrere Einladungen per E-Mail gleichzeitig absenden",
+  "Send_invitation_email_success": "Sie haben eine Einladung an folgende E-Mail-Adressen versendet:",
+  "Send_request_on_chat_close": "Nach dem Schließen des Chatraums einen Webhook anstoßen",
+  "Send_request_on_offline_messages": "Webhook bei Offline-Nachrichten anstoßen",
+  "Send_Test": "Test senden",
   "Send_welcome_email": "Willkommens-E-Mail senden",
-  "Send_your_JSON_payloads_to_this_URL": "Senden Sie Ihre JSON-Nutzlasten an diese URL.",
+  "Send_your_JSON_payloads_to_this_URL": "Senden Sie Ihre JSON-Nutzlasten an diese URL",
   "Sending": "Senden...",
+  "Served_By": "Bedient von",
   "Service": "Service",
+  "Service_account_key": "Service Account Schlüssel",
+  "set-moderator": "Moderator ernennen",
+  "set-moderator_description": "Berechtigung, andere Benutzer zum Moderator eines Kanals zu ernennen",
+  "set-owner": "Eigentümer ernennen",
+  "set-owner_description": "Berechtigung, andere Benutzer zum Eigentümer eines Kanals zu ernennen",
+  "set-react-when-readonly": "Reaktionen in einem schreibgeschützten Kanal erlauben",
+  "set-react-when-readonly_description": "Berechtigung, Reaktionen in einem schreibgeschützten Kanal zu erlauben",
+  "set-readonly": "Mit Schreibschutz versehem",
+  "set-readonly_description": "Berechtigung, einen Raum schreibgeschützt zu machen",
+  "Set_as_leader": "Zum Diskussionsleiter ernennen",
   "Set_as_moderator": "Zum Moderator ernennen",
   "Set_as_owner": "Zum Besitzer machen",
   "Settings": "Einstellungen",
-  "Settings_updated": "Die Einstellungen wurden aktualisiert.",
+  "Settings_updated": "Die Einstellungen wurden aktualisiert",
   "Share_Location_Title": "Standort teilen?",
   "Shared_Location": "Standort geteilt",
-  "Should_be_a_URL_of_an_image": "Dies soll die URL des Bildes sein.",
-  "Should_exists_a_user_with_this_username": "Der Benutzer muss bereits vorhanden sein.",
+  "Should_be_a_URL_of_an_image": "Sollte die URL eines Bildes sein",
+  "Should_exists_a_user_with_this_username": "Der Benutzer muss bereits vorhanden sein",
   "Show_all": "Alle Nutzer zeigen",
-  "Show_more": "Mehr Nutzer zeigen",
+  "Show_more": "Weitere Nutzer zeigen",
   "show_offline_users": "Zeige Benutzer an, die offline sind",
   "Show_on_registration_page": "Auf der Registrierungsseite anzeigen",
-  "Show_only_online": "Nur Online-Nutzer zeigen",
-  "Show_preregistration_form": "Vorregistrierungsformular zeigen",
+  "Show_only_online": "Nur Online-Benutzer anzeigen",
+  "Show_preregistration_form": "Vorregistrierungsformular anzeigen",
+  "Show_queue_list_to_all_agents": "Die Warteschlange allen Agenten anzeigen",
+  "Show_the_keyboard_shortcut_list": "Zeige die Liste der Keyboard-Shortcuts",
   "Showing_archived_results": "<b>%s</b> archivierte Räume",
-  "Showing_online_users": "<b>__total_showing__</b> von __total__ Nutzer angezeigt",
+  "Showing_online_users": "<b>__total_showing__</b> von __total__ Benutzern werden angezeigt",
   "Showing_results": "<p><b>%s</b> Ergebnisse</p>",
+  "Sidebar_list_mode": "Sidebar-Kanallisten-Modus",
+  "Sign_in_to_start_talking": "Anmelden, um mit dem Chatten zu beginnen",
   "since_creation": "seit %s",
   "Site_Name": "Seitenname",
   "Site_Url": "Website-URL",
   "Site_Url_Description": "Beispiel: https://chat.domain.com/",
   "Skip": "Überspringen",
+  "SlackBridge_error": "SlackBridge hat beim Import der Nachrichten einen Fehler gemeldet. %s: %s",
+  "SlackBridge_finish": "SlackBridge hat den Import aller Nachrichten um %s beendet. Bitte laden Sie die Seite neu, um sie einzusehen.",
+  "SlackBridge_Out_All": "Alles an SlackBridge senden",
+  "SlackBridge_Out_All_Description": "Nachrichten aller Kanäle, die in Slack existieren und denen der Bot beigetreten ist senden",
+  "SlackBridge_Out_Channels": "Kanäle für SlackBridge",
+  "SlackBridge_Out_Channels_Description": "Auswählen, welche Kanäle an Slack gesendet werden",
+  "SlackBridge_Out_Enabled": "SlackBridge Ausgang",
+  "SlackBridge_Out_Enabled_Description": "Ob die SlackBridge auch Nachrichten aus Rocket.Chat an Slack zurücksenden soll",
+  "SlackBridge_start": "@%s hat um `#%s` einen SlackBridge-Import gestartet. Wir werden Sie darüber informieren, sobald dieser beendet ist.",
   "Slash_Gimme_Description": "Zeigt ༼ つ ◕_◕ ༽つ vor Ihrer Nachricht",
   "Slash_LennyFace_Description": "Zeigt ( ͡° ͜ʖ ͡°) nach Ihrer Nachricht",
   "Slash_Shrug_Description": "Zeigt ¯\\_(ツ)_/¯ am Ende der Nachricht",
   "Slash_Tableflip_Description": "Zeigt (╯°□°）╯︵ ┻━┻",
   "Slash_TableUnflip_Description": "Zeigt ┬─┬ ノ( ゜-゜ノ)",
-  "Slash_Topic_Description": "Thema setzen",
-  "Slash_Topic_Params": "Themennachricht",
-  "Smarsh_Enabled": "Smarsh aktiviert",
-  "Smarsh_MissingEmail_Email": "Fehlende E-Mail",
+  "Slash_Topic_Description": "Thema definieren",
+  "Slash_Topic_Params": "Themen-Nachricht",
+  "Smarsh_Email": "Smarsh E-Mail",
+  "Smarsh_Email_Description": "Smarsh E-Mail-Adresse, an die die .eml-Datei gesendet werden soll.",
+  "Smarsh_Enabled": "Smarsh",
+  "Smarsh_Enabled_Description": "Ob der Smarsh-E-Mail-Konnektor aktiviert ist. Erfordert, dass \"Absender-E-Mail\" unter E-Mail -> SMTP konfiguriert ist.",
+  "Smarsh_Interval": "Smarsh-Intervall",
+  "Smarsh_Interval_Description": "Die Wartezeit, bevor die Konversation versendet wird. Erfordert, dass \"Absender-E-Mail\" unter E-Mail -> SMTP konfiguriert ist.",
+  "Smarsh_MissingEmail_Email": "Fehlende E-Mail-Adresse",
+  "Smarsh_MissingEmail_Email_Description": "Eine E-Mail-Adresse, die bei Benutzern ohne E-Mail-Adresse (üblicherweise Bots) angezeigt werden soll.",
   "Smileys_and_People": "Gesichter & Personen",
   "SMS_Enabled": "SMS aktiviert",
   "SMTP": "SMTP",
@@ -1213,212 +1644,313 @@
   "SMTP_Port": "SMTP-Port",
   "SMTP_Test_Button": "SMTP-Einstellungen testen",
   "SMTP_Username": "SMTP-Benutzername",
+  "snippet-message": "Nachrichten-Snippet",
+  "snippet-message_description": "Berechtigung, ein Nachrichten-Snippet zu erstellen",
   "Snippet_Added": "Erstellt am %s",
+  "Snippet_Messages": "Nachrichten-Snippets",
+  "Snippeted_a_message": "Ein Snippet wurde erstellt: __snippetLink__",
+  "Sort_by_activity": "Nach Aktivität sortieren",
   "Sound": "Ton",
+  "Sound_File_mp3": "Ton-Datei (.mp3)",
+  "Split_by_categories": "Nach Kategorien aufteilen",
   "SSL": "SSL",
-  "Star_Message": "Nachricht markieren",
-  "Starred_Messages": "Markierte Nachrichten",
+  "Star_Message": "Nachricht favorisieren",
+  "Starred_Messages": "Favorisierte Nachrichten",
   "Start_audio_call": "Anruf starten",
   "Start_Chat": "Chat beginnen",
   "Start_of_conversation": "Beginn des Gesprächs",
-  "Start_OTR": "OTR beginnen",
+  "Start_OTR": "OTR starten",
   "Start_video_call": "Videoanruf starten",
   "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Starten Sie mit <code class=\"inline\">%s</code> für Nutzer oder <code class=\"inline\">%s</code> für Kanäle. Beispiel: <code class=\"inline\">%s</code> oder <code class=\"inline\">%s</code>",
   "Started_At": "Gestartet um",
   "Statistics": "Statistiken",
   "Statistics_reporting": "Sende Statistiken an Rocket.Chat",
-  "Statistics_reporting_Description": "Mit dem Senden Ihrer Statistiken helfen Sie uns herauszufinden wie viele Instanzen von Rocket.Chat eingesetzt werden und außerdem wie gut sich das System verhält, so können wir es weiter verbessern. Es werden keine Benutzerinformationen übertragen und die erhaltenen Daten werden vertraulich behandelt.",
+  "Statistics_reporting_Description": "Mit dem Senden Ihrer Statistiken helfen Sie uns herauszufinden, wie viele Instanzen von Rocket.Chat eingesetzt werden und wie gut sich das System verhält. So können wir es weiter verbessern. Es werden keine Benutzerinformationen übertragen und die erhaltenen Daten werden vertraulich behandelt.",
   "Stats_Active_Users": "Aktive Benutzer",
   "Stats_Avg_Channel_Users": "Durchschnittliche Benutzeranzahl pro Kanal",
   "Stats_Avg_Private_Group_Users": "Durchschnittliche Benutzeranzahl in privaten Gruppen",
   "Stats_Away_Users": "Abwesende Benutzer",
   "Stats_Max_Room_Users": "Maximale Benutzeranzahl eines Raums",
   "Stats_Non_Active_Users": "Nicht aktive Benutzer",
-  "Stats_Offline_Users": "Benutzer offline",
-  "Stats_Online_Users": "Benutzer online",
+  "Stats_Offline_Users": "Offline-Benutzer",
+  "Stats_Online_Users": "Online-Benutzer",
   "Stats_Total_Channels": "Anzahl der Kanäle",
   "Stats_Total_Direct_Messages": "Anzahl der privaten Nachrichtenräume",
+  "Stats_Total_Livechat_Rooms": "Gesamtzahl der Livechat-Räume",
   "Stats_Total_Messages": "Anzahl aller Nachrichten",
+  "Stats_Total_Messages_Channel": "Gesamtanzahl der Nachrichten in Kanälen",
+  "Stats_Total_Messages_Direct": "Gesamtanzahl der Nachrichten in Direktnachrichten",
+  "Stats_Total_Messages_Livechat": "Gesamtanzahl der Nachrichten in Livechats",
+  "Stats_Total_Messages_PrivateGroup": "Gesamtanzahl der Nachrichten in privaten Gruppen",
   "Stats_Total_Private_Groups": "Anzahl der privaten Gruppen",
   "Stats_Total_Rooms": "Anzahl der Räume",
   "Stats_Total_Users": "Anzahl der Benutzer",
+  "Status": "Status",
   "Stop_Recording": "Aufnahme stoppen",
+  "Stream_Cast": "Stream Cast",
+  "Stream_Cast_Address": "Stream Cast Adresse",
+  "Stream_Cast_Address_Description": "IP oder Host Ihres zentralen Stream Cast Servers inkl. Port, bspw. `192.168.1.1:3000` oder `localhost:4000`",
   "strike": "durchgestrichen",
   "Subject": "Betreff",
-  "Submit": "Abschicken",
-  "Success": "Dieser Vorgang war erfolgreich.",
+  "Submit": "Abssenden",
+  "Success": "Dieser Vorgang war erfolgreich",
   "Success_message": "Erfolgsnachricht",
   "Sunday": "Sonntag",
   "Survey": "Umfrage",
-  "Survey_instructions": "Bewerten Sie jede Frage nach Ihrer Zufriedenheit. 1 bedeutet, dass Sie völlig unzufrieden sind und 5 bedeutet, dass Sie vollständig zufrieden sind.",
+  "Survey_instructions": "Bewerten Sie jede Frage nach Ihrer Zufriedenheit. 1 bedeutet, dass Sie völlig frustriert sind. 5 bedeutet, dass Sie vollständig zufrieden sind.",
   "Symbols": "Symbole",
-  "Sync_success": "Die Synchronisierung war erfolgreich.",
+  "Sync_success": "Die Synchronisierung war erfolgreich",
   "Sync_Users": "Benutzer synchronisieren",
-  "System_messages": "System Nachrichten",
+  "System_messages": "Systemnachrichten",
   "Tag": "Tag",
-  "TargetRoom": "Ziel Raum!",
-  "Test_Connection": "Testverbindung",
+  "Take_it": "Übernehmen",
+  "TargetRoom": "Ziel-Raum",
+  "TargetRoom_Description": "Der Raum, an den Nachrichten gesendet werden, wenn dieses Ereignis eintritt. Nur ein existierender Raum kann angegeben werden.",
+  "Team": "Team",
+  "Test_Connection": "Teste die Verbindung",
   "Test_Desktop_Notifications": "Desktop-Benachrichtigungen testen",
   "Thank_you_exclamation_mark": "Vielen Dank!",
-  "Thank_you_for_your_feedback": "Vielen Dank für Ihre Rückmeldung.",
-  "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden.",
-  "The_channel_name_is_required": "Ein Name für den Kanal muss angegeben werden.",
-  "The_emails_are_being_sent": "Die E-Mails werden gesendet.",
-  "The_field_is_required": "Das Feld %s ist erforderlich.",
+  "Thank_you_for_your_feedback": "Vielen Dank für Ihre Rückmeldung",
+  "The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
+  "The_channel_name_is_required": "Ein Name für den Kanal muss angegeben werden",
+  "The_emails_are_being_sent": "E-Mails werden gesendet",
+  "The_field_is_required": "Das Feld %s ist erforderlich",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
-  "The_redirectUri_is_required": "Es muss eine Weiterleitung-URL angegeben werden.",
+  "The_redirectUri_is_required": "Es muss eine Weiterleitungs-URL angegeben werden.",
   "The_server_will_restart_in_s_seconds": "Der Server wird in %s Sekunden neu gestartet",
-  "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "Die Einstellung <strong>%s</strong> wurde zu <strong>%s</strong> konfiguriert und Sie greifen von <strong>%s</strong> zu!",
-  "The_user_will_be_removed_from_s": "Der Benutzer wird von %s entfernt.",
-  "The_user_wont_be_able_to_type_in_s": "Der Benutzer kann nicht mehr in %s schreiben.",
-  "Theme": "Theme",
+  "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "Die Einstellung <strong>%s</strong> wurde zu <strong>%s</strong> konfiguriert. Sie greifen von <strong>%s</strong> zu!",
+  "The_user_will_be_removed_from_s": "Der Benutzer wird aus %s entfernt",
+  "The_user_wont_be_able_to_type_in_s": "Der Benutzer kann nicht mehr in %s schreiben",
+  "Theme": "Visuelles Theme",
+  "theme-color-component-color": "Komponentenfarbe",
   "theme-color-content-background-color": "Hintergrundfarbe des Inhalts",
+  "theme-color-custom-scrollbar-color": "Benutzerdefinierte Farbe der Scrollbar",
+  "theme-color-error-color": "Farbe für Fehler",
+  "theme-color-info-font-color": "Schriftfarbe von Informationen",
+  "theme-color-link-font-color": "Schriftfarbe von Links",
+  "theme-color-pending-color": "Farbe für Ausstehendes",
+  "theme-color-primary-action-color": "Primäre Aktionsfarbe",
   "theme-color-primary-background-color": "Primäre Hintergrundfarbe ",
   "theme-color-primary-font-color": "Primäre Schriftfarbe",
+  "theme-color-secondary-action-color": "Sekundäre Aktionsfarbe",
   "theme-color-secondary-background-color": "Sekundäre Hintergrundfarbe",
   "theme-color-secondary-font-color": "Sekundäre Schriftfarbe",
-  "theme-color-tertiary-background-color": "Tertiäre Hintergrundfarbe ",
-  "theme-color-tertiary-font-color": "Tertiäre Schriftfarbe",
-  "theme-color-link-font-color": "Schriftfarbe des Links",
-  "theme-color-info-font-color": "Schriftfarbe von Informationen",
-  "theme-color-custom-scrollbar-color": "Benutzerdefinierte Farbe der Scrollbar",
+  "theme-color-selection-color": "Auswahlfarbe",
   "theme-color-status-away": "Farbe des Status \"abwesend\"",
   "theme-color-status-busy": "Farbe des Status \"beschäftigt\"",
   "theme-color-status-offline": "Farbe des Status \"offline\"\n",
   "theme-color-status-online": "Farbe des Status \"online\"",
+  "theme-color-success-color": "Farbe für Erfolg",
+  "theme-color-tertiary-background-color": "Tertiäre Hintergrundfarbe ",
+  "theme-color-tertiary-font-color": "Tertiäre Schriftfarbe",
+  "theme-color-transparent-dark": "Transparent dunkel",
+  "theme-color-transparent-darker": "Transparent dunkler",
+  "theme-color-transparent-light": "Transparent heller",
+  "theme-color-transparent-lighter": "Transparent hell",
+  "theme-color-transparent-lightest": "Transparent am hellsten",
   "theme-color-unread-notification-color": "Farbe von ungelesenen Benachrichtigungen",
   "theme-custom-css": "Benutzerdefiniertes CSS",
-  "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt.",
-  "There_are_no_integrations": "Es sind keine Integrationen vorhanden.",
-  "There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet.",
-  "This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet.",
-  "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Diese E-Mail wurde bereits verschickt, aber noch nicht bestätigt. Bitte ändern Sie Ihr Passwort.",
-  "This_is_a_desktop_notification": "Das ist eine Desktop-Benachrichtigung.",
-  "This_is_a_push_test_messsage": "Dies ist eine Test-Push-Nachricht.",
+  "theme-font-body-font-family": "Schrift-Familie für den Textkörper",
+  "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt",
+  "There_are_no_integrations": "Es sind keine Integrationen vorhanden",
+  "There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet",
+  "This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet",
+  "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Die E-Mail wurde bereits verschickt, aber noch nicht bestätigt. Bitte ändern Sie Ihr Passwort",
+  "This_is_a_desktop_notification": "Das ist eine Desktop-Benachrichtigung",
+  "This_is_a_push_test_messsage": "Dies ist eine Test-Push-Nachricht",
   "This_room_has_been_archived_by__username_": "Dieser Raum wurde von __username__ archiviert",
-  "This_room_has_been_unarchived_by__username_": "Dieser Raum wurde von __username__ unarchiviert",
-  "Two-factor_authentication": "2-Faktor Authentifizierung",
-  "Two-factor_authentication_disabled": "2-Faktor Authentifizierung deaktiviert",
-  "Two-factor_authentication_enabled": "2-Faktor Authentifizierung aktiviert",
-  "Two-factor_authentication_is_currently_disabled": "2-Faktor Authentifizierung ist momentan deaktiviert",
+  "This_room_has_been_unarchived_by__username_": "Dieser Raum wurde von __username__ aus dem Archiv geholt",
   "Thursday": "Donnerstag",
   "Time_in_seconds": "Zeit in Sekunden",
   "Title": "Titel",
   "Title_bar_color": "Farbe der Titelleiste",
-  "Title_bar_color_offline": "Titelbarfarbe ist offline.",
-  "Title_offline": "Titel ist offline.",
-  "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "Um den Rocket.Chat-LiveChat auf Ihrer Webseite zu installieren, kopieren und fügen Sie den Code über den letzten <strong>&lt;/body&gt;</strong>-Tag Ihrer Seite ein.",
-  "to_see_more_details_on_how_to_integrate": "um weitere Informationen zur Integration zu sehen.",
-  "To_users": "An die Benutzer",
+  "Title_bar_color_offline": "Farbe der Offline-Titelleiste",
+  "Title_offline": "Titel wenn offline",
+  "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "Um den Rocket.Chat-LiveChat auf Ihrer Webseite zu installieren, kopieren und fügen Sie den Code oberhalb des letzten <strong>&lt;/body&gt;</strong>-Tags Ihrer Seite ein.",
+  "to_see_more_details_on_how_to_integrate": "um weitere Informationen zur Integration zu sehen",
+  "To_users": "An Benutzer",
+  "Toggle_original_translated": "Zwischen \"Original\" und \"Übersetzt\" wechseln",
   "Topic": "Thema",
-  "Travel_and_Places": "Reisen & Orte",
-  "Translated": "übersetzt",
+  "Transcript_Enabled": "Frage Besucher, ob Sie nach dem Schließen des Livechats eine Mitschrift zugesandt bekommen möchten",
+  "Transcript_message": "Nachricht, die bei der Nachfrage bzgl. einer Mitschrift gesendet wird",
+  "Transcript_of_your_livechat_conversation": "Mitschrift Ihres Livechats",
+  "Translated": "Übersetzt",
   "Translations": "Übersetzungen",
-  "Trigger_removed": "Auslöser entfernt",
-  "Trigger_Words": "Trigger Words",
-  "Triggers": "Auslöser",
+  "Travel_and_Places": "Reisen & Orte",
+  "Trigger_removed": "Trigger entfernt",
+  "Trigger_Words": "Trigger-Wörter",
+  "Triggers": "Trigger",
   "True": "Ja",
   "Tuesday": "Dienstag",
+  "Two-factor_authentication": "Zwei-Faktor-Authentifizierung",
+  "Two-factor_authentication_disabled": "Zwei-Faktor-Authentifizierung deaktiviert",
+  "Two-factor_authentication_enabled": "Zwei-Faktor-Authentifizierung aktiviert",
+  "Two-factor_authentication_is_currently_disabled": "Zwei-Faktor-Authentifizierung ist momentan deaktiviert",
+  "Two-factor_authentication_native_mobile_app_warning": "WARNUNG: Nach der Aktivierung kannst du dich nicht mehr auf den mobilen Apps (Rocket.Chat+) einloggen, da dieses Feature dort noch nicht implementiert wurde.",
   "Type": "Typ",
   "Type_your_email": "Geben Sie Ihre E-Mail-Adresse ein",
   "Type_your_message": "Geben Sie Ihre Nachricht ein",
   "Type_your_name": "Geben Sie Ihren Namen ein",
   "Type_your_new_password": "Geben Sie Ihr neues Passwort ein",
+  "UI_Allow_room_names_with_special_chars": "Sonderzeichen im Raumnamen erlauben",
+  "UI_Click_Direct_Message": "Anklicken, um eine Direktnachricht zu erstellen",
+  "UI_Click_Direct_Message_Description": "Den Profil-Tab überspringen und direkt zur Konversation gehen",
   "UI_DisplayRoles": "Rollen anzeigen",
   "UI_Merge_Channels_Groups": "Führe private Gruppen und Kanäle zusammen",
-  "UI_Use_Real_Name": "Benutze den Realen Namen",
-  "Unarchive": "Wiederherstellen",
+  "UI_Unread_Counter_Style": "Stil für den \"Ungelesen\"-Zähler",
+  "UI_Use_Name_Avatar": "Die Initialen des vollständigen Namens verwenden, um einen Standard-Avatar zu generieren",
+  "UI_Use_Real_Name": "Den echten Namen verwenden",
+  "Unarchive": "Aus dem Archiv holen",
+  "unarchive-room": "Raum aus dem Archiv holen",
+  "unarchive-room_description": "Berechtigung, einen Raum aus dem Archiv holen",
   "Unblock_User": "Benutzer entsperren",
-  "Unmute_someone_in_room": "Jemanden das Chatten in einem Raum wieder erlauben",
+  "Unmute_someone_in_room": "Jemandem das Chatten in einem Raum wieder erlauben",
   "Unmute_user": "Benutzern das Chatten erlauben ",
   "Unnamed": "Unbenannt",
   "Unpin_Message": "Nachicht nicht mehr anheften",
+  "Unread_Count": "Zählen ungelesener Nachrichten",
+  "Unread_Count_DM": "Zählen ungelesener Direktnachrichten",
+  "Unread_Messages": "Ungelesene Nachrichten",
   "Unread_Rooms": "Ungelesene Räume",
-  "Unread_Rooms_Mode": "Ungelesene Räume aufgelistet anzeigen ",
-  "Unstar_Message": "Markierung entfernen",
+  "Unread_Rooms_Mode": "Ungelesene Räume gruppiert anzeigen",
+  "Unread_Tray_Icon_Alert": "Ungelesen-Markierung in Statusleiste anzeigen",
+  "Unstar_Message": "Aus den Favoriten entfernen",
+  "Updated_at": "Aktualisiert am",
+  "Upload_file_description": "Dateibeschreibung",
+  "Upload_file_name": "Dateiname",
   "Upload_file_question": "Möchten Sie eine Datei hochladen?",
   "Uploading_file": "Datei wird hochgeladen...",
   "Uptime": "Laufzeit",
   "URL": "URL",
+  "URL_room_prefix": "URL-Präfix für Räume",
   "Use_account_preference": "Kontoeinstellungen verwenden",
   "Use_Emojis": "Emojis verwenden",
-  "Use_Global_Settings": "Globale Einstellungen nutzen",
+  "Use_Global_Settings": "Globale Einstellungen verwenden",
   "Use_initials_avatar": "Anfangsbuchstaben des Nutzernamens verwenden",
-  "Use_service_avatar": "Benutze %s Profilbild",
-  "Use_this_username": "Benutzen Sie folgenden Benutzernamen",
+  "Use_minor_colors": "\"Minor\" Farbpalette verwenden (Standard: Erben von den Hauptfarben",
+  "Use_service_avatar": "Verwende %s Profilbild",
+  "Use_this_username": "Benutzen Sie folgenden Nutzernamen",
   "Use_uploaded_avatar": "Das hochgeladene Profilbild verwenden",
   "Use_url_for_avatar": "URL für Profilbild verwenden",
-  "Use_User_Preferences_or_Global_Settings": "Benutzerpräferenzen oder globale Einstellungen nutzen",
-  "User__username__is_now_a_moderator_of__room_name_": "Der Benuzer __username__ ist jetzt ein Moderator des Raums __room_name__.",
-  "User__username__is_now_a_owner_of__room_name_": "Benutzer __username__ ist jetzt ein Besitzer von __room_name__",
-  "User__username__removed_from__room_name__moderators": "Der Benutzer __username__ wurde von einem Moderator aus __room_name__ entfernt.",
-  "User__username__removed_from__room_name__owners": "Benutzer __username__ wurde als Besitzer von __room_name__ entfernt.",
-  "User_added": "Der Benutzer <em>__user_added__</em> wurde hinzugefügt.",
-  "User_added_by": "Der Benutzer <em>__user_added__</em> wurde von <em>__user_by__</em> hinzugefügt.",
+  "Use_User_Preferences_or_Global_Settings": "Kontoeinstellungen oder globale Einstellungen verwenden",
+  "User": "Benutzer",
+  "user-generate-access-token": "Zugriffs-Token erzeugen",
+  "user-generate-access-token_description": "Berechtigung, Zugriffs-Tokens zu erzeugen",
+  "User__username__is_now_a_leader_of__room_name_": "Benutzer __username__ ist nun Diskussionsleiter für __room_name__",
+  "User__username__is_now_a_moderator_of__room_name_": "Der Benutzer __username__ ist jetzt ein Moderator von __room_name__",
+  "User__username__is_now_a_owner_of__room_name_": "Benutzer __username__ ist jetzt Besitzer von __room_name__",
+  "User__username__removed_from__room_name__leaders": "Benutzer __username__ wurde als Diskussionsleiter in __room_name__ entfernt",
+  "User__username__removed_from__room_name__moderators": "Der Benutzer __username__ wurde von einem Moderator aus __room_name__ entfernt",
+  "User__username__removed_from__room_name__owners": "Benutzer __username__ ist nicht mehr Besitzer von __room_name__",
+  "User_added": "Der Benutzer <em>__user_added__</em> wurde hinzugefügt",
+  "User_added_by": "Der Benutzer <em>__user_added__</em> wurde von <em>__user_by__</em> hinzugefügt",
   "User_added_successfully": "Benutzer erfolgreich hinzugefügt",
-  "User_doesnt_exist": "Kein Benutzer mit dem Namen `@%s` vorhanden.",
-  "User_has_been_activated": "Der Benutzer wurde aktiviert.",
-  "User_has_been_deactivated": "Der Benutzer wurde deaktiviert.",
-  "User_has_been_deleted": "Der Benutzer wurde gelöscht.",
-  "User_has_been_muted_in_s": "Dem Nutzer wurde das Schreiben in %s verboten.",
-  "User_has_been_removed_from_s": "Der Benutzer wurde von %s entfernt.",
+  "User_and_group_mentions_only": "Nur Benutzer- und Gruppenerwähnungen",
+  "User_doesnt_exist": "Kein Benutzer mit Namen `@%s` vorhanden",
+  "User_has_been_activated": "Benutzer wurde aktiviert",
+  "User_has_been_deactivated": "Benutzer wurde deaktiviert",
+  "User_has_been_deleted": "Benutzer wurde gelöscht",
+  "User_has_been_muted_in_s": "Dem Nutzer wurde das Schreiben in %s verboten",
+  "User_has_been_removed_from_s": "Der Benutzer wurde aus %s entfernt",
   "User_Info": "Benutzerinformationen",
-  "User_is_no_longer_an_admin": "Der Benutzer ist kein Admin mehr.",
-  "User_is_now_an_admin": "Der Benutzer ist jetzt ein Admin.",
-  "User_joined_channel": "Ist dem Kanal beigetreten.",
-  "User_joined_channel_female": "Ist dem Kanal beigetreten.",
-  "User_joined_channel_male": "Ist dem Kanal beigetreten.",
-  "User_left": "Der Benutzer <em>__user_left__</em> hat den Kanal verlassen.",
-  "User_left_female": "Der Benutzer <em>__user_left__</em> hat den Kanal verlassen.",
-  "User_left_male": "Der Benutzer <em>__user_left__</em> hat den Kanal verlassen.",
-  "User_logged_out": "Der Benutzer wurde abgemeldet.",
+  "User_Interface": "User Interface",
+  "User_is_blocked": "Benutzer ist geblockt",
+  "User_is_no_longer_an_admin": "Der Benutzer ist kein Administrator mehr",
+  "User_is_now_an_admin": "Der Benutzer ist jetzt ein Administrator",
+  "User_is_unblocked": "Benutzer ist nicht mehr geblockt",
+  "User_joined_channel": "Ist dem Kanal beigetreten",
+  "User_joined_channel_female": "Ist dem Kanal beigetreten",
+  "User_joined_channel_male": "Ist dem Kanal beigetreten",
+  "User_left": "Benutzer <em>__user_left__</em> hat den Kanal verlassen",
+  "User_left_female": "Benutzer <em>__user_left__</em> hat den Kanal verlassen.",
+  "User_left_male": "Benutzer <em>__user_left__</em> hat den Kanal verlassen.",
+  "User_logged_out": "Benutzer wurde abgemeldet",
   "User_management": "Benutzerverwaltung",
-  "User_muted": "Benutzer stummgeschaltet",
-  "User_muted_by": "Dem Benutzer <em>__user_muted__</em> wurde das Chatten von <em>__user_by__</em> verboten.",
-  "User_not_found": "Der Benutzer konnte nicht gefunden werden.",
-  "User_not_found_or_incorrect_password": "Entweder konnte der Benutzer nicht gefunden werden oder Sie haben ein falsches Passwort angegeben.",
+  "User_mentions_only": "Nur Benutzererwähnungen",
+  "User_muted": "Benutzer stumm geschaltet",
+  "User_muted_by": "Benutzer <em>__user_muted__</em> wurde das Chatten von <em>__user_by__</em> verboten",
+  "User_not_found": "Der Benutzer konnte nicht gefunden werden",
+  "User_not_found_or_incorrect_password": "Entweder konnte der Benutzer nicht gefunden werden oder Sie haben ein falsches Passwort angegeben",
   "User_or_channel_name": "Benutzer- oder Kanalname",
-  "User_removed": "Der Benutzer wurde gelöscht.",
-  "User_removed_by": "Der Benutzer <em>__user_removed__</em> wurde von <em>__user_by__</em> entfernt.",
-  "User_Settings": "Benutzereinstellungen",
-  "User_unmuted_by": "Dem Benutzer <em>__user_unmuted__</em> wurde das Chatten von <em>__user_by__</em> wieder erlaubt. ",
-  "User_unmuted_in_room": "Dem Benutzer wurde das Chatten wieder erlaubt.",
-  "User_updated_successfully": "Der Benutzer wurde erfolgreich aktualisiert.",
+  "User_removed": "Benutzer wurde gelöscht",
+  "User_removed_by": "Benutzer <em>__user_removed__</em> wurde von <em>__user_by__</em> entfernt",
+  "User_Settings": "Kontoeinstellungen",
+  "User_unmuted_by": "Benutzer <em>__user_unmuted__</em> wurde das Chatten von <em>__user_by__</em> wieder erlaubt",
+  "User_unmuted_in_room": "Dem Benutzer wurde das Chatten wieder erlaubt",
+  "User_updated_successfully": "Benutzer wurde erfolgreich aktualisiert",
+  "User_uploaded_file": "Eine Datei hochladen",
+  "User_uploaded_image": "Ein Bild hochladen",
   "Username": "Benutzername",
-  "Username_and_message_must_not_be_empty": "Die Felder \"Benutzername\" und \"Nachricht\" dürfen nicht leer sein.",
-  "Username_cant_be_empty": "Sie müssen einen Benutzernamen angeben.",
-  "Username_Change_Disabled": "Der Administrator hat das Ändern von Benutzernamen deaktiviert.",
-  "Username_denied_the_OTR_session": "__username__ hat die OTR-Session abgelehnt.",
-  "Username_description": "Der Benutzername wird dazu benutzt, Sie in Nachrichten zu erwähnen.",
-  "Username_doesnt_exist": "Der Benutzer \"%s\" existiert nicht.",
-  "Username_ended_the_OTR_session": "__username__ hat die OTR-Session beendet.",
+  "Username_and_message_must_not_be_empty": "Benutzername und Nachricht müssen eingegeben werden",
+  "Username_cant_be_empty": "Sie müssen einen Benutzernamen angeben",
+  "Username_Change_Disabled": "Der Administrator hat das Ändern von Benutzernamen deaktiviert",
+  "Username_denied_the_OTR_session": "__username__ hat die OTR-Session abgelehnt",
+  "Username_description": "Der Benutzername wird dazu benutzt, um Sie in Nachrichten zu erwähnen",
+  "Username_doesnt_exist": "Benutzer \"%s\" existiert nicht",
+  "Username_ended_the_OTR_session": "__username__ hat die OTR-Session beendet",
   "Username_invalid": "<strong>%s</strong> ist kein zulässiger Benutzername.<br/> Verwenden Sie nur Buchstaben, Zahlen, Punkte oder Binde- und Unterstriche.",
-  "Username_is_already_in_here": "`@%s` wurde bereits hinzugefügt.",
-  "Username_is_not_in_this_room": "Der Benutzer `#%s` ist nicht in diesem Raum.",
+  "Username_is_already_in_here": "`@%s` wurde bereits hinzugefügt",
+  "Username_is_not_in_this_room": "Benutzer `#%s` ist nicht in diesem Raum",
+  "Username_Placeholder": "Bitte geben sie Benutzernamen ein",
   "Username_title": "Benutzernamen festlegen",
-  "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ möchte ein OTR-Gespräch starten. Möchten Sie annehmen?",
+  "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ möchte ein OTR-Gespräch starten. Möchten Sie es annehmen?",
   "Users": "Benutzer",
   "Users_added": "Die Benutzer wurden hinzugefügt",
-  "Users_in_role": "Zugeordnete Nutzer",
+  "Users_in_role": "Nutzer mit dieser Rolle",
   "UTF8_Names_Slugify": "UTF8-Namen-Slugify",
   "UTF8_Names_Validation": "UTF8-Namen-Verifizierung",
-  "UTF8_Names_Validation_Description": "Erlauben Sie keine Sonderzeichen und Leerzeichen. Sie können - _ und . verwenden, aber nicht am Ende eines Namens.",
+  "UTF8_Names_Validation_Description": "Regulärer Ausdruck, der zur Validierung der Benutzer- und Kanalnamen verwendet wird",
   "Validate_email_address": "E-Mail-Adresse bestätigen",
   "Verification": "Überprüfung ",
+  "Verification_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li>[[Verification_Url] für die Verifikations-URL</li><li>[name], [fname], [lname] für den vollständigen Namen, Vornamen oder Nachnamen des Benutzers</li><li>[email] für die E-Mail-Adresse des Benutzers.</li><li>[Site_Name] und [Site_URL] für den Anwendungsnamen und die URL der Anwendung</li></ul>",
+  "Verification_Email": "Klicken Sie <a href=\"[Verification_Url]\">hier</a>, um ihr Benutzerkonto zu bestätigen",
   "Verification_email_sent": "Bestätigungsmail gesendet",
-  "Verification_Email_Subject": "[Site_Name] - Bestätige dein Benutzerkonto",
-  "Verification_Email": "Klicke <a href=\"[Verification_Url]\">hier</a> um dein Benutzerkonto zu bestätigen.",
-  "Verified": "Verifiziert",
+  "Verification_Email_Subject": "[Site_Name] - Bestätigen Sie ihr Benutzerkonto",
+  "Verified": "Überprüft",
   "Verify": "überprüfen",
   "Version": "Version",
   "Video_Chat_Window": "Video-Chat",
   "Video_Conference": "Video-Konferenz",
-  "Videocall_declined": "Videoanruf abgelehnt.",
+  "Video_message": "Videonachricht",
+  "Videocall_declined": "Videoanruf abgelehnt",
   "Videocall_enabled": "Videoanruf aktiviert",
+  "view-c-room": "Öffentlichen Kanal anzeigen",
+  "view-c-room_description": "Berechtigung, öffentliche Kanäle einzusehen",
+  "view-d-room": "Direktnachrichten erhalten",
+  "view-d-room_description": "Berechtigung, Direktnachrichten zu erhalten",
+  "view-full-other-user-info": "Vollständige Benutzerinformation einsehen",
+  "view-full-other-user-info_description": "Berechtigung, die vollständigen Benutzerinformation anderer Benutzer einzusehen (inkl. Erstelldatum, letztem Login etc.)",
+  "view-history": "Historie anzeigen",
+  "view-history_description": "Berechtigung, die Kanal-Historie anzuzeigen",
+  "view-join-code": "Beitritts-Code anzeigen",
+  "view-join-code_description": "Berechtigung, den Beitritts-Code zu einem Kanal anzuzeigen",
+  "view-joined-room": "Beigetretenen Raum anzeigen",
+  "view-joined-room_description": "Berechtigung, einen Raum, dem der Benutzer angehört, anzuzeigen",
+  "view-l-room": "Zeige Livechat-Räume",
+  "view-l-room_description": "Berechtigung, Livechat-Räume zu sehen",
+  "view-livechat-manager": "Zeige Livechat-Manager",
+  "view-livechat-manager_description": "Berechtigung, andere Livechat-Manager zu sehen",
+  "view-livechat-rooms": "Zeige Livechat-Räume",
+  "view-livechat-rooms_description": "Berechtigung, andere Livechat-Räume einzusehen",
+  "view-logs": "Logs anzeigen",
+  "view-logs_description": "Berechtigung, die Server-Logs anzuzeigen",
+  "view-other-user-channels": "Räume anderer Benutzer anzeigen",
+  "view-other-user-channels_description": "Berechtigung, die Räume anderer Benutzer zu sehen",
+  "view-outside-room": "Raum außerhalb anzeigen",
+  "view-p-room": "Privaten Raum anzeigen",
+  "view-p-room_description": "Berechtigung, private Räume anzuzeigen",
+  "view-privileged-setting": "Besonders geschützte Einstellungen einsehen",
+  "view-privileged-setting_description": "Einstellungen anzeigen",
+  "view-room-administration": "Raum-Administration anzeigen",
+  "view-room-administration_description": "Berechtigung, Raumstatistiken zu öffentlichen, privaten und Direktnachrichten anzeigen. Beinhaltet nicht die Berechtigung, die Konversationen selbst oder Archive einzusehen.",
+  "view-statistics": "Statistiken anzeigen",
+  "view-statistics_description": "Berechtigung, Statistiken über das System einzusehen, bspw. Anzahl der angemeldeten Benutzer, Anzahl der Räume und Informationen zum Betriebssystem.",
+  "view-user-administration": "Benutzerverwaltung anzeigen",
+  "view-user-administration_description": "Berechtigung zu unvollständigen, schreibgeschützten Listen von anderen Benutzer, die derzeit am System angemeldet sind. Keine Details der Benutzerkonten können mit dieser Berechtigung eingesehen werden.",
   "View_All": "Alle ansehen",
   "View_Logs": "Logs anzeigen",
   "View_mode": "Ansichts-Modus",
-  "View_mode_info": "Dadurch ändert sich der Platzbedarf für Nachrichten auf dem Bildschirm.",
+  "View_mode_info": "Dadurch ändert sich der Platzbedarf für Nachrichten auf dem Bildschirm",
   "Viewing_room_administration": "Raumadministration anzeigen",
   "Visibility": "Sichtbarkeit",
   "Visible": "Sichtbar",
@@ -1426,10 +1958,10 @@
   "Visitor_Info": "Besucherinformation",
   "Visitor_Navigation": "Besuchernavigation",
   "Visitor_page_URL": "URL der Besucherseite",
-  "Visitor_time_on_site": "Besucherzeit auf der Seite",
-  "Wait_activation_warning": "Bevor Sie sich anmelden können, muss das Konto von einem Administrator manuell aktiviert werden.",
+  "Visitor_time_on_site": "Besuchsdauer auf der Seite",
+  "Wait_activation_warning": "Bevor Sie sich anmelden können, muss das Konto von einem Administrator manuell aktiviert werden",
   "Warnings": "Warnungen",
-  "We_are_offline_Sorry_for_the_inconvenience": "Wir sind offline. Entschuldigen Sie die Unannehmlichkeiten.",
+  "We_are_offline_Sorry_for_the_inconvenience": "Wir sind offline. Bitte entschuldigen Sie die Unannehmlichkeiten.",
   "We_have_sent_password_email": "Wir haben Ihnen eine Anleitung zum Zurücksetzen des Passworts an Ihre E-Mail-Adresse gesendet. Wenn Sie keine E-Mail erhalten haben, versuchen Sie es bitte noch einmal.",
   "We_have_sent_registration_email": "Wir haben Ihnen eine Bestätigungsmail gesendet. Wenn Sie keine E-Mail erhalten haben, versuchen Sie es bitte noch einmal.",
   "Webhook_URL": "Webhook-URL",
@@ -1438,51 +1970,54 @@
   "WebRTC_Enable_Direct": "Für private Nachrichten aktivieren",
   "WebRTC_Enable_Private": "Für private Kanäle aktivieren",
   "WebRTC_Servers": "STUN/TURN-Server",
-  "WebRTC_Servers_Description": "Kommata-getrennte Liste von STUN- und TURN-Servern.<br/>Benutzernamen, Passwörter und Ports sind in diesen Formaten erlaubt: `username:password@stun:host:port` oder `username:password@turn:host:port",
+  "WebRTC_Servers_Description": "Kommaseparierte Liste von STUN- und TURN-Servern.<br/>Benutzernamen, Passwörter und Ports sind in diesen Formaten erlaubt: `username:password@stun:host:port` oder `username:password@turn:host:port",
   "Wednesday": "Mittwoch",
   "Welcome": "Willkommen, <em>%s</em>.",
   "Welcome_to_the": "Willkommen bei",
   "Why_do_you_want_to_report_question_mark": "Warum möchten Sie das melden?",
   "will_be_able_to": "wird in der Lage sein,",
-  "Would_you_like_to_return_the_inquiry": "Anfrage erwidern?",
+  "Would_you_like_to_return_the_inquiry": "Anfrage zurückgeben?",
   "Yes": "Ja",
-  "Yes_clear_all": "Ja!",
+  "Yes_archive_it": "Ja, archivieren!",
+  "Yes_clear_all": "Ja, alles löschen!",
   "Yes_delete_it": "Ja!",
   "Yes_hide_it": "Ja, verstecken!",
-  "Yes_leave_it": "Ja!",
+  "Yes_leave_it": "Ja, verlassen!",
   "Yes_mute_user": "Ja, Benutzer stumm schalten!\n",
-  "Yes_remove_user": "Ja, Nutzer entfernen!",
+  "Yes_remove_user": "Ja, Benutzer entfernen!",
+  "Yes_unarchive_it": "Ja, aus dem Archiv holen!",
   "You": "Sie",
-  "you_are_in_preview_mode_of": "Sie befinden sich im Vorschaumodus des Kanals #<strong>__room_name__</strong>.",
+  "you_are_in_preview_mode_of": "Sie befinden sich im Vorschaumodus des Kanals #<strong>__room_name__</strong>",
   "You_are_logged_in_as": "Sie sind angemeldet als",
-  "You_are_not_authorized_to_view_this_page": "Sie sind nicht berechtigt, diese Seite zu sehen.",
-  "You_can_change_a_different_avatar_too": "Sie können das aktuell verwendete Profilbild überschreiben, um von dieser Integration zu veröffentlichen.",
-  "You_can_search_using_RegExp_eg": "Sie können RegExp zum Suchen verwenden. z.B.",
-  "You_can_use_an_emoji_as_avatar": "Sie können auch einen Emoji als Profilbild verwenden.",
-  "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "Sie können webhooks verwenden, um den livechat mit Ihrem CRM zu integrieren.",
-  "You_cant_leave_a_livechat_room_Please_use_the_close_button": "Sie können keinen Livechat-Raum verlassen. Bitte verwenden Sie die Schaltfläche zum Schließen.",
-  "You_have_been_muted": "Ihnen wurde das Chatten in diesem Raum verboten. ",
-  "You_have_not_verified_your_email": "Sie haben Ihre E-Mail-Adresse nicht verifiziert.",
-  "You_have_successfully_unsubscribed": "Sie haben sich erfolgreich von unserem Verteiler abgemeldet.",
+  "You_are_not_authorized_to_view_this_page": "Sie sind nicht berechtigt, diese Seite zu sehen",
+  "You_can_change_a_different_avatar_too": "Sie können für Post dieser Integration ein anderes Profilbild verwenden",
+  "You_can_search_using_RegExp_eg": "Sie können einen regulären Ausdruck zum Suchen verwenden. z.B.",
+  "You_can_use_an_emoji_as_avatar": "Sie können auch einen Emoji als Profilbild verwenden",
+  "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "Sie können Webhooks verwenden, um den Livechat mit Ihrem CRM zu integrieren.",
+  "You_cant_leave_a_livechat_room_Please_use_the_close_button": "Sie können keinen Livechat-Raum verlassen. Bitte Schließen Sie die Anfrage ",
+  "You_have_been_muted": "Ihnen wurde das Chatten in diesem Raum verboten",
+  "You_have_n_codes_remaining": "Sie haben __number__ Codes übrig",
+  "You_have_not_verified_your_email": "Sie haben Ihre E-Mail-Adresse nicht verifiziert",
+  "You_have_successfully_unsubscribed": "Sie haben sich erfolgreich von unserem Verteiler abgemeldet",
   "You_must_join_to_view_messages_in_this_channel": "Sie müssen dem Kanal beitreten, um Nachrichten darin lesen zu können",
-  "You_need_confirm_email": "Sie müssen Ihre E-Mail-Adresse bestätigen!",
-  "You_need_install_an_extension_to_allow_screen_sharing": "Sie müssen eine Erweiterung installieren, um eine Bildschirmübertragung zu starten.",
-  "You_need_to_change_your_password": "Sie müssen ihr Passwort ändern.",
-  "You_need_to_type_in_your_password_in_order_to_do_this": "Um diese Aktion auszuführen, müssen sie Ihr Passwort eingeben.",
-  "You_need_to_type_in_your_username_in_order_to_do_this": "Sie müssen Ihren Benutzernamen angeben, um diese Aktion durchzuführen!",
-  "You_need_to_verifiy_your_email_address_to_get_notications": "Sie müssen Ihre E-Mail-Adresse bestätigen, um Benachrichtigungen zu erhalten",
+  "You_need_confirm_email": "Sie müssen Ihre E-Mail-Adresse bestätigen, um sich anmelden zu können",
+  "You_need_install_an_extension_to_allow_screen_sharing": "Sie müssen eine Erweiterung installieren, um eine Bildschirmübertragung zu starten",
+  "You_need_to_change_your_password": "Sie müssen ihr Passwort ändern",
+  "You_need_to_type_in_your_password_in_order_to_do_this": "Um diese Aktion auszuführen, müssen sie Ihr Passwort eingeben",
+  "You_need_to_type_in_your_username_in_order_to_do_this": "Sie müssen Ihren Benutzernamen angeben, um diese Aktion auszuführen",
+  "You_need_to_verifiy_your_email_address_to_get_notications": "Sie müssen Ihre E-Mail-Adresse bestätigen, um Benachrichtigungen erhalten zu können",
   "You_need_to_write_something": "Sie müssen etwas dazu schreiben!",
-  "You_should_inform_one_url_at_least": "Sie müssen mindestens eine URL definieren.",
-  "You_should_name_it_to_easily_manage_your_integrations": "Zur einfachen Verwaltung der Integrationen empfehlen wir, der Integration einen Namen zuzuordnen.",
-  "You_will_not_be_able_to_recover": "Die Nachricht kann anschließend nicht wiederhergestellt werden.",
-  "You_will_not_be_able_to_recover_file": "Das Wiederherstellen dieser Datei wird nicht möglich sein.",
-  "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "Sie werden keine E-Mail-Benachrichtigungen erhalten, da Sie ihre E-Mail-Adresse nicht verifiziert haben.",
-  "Your_email_has_been_queued_for_sending": "Ihre E-Mail wird in Kürze gesendet werden.",
-  "Your_entry_has_been_deleted": "Ihr Eintrag wurde gelöscht.",
-  "Your_file_has_been_deleted": "Deine Datei wurde erfolgreich gelöscht.",
-  "Your_mail_was_sent_to_s": "Ihre E-Mail wurde an %s gesendet.",
+  "You_should_inform_one_url_at_least": "Sie müssen mindestens eine URL angeben",
+  "You_should_name_it_to_easily_manage_your_integrations": "Zur einfacheren Verwaltung der Integrationen empfehlen wir, der Integration einen Namen zu geben.",
+  "You_will_not_be_able_to_recover": "Die Nachricht kann anschließend nicht wiederhergestellt werden",
+  "You_will_not_be_able_to_recover_file": "Das Wiederherstellen dieser Datei wird nicht möglich sein",
+  "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "Sie werden keine E-Mail-Benachrichtigungen erhalten, da Sie ihre E-Mail-Adresse nicht bestätigt haben",
+  "Your_email_has_been_queued_for_sending": "Ihre E-Mail wird in Kürze gesendet werden",
+  "Your_entry_has_been_deleted": "Ihr Eintrag wurde gelöscht",
+  "Your_file_has_been_deleted": "Ihre Datei wurde erfolgreich gelöscht",
+  "Your_mail_was_sent_to_s": "Ihre E-Mail wurde an %s gesendet",
   "your_message": "ihre Nachricht",
   "your_message_optional": "ihre optionale Nachricht",
   "Your_password_is_wrong": "Falsches Passwort",
-  "Your_push_was_sent_to_s_devices": "Die Push-Nachricht wurde an %s Geräte gesendet."
-}
+  "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/el.i18n.json b/packages/rocketchat-i18n/i18n/el.i18n.json
index 9c2b2c41b57..bdebece374b 100644
--- a/packages/rocketchat-i18n/i18n/el.i18n.json
+++ b/packages/rocketchat-i18n/i18n/el.i18n.json
@@ -764,8 +764,10 @@
   "Off_the_record_conversation": "Off-the-record συνομιλία",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record συνομιλία δεν είναι διαθέσιμη για το πρόγραμμα περιήγησης ή τη συσκευή σας.",
   "Offline": "offline",
+  "Offline_DM_Email": "Σας έχουν άμεση ειδοποιήται από __user__",
   "Offline_form": "offline μορφή",
   "Offline_form_unavailable_message": "Offline μορφή διαθέσιμη μήνυμα",
+  "Offline_Mention_Email": "Έχετε αναφερθεί από __user__ στην #__room__",
   "Offline_message": "offline μήνυμα",
   "Offline_success_message": "Offline μήνυμα επιτυχίας",
   "Offline_unavailable": "offline διαθέσιμη",
@@ -1041,19 +1043,19 @@
   "The_user_wont_be_able_to_type_in_s": "Ο χρήστης δεν θα είναι σε θέση να πληκτρολογήσετε %s",
   "Theme": "Θέμα",
   "theme-color-content-background-color": "Περιεχόμενο Χρώμα φόντου",
+  "theme-color-custom-scrollbar-color": "Έθιμο κύλισης Χρώμα",
+  "theme-color-info-font-color": "Πληροφορίες Χρώμα γραμματοσειράς",
+  "theme-color-link-font-color": "Σύνδεσμος Χρώμα γραμματοσειράς",
   "theme-color-primary-background-color": "Πρωτοβάθμια Χρώμα φόντου",
   "theme-color-primary-font-color": "Πρωτοβάθμια Χρώμα γραμματοσειράς",
   "theme-color-secondary-background-color": "Δευτεροβάθμιο χρώμα φόντου",
   "theme-color-secondary-font-color": "Δευτεροβάθμια Χρώμα γραμματοσειράς",
-  "theme-color-tertiary-background-color": "Τριτοβάθμια χρώμα φόντου",
-  "theme-color-tertiary-font-color": "Τριτοβάθμια χρώμα γραμματοσειράς",
-  "theme-color-link-font-color": "Σύνδεσμος Χρώμα γραμματοσειράς",
-  "theme-color-info-font-color": "Πληροφορίες Χρώμα γραμματοσειράς",
-  "theme-color-custom-scrollbar-color": "Έθιμο κύλισης Χρώμα",
   "theme-color-status-away": "Μακριά Χρώμα Κατάσταση",
   "theme-color-status-busy": "Απασχολημένος Χρώμα Κατάσταση",
   "theme-color-status-offline": "Offline Χρώμα Κατάσταση",
   "theme-color-status-online": "Σε απευθείας σύνδεση Χρώμα Κατάσταση",
+  "theme-color-tertiary-background-color": "Τριτοβάθμια χρώμα φόντου",
+  "theme-color-tertiary-font-color": "Τριτοβάθμια χρώμα γραμματοσειράς",
   "theme-color-unread-notification-color": "Αδιάβαστη Ειδοποιήσεις Χρώμα",
   "theme-custom-css": "έθιμο CSS",
   "There_are_no_agents_added_to_this_department_yet": "Δεν υπάρχουν παράγοντες που προστίθενται σε αυτό το τμήμα ακόμα.",
@@ -1224,4 +1226,4 @@
   "Your_mail_was_sent_to_s": "mail σας στάλθηκε στο %s",
   "Your_password_is_wrong": "Ο κωδικός πρόσβασής σας είναι λάθος!",
   "Your_push_was_sent_to_s_devices": "ώθηση σας στάλθηκε σε συσκευές %s"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index ac0a6f427ac..2c8ff91128b 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2022,4 +2022,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index cbd1497ca6c..0feb4497c4f 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -87,6 +87,8 @@
   "Accounts_OAuth_Meteor_callback_url": "URL de retorno (callback) de Meteor",
   "Accounts_OAuth_Meteor_id": "Id de Meteor",
   "Accounts_OAuth_Meteor_secret": "Secreto de Meteor",
+  "Accounts_OAuth_Proxy_host": "Anfitrión Proxy",
+  "Accounts_OAuth_Proxy_services": "Servicios de Proxy",
   "Accounts_OAuth_Twitter": "Iniciar Sesión con Twitter",
   "Accounts_OAuth_Twitter_callback_url": "URL de retorno (callback) de Twitter",
   "Accounts_OAuth_Twitter_id": "Id de Twitter",
@@ -96,8 +98,6 @@
   "Accounts_OAuth_Wordpress_id": "Id de Wordpress",
   "Accounts_OAuth_Wordpress_secret": "Secreto de Wordpress",
   "Accounts_PasswordReset": "Restablecer Contraseña",
-  "Accounts_OAuth_Proxy_host": "Anfitrión Proxy",
-  "Accounts_OAuth_Proxy_services": "Servicios de Proxy",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Roles predeterminados para Servicios de Autenticación",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Roles predeterminados (separados por comas) que los usuarios recibirán cuando se registren a través de servicios de autenticación ",
   "Accounts_Registration_AuthenticationServices_Enabled": "Registro mediante Servicios de Autenticación",
@@ -204,6 +204,7 @@
   "Authorization_URL": "URL de Autorización",
   "Authorize": "Autorizar",
   "Auto_Load_Images": "Cargar automáticamente las imagenes",
+  "Auto_Translate": " Traducción Automática",
   "AutoLinker_Email": "AutoLinker Correo Electrónico",
   "AutoLinker_Phone": "AutoLinker Teléfono",
   "AutoLinker_Phone_Description": "Enlazada automáticamente los números de teléfono. Ej:`(123) 456-7890`",
@@ -214,7 +215,6 @@
   "AutoLinker_Urls_www": "Enlaces Automáticos en URLs 'www'",
   "AutoLinker_UrlsRegExp": "Enlaces Automáticos en URL de expresiones regulares",
   "Automatic_Translation": "Traducción automática",
-  "Auto_Translate": " Traducción Automática",
   "AutoTranslate_Enabled": "Habilitar Traducción Automática",
   "AutoTranslate_GoogleAPIKey": "Clave de la API de Google",
   "Available": "Disponible",
@@ -231,8 +231,8 @@
   "Away_male": "Ausente",
   "Back": "Atrás",
   "Back_to_applications": "Volver a las aplicaciones",
-  "Back_to_integrations": "De regreso a integraciones",
   "Back_to_integration_detail": "Volver al detalle de la integración",
+  "Back_to_integrations": "De regreso a integraciones",
   "Back_to_login": "Volver a identificarse",
   "Back_to_permissions": "Regresar a permisos",
   "Backup_codes": "Respaldar códigos",
@@ -249,7 +249,6 @@
   "busy_male": "ocupado",
   "Busy_male": "Ocupado",
   "by": "por",
-  "Content": "Contenido",
   "cache_cleared": "Caché borrado",
   "Cancel": "Cancelar",
   "Cancel_message_input": "Cancelar",
@@ -258,8 +257,8 @@
   "CAS_Sync_User_Data_Enabled": "Siempre sincronizar los Datos de Usuario",
   "CDN_PREFIX": "Prefijo de CDN",
   "Certificates_and_Keys": "Certificados y Llaves",
-  "Changing_email": "Cambiando correo electrónico",
   "Change_Room_Type": "Cambiar el Tipo de Sala",
+  "Changing_email": "Cambiando correo electrónico",
   "channel": "canal",
   "Channel": "Canal",
   "Channel_already_exist": "El canal '#% s' ya existe.",
@@ -281,9 +280,9 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Elige el alias que aparecerá antes del nombre de usuario en los mensajes.",
   "Choose_the_username_that_this_integration_will_post_as": "Elige el nombre de usuario con el cual esta integración publicara.",
   "clear": "Borrar",
+  "Clear_all_unreads_question": "Borrar todos los mensajes no leídos?",
   "clear_cache_now": "Borrar caché ahora",
   "clear_history": "Borrar Historial",
-  "Clear_all_unreads_question": "Borrar todos los mensajes no leídos?",
   "Click_here": "Haga clic aquí",
   "Click_here_for_more_info": "Cliquea aquí para más información",
   "Client_ID": "Cliente ID",
@@ -299,6 +298,7 @@
   "Commands": "Comandos",
   "Compact": "Compacto",
   "Confirm_password": "Confirma tu contraseña",
+  "Content": "Contenido",
   "Conversation": "Conversación",
   "Conversation_closed": "Conversación cerrada: __comment__.",
   "Convert_Ascii_Emojis": "Convierte ASCII a Emoji",
@@ -415,6 +415,7 @@
   "error-could-not-change-username": "No se pudo cambiar nombre de usuario",
   "error-delete-protected-role": "No puede eliminar un rol protegido",
   "error-department-not-found": "Departamento no encontrado",
+  "error-direct-message-file-upload-not-allowed": "No se permite compartir archivos en mensajes directos",
   "error-duplicate-channel-name": "Un canal con el nombre '__channel_name__' ya existe",
   "error-email-domain-blacklisted": "El dominio de correo electrónico en una lista negra",
   "error-field-unavailable": "<strong>__field__</strong> ya está en uso :(",
@@ -435,7 +436,6 @@
   "error-invalid-email-address": "Dirección de correo inválida",
   "error-invalid-file-height": "Altura Invalida de Archivo",
   "error-invalid-file-type": "Tipo Invalido de Archivo",
-  "error-direct-message-file-upload-not-allowed": "No se permite compartir archivos en mensajes directos",
   "error-invalid-file-width": "Anchura Invalida de Archivo",
   "error-invalid-from-address": "Ha ingresado una dirección invalida en el campo De",
   "error-invalid-integration": "la integración no válido",
@@ -512,9 +512,9 @@
   "FileUpload_Storage_Type": "Tipo de Almacenamiento",
   "Flags": "Indicadores",
   "Follow_social_profiles": "Sigue nuestros perfiles sociales, realiza un fork en github y comparte tus pensamientos acerca de la aplicación rocket.chat en nuestro tablero de Trello.",
+  "Fonts": "Fuentes",
   "Food_and_Drink": "Comer y beber",
   "Footer": "Pie de página",
-  "Fonts": "Fuentes",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Para su seguridad, debe volver a introducir su contraseña para continuar",
   "Force_SSL": "Forzar SSL",
   "Force_SSL_Description": "* Precaución! * _Force SSL_ nunca debe ser usado con proxy inverso. Si usted tiene un proxy inverso, debería hacer la redirección AHÍ. Esta opción existe para los despliegues como Heroku, que no permite la configuración de redirección en el proxy inverso.",
@@ -587,17 +587,17 @@
   "Installation": "Instalación ",
   "Installed_at": "instalado en",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instrucciones a sus visitantes llenan el formulario para enviar un mensaje",
-  "Integration_Advanced_Settings": "Ajustes Avanzados",
   "Integration_added": "La Integración ha sido añadida",
+  "Integration_Advanced_Settings": "Ajustes Avanzados",
   "Integration_Incoming_WebHook": "Integración WebHook de Entrada",
   "Integration_New": "Nueva Integración",
+  "Integration_Outgoing_WebHook": "Integración web hook saliente",
+  "Integration_updated": "La Integración ha sido actualizada",
+  "Integrations": "Integraciones",
   "Integrations_Outgoing_Type_FileUploaded": "Archivo Subido",
   "Integrations_Outgoing_Type_RoomArchived": "chat archivado",
   "Integrations_Outgoing_Type_RoomCreated": "chat creado(público y privado)",
   "Integrations_Outgoing_Type_RoomJoined": "Usuario se ha unido al chat",
-  "Integration_Outgoing_WebHook": "Integración web hook saliente",
-  "Integration_updated": "La Integración ha sido actualizada",
-  "Integrations": "Integraciones",
   "InternalHubot": "hubot interna",
   "InternalHubot_ScriptsToLoad": "Secuencias de comandos para cargar",
   "InternalHubot_ScriptsToLoad_Description": "Por favor, introduzca una lista separada por comas de secuencias de comandos para cargar desde https://github.com/github/hubot-scripts/tree/master/src/scripts",
@@ -621,17 +621,17 @@
   "Invitation_Subject": "Asunto de la Invitación",
   "Invitation_Subject_Default": "Se le ha invitado a [Site_Name]",
   "Invite_user_to_join_channel": "Invitar a un usuario a unirse a este canal",
-  "Invite_user_to_join_channel_all_to": "Invitar a todos los usuarios de este canal a unirse a [#channel]",
   "Invite_user_to_join_channel_all_from": "Invitar a todos los usuarios de [#channell] para unirse a este canal",
+  "Invite_user_to_join_channel_all_to": "Invitar a todos los usuarios de este canal a unirse a [#channel]",
   "Invite_Users": "Invitar Usuarios",
+  "IRC_Channel_Join": "Salida del comando JOIN",
+  "IRC_Channel_Leave": "Salida del comando PART",
   "is_also_typing": "también esta escribiendo",
   "is_also_typing_female": "tambien esta escribiendo",
   "is_also_typing_male": "tambien esta escribiendo",
   "is_typing": "está escribiendo",
   "is_typing_female": "esta escribiendo",
   "is_typing_male": "esta escribiendo",
-  "IRC_Channel_Join": "Salida del comando JOIN",
-  "IRC_Channel_Leave": "Salida del comando PART",
   "It_works": "Funciona",
   "italics": "cursiva",
   "Jitsi_Chrome_Extension": "Id extensión de Chrome",
@@ -883,9 +883,11 @@
   "Off_the_record_conversation": "Off-the-record Conversación",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record conversación no está disponible para el navegador o dispositivo.",
   "Offline": "Desconectado",
+  "Offline_DM_Email": "Se le ha contactado directamente por __user__",
   "Offline_form": "Formulario fuera de línea",
   "Offline_form_unavailable_message": "formulario en línea mensaje inasequible",
   "Offline_Link_Message": "IR AL MENSAJE",
+  "Offline_Mention_Email": "Usted ha sido mencionado por __user__ en #__room__",
   "Offline_message": "Mensaje fuera de línea",
   "Offline_success_message": "Mensaje fuera de línea correcto",
   "Offline_unavailable": "disponible sin conexión",
@@ -1174,19 +1176,19 @@
   "The_user_wont_be_able_to_type_in_s": "El usuario no podra introducir datos en %s",
   "Theme": "Tema",
   "theme-color-content-background-color": "Color de fondo del contenido",
+  "theme-color-custom-scrollbar-color": "Barra de desplazamiento de color personalizado",
+  "theme-color-info-font-color": "Color del texto de Información",
+  "theme-color-link-font-color": "Color del texto de los Hipervinculos",
   "theme-color-primary-background-color": "Color primario del fondo ",
   "theme-color-primary-font-color": "Color primario del texto",
   "theme-color-secondary-background-color": "Color secundario del fondo",
   "theme-color-secondary-font-color": "Color secundario del texto",
-  "theme-color-tertiary-background-color": "Color de fondo terciario",
-  "theme-color-tertiary-font-color": "Color de fuente terciaria",
-  "theme-color-link-font-color": "Color del texto de los Hipervinculos",
-  "theme-color-info-font-color": "Color del texto de Información",
-  "theme-color-custom-scrollbar-color": "Barra de desplazamiento de color personalizado",
   "theme-color-status-away": "Color del estado Ausente",
   "theme-color-status-busy": "Color de Estado Ocupado",
   "theme-color-status-offline": "Color del estado Desconectado",
   "theme-color-status-online": "Color del estado Conectado",
+  "theme-color-tertiary-background-color": "Color de fondo terciario",
+  "theme-color-tertiary-font-color": "Color de fuente terciaria",
   "theme-color-unread-notification-color": "Sin leer Notificaciones color",
   "theme-custom-css": "CSS personalizado",
   "There_are_no_agents_added_to_this_department_yet": "Todavia no hay ningún agente agregado a este departamento.",
@@ -1361,4 +1363,4 @@
   "Your_mail_was_sent_to_s": "Su correo electrónico fue enviado a %s",
   "Your_password_is_wrong": "Su contraseña es incorrecta!",
   "Your_push_was_sent_to_s_devices": "Su push fue enviado a los dispositivos %s"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/fa.i18n.json b/packages/rocketchat-i18n/i18n/fa.i18n.json
index a212fdd4016..3ca1c87ff18 100644
--- a/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -1,20 +1,27 @@
 {
-  "0_Errors_Only": "0 - خطاها فقط",
+  "#channel": "#channel",
+  "0_Errors_Only": "0 - فقط خطاها ",
   "1_Errors_and_Information": "1 - خطاها و اطلاعات",
-  "2_Erros_Information_and_Debug": "2 - Erros، اطلاعات و اشکال زدایی",
+  "2_Erros_Information_and_Debug": "2 - خطاها، اطلاعات و اشکال زدایی",
   "403": "ممنوع",
   "500": "خطای داخلی سرور",
+  "@username": "@username",
   "__username__is_no_longer__role__defined_by__user_by_": "_نام کاربری_ است که دیگر __role__، توسط __user_by__",
   "__username__was_set__role__by__user_by_": "_نام کاربری_ __role__ توسط __user_by__ تعیین شد",
-  "Access_not_authorized": "دسترسی مجاز",
+  "Accept": "قبول",
+  "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "قبول درخواست های ورودی چت آنلاین حتی اگر هیچ عامل آنلاینی وجود نداشته باشد",
+  "Accept_with_no_online_agents": "قبول بدون عاملین آنلاین",
+  "Access_not_authorized": "دسترسی مجاز نمی باشد",
   "Access_Token_URL": "URL دسترسی به رمز",
-  "Accessing_permissions": "دسترسی به مجوز",
+  "Accessing_permissions": "مجوزهای دسترسی",
   "Account_SID": "حساب SID",
-  "Accounts": "حساب ها",
+  "Accounts": "حساب‌ها",
+  "Accounts_AllowAnonymousRead": "اجازه خواندن گمنام",
+  "Accounts_AllowAnonymousWrite": "اجازه نوشتن گمنام",
   "Accounts_AllowDeleteOwnAccount": "اجازه به کاربران برای حذف حساب کاربری خود",
-  "Accounts_AllowedDomainsList": "فهرست دامنههای مجاز",
+  "Accounts_AllowedDomainsList": "فهرست دامنه‌های مجاز",
   "Accounts_AllowedDomainsList_Description": "جدا شده با کاما از دامنه مجاز",
-  "Accounts_AllowEmailChange": "اجازه می دهد ایمیل تغییر",
+  "Accounts_AllowEmailChange": "اجازه تغییر ایمیل",
   "Accounts_AllowPasswordChange": "اجازه تغییر رمز ورود",
   "Accounts_AllowUserAvatarChange": "کاربر اجازه می دهد آواتار تغییر",
   "Accounts_AllowUsernameChange": "اجازه می دهد نام کاربری تغییر",
@@ -31,7 +38,7 @@
   "Accounts_Enrollment_Email": "ثبت نام پست الکترونیک",
   "Accounts_Enrollment_Email_Default": "<h2 style=\";text-align:right;direction:rtl\"> خوش آمدید به <h1 style=\";text-align:right;direction:rtl\"> [Site_Name] </h1></h2><p style=\";text-align:right;direction:rtl\"> برو به [Site_URL] و سعی کنید بهترین راه حل چت منبع باز امروز در دسترس است! </p>",
   "Accounts_Enrollment_Email_Description": "شما ممکن است [name]، [fname] برای نام کامل کاربر، نام اول یا نام خانوادگی، به ترتیب استفاده کنید، [lname]. <br /> ممکن است [email] برای ایمیل کاربر استفاده کنید.",
-  "Accounts_Enrollment_Email_Subject_Default": "به استقبال [Site_Name]",
+  "Accounts_Enrollment_Email_Subject_Default": "به [Site_Name] خوش آمدید",
   "Accounts_Iframe_api_method": "روش API",
   "Accounts_Iframe_api_url": "URL API",
   "Accounts_iframe_enabled": "فعال",
@@ -757,8 +764,10 @@
   "Off_the_record_conversation": "خارج از رکورد مکالمات",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "خارج از ضبط مکالمات برای مرورگر یا دستگاه شما در دسترس نیست.",
   "Offline": "آفلاین",
+  "Offline_DM_Email": "شما مستقیم توسط __user__ پیام ارسال شده است",
   "Offline_form": "فرم آفلاین",
   "Offline_form_unavailable_message": "آفلاین فرم پیام در دسترس نیست",
+  "Offline_Mention_Email": "شما توسط __user__ در #__room__ ذکر شده است",
   "Offline_message": "آفلاین",
   "Offline_success_message": "پیام موفقیت آفلاین",
   "Offline_unavailable": "آفلاین در دسترس نیست",
@@ -956,7 +965,7 @@
   "Show_only_online": "نمایش فقط آنلاین",
   "Show_preregistration_form": "فرم پیش ثبت نام",
   "Showing_archived_results": "<p style=\";text-align:right;direction:rtl\"> نمایش نتایج: از <b>آرشیو %s را</b> </p>",
-  "Showing_online_users": "نمایش <b>__total_showing__</b> از __total__ کاربران",
+  "Showing_online_users": "<b>نمایش:</b> __total_showing__, <b>آنلاین:</b> __online__, <b>تعداد کل:</b> __total__",
   "Showing_results": "<p style=\";text-align:right;direction:rtl\"> نمایش نتایج: <b>از %s را</b> </p>",
   "since_creation": "از %s را",
   "Site_Name": "نام سایت",
@@ -1034,19 +1043,20 @@
   "The_user_wont_be_able_to_type_in_s": "کاربر نمی خواهد قادر به تایپ در %s",
   "Theme": "موضوع",
   "theme-color-content-background-color": "محتوای رنگ پس زمینه",
+  "theme-color-custom-scrollbar-color": "سفارشی نمایشمیلهلغزش رنگ",
+  "theme-color-info-font-color": "اطلاعات رنگ قلم",
+  "theme-color-link-font-color": "لینک رنگ قلم",
+  "theme-color-primary-action-color": "رنگ اولیه عملیات",
   "theme-color-primary-background-color": "اولیه رنگ پس زمینه",
   "theme-color-primary-font-color": "اولیه رنگ قلم",
   "theme-color-secondary-background-color": "ثانویه رنگ پس زمینه",
   "theme-color-secondary-font-color": "ثانویه رنگ قلم",
-  "theme-color-tertiary-background-color": "دوران سوم رنگ پس زمینه",
-  "theme-color-tertiary-font-color": "دوران سوم رنگ قلم",
-  "theme-color-link-font-color": "لینک رنگ قلم",
-  "theme-color-info-font-color": "اطلاعات رنگ قلم",
-  "theme-color-custom-scrollbar-color": "سفارشی نمایشمیلهلغزش رنگ",
   "theme-color-status-away": "وضعیت دور رنگ",
   "theme-color-status-busy": "وضعیت مشغول رنگ",
   "theme-color-status-offline": "وضعیت: آفلاین رنگ",
   "theme-color-status-online": "وضعیت رنگ",
+  "theme-color-tertiary-background-color": "دوران سوم رنگ پس زمینه",
+  "theme-color-tertiary-font-color": "دوران سوم رنگ قلم",
   "theme-color-unread-notification-color": "خوانده نشده اطلاعیه رنگ",
   "theme-custom-css": "CSS سفارشی",
   "There_are_no_agents_added_to_this_department_yet": "هیچ عوامل اضافه شده به این بخش وجود ندارد.",
@@ -1057,6 +1067,7 @@
   "This_is_a_push_test_messsage": "این messsage آزمون فشار است",
   "This_room_has_been_archived_by__username_": "این اتاق شده است _نام کاربری_ آرشیو",
   "This_room_has_been_unarchived_by__username_": "این اتاق شده است _نام کاربری_ از بایگانی خارج شد",
+  "Thursday": "پنج شنبه",
   "Time_in_seconds": "زمان در ثانیه",
   "Title": "عنوان",
   "Title_bar_color": "رنگ نوار عنوان",
@@ -1090,8 +1101,10 @@
   "Uploading_file": "آپلود فایل ...",
   "Uptime": "آپ تایم",
   "URL": "URL",
+  "URL_room_prefix": "پیشوند آدرس اتاق",
   "Use_account_preference": "استفاده از همه حساب",
   "Use_Emojis": "استفاده از Emojis",
+  "Use_Global_Settings": "استفاده از تنظیمات عمومی",
   "Use_initials_avatar": "استفاده از حروف اول نام کاربری خود را",
   "Use_service_avatar": "استفاده از %s آواتار ها",
   "Use_this_username": "با استفاده از این نام کاربری",
@@ -1131,6 +1144,8 @@
   "User_unmuted_by": "<em>__user_unmuted__</em> کاربر لغو شد توسط <em>__user_by__.</em>",
   "User_unmuted_in_room": "کاربر نادیده در اتاق",
   "User_updated_successfully": "کاربر با موفقیت به روز",
+  "User_uploaded_file": "یک فایل آپلود شد",
+  "User_uploaded_image": "یک عکس آپلود شد",
   "Username": "نام کاربری",
   "Username_and_message_must_not_be_empty": "نام کاربری و پیام نباید خالی باشد.",
   "Username_cant_be_empty": "نام کاربری نمی تواند خالی باشد",
@@ -1152,7 +1167,11 @@
   "Verification_email_sent": "ایمیل تأیید",
   "Verified": "تایید شده",
   "Version": "نسخه",
-  "Video_Chat_Window": "ویدئو چت",
+  "Video_Chat_Window": "ویدیو چت",
+  "Video_Conference": "ویدیو کنفرانس",
+  "Video_message": "پیام ویدویی",
+  "Videocall_declined": "تماس ویدیویی  رد شد",
+  "Videocall_enabled": "تماس ویدیویی فعال شد",
   "View_All": "مشاهده همه",
   "View_Logs": "نمایش سیاهههای مربوط",
   "View_mode": "حالت نمایش",
@@ -1166,27 +1185,32 @@
   "Visitor_page_URL": "URL صفحه های بازدید کننده",
   "Visitor_time_on_site": "زمان بازدید کنندگان در سایت",
   "Wait_activation_warning": "قبل از اینکه شما می توانید وارد شوید، حساب خود را باید به صورت دستی توسط مدیر فعال می شود.",
+  "Warnings": "اخطارها",
   "We_are_offline_Sorry_for_the_inconvenience": "ما آنلاین نیست. با عرض پوزش برای ناراحتی.",
   "We_have_sent_password_email": "ما به شما یک ایمیل با دستورالعمل تنظیم مجدد رمز عبور ارسال کرده اند. اگر شما یک ایمیل را دریافت نمی در مدت کوتاهی، لطفا دوباره و دوباره امتحان کنید.",
   "We_have_sent_registration_email": "ما به شما یک ایمیل برای تایید ثبت نام خود را فرستاده اند. اگر شما یک ایمیل را دریافت نمی در مدت کوتاهی، لطفا دوباره و دوباره امتحان کنید.",
-  "Webhook_URL": "URL Webhook",
+  "Webhook_URL": "آدرس Webhook",
   "Webhooks": "Webhooks",
   "WebRTC_Enable_Channel": "فعال کردن برای کانال های عمومی",
   "WebRTC_Enable_Direct": "فعال کردن برای پیام های مستقیم",
   "WebRTC_Enable_Private": "فعال کردن برای کانال خصوصی",
   "WebRTC_Servers": "سرور بی حس کردن / روشن",
   "WebRTC_Servers_Description": "یک لیست از بی حس کردن و روشن کردن سرور جداشده با کاما. <br/> رمز عبور @ بی حس کردن:: نام کاربری و رمز پورت در فرمت `نام کاربری اجازه میزبان: port` یا` نام کاربری: رمز عبور @ نوبه خود: میزبان: port`.",
+  "Wednesday": "چهارشنبه",
   "Welcome": "خوش آمدید <em>به %s.</em>",
   "Welcome_to_the": "خوش آمدید به",
   "Why_do_you_want_to_report_question_mark": "چرا شما می خواهید به گزارش؟",
   "will_be_able_to": "قادر خواهد بود تا",
+  "Would_you_like_to_return_the_inquiry": "تمایل دارید به پرس و جو بازگردید؟",
   "Yes": "بله",
+  "Yes_archive_it": "بلی بایگانی کن",
   "Yes_clear_all": "بله، پاک کردن تمام!",
   "Yes_delete_it": "بله، آن را حذف کنید!",
   "Yes_hide_it": "بله، آن را پنهان!",
   "Yes_leave_it": "بله، آن را ترک کنید!",
   "Yes_mute_user": "بله، کاربر قطع!",
   "Yes_remove_user": "بله، حذف کاربر!",
+  "Yes_unarchive_it": "بلی از بایگانی خارج کن",
   "You": "شما",
   "you_are_in_preview_mode_of": "شما در حالت پیش نمایش از کانال # <strong>__room_name__</strong> هستند",
   "You_are_logged_in_as": "شما وارد شدید با عنوان",
@@ -1199,6 +1223,7 @@
   "You_have_been_muted": "شما نادیده گرفته شده است و نمی تواند در این اتاق صحبت",
   "You_have_not_verified_your_email": "شما ایمیل خود را تایید نمی کند.",
   "You_have_successfully_unsubscribed": "شما با موفقیت از فهرست Mailling ما لغو شده است.",
+  "You_must_join_to_view_messages_in_this_channel": "شما برای دیدن پیامهای این کانال باید عضو شوید",
   "You_need_confirm_email": "شما نیاز به تایید ایمیل خود را برای ورود!",
   "You_need_install_an_extension_to_allow_screen_sharing": "شما نیاز به نصب یک فرمت به اجازه به اشتراک گذاری صفحه نمایش",
   "You_need_to_change_your_password": "شما نیاز به تغییر رمز عبور خود را",
@@ -1215,6 +1240,8 @@
   "Your_entry_has_been_deleted": "ورود شما حذف شده است.",
   "Your_file_has_been_deleted": "فایل شما حذف شده است.",
   "Your_mail_was_sent_to_s": "پست الکترونیکی خود را به %s ارسال شد",
+  "your_message": "پیام شما",
+  "your_message_optional": "پیام شما(انتخابی)",
   "Your_password_is_wrong": "رمز عبور خود را اشتباه است!",
   "Your_push_was_sent_to_s_devices": "فشار خود را به دستگاه %s را ارسال شد"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/fi.i18n.json b/packages/rocketchat-i18n/i18n/fi.i18n.json
index 1a827689916..1a26dfa0995 100644
--- a/packages/rocketchat-i18n/i18n/fi.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -7,7 +7,7 @@
   "500": "Sisäinen palvelinvirhe",
   "@username": "@käyttäjä",
   "@username_message": "@käyttäjä <message>",
-  "__username__is_no_longer__role__defined_by__user_by_": "__username__ ei ole enää __role__ (__user_by__)",
+  "__username__is_no_longer__role__defined_by__user_by_": "__username__ ei ole enää __role__ (__user_by__ toimesta)",
   "__username__was_set__role__by__user_by_": "__user_by__ muutti käyttäjän __username__ rooliksi __role__ ",
   "Accept": "Hyväksy",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Hyväksy sisääntulevat livechatit vaikka agentteja ei ole paikalla",
@@ -17,25 +17,27 @@
   "Accessing_permissions": "Pääsyn käyttöoikeudet",
   "Account_SID": "Tilin SID",
   "Accounts": "Käyttäjätilit",
+  "Accounts_AllowAnonymousRead": "Salli lukeminen anonyymeille",
+  "Accounts_AllowAnonymousWrite": "Salli kirjoitus anonyymeille",
   "Accounts_AllowDeleteOwnAccount": "Salli käyttäjien poistaa oma tunnuksensa",
   "Accounts_AllowedDomainsList": "Lista sallituista domaineista",
   "Accounts_AllowedDomainsList_Description": "Pilkuilla eroteltu luettelo sallituista verkkotunnuksia",
-  "Accounts_AllowEmailChange": "Salli sähköpostin vaihtaminen",
+  "Accounts_AllowEmailChange": "Salli sähköpostiosoitteen vaihtaminen",
   "Accounts_AllowPasswordChange": "Salli salasanan vaihto",
   "Accounts_AllowUserAvatarChange": "Salli käyttäjän avatarin muutos",
   "Accounts_AllowUsernameChange": "Salli käyttäjätunnuksen muuttaminen",
   "Accounts_AllowUserProfileChange": "Salli käyttäjän profiilin muutos",
   "Accounts_AvatarResize": "Muuta avatarien kokoa",
   "Accounts_AvatarSize": "Avatarin koko",
-  "Accounts_BlockedDomainsList": "Estettyjen verkkotunnusten lista",
-  "Accounts_BlockedDomainsList_Description": "Pilkuilla eroteltu lista estetyistä verkkotunnuksista",
+  "Accounts_BlockedDomainsList": "Estettyjen domainien lista",
+  "Accounts_BlockedDomainsList_Description": "Pilkuilla eroteltu lista estetyistä domaineista",
   "Accounts_BlockedUsernameList": "Estettyjen käyttäjätunnusten lista",
-  "Accounts_BlockedUsernameList_Description": "Pilkuilla erotettu luettelo estetyistä käyttäjätunnuksia (kirjainkoosta riippumaton)",
+  "Accounts_BlockedUsernameList_Description": "Pilkuilla erotettu luettelo estetyistä käyttäjätunnuksista (kirjainkoosta riippumaton)",
   "Accounts_denyUnverifiedEmail": "Estä vahvistamaton sähköpostiosoite",
   "Accounts_EmailVerification": "Sähköpostiosoitteen vahvistaminen",
   "Accounts_EmailVerification_Description": "Varmista, että käytät oikeita SMTP-asetuksia tätä ominaisuutta varten",
   "Accounts_Enrollment_Email": "Kirjautumissähköposti",
-  "Accounts_Enrollment_Email_Default": "<h2> Tervetuloa sivustolle </h2><h1> [Site_Name] </h1><p> Siirry osoitteeseen [Site_URL] ja kokeile parasta avoimen lähdekoodin chat ratkaisua tänään! </p>",
+  "Accounts_Enrollment_Email_Default": "<h2> Tervetuloa sivustolle </h2><h1> [Site_Name] </h1><p> Siirry osoitteeseen [Site_URL] ja kokeile parasta avoimen lähdekoodin chat ratkaisua tänään! </p>",
   "Accounts_Enrollment_Email_Description": "Voit käyttää seuraavia placeholdereita <br/><ul><li>[name], [fname], [lname] käyttäjän koko nimen, etunimen tai sukunimen paikalla.</li><li> [Site_Name] ja [Site_URL] sivuston nimen ja osoitteen paikalla</li></ul>",
   "Accounts_Enrollment_Email_Subject_Default": "Tervetuloa sivustolle [Site_Name]",
   "Accounts_Iframe_api_method": "API metodi",
@@ -800,8 +802,10 @@
   "Off_the_record_conversation": "Off-the-record keskustelu",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record -keskustelua ei ole saatavilla käyttämälläsi selaimella tai laitteella.",
   "Offline": "Offline",
+  "Offline_DM_Email": "__user__ lähetti sinulle yksityisviestin",
   "Offline_form": "Offline-lomake",
   "Offline_form_unavailable_message": "Offline-lomakkeen \"poissa\" viesti",
+  "Offline_Mention_Email": "__user__ mainitsi sinut huoneessa #__room__",
   "Offline_message": "Offline-tilan viesti",
   "Offline_success_message": "Offline-tilan onnistumisviesti",
   "Offline_unavailable": "Offline poissa",
@@ -826,7 +830,7 @@
   "OS_Uptime": "OS Päälläoloaika",
   "others": "muut",
   "OTR": "OTR",
-  "OTR_is_only_available_when_both_users_are_online": "OTR on käytettävissä vain, kun molemmat käyttäjät ovat verkossa",
+  "OTR_is_only_available_when_both_users_are_online": "OTR on käytettävissä vain, kun molemmat käyttäjät ovat online",
   "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "Ohitus-URL johon tiedostot siirretään. Tätä urlia käytetään myös latauksia varten ellei erillistä CDN:ää syötetty",
   "Page_title": "Sivun otsikko",
   "Page_URL": "Sivun URL",
@@ -1006,7 +1010,7 @@
   "Show_all": "Näytä kaikki",
   "Show_more": "Näytä lisää",
   "show_offline_users": "Näytä käyttäjät, jotka ovat offline",
-  "Show_only_online": "Näytä vain verkossa",
+  "Show_only_online": "Näytä vain onlinessä olevat",
   "Show_preregistration_form": "Näytä esirekisteröintilomake",
   "Show_queue_list_to_all_agents": "Näytä jonolista kaikille agenteille",
   "Showing_archived_results": "<p>Näytetään <b>%s</b> arkistoitua tulosta</p>",
@@ -1089,19 +1093,19 @@
   "The_user_wont_be_able_to_type_in_s": "Käyttäjä ei pysty kirjoittamaan %s",
   "Theme": "Ulkoasu",
   "theme-color-content-background-color": "Sisällön taustaväri",
+  "theme-color-custom-scrollbar-color": "Vierityspalkin väri (custom)",
+  "theme-color-info-font-color": "Infon fontin väri",
+  "theme-color-link-font-color": "Linkin fontin väri",
   "theme-color-primary-background-color": "Ensisijainen taustaväri",
   "theme-color-primary-font-color": "Ensisijainen fontin väri",
   "theme-color-secondary-background-color": "Toissijainen taustaväri",
   "theme-color-secondary-font-color": "Toissijainen fontin väri",
-  "theme-color-tertiary-background-color": "Tertiäärinen (se kolmas) taustaväri",
-  "theme-color-tertiary-font-color": "Tertiäärinen (se kolmas) fontin väri",
-  "theme-color-link-font-color": "Linkin fontin väri",
-  "theme-color-info-font-color": "Infon fontin väri",
-  "theme-color-custom-scrollbar-color": "Vierityspalkin väri (custom)",
   "theme-color-status-away": "Poissa-tilan väri",
   "theme-color-status-busy": "Varattu-tilan väri",
   "theme-color-status-offline": "Offline-tilan väri",
   "theme-color-status-online": "Online-tilan väri",
+  "theme-color-tertiary-background-color": "Tertiäärinen (se kolmas) taustaväri",
+  "theme-color-tertiary-font-color": "Tertiäärinen (se kolmas) fontin väri",
   "theme-color-unread-notification-color": "Lukemattomien ilmoitusten väri",
   "theme-custom-css": "Mukautettu CSS",
   "There_are_no_agents_added_to_this_department_yet": "Yhtään agenttia ei ole vielä lisätty tähän osastoon.",
@@ -1275,4 +1279,4 @@
   "Your_mail_was_sent_to_s": "Sähköpostisi lähetettiin, vastaanottajana %s",
   "Your_password_is_wrong": "Salasanasi on väärin!",
   "Your_push_was_sent_to_s_devices": "Push-viestisi lähetettiin %s laitteeseen"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json
index 6822866138a..02ce7c002b5 100644
--- a/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -92,6 +92,8 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor URL de Callback",
   "Accounts_OAuth_Meteor_id": "ID Meteor ",
   "Accounts_OAuth_Meteor_secret": "Secret Meteor ",
+  "Accounts_OAuth_Proxy_host": "Hôte proxy",
+  "Accounts_OAuth_Proxy_services": "Services proxy",
   "Accounts_OAuth_Twitter": "Connexion avec Twitter",
   "Accounts_OAuth_Twitter_callback_url": "Twitter URL de Callback",
   "Accounts_OAuth_Twitter_id": "ID Twitter",
@@ -101,8 +103,6 @@
   "Accounts_OAuth_Wordpress_id": "ID WordPress",
   "Accounts_OAuth_Wordpress_secret": "Secret WordPress",
   "Accounts_PasswordReset": "Réinitialisation du mot de passe",
-  "Accounts_OAuth_Proxy_host": "Hôte proxy",
-  "Accounts_OAuth_Proxy_services": "Services proxy",
   "Accounts_Registration_AuthenticationServices_Enabled": "Inscription avec les services d'authentification",
   "Accounts_RegistrationForm": "Formulaire d'inscription",
   "Accounts_RegistrationForm_Disabled": "Désactivé",
@@ -127,7 +127,9 @@
   "Add_agent": "Ajouter d'un assistant",
   "Add_custom_oauth": "Ajouter un OAuth personnalisé",
   "Add_Domain": "Ajouter un domaine",
+  "Add_files_from": "Ajouter des fichiers depuis",
   "Add_manager": "Ajouter un manager",
+  "Add_Role": "Ajouter un rôle",
   "Add_user": "Ajouter un utilisateur",
   "Add_User": "Ajouter un utilisateur",
   "Add_users": "Ajouter des utilisateurs",
@@ -208,6 +210,7 @@
   "Authorization_URL": "URL d’autorisation",
   "Authorize": "Autoriser",
   "Auto_Load_Images": "Charger automatiquement les images",
+  "Auto_Translate": "Traduction automatique",
   "AutoLinker_Email": "Lien automatique sur les adresses e-mail",
   "AutoLinker_Phone": "Lien automatique sur les numéros de téléphone",
   "AutoLinker_Phone_Description": "Lier automatiquement les numéros de téléphone. par exemple `(123) 456-7890`",
@@ -218,7 +221,6 @@
   "AutoLinker_Urls_www": "Lien automatique si URL contenant 'www'",
   "AutoLinker_UrlsRegExp": "Lien automatique si URL dans expression régulière",
   "Automatic_Translation": "Traduction automatique",
-  "Auto_Translate": "Traduction automatique",
   "AutoTranslate_Enabled": "Activer la traduction automatique",
   "AutoTranslate_Enabled_Description": "Activer la traduction automatique permettra aux utilisateurs disposant de la permission <code class=\"inline\">auto-translate</code> d'avoir l'ensemble des messages traduits automatiquement dans leur langue. Des frais peuvent s'appliquer, voir <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">la documentation Google</a>",
   "Available": "Disponible",
@@ -254,7 +256,6 @@
   "busy_male": "occupé",
   "Busy_male": "Occupé",
   "by": "par",
-  "Content": "Contenu",
   "cache_cleared": "Cache effacé",
   "Cancel": "Annuler",
   "Cancel_message_input": "Annuler",
@@ -277,21 +278,26 @@
   "CAS_version_Description": "Utiliser seulement une version de CAS supportée par votre service CAS SSO",
   "CDN_PREFIX": "Préfixe CDN",
   "Certificates_and_Keys": "Certificats et clés",
-  "Changing_email": "Modification des adresses e-mail",
   "Change_Room_Type": "Modification du type de salon",
+  "Changing_email": "Modification des adresses e-mail",
   "channel": "canal",
   "Channel": "Canal",
   "Channel_already_exist": "Le canal '#% s' existe déjà.",
-  "Channel_created": "Canal `#%s` créé",
+  "Channel_already_exist_static": "Le canal existe déjà",
   "Channel_already_Unarchived": "Canal avec le nom `#%s` est déjà dans l'état désarchivé",
   "Channel_Archived": "Canal avec le nom `#%s` a été archivé avec succès",
+  "Channel_created": "Canal `#%s` créé",
   "Channel_doesnt_exist": "Le canal `#%s` n'existe pas.",
+  "Channel_name": "Nom du canal",
+  "Channel_to_listen_on": "Canal à écouter",
   "Channel_Unarchived": "Canal avec le nom `#%s` a été désarchivé avec succès",
   "Channels": "Canaux",
+  "Channels_are_where_your_team_communicate": "Les canaux sont les lieux où votre équipe communique.",
   "Channels_list": "Liste des canaux publics",
   "Chat_button": "Bouton chat",
   "Chat_closed": "Chat fermé",
   "Chat_closed_successfully": "Chat fermé avec succès",
+  "Chat_Now": "Discuter maintenant",
   "Chat_window": "Fenêtre de chat",
   "Chatops_Enabled": "Activer Chatops",
   "Chatops_Title": "Panneau de contrôle des Chatops",
@@ -301,8 +307,9 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Choisissez l'alias qui apparaitra avant le nom d'utilisateur dans les messages.",
   "Choose_the_username_that_this_integration_will_post_as": "Choisir le nom d'utilisateur que cette intégration va utiliser pour publier.",
   "clear": "Effacer/Nettoyer",
-  "clear_cache_now": "Effacer le cache maintenant",
   "Clear_all_unreads_question": "Marquer tout comme lu ?",
+  "clear_cache_now": "Effacer le cache maintenant",
+  "clear_history": "Effacer l'historique",
   "Click_here": "Cliquez ici",
   "Click_here_for_more_info": "Cliquer ici pour plus d'information",
   "Client_ID": "ID du client",
@@ -319,6 +326,7 @@
   "Comment_to_leave_on_closing_session": "Commentaire à laisser lors de la fermeture de session",
   "Compact": "Compact",
   "Confirm_password": "Confirmez votre mot de passe",
+  "Content": "Contenu",
   "Conversation": "Conversation",
   "Conversation_closed": "Conversation fermée : __comment__.",
   "Convert_Ascii_Emojis": "Convertir le code ASCII en émoticône",
@@ -333,8 +341,10 @@
   "Create_new": "Créer nouveau",
   "Created_at": "Créé le",
   "Created_at_s_by_s": "Créé le <strong>%s</strong> par <strong>%s</strong>",
+  "CRM_Integration": "Intégration CRM (GRC)",
   "CROWD_Reject_Unauthorized": "Rejeter si non-autorisé",
   "Current_Chats": "Discussions actuelles",
+  "Current_Status": "Statut actuel",
   "Custom": "Personnalisé",
   "Custom_Emoji": "Emoticône personnalisée",
   "Custom_Emoji_Add": "Ajouter une nouvelle émoticône",
@@ -348,10 +358,9 @@
   "Custom_Fields": "Champs personnalisés",
   "Custom_oauth_helper": "Lorsque vous configurez votre service OAuth, vous devez indiquer une URL pour le Callback. Utilisez <pre>%s</pre>",
   "Custom_oauth_unique_name": "Nom unique de l'OAuth personnalisé",
-  "Custom_Scripts": "Scripts personnalisés",
   "Custom_Script_Logged_In": "Script personnalisé pour les utilisateurs connectés",
   "Custom_Script_Logged_Out": "Script personnalisé pour les utilisateurs déconnectés",
-  "Custom_Sounds": "Son personnalisés",
+  "Custom_Scripts": "Scripts personnalisés",
   "Custom_Sound_Add": "Ajouter un son personnalisé",
   "Custom_Sound_Delete_Warning": "La suppression d'un son est irréversible.",
   "Custom_Sound_Error_Invalid_Sound": "Son invalide",
@@ -359,6 +368,7 @@
   "Custom_Sound_Has_Been_Deleted": "Le son personnalisé a été supprimé.",
   "Custom_Sound_Info": "Information du son personalisé",
   "Custom_Sound_Saved_Successfully": "Son personnalisé enregistré avec succès",
+  "Custom_Sounds": "Son personnalisés",
   "Custom_Translations": "Traductions personnalisées",
   "Custom_Translations_Description": "Devrait être un JSON valide où les clefs sont des langues conenant un dictionnaire de clefs et de traductions.\nExemple:<br/><code>{\n \"en\": {\n  \"key\": \"translation\"\n },\n \"fr\": {\n  \"key\": \"traduction\"\n }\n}</code> ",
   "CustomSoundsFilesystem": "Système de fichier des sons personnalisés",
@@ -386,12 +396,16 @@
   "Desktop": "Bureau",
   "Desktop_Notification_Test": "Test des notifications sur le bureau",
   "Desktop_Notifications": "Notifications sur le bureau",
+  "Desktop_Notifications_Default_Alert": "Alterte notification de bureau par défaut",
   "Desktop_Notifications_Disabled": "Les notifications du bureau sont désactivées, Modifiez les préférences de votre navigateur si vous avez besoin de les activer.",
   "Desktop_Notifications_Duration": "Durée des notifications",
   "Desktop_Notifications_Duration_Description": "Secondes pour afficher une notification de bureau. Cela peut affecter le Centre de Notification de OS X. Entrez 0 pour utiliser les paramètres du navigateur par défaut et ne pas affecter le Centre de Notification de OS X.",
   "Desktop_Notifications_Enabled": "Les notifications sur le bureau sont activées",
+  "Different_Style_For_User_Mentions": "Style différent pour les mentions utilisateurs",
   "Direct_message_someone": "Envoyer un message privé à quelqu'un",
   "Direct_Messages": "Messages Privés",
+  "Direct_Reply": "Réponse directe",
+  "Direct_Reply_Debug": "Deboguer la réponse directe",
   "Display_offline_form": "Affichage formulaire hors ligne",
   "Displays_action_text": "Texte d'affichage",
   "Do_you_want_to_change_to_s_question": "Voulez-vous changer pour <strong>%s</strong> ?",
@@ -399,6 +413,7 @@
   "Domain_added": "Domaine ajouté",
   "Domain_removed": "Domaine supprimé",
   "Domains": "Domaines",
+  "Domains_allowed_to_embed_the_livechat_widget": "Liste des domaines autorisés à intégrer le widget de chat en direct, séparés par des virgules. Laissez vide pour autoriser tous les domaines. ",
   "Download_Snippet": "Telecharger",
   "Drop_to_upload_file": "Glissez-déposez pour envoyer un fichier",
   "Dry_run": "Essai à vide",
@@ -434,22 +449,20 @@
   "Empty_title": "Titre vide",
   "Enable": "Activer",
   "Enable_Desktop_Notifications": "Activer les notifications sur le bureau",
-  "Enabled": "Activé",
   "Enable_Svg_Favicon": "Activer les favicon en format SVG",
+  "Enabled": "Activé",
   "Encrypted_message": "Message chiffré",
   "End_OTR": "Arrêter OTR",
-  "Enter_Alternative": "Mode alternatif (envoyé avec Entrée + Ctrl/Alt/Shift/CMD)",
   "Enter_a_regex": "Saisissez une expression rationnelle",
   "Enter_a_room_name": "Saisissez un nom de salon",
   "Enter_a_username": "Saisissez un nom d'utilisateur",
+  "Enter_Alternative": "Mode alternatif (envoyé avec Entrée + Ctrl/Alt/Shift/CMD)",
   "Enter_Behaviour": "Comportement de la touche Entrée",
   "Enter_Behaviour_Description": "Cela change si la touche Entrée enverra un message ou ajoutera un retour à la ligne",
   "Enter_name_here": "Saisissez le nom ici",
   "Enter_Normal": "Mode normal (envoyé avec Entrée)",
   "Enter_to": "Entrée pour",
   "Error": "Erreur",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Erreur: Rocket.chat requiert l'activation de la fonction \"oplog tailing\" lorsqu'il fonctionne sur plusieurs instances",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Veuillez vous assurer que MongoDB est en mode ReplicaSet et que la variable d'environnement MONGO_OPLOG_URL est définie correctement sur le serveur de l'application",
   "error-action-not-allowed": "__action__ n'est pas autorisée",
   "error-application-not-found": "Application introuvable",
   "error-archived-duplicate-name": "Il y a un canal archivé avec le nom '__room_name__'",
@@ -461,6 +474,7 @@
   "error-could-not-change-username": "Impossible de modifier le nom d'utilisateur",
   "error-delete-protected-role": "Impossible de supprimer un rôle protégé",
   "error-department-not-found": "Service introuvable",
+  "error-direct-message-file-upload-not-allowed": "L'envoi de fichier n'est pas autorisé dans les messages privés",
   "error-duplicate-channel-name": "Un canal avec le nom '__channel_name__' existe déjà",
   "error-email-domain-blacklisted": "Le domaine de l'adresse e-mail est sur liste noire",
   "error-email-send-failed": "Erreur lors de la tentative d'envoi d'e-mail : __message__",
@@ -482,7 +496,6 @@
   "error-invalid-email-address": "Adresse e-mail invalide",
   "error-invalid-file-height": "Hauteur du fichier non valide",
   "error-invalid-file-type": "Type de fichier non valide",
-  "error-direct-message-file-upload-not-allowed": "L'envoi de fichier n'est pas autorisé dans les messages privés",
   "error-invalid-file-width": "Largeur du fichier non valide",
   "error-invalid-from-address": "Vous avez entré un expéditeur invalide (champ De).",
   "error-invalid-integration": "Intégration non valide",
@@ -517,12 +530,14 @@
   "error-the-field-is-required": "Le champ __field__ est obligatoire.",
   "error-too-many-requests": "Erreur, trop de demandes. Ralentissez, s'il vous plaît. Vous devez attendre __seconds__ secondes avant de réessayer.",
   "error-user-is-not-activated": "L'utilisateur n'est pas activé",
+  "error-user-limit-exceeded": "Le nombre d'utilisateurs que vous essayez d'inviter pour #channel_name dépasse le nombre autorisé par l'administrateur",
   "error-user-not-in-room": "L'utilisateur n'est pas dans ce salon.",
   "error-user-registration-disabled": "L'inscription des nouveaux utilisateurs est désactivée",
-  "error-user-limit-exceeded": "Le nombre d'utilisateurs que vous essayez d'inviter pour #channel_name dépasse le nombre autorisé par l'administrateur",
   "error-user-registration-secret": "L'inscription des utilisateurs n'est autorisée que depuis une URL Secrète",
   "error-you-are-last-owner": "Vous êtes le dernier propriétaire. Veuillez choisir un nouveau propriétaire avant de quitter le salon.",
   "Error_changing_password": "Erreur lors du changement de mot de passe",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Erreur: Rocket.chat requiert l'activation de la fonction \"oplog tailing\" lorsqu'il fonctionne sur plusieurs instances",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Veuillez vous assurer que MongoDB est en mode ReplicaSet et que la variable d'environnement MONGO_OPLOG_URL est définie correctement sur le serveur de l'application",
   "Esc_to": "Échap pour",
   "Event_Trigger_Description": "Sélectionner quel type d'événements déclencheront cette intégration WebHook Sortant",
   "every_30_minutes": "Une fois toutes les 30 minutes",
@@ -543,8 +558,8 @@
   "File_type_is_not_accepted": "Ce type de fichier n'est pas accepté.",
   "File_uploaded": "Fichier envoyé",
   "FileUpload": "Envoi de fichiers",
-  "FileUpload_Enabled": "Envois de fichiers activés",
   "FileUpload_Disabled": "L'envoi de fichiers n'est pas activé.",
+  "FileUpload_Enabled": "Envois de fichiers activés",
   "FileUpload_Enabled_Direct": "L'envoi de fichiers est activé dans les messages privés",
   "FileUpload_File_Empty": "Fichier vide",
   "FileUpload_FileSystemPath": "Chemin d'accès",
@@ -568,17 +583,17 @@
   "FileUpload_Storage_Type": "Type de stockage",
   "Flags": "Drapeaux",
   "Follow_social_profiles": "Suivez-nous sur les réseaux sociaux, clonez le projet sur GitHub et partagez vos idées à propos de Rocket.Chat sur notre tableau Trello.",
+  "Fonts": "Polices",
   "Food_and_Drink": "Nourriture & Boissons",
   "Footer": "Pied de page",
-  "Fonts": "Polices",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Pour votre sécurité, vous devez ré-entrer votre mot de passe pour continuer",
   "Force_Disable_OpLog_For_Cache": "Forcer la désactivation de la fonction OpLog pour le cache",
   "Force_Disable_OpLog_For_Cache_Description": "N'utlisera pas la fonction OpLog pour syncroniser le cache même si elle est  disponible.",
   "Force_SSL": "Forcer l'utilisation de SSL",
   "Force_SSL_Description": "*Attention !* _ForceSSL_ ne devrait jamais être utilisé avec un reverse proxy. Si vous utilisez un reverse proxy, vous devriez y gérer la redirection. Cette option existe pour des déploiements tels que Heroku, qui n'autorisent pas la configuration de redirection au niveau des reverse proxy.",
   "Forgot_password": "Mot de passe oublié",
-  "Forgot_Password_Email_Subject": "[Site_Name] - Récupération du mot de passe",
   "Forgot_Password_Email": "Cliquez <a href=\"[Forgot_Password_Url]\">ici</a> pour remettre à zéro votre mot de passe.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Récupération du mot de passe",
   "Forgot_password_section": "Mot de passe oublié",
   "Forward": "Transmettre",
   "Forward_chat": "Transmettre la conversation",
@@ -604,9 +619,9 @@
   "Hide_flextab": "Masquer le volet de réglages du canal par un clique",
   "Hide_Group_Warning": "Êtes-vous sûr(e) de vouloir masquer le groupe \"%s\" ?",
   "Hide_Private_Warning": "Êtes-vous sûr(e) de vouloir masquer la discussion avec \"%s\" ?",
+  "Hide_roles": "Masquer les rôles",
   "Hide_room": "Masquer le salon",
   "Hide_Room_Warning": "Êtes-vous sûr(e) de vouloir masquer le salon \"%s\" ?",
-  "Hide_roles": "Masquer les rôles",
   "Hide_usernames": "Masquer les noms d'utilisateur",
   "Highlights": "Mises en avant",
   "Highlights_How_To": "Pour être notifié(e) lorsque quelqu'un écrit un mot ou une phrase spécifique, ajoutez le/la ici. Vous pouvez les séparer par des virgules. Les termes surveillés ne sont pas sensibles à la casse.",
@@ -633,6 +648,7 @@
   "Iframe_Integration_send_enable_Description": "Envoyer les événements à la fenêtre parente",
   "Iframe_Integration_send_target_origin": "Envoyer la cible origine",
   "Iframe_Integration_send_target_origin_Description": "Seules les pages ayant une origine donnée seront autorisée à recevoir des commandes ou `*` pour toutes les origines.  Exemple : `http://localhost`",
+  "Impersonate_user": "Incarner l'utilisateur",
   "Importer_Archived": "Archivé",
   "Importer_done": "Importation réussie !",
   "Importer_finishing": "Finalisation de l'importation.",
@@ -652,6 +668,7 @@
   "Importer_setup_error": "Une erreur est survenue lors du paramétrage de l'importateur.",
   "Importer_Source_File": "Sélection du fichier source",
   "Incoming_Livechats": "Arrivée de nouveaux chats en direct",
+  "Incoming_WebHook": "WebHook entrant",
   "inline_code": "Ligne de code",
   "Install_Extension": "Installer l'extension",
   "Install_FxOs": "Installez Rocket.Chat dans votre Firefox",
@@ -661,29 +678,27 @@
   "Installation": "Installation",
   "Installed_at": "installé à",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instructions à votre visiteur de remplir le formulaire pour envoyer un message",
-  "Impersonate_user": "Incarner l'utilisateur",
-  "Incoming_WebHook": "WebHook entrant",
-  "Integration_Advanced_Settings": "Paramètres avancés",
   "Integration_added": "L'intégration a été ajoutée",
+  "Integration_Advanced_Settings": "Paramètres avancés",
   "Integration_Incoming_WebHook": "Intégration WebHook Entrant",
   "Integration_New": "Nouvelle intégration",
-  "Integrations_Outgoing_Type_FileUploaded": "Fichier envoyé",
-  "Integrations_Outgoing_Type_RoomArchived": "Salon archivé",
-  "Integrations_Outgoing_Type_RoomCreated": "Salon créé (public et privé)",
-  "Integrations_Outgoing_Type_RoomJoined": "L'utilisateur a rejoint le salon",
-  "Integrations_Outgoing_Type_RoomLeft": "L'utilisateur a quitté le salon",
-  "Integrations_Outgoing_Type_SendMessage": "Message envoyé",
-  "Integrations_Outgoing_Type_UserCreated": "Utilisateur créé",
   "Integration_Outgoing_WebHook": "Intégration WebHook Sortant",
   "Integration_Outgoing_WebHook_History": "Historique de l'intégration WebHook Sortant",
-  "Integration_Outgoing_WebHook_No_History": "L'intégration WebHook sortant n'a pas encore d'historique enregistré.",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Données passées pour intégration",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Données passées pour URL",
-  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Erreur Réponse HTTP",
   "Integration_Outgoing_WebHook_History_Http_Response": "Réponse HTTP",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Erreur Réponse HTTP",
+  "Integration_Outgoing_WebHook_No_History": "L'intégration WebHook sortant n'a pas encore d'historique enregistré.",
   "Integration_updated": "L'intégration a été mise à jour",
   "Integrations": "Intégrations",
   "Integrations_for_all_channels": "Entrez <strong>all_public_channels</strong>pour écouter sur tous les canaux publics, <strong>all_private_groups</strong>pour écouter sur tous les groupes privés, et <strong>all_direct_messages</strong>pour écouter sur tous les messages privés.",
+  "Integrations_Outgoing_Type_FileUploaded": "Fichier envoyé",
+  "Integrations_Outgoing_Type_RoomArchived": "Salon archivé",
+  "Integrations_Outgoing_Type_RoomCreated": "Salon créé (public et privé)",
+  "Integrations_Outgoing_Type_RoomJoined": "L'utilisateur a rejoint le salon",
+  "Integrations_Outgoing_Type_RoomLeft": "L'utilisateur a quitté le salon",
+  "Integrations_Outgoing_Type_SendMessage": "Message envoyé",
+  "Integrations_Outgoing_Type_UserCreated": "Utilisateur créé",
   "InternalHubot": "Hubot interne",
   "InternalHubot_ScriptsToLoad": "Scripts à charger",
   "InternalHubot_ScriptsToLoad_Description": "Veuillez entrer une liste de scripts séparés par des virgules à charger depuis https://github.com/github/hubot-scripts/tree/master/src/scripts",
@@ -707,24 +722,24 @@
   "Invitation_Subject": "Sujet de l'invitation",
   "Invitation_Subject_Default": "Vous avez été invité à [Site_Name]",
   "Invite_user_to_join_channel": "Inviter un utilisateur à rejoindre le canal",
-  "Invite_user_to_join_channel_all_to": "Inviter tous les utilisateurs de ce canal à rejoindre [#channel]",
   "Invite_user_to_join_channel_all_from": "Inviter tous les utilisateurs de [#channel] à rejoindre ce salon",
+  "Invite_user_to_join_channel_all_to": "Inviter tous les utilisateurs de ce canal à rejoindre [#channel]",
   "Invite_Users": "Inviter des utilisateurs",
-  "is_also_typing": "est également en train d'écrire",
-  "is_also_typing_female": "est également en train d'écrire",
-  "is_also_typing_male": "est également en train d'écrire",
-  "is_typing": "est en train d'écrire",
-  "is_typing_female": "est en train d'écrire",
-  "is_typing_male": "est en train d'écrire",
   "IRC_Channel_Join": "Sortie de la commande JOIN.",
   "IRC_Channel_Leave": "Sortie de la commande PART.",
-  "IRC_Private_Message": "Sortie de la commande PRIVMSG.",
   "IRC_Channel_Users": "Sortie de la commande NAMES.",
   "IRC_Channel_Users_End": "Fin de sortie de la commande NAMES.",
   "IRC_Hostname": "Le serveur d'hôte IRC auquel se connecter.",
   "IRC_Login_Fail": "Sortie après une connexion échouée au serveur IRC.",
   "IRC_Login_Success": "Sortie après une connexion réussie au serveur IRC.",
+  "IRC_Private_Message": "Sortie de la commande PRIVMSG.",
   "IRC_Quit": "Sortie après avoir quitté une session IRC.",
+  "is_also_typing": "est également en train d'écrire",
+  "is_also_typing_female": "est également en train d'écrire",
+  "is_also_typing_male": "est également en train d'écrire",
+  "is_typing": "est en train d'écrire",
+  "is_typing_female": "est en train d'écrire",
+  "is_typing_male": "est en train d'écrire",
   "It_works": "Ça marche",
   "italics": "italique",
   "Jitsi_Chrome_Extension": "Chrome Extension Id",
@@ -785,6 +800,10 @@
   "LDAP_Enable_Description": "Essayer d'utiliser LDAP pour l'authentification.",
   "LDAP_Encryption": "Chiffrement",
   "LDAP_Encryption_Description": "La méthode de chiffrement utilisée pour sécuriser les communications avec le serveur LDAP. Parmi les exemples on trouve `plain` (pas de chiffrement), `SSL/LDAPS` (chiffrement dès le début) et `StartTLS` (chiffrement une fois la connexion établie).",
+  "LDAP_Group_Filter_Enable": "Activer le filtre des utilisateurs sur un groupe LDAP",
+  "LDAP_Group_Filter_Enable_Description": "Restreint l'accès aux utilisateurs d'un groupe LDAP <br/>Utile pour les serveurs OpenLDAP sans recouvrement qui ne permettent pas le filtre *memberOf* ",
+  "LDAP_Group_Filter_Group_Name": "Nom du groupe",
+  "LDAP_Group_Filter_Group_Name_Description": "Groupe auquel appartient l'utilisateur",
   "LDAP_Host": "Hôte",
   "LDAP_Host_Description": "L'hôte LDAP, par exemple `ldap.exemple.com` ou `10.0.0.30`.",
   "LDAP_Import_Users": "Importer les utilisateurs LDAP",
@@ -809,10 +828,6 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Écrivez vos propres filtres pour rechercher les utilisateurs dans le serveur LDAP.",
   "LDAP_Username_Field": "Champs du nom d'utilisateur",
   "LDAP_Username_Field_Description": "Champ utilisé en tant que *nom d'utilisateur* pour les nouveaux utilisateurs. Laisser vide pour utiliser le nom d'utilisateur renseigné sur la page de connexion.<br/>Vous pouvez aussi utiliser un modèle à base de tags, comme `#{givenName}.#{sn}`. La valeur par défaut est `sAMAccountName`.",
-  "LDAP_Group_Filter_Enable": "Activer le filtre des utilisateurs sur un groupe LDAP",
-  "LDAP_Group_Filter_Enable_Description": "Restreint l'accès aux utilisateurs d'un groupe LDAP <br/>Utile pour les serveurs OpenLDAP sans recouvrement qui ne permettent pas le filtre *memberOf* ",
-  "LDAP_Group_Filter_Group_Name": "Nom du groupe",
-  "LDAP_Group_Filter_Group_Name_Description": "Groupe auquel appartient l'utilisateur",
   "Least_Amount": "Le minimum",
   "Leave_Group_Warning": "Êtes-vous sûr(e) de vouloir quitter le groupe \"%s\" ?",
   "Leave_Private_Warning": "Êtes-vous sûr(e) de vouloir quitter la discussion avec \"%s\" ?",
@@ -824,7 +839,6 @@
   "List_of_Direct_Messages": "Liste des messages privés",
   "Livechat_agents": "Assistants du chat en direct",
   "Livechat_AllowedDomainsList": "Domaines autorisés pour le chat en direct",
-  "Domains_allowed_to_embed_the_livechat_widget": "Liste des domaines autorisés à intégrer le widget de chat en direct, séparés par des virgules. Laissez vide pour autoriser tous les domaines. ",
   "Livechat_Dashboard": "Tableau de bord du chat en direct",
   "Livechat_enabled": "Chat en direct activé",
   "Livechat_forward_open_chats_timeout": "Timeout (en secondes) de transmettre les chats",
@@ -880,6 +894,8 @@
   "Markdown_SupportSchemesForLink_Description": "Liste de schémas séparés par des virgules",
   "Max_length_is": "La longueur maximale est %s",
   "Members_List": "Liste des membres",
+  "mention-all": "Mention @all",
+  "mention-all_description": "Autorisation d'utiliser la mention @all",
   "Mentions": "Mentions",
   "Mentions_default": "Mentions (défaut)",
   "Message": "Message",
@@ -921,10 +937,10 @@
   "Message_ShowEditedStatus": "Afficher le statut de modification",
   "Message_ShowFormattingTips": "Afficher les astuces de mise en forme",
   "Message_starring": "Mettre un message en favoris",
-  "Message_TimeFormat": "Format de l'heure",
   "Message_TimeAndDateFormat": "Format de l'heure et de la date",
-  "Message_TimeFormat_Description": "Voir aussi : <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeAndDateFormat_Description": "Voir aussi : <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
+  "Message_TimeFormat": "Format de l'heure",
+  "Message_TimeFormat_Description": "Voir aussi : <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Message trop long",
   "Message_VideoRecorderEnabled": "Enregistreur vidéo activé",
   "Message_VideoRecorderEnabledDescription": "Nécessite que le type de média \"video/webm\" soit accepté dans les paramètres d'envoi des fichiers.",
@@ -967,8 +983,8 @@
   "New_password": "Nouveau mot de passe",
   "New_role": "Nouveau rôle",
   "New_Room_Notification": "Notification de nouveau salon",
-  "New_videocall_request": "Nouvelle demande d'appel vidéo",
   "New_Trigger": "Nouveau déclencheur",
+  "New_videocall_request": "Nouvelle demande d'appel vidéo",
   "No_available_agents_to_transfer": "Aucun agent disponible pour le transfert",
   "No_channel_with_name_%s_was_found": "Aucun canal nommé <strong>\"%s\"</strong> n'a été trouvé !",
   "No_channels_yet": "Vous ne faites partie d’aucun canal pour le moment.",
@@ -994,8 +1010,8 @@
   "Nothing_found": "Aucun résultat",
   "Notification_Duration": "Durée de la notification",
   "Notifications": "Notifications",
-  "Notify_all_in_this_room": "Notifiez tout le monde dans ce salon",
   "Notify_active_in_this_room": "Notifier les utilisateurs actifs (connectés) de ce canal",
+  "Notify_all_in_this_room": "Notifiez tout le monde dans ce salon",
   "Num_Agents": "# Assistants",
   "Number_of_messages": "Nombre de messages",
   "OAuth_Application": "Application OAuth",
@@ -1008,9 +1024,12 @@
   "Office_hours_enabled": "Heures de bureau activées",
   "Office_hours_updated": "Heures de bureau modifiées",
   "Offline": "Hors ligne",
+  "Offline_DM_Email": "Vous avez reçu des messages privés de __user__",
   "Offline_form": "Formulaire hors ligne",
   "Offline_form_unavailable_message": "Message indisponible du formulaire hors ligne",
   "Offline_Link_Message": "ALLER AU MESSAGE",
+  "Offline_Mention_All_Email": "Objet de l'email avec la mention @all",
+  "Offline_Mention_Email": "Objet de l'email de mention",
   "Offline_message": "Message hors ligne",
   "Offline_success_message": "Message de succès hors ligne",
   "Offline_unavailable": "Hors ligne indisponible",
@@ -1027,8 +1046,8 @@
   "Opens_a_channel_group_or_direct_message": "Ouvre un canal, un groupe ou un message direct",
   "optional": "facultatif",
   "or": "ou",
-  "Order": "Ordre",
   "Or_talk_as_anonymous": "Ou discutez de manière anonyme",
+  "Order": "Ordre",
   "OS_Arch": "Architecture",
   "OS_Cpus": "Nombre de CPU",
   "OS_Freemem": "Mémoire disponible",
@@ -1063,10 +1082,10 @@
   "Please_add_a_comment": "Merci d'ajouter un commentaire",
   "Please_add_a_comment_to_close_the_room": "Merci d'ajouter un commentaire pour fermer le salon",
   "Please_answer_survey": "Merci de prendre un moment pour répondre à un court sondage à propos de cette conversation",
+  "please_enter_valid_domain": "Merci d'entrer un domaine valide",
   "Please_enter_value_for_url": "Veuillez entrer l'url de votre avatar.",
   "Please_enter_your_new_password_below": "Veuillez écrire votre nouveau mot de passe ci-dessous :",
   "Please_enter_your_password": "Veuillez entrer votre mot de passe",
-  "please_enter_valid_domain": "Merci d'entrer un domaine valide",
   "Please_fill_a_label": "Veuillez entrer une étiquette",
   "Please_fill_a_name": "Veuillez saisir un nom",
   "Please_fill_a_username": "Veuillez enter un nom d'utilisateur",
@@ -1135,7 +1154,8 @@
   "Regular_Expressions": "Expressions régulières",
   "Release": "Version",
   "Reload": "Recharger",
-  "Remove": "Supprimer",
+  "Remove": "Retirer",
+  "remove-user": "Retirer l'utilisateur",
   "Remove_Admin": "Supprimer administrateur",
   "Remove_as_moderator": "Supprimer de la liste des modérateurs",
   "Remove_as_owner": "Supprimer de la liste des propriétaires",
@@ -1152,8 +1172,8 @@
   "Require_password_change": "Changement de mot de passe requis",
   "Resend_verification_email": "Renvoyer l'e-mail de vérification",
   "Reset": "Réinitialiser",
-  "Reset_section_settings": "Réinitialiser les paramètres de la section",
   "Reset_password": "Réinitialiser le mot de passe",
+  "Reset_section_settings": "Réinitialiser les paramètres de la section",
   "Restart": "Redémarrer",
   "Restart_the_server": "Redémarrer le serveur",
   "Role": "Rôle",
@@ -1169,12 +1189,11 @@
   "room_changed_description": "Description du salon modifiée pour : <em>__room_description__</em> par <em>__user_by__</em>",
   "room_changed_privacy": "Type du salon changé pour : <em>__room_type__</em> par <em>__user_by__</em>",
   "room_changed_topic": "Sujet du salon changé pour : <em>__room_topic__</em> by <em>__user_by__</em>",
+  "Room_default_change_to_private_will_be_default_no_more": "Modifier ce canal en groupe privé fera qu'il ne sera plus un canal par défaut. Etes vous sûr de vouloir continuer ?",
   "Room_description_changed_successfully": "Description de la salle modifiée avec succès",
-  "Room_has_been_deleted": "Le salon a été supprimé",
   "Room_has_been_archived": "Le salon a été archivé",
+  "Room_has_been_deleted": "Le salon a été supprimé",
   "Room_has_been_unarchived": "Le salon a été désarchivé",
-  "Room_type_of_default_rooms_cant_be_changed": "C'est un salon par défaut et le type ne peut être modifié, merci de contacter un administrateur.",
-  "Room_default_change_to_private_will_be_default_no_more": "Modifier ce canal en groupe privé fera qu'il ne sera plus un canal par défaut. Etes vous sûr de vouloir continuer ?",
   "Room_Info": "Informations sur le salon",
   "room_is_blocked": "Le salon est bloqué",
   "room_is_read_only": "Le salon est en lecture seule",
@@ -1185,6 +1204,7 @@
   "Room_password_changed_successfully": "Mot de passe du salon modifié avec succès",
   "Room_topic_changed_successfully": "Sujet du salon modifié avec succès",
   "Room_type_changed_successfully": "Type du salon modifié avec succès",
+  "Room_type_of_default_rooms_cant_be_changed": "C'est un salon par défaut et le type ne peut être modifié, merci de contacter un administrateur.",
   "Room_unarchived": "Salon désarchivé",
   "Room_uploaded_file_list": "Liste des fichiers",
   "Room_uploaded_file_list_empty": "Aucun fichier disponible.",
@@ -1197,9 +1217,9 @@
   "SAML_Custom_Generate_Username": "Générer le nom d'utilisateur",
   "SAML_Custom_IDP_SLO_Redirect_URL": "URL de redirection IDP SLO",
   "SAML_Custom_Issuer": "Émetteur personnalisé",
+  "SAML_Custom_Private_Key": "Contenu de la clé privée",
   "SAML_Custom_Provider": "Fournisseur personnalisé",
   "SAML_Custom_Public_Cert": "Contenu du certificat public",
-  "SAML_Custom_Private_Key": "Contenu de la clé privée",
   "Sandstorm_Powerbox_Share": "Partager une graine Sandstorm",
   "Saturday": "Samedi",
   "Save": "Enregistrer",
@@ -1357,29 +1377,29 @@
   "The_redirectUri_is_required": "L'URI de redirection est requise",
   "The_server_will_restart_in_s_seconds": "Le serveur redémarrera dans %s secondes",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "Le réglage <strong>%s</strong> est configuré pour <strong>%s</strong> et vous accédez à partir de <strong>%s</strong> !",
-  "The_user_will_be_removed_from_s": "L'utilisateur sera éjecté de %s",
+  "The_user_will_be_removed_from_s": "L'utilisateur sera retiré de %s",
   "The_user_wont_be_able_to_type_in_s": "L'utilisateur ne pourra pas écrire dans %s",
   "Theme": "Thème",
+  "theme-color-component-color": "Couleur du composant",
   "theme-color-content-background-color": "Couleur d'arrière plan du contenu",
+  "theme-color-custom-scrollbar-color": "Couleur personnalisée de la barre de défilement",
+  "theme-color-error-color": "Couleur d'erreur",
+  "theme-color-info-font-color": "Couleur de la police des informations",
+  "theme-color-link-font-color": "Couleur de la police des liens",
+  "theme-color-pending-color": "Couleur en attente",
+  "theme-color-primary-action-color": "Couleur de l'action primaire",
   "theme-color-primary-background-color": "Couleur d'arrière plan principale",
   "theme-color-primary-font-color": "Couleur de la police principale",
-  "theme-color-primary-action-color": "Couleur de l'action primaire",
+  "theme-color-secondary-action-color": "Couleur de l'action secondaire",
   "theme-color-secondary-background-color": "Couleur d'arrière plan secondaire",
   "theme-color-secondary-font-color": "Couleur de police secondaire",
-  "theme-color-secondary-action-color": "Couleur de l'action secondaire",
-  "theme-color-component-color": "Couleur du composant",
-  "theme-color-success-color": "Couleur de succès",
-  "theme-color-pending-color": "Couleur en attente",
-  "theme-color-error-color": "Couleur d'erreur",
-  "theme-color-tertiary-background-color": "Couleur de fond tertiaire (contenu)",
-  "theme-color-tertiary-font-color": "Couleur de police tertiaire (contenu)",
-  "theme-color-link-font-color": "Couleur de la police des liens",
-  "theme-color-info-font-color": "Couleur de la police des informations",
-  "theme-color-custom-scrollbar-color": "Couleur personnalisée de la barre de défilement",
   "theme-color-status-away": "Couleur du statut \"Absent\"",
   "theme-color-status-busy": "Couleur du statut \"Occupé\"",
   "theme-color-status-offline": "Couleur du statut \"Hors-ligne\"",
   "theme-color-status-online": "Couleur du statut \"Connecté\"",
+  "theme-color-success-color": "Couleur de succès",
+  "theme-color-tertiary-background-color": "Couleur de fond tertiaire (contenu)",
+  "theme-color-tertiary-font-color": "Couleur de police tertiaire (contenu)",
   "theme-color-unread-notification-color": "Couleur des notifications non-lues",
   "theme-custom-css": "CSS personnalisé",
   "theme-font-body-font-family": "Famille de police du body",
@@ -1403,11 +1423,11 @@
   "To_users": "Pour les utilisateurs",
   "Toggle_original_translated": "Basculer original/traduit",
   "Topic": "Sujet",
-  "Travel_and_Places": "Voyages & Lieux",
   "Transcript_Enabled": "Demandez au visiteur s'ils souhaitent une transcription après la fermeture du chat",
   "Transcript_of_your_livechat_conversation": "Transcription de votre conversation",
   "Translated": "Traduit",
   "Translations": "Traductions",
+  "Travel_and_Places": "Voyages & Lieux",
   "Trigger_removed": "Déclencheur supprimé",
   "Trigger_Words": "Mots déclencheurs",
   "Triggers": "Déclencheurs",
@@ -1418,6 +1438,8 @@
   "Type_your_message": "Entrez votre message",
   "Type_your_name": "Entrez votre nom",
   "Type_your_new_password": "Entrez votre nouveau mot de passe",
+  "UI_Click_Direct_Message": "Cliquer pour commercer une discussion privée",
+  "UI_Click_Direct_Message_Description": "N'ouvrez pas les onglets de profils, allez directement à la discussion",
   "UI_DisplayRoles": "Afficher les rôles",
   "UI_Merge_Channels_Groups": "Fusionner les groupes privés avec canaux",
   "Unarchive": "Désarchiver",
@@ -1457,7 +1479,7 @@
   "User_has_been_deactivated": "L'utilisateur a été désactivé",
   "User_has_been_deleted": "L'utilisateur a été supprimé",
   "User_has_been_muted_in_s": "L'utilisateur a été rendu muet dans %s",
-  "User_has_been_removed_from_s": "L'utilisateur a été éjecté de %s",
+  "User_has_been_removed_from_s": "L'utilisateur a été retiré de %s",
   "User_Info": "Informations sur l'utilisateur",
   "User_Interface": "Interface utilisateur",
   "User_is_blocked": "L'utilisateur est bloqué",
@@ -1478,7 +1500,7 @@
   "User_not_found_or_incorrect_password": "Utilisateur introuvable ou mot de passe incorrect",
   "User_or_channel_name": "Nom d'utilisateur ou de canal",
   "User_removed": "Utilisateur ejecté",
-  "User_removed_by": "L'utilisateur <em>__user_removed__</em> a été éjecté par <em>__user_by__</em>.",
+  "User_removed_by": "L'utilisateur <em>__user_removed__</em> a été retiré par <em>__user_by__</em>.",
   "User_Settings": "Paramètres utilisateur",
   "User_unmuted_by": "L'utilisateur <em>__user_by__</em> a rendu la parole à <em>__user_unmuted__</em>.",
   "User_unmuted_in_room": "L'utilisateur a retrouvé la parole dans ce salon",
@@ -1504,9 +1526,9 @@
   "UTF8_Names_Validation_Description": "Expression régulière utilisée pour valider les noms des utilisateurs et des canaux",
   "Validate_email_address": "Valider l'adresse e-mail",
   "Verification": "Vérification",
+  "Verification_Email": "Cliquez <a href=\"[Verification_Url]\">ici</a> pour vérifier votre compte.",
   "Verification_email_sent": "E-mail de vérification envoyé",
   "Verification_Email_Subject": "[Nom_du_site] - Vérifiez votre compte",
-  "Verification_Email": "Cliquez <a href=\"[Verification_Url]\">ici</a> pour vérifier votre compte.",
   "Verified": "Vérifié(e)",
   "Verify": "Vérifier",
   "Version": "Version",
@@ -1546,13 +1568,13 @@
   "Would_you_like_to_return_the_inquiry": "Voulez-vous retourner le dossier ?",
   "Yes": "Oui",
   "Yes_archive_it": "Oui, archive le !",
-  "Yes_unarchive_it": "Oui, désarchive le !",
   "Yes_clear_all": "Oui, marque tout comme lu !",
   "Yes_delete_it": "Oui, supprime le !",
   "Yes_hide_it": "Oui, masque le !",
   "Yes_leave_it": "Oui, je veux partir !",
   "Yes_mute_user": "Oui, rend muet l'utilisateur !",
   "Yes_remove_user": "Oui, éjecte l'utilisateur !",
+  "Yes_unarchive_it": "Oui, désarchive le !",
   "You": "Vous",
   "you_are_in_preview_mode_of": "Aperçu du salon #<strong>__room_name__</strong> ",
   "You_are_logged_in_as": "Vous êtes connecté en tant que",
@@ -1586,4 +1608,4 @@
   "your_message_optional": "votre message (optionnel)",
   "Your_password_is_wrong": "Votre mot de passe est incorrect !",
   "Your_push_was_sent_to_s_devices": "Votre notification a été envoyée à %s appareils"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/he.i18n.json b/packages/rocketchat-i18n/i18n/he.i18n.json
index b80a3ece5be..d7000fbffc3 100644
--- a/packages/rocketchat-i18n/i18n/he.i18n.json
+++ b/packages/rocketchat-i18n/i18n/he.i18n.json
@@ -752,8 +752,8 @@
   "Nothing_found": "אין תוצאות",
   "Notification_Duration": "משך התרעה",
   "Notifications": "התרעות",
-  "Notify_all_in_this_room": "להודיע לכל מי שבחדר",
   "Notify_active_in_this_room": "להודיע לכל המחוברים שבחדר",
+  "Notify_all_in_this_room": "להודיע לכל מי שבחדר",
   "Num_Agents": "סוכני #",
   "Number_of_messages": "מספר הודעות",
   "OAuth_Application": "יישום OAuth",
@@ -763,8 +763,10 @@
   "Off_the_record_conversation": "שיחה לא לציטוט",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "שיחה לא לציטוט אינה זמינה בדפדפן או במכשיר שלך.",
   "Offline": "מנותק",
+  "Offline_DM_Email": "קבלת הודעות במשך ישיר על ידי __user__",
   "Offline_form": "טופס מנותק",
   "Offline_form_unavailable_message": "טופס מנותק הודעה זמינה",
+  "Offline_Mention_Email": "אתה הוזכרת על ידי __user__ ב #__room__",
   "Offline_message": "הודעה מנותקת",
   "Offline_success_message": "הודעת הצלחה מנותקת",
   "Offline_unavailable": "זמין מנותק",
@@ -1044,19 +1046,19 @@
   "The_user_wont_be_able_to_type_in_s": "המשתמש לא יוכל להקליד %s",
   "Theme": "ערכת עיצוב",
   "theme-color-content-background-color": "צבע הרקע של התוכן",
+  "theme-color-custom-scrollbar-color": "צבע מותאם אישית פס גלילה",
+  "theme-color-info-font-color": "צבע של פונט Info",
+  "theme-color-link-font-color": "צבע פונט של לינק",
   "theme-color-primary-background-color": "צבע רקע ראשי",
   "theme-color-primary-font-color": "צבע פונט ראשי",
   "theme-color-secondary-background-color": "צבע רקע משני",
   "theme-color-secondary-font-color": "צבע פונט משני",
-  "theme-color-tertiary-background-color": "צבע סטטוס ",
-  "theme-color-tertiary-font-color": "צבע פונט שלישי",
-  "theme-color-link-font-color": "צבע פונט של לינק",
-  "theme-color-info-font-color": "צבע של פונט Info",
-  "theme-color-custom-scrollbar-color": "צבע מותאם אישית פס גלילה",
   "theme-color-status-away": "צבע סטטוס לא נמצא",
   "theme-color-status-busy": "צבע סטטוס עסוק",
   "theme-color-status-offline": "צבע סטטוס לא מחובר",
   "theme-color-status-online": "צבע סטטוס זמין",
+  "theme-color-tertiary-background-color": "צבע סטטוס ",
+  "theme-color-tertiary-font-color": "צבע פונט שלישי",
   "theme-color-unread-notification-color": "צבע הודעות שלא נקראו",
   "theme-custom-css": "CSS בהתאמה אישית",
   "There_are_no_agents_added_to_this_department_yet": "אין סוכנים שנוספו למחלקה זו עדיין.",
@@ -1229,4 +1231,4 @@
   "Your_mail_was_sent_to_s": "הדואר שלך נשלח אל %s",
   "Your_password_is_wrong": "הסיסמה שלך היא לא בסדר!",
   "Your_push_was_sent_to_s_devices": "הודעת ה-push נשלח בהצלחה ל-%s מכשירים"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json
index 6408c15086b..f4d2b496f38 100644
--- a/packages/rocketchat-i18n/i18n/hr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hr.i18n.json
@@ -231,7 +231,6 @@
   "busy_male": "zauzet",
   "Busy_male": "Zauzet",
   "by": "od",
-  "Content": "Sadržaj",
   "cache_cleared": "Predmemorija očišćena",
   "Cancel": "Otkaži",
   "Cancel_message_input": "Otkaži",
@@ -242,8 +241,8 @@
   "CAS_enabled": "Omogućeno",
   "CDN_PREFIX": "CDN Prefiks",
   "Certificates_and_Keys": "Certifikati i ključevi",
-  "Changing_email": "Promjena email",
   "Change_Room_Type": "Mijenjam tip sobe",
+  "Changing_email": "Promjena email",
   "channel": "soba",
   "Channel": "Soba",
   "Channel_already_exist": "Soba \"#% s' već postoji.",
@@ -265,9 +264,9 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Odaberite pseudonim koji će se pojaviti pred korisničko ime u porukama.",
   "Choose_the_username_that_this_integration_will_post_as": "Odaberite korisničko ime za koje će ova integracija objavljivati.",
   "clear": "Očisti",
+  "Clear_all_unreads_question": "Očisti sve nepročitane?",
   "clear_cache_now": "Očisti sada predmemoriju",
   "clear_history": "Očisti Povijest",
-  "Clear_all_unreads_question": "Očisti sve nepročitane?",
   "Click_here": "Kliknite ovdje",
   "Client_ID": "ID klijenta",
   "Client_Secret": "Klijent tajna",
@@ -282,6 +281,7 @@
   "Commands": "Naredbe",
   "Compact": "Kompaktan",
   "Confirm_password": "Potvrdi svoju lozinku",
+  "Content": "Sadržaj",
   "Conversation": "Razgovor",
   "Conversation_closed": "Razgovor je zatvoren: __comment__.",
   "Convert_Ascii_Emojis": "Pretvori ASCII u Emoji",
@@ -296,8 +296,8 @@
   "Create_new": "Stvori novi",
   "Created_at": "Stvoreno u",
   "Created_at_s_by_s": "<strong>%s</strong> je stvorio <strong>%s</strong>",
-  "CROWD_Reject_Unauthorized": "Odbije neautorizirano",
   "CRM_Integration": "CRM Integracija",
+  "CROWD_Reject_Unauthorized": "Odbije neautorizirano",
   "Current_Chats": "Trenutni Razgovori",
   "Custom": "Prilagođeno",
   "Custom_Emoji": "Posebni Emotikon",
@@ -406,6 +406,7 @@
   "error-could-not-change-username": "Nismo uspjeli promijeniti korisničko ime",
   "error-delete-protected-role": "Ne možete izbrisati zaštićenu ulogu",
   "error-department-not-found": "Odjel nije pronađen",
+  "error-direct-message-file-upload-not-allowed": "Dijeljenje datoteka nije dozvoljeno u direktnim porukama",
   "error-duplicate-channel-name": "Soba s nazivom ' __channel_name__' već postoji",
   "error-email-domain-blacklisted": "Email domena je na crnoj listi",
   "error-email-send-failed": "Greška pri slanju emaila: __message__",
@@ -426,7 +427,6 @@
   "error-invalid-email": "Pogrešan __email__ email",
   "error-invalid-file-height": "Neispravna visina datoteke",
   "error-invalid-file-type": "Pogrešna vrsta datoteke",
-  "error-direct-message-file-upload-not-allowed": "Dijeljenje datoteka nije dozvoljeno u direktnim porukama",
   "error-invalid-file-width": "Pogrešna širina datoteke",
   "error-invalid-from-address": "Unijeta je kriva OD adresa",
   "error-invalid-integration": "Pogrešna integracija",
@@ -484,8 +484,8 @@
   "File_not_allowed_direct_messages": "Dijeljenje datoteka nije dozvoljeno u direktnim porukama",
   "File_type_is_not_accepted": "Tip datoteke nije prihvaćen",
   "FileUpload": "Prijenos datoteke",
-  "FileUpload_Enabled": "Prijenos Datoteka Omogućeno",
   "FileUpload_Disabled": "Prijenosi datoteka su onemogućeni",
+  "FileUpload_Enabled": "Prijenos Datoteka Omogućeno",
   "FileUpload_Enabled_Direct": "Prijenos datoteka u direktnim porukama",
   "FileUpload_File_Empty": "Prazna datoteka",
   "FileUpload_FileSystemPath": "Odredište u sustavu",
@@ -592,15 +592,15 @@
   "Integration_added": "Integracija je dodana",
   "Integration_Incoming_WebHook": "Dolazni WebHook integracija",
   "Integration_New": "Nova integracija",
+  "Integration_Outgoing_WebHook": "Odlazna WebHook integracija",
+  "Integration_updated": "Integracija je ažurirana",
+  "Integrations": "Integracije",
   "Integrations_Outgoing_Type_RoomArchived": "Soba je arhivirana",
   "Integrations_Outgoing_Type_RoomCreated": "Soba je stvorena (javna i privatna)",
   "Integrations_Outgoing_Type_RoomJoined": "Korisnik se pridružio sobi",
   "Integrations_Outgoing_Type_RoomLeft": "Korisnik je napustio sobu",
   "Integrations_Outgoing_Type_SendMessage": "Poruka je poslana",
   "Integrations_Outgoing_Type_UserCreated": "Korisnik je stvoren",
-  "Integration_Outgoing_WebHook": "Odlazna WebHook integracija",
-  "Integration_updated": "Integracija je ažurirana",
-  "Integrations": "Integracije",
   "InternalHubot": "Vlastiti Hubot",
   "InternalHubot_ScriptsToLoad": "Skripte za učitavanje",
   "InternalHubot_ScriptsToLoad_Description": "Unesite zarezom odvojen popis skripti za učitavanje s https://github.com/github/hubot-scripts/tree/master/src/scripts",
@@ -689,6 +689,7 @@
   "LDAP_Enable_Description": "Pokušaj koristiti LDAP za provjeru autentičnosti.",
   "LDAP_Encryption": "Šifriranje",
   "LDAP_Encryption_Description": "Način šifriranja koristi za sigurnu komunikaciju s LDAP poslužiteljem. Primjeri uključuju `plain` (bez enkripcije),` SSL / LDAPS` (šifriranu od početka), i `StartTLS` (nadogradite na šifrirani komunikacije nekad povezano).",
+  "LDAP_Group_Filter_Group_Name": "Ime grupe",
   "LDAP_Host": "Domaćin",
   "LDAP_Host_Description": "LDAP domaćin, npr `ldap.example.com` ili` 10.0.0.30`.",
   "LDAP_Import_Users": "Uvezi LDAP korisnike",
@@ -710,7 +711,6 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Napišite vlastiti filter za pretraživanje korisnika u LDAP poslužitelju.",
   "LDAP_Username_Field": "Polje za Korisničko ime",
   "LDAP_Username_Field_Description": "Koje polje će se koristiti kao *username* za nove korisnike. Ostavite prazno za korištenje korisničkog imena s prijave. <br/> Možete koristiti oznake poput `#{givenName}.#{sn}`. <br/> Zadana vrijednost je `sAMAccountName`.",
-  "LDAP_Group_Filter_Group_Name": "Ime grupe",
   "Least_Amount": "Najmanja količina",
   "Leave_Group_Warning": "Jeste li sigurni da želite napustiti grupu \"%s\"?",
   "Leave_Private_Warning": "Jeste li sigurni da želite napustiti razgovor s \"%s\"?",
@@ -815,8 +815,8 @@
   "Message_ShowEditedStatus": "Prikaži uređeni status",
   "Message_ShowFormattingTips": "Prikaži Savjete za oblikovanje",
   "Message_starring": "Dodavanje zvjezdica na poruka",
-  "Message_TimeFormat": "Format vremena",
   "Message_TimeAndDateFormat": "Format Vremena i Datuma",
+  "Message_TimeFormat": "Format vremena",
   "Message_TimeFormat_Description": "Vidi: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Poruka je preduga",
   "Message_VideoRecorderEnabled": "Video snimač omogućen",
@@ -887,8 +887,8 @@
   "Nothing_found": "Ništa nije nađeno",
   "Notification_Duration": "Trajanje obavijesti",
   "Notifications": "Obavijesti",
-  "Notify_all_in_this_room": "Obavijesti sve u ovoj sobi",
   "Notify_active_in_this_room": "Obavijesti aktivne korisnike u ovoj sobi",
+  "Notify_all_in_this_room": "Obavijesti sve u ovoj sobi",
   "Num_Agents": "# agenata",
   "Number_of_messages": "Broj poruka",
   "OAuth_Application": "OAuth Aplikacija",
@@ -900,9 +900,11 @@
   "Office_Hours": "Uredovni Sati",
   "Office_hours_enabled": "Uredovni Sati omogućeno",
   "Offline": "Offline",
+  "Offline_DM_Email": "__user__ vas je izravno kontaktirao",
   "Offline_form": "Izvanmrežni obrazac",
   "Offline_form_unavailable_message": "Poruka nedostupnosti za izvanmrežni obrazac",
   "Offline_Link_Message": "IDI NA PORUKU",
+  "Offline_Mention_Email": "__user__ vas je spomenuo u #__room__",
   "Offline_message": "Izvanmrežna poruka",
   "Offline_success_message": "Izvanmrežna poruka uspjeha",
   "Offline_unavailable": "Nedostupnost izvanmrežnosti",
@@ -1028,11 +1030,11 @@
   "Remove_someone_from_room": "Uklonite nekoga iz sobe",
   "Removed": "Uklonjeno",
   "Reply": "Odgovor",
-  "Reporting": "Prijava",
   "Report_Abuse": "Prijavi zlostavljanje",
   "Report_exclamation_mark": "Izvješće!",
   "Report_sent": "Izvješće je poslano",
   "Report_this_message_question_mark": "Prijavi ovu poruku?",
+  "Reporting": "Prijava",
   "Require_password_change": "Zahtijevaj promjenu lozinke",
   "Resend_verification_email": "Ponovno pošalji e-mail potvrdu",
   "Reset": "Resetiraj",
@@ -1051,8 +1053,8 @@
   "room_changed_privacy": "<em>__user_by__</em> je promjenio vrstu sobe u <em>__room_type__</em>",
   "room_changed_topic": "<em>__user_by__</em> je promjenip temu sobe u <em>__room_topic__</em>",
   "Room_description_changed_successfully": "Opis sobe je uspješno promjenjen",
-  "Room_has_been_deleted": "Soba je obrisana",
   "Room_has_been_archived": "Soba je arhivirana",
+  "Room_has_been_deleted": "Soba je obrisana",
   "Room_has_been_unarchived": "Soba je vraćena iz arhive",
   "Room_Info": "Info Sobe",
   "room_is_blocked": "Ova soba je blokirana",
@@ -1224,24 +1226,24 @@
   "The_user_will_be_removed_from_s": "Korisnik će biti uklonjen iz %s",
   "The_user_wont_be_able_to_type_in_s": "Korisnik neće moći pisati u %s",
   "Theme": "Tema",
+  "theme-color-component-color": "Boja komponente",
   "theme-color-content-background-color": "Boja pozadine sadržaja",
+  "theme-color-custom-scrollbar-color": "Prilagođena boja klizača",
+  "theme-color-error-color": "Boja greške",
+  "theme-color-info-font-color": "Boja slova informacija",
+  "theme-color-link-font-color": "Boja slova poveznice",
   "theme-color-primary-background-color": "Primarna boja pozadine",
   "theme-color-primary-font-color": "Primarna boja slova",
   "theme-color-secondary-background-color": "Sekundarna boja pozadine",
   "theme-color-secondary-font-color": "Sekundarna boja slova",
-  "theme-color-component-color": "Boja komponente",
-  "theme-color-success-color": "Boja uspješnog",
-  "theme-color-error-color": "Boja greške",
   "theme-color-selection-color": "Boja odabranog",
-  "theme-color-tertiary-background-color": "Tercijarna boja pozadine",
-  "theme-color-tertiary-font-color": "Tercijarna boja slova",
-  "theme-color-link-font-color": "Boja slova poveznice",
-  "theme-color-info-font-color": "Boja slova informacija",
-  "theme-color-custom-scrollbar-color": "Prilagođena boja klizača",
   "theme-color-status-away": "Boja odsutnog statusa",
   "theme-color-status-busy": "Boja zauzetog statusa",
   "theme-color-status-offline": "Boja izvanmrežnog statusa",
   "theme-color-status-online": "Boja umreženog statusa",
+  "theme-color-success-color": "Boja uspješnog",
+  "theme-color-tertiary-background-color": "Tercijarna boja pozadine",
+  "theme-color-tertiary-font-color": "Tercijarna boja slova",
   "theme-color-unread-notification-color": "Boja Nepročitanih Obavijesti",
   "theme-custom-css": "Prilagođeni CSS",
   "theme-font-body-font-family": "Font Obitelj Tijela",
@@ -1264,11 +1266,11 @@
   "to_see_more_details_on_how_to_integrate": "kako bi vidjeli više detalja o integraciji",
   "To_users": "Korisnicima",
   "Topic": "Tema",
-  "Travel_and_Places": "Putovanja & Mjesta",
   "Transcript_Enabled": "Pitaj posjetitelja bi li htio transkript nakon što je chat zatvoren",
   "Transcript_message": "Poruka koja će biti prikazana kad korisnik zatraži transkript",
   "Transcript_of_your_livechat_conversation": "Transkript tvog razgovora",
   "Translations": "Prijevodi",
+  "Travel_and_Places": "Putovanja & Mjesta",
   "Trigger_removed": "Okidač uklonjen",
   "Trigger_Words": "Riječi okidača",
   "Triggers": "Okidači",
@@ -1366,9 +1368,9 @@
   "UTF8_Names_Validation_Description": "RegExp koji će biti korišten za provjeru korisničkih imena i imena soba",
   "Validate_email_address": "Validiraj email adresu",
   "Verification": "Verifikacija",
+  "Verification_Email": "Klikni <a href=\"[Verification_Url]\">ovdje</a> da bi potvrdio svoj račun.",
   "Verification_email_sent": "Provjera e-maila poslana",
   "Verification_Email_Subject": "[Site_Name] - Potvrdi svoj račun",
-  "Verification_Email": "Klikni <a href=\"[Verification_Url]\">ovdje</a> da bi potvrdio svoj račun.",
   "Verified": "Ovjeren",
   "Version": "Verzija",
   "Video_Chat_Window": "Video razgovor",
@@ -1407,13 +1409,13 @@
   "Would_you_like_to_return_the_inquiry": "Želite li vratiti upit?",
   "Yes": "Da",
   "Yes_archive_it": "Da, arhiviraj!",
-  "Yes_unarchive_it": "Da, izvadi iz arhive!",
   "Yes_clear_all": "Da, makni sve!",
   "Yes_delete_it": "Da, obriši!",
   "Yes_hide_it": "Da, sakrij!",
   "Yes_leave_it": "Da, napusti!",
   "Yes_mute_user": "Da, utišaj korisnika!",
   "Yes_remove_user": "Da, ukloni korisnika!",
+  "Yes_unarchive_it": "Da, izvadi iz arhive!",
   "You": "Vi",
   "you_are_in_preview_mode_of": "Ti si u preglednom načinu sobe # <strong>__room_name__</strong>",
   "You_are_logged_in_as": "Prijavljeni ste kao",
@@ -1447,4 +1449,4 @@
   "your_message_optional": "tvoja poruka (opcionalno)",
   "Your_password_is_wrong": "Vaša lozinka je pogrešna!",
   "Your_push_was_sent_to_s_devices": "Push obavijest je poslana %s uređaje"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json
index 736269b97ee..830c1c44a3a 100644
--- a/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -235,14 +235,14 @@
   "CAS_version": "CAS verzió",
   "CDN_PREFIX": "CDN előtag",
   "Certificates_and_Keys": "Bizonyítványok és kulcsok",
-  "Changing_email": "változó email",
   "Change_Room_Type": "Szoba típusának változtatása",
+  "Changing_email": "változó email",
   "channel": "csatorna",
   "Channel": "Csatorna",
   "Channel_already_exist": "A csatorna \"#% s 'már létezik.",
-  "Channel_created": "Csatorna  `#%s` létre lett hozva.",
   "Channel_already_Unarchived": "Csatorna névvel `#% s` már archivált állapotban",
   "Channel_Archived": "Csatorna névvel `#% s` archiválva lett sikeres",
+  "Channel_created": "Csatorna  `#%s` létre lett hozva.",
   "Channel_doesnt_exist": "A csatorna `# %s` nem létezik.",
   "Channel_to_listen_on": "Csatorna figyelő",
   "Channel_Unarchived": "Csatorna névvel `#% s` már archivált sikeresen",
@@ -260,8 +260,8 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Válassza Alias ​​előtt jelenik meg a felhasználónevét üzeneteket.",
   "Choose_the_username_that_this_integration_will_post_as": "Válassza ki a felhasználónevét, hogy ez az integráció utáni mint.",
   "clear": "Törlés",
-  "clear_cache_now": "Cache törlése ",
   "Clear_all_unreads_question": "Törölje az összes unreads?",
+  "clear_cache_now": "Cache törlése ",
   "Click_here": "Kattints ide",
   "Click_here_for_more_info": "Kattints ide a további információért",
   "Client_ID": "ügyfél-azonosító",
@@ -300,10 +300,9 @@
   "Custom_Fields": "egyéni mezők",
   "Custom_oauth_helper": "Amikor beállítja OAuth Szolgáltató, akkor tájékoztatni visszahívás URL. Használat <pre> %s </pre> .",
   "Custom_oauth_unique_name": "Egyedi OAuth egyedi nevet",
-  "Custom_Scripts": "Egyéni Srcipt",
   "Custom_Script_Logged_In": "Egyedi szkript bejelentkezett felhasználóknak",
   "Custom_Script_Logged_Out": "Egyedi szkript kijelentkezett felhasználó",
-  "Custom_Sounds": "Egyéni Hangok",
+  "Custom_Scripts": "Egyéni Srcipt",
   "Custom_Sound_Add": "Egyéni hang hozzáadása",
   "Custom_Sound_Delete_Warning": "A hang törlése nem vonható vissza.",
   "Custom_Sound_Error_Invalid_Sound": "Érvénytelen hang",
@@ -311,6 +310,7 @@
   "Custom_Sound_Has_Been_Deleted": "Az egyéni hang törölve lett.",
   "Custom_Sound_Info": "Egyéni hang infó",
   "Custom_Sound_Saved_Successfully": "Az egyéni hang sikeresen mentve",
+  "Custom_Sounds": "Egyéni Hangok",
   "Custom_Translations": "Egyéni fordítás",
   "Dashboard": "Műszerfal",
   "Date": "Dátum",
@@ -462,8 +462,8 @@
   "File_exceeds_allowed_size_of_bytes": "Fájl mérete meghaladja a megengedett méretet a __size__ bájt",
   "File_uploaded": "Fájl feltöltve",
   "FileUpload": "Fájlfeltöltés",
-  "FileUpload_Enabled": "Fájlfeltöltések Enabled",
   "FileUpload_Disabled": "Fájl feltöltés nem lehetséges.",
+  "FileUpload_Enabled": "Fájlfeltöltések Enabled",
   "FileUpload_Enabled_Direct": "Fájl feltöltés engedélyezése a közvetlen üzeneteknél",
   "FileUpload_File_Empty": "Fájl üres",
   "FileUpload_FileSystemPath": "rendszer Path",
@@ -489,8 +489,8 @@
   "Force_SSL": "Force SSL",
   "Force_SSL_Description": "* Figyelem! * _Force SSL_ soha nem lehet fordított proxy. Ha van egy fordított proxy, meg kell tennie az átirányítást OTT. Ez a lehetőség fennáll telepítések mint Heroku, amely nem teszi lehetővé az átirányítás konfiguráció a fordított proxy.",
   "Forgot_password": "Elfelejtetted a jelszavad?",
-  "Forgot_Password_Email_Subject": "[Site_Name] - jelszó visszaállítva",
   "Forgot_Password_Email": "Kattints <a href=\"[Forgot_Password_Url]\">ide</a> a jelszó visszaállításához.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - jelszó visszaállítva",
   "Forward": "Előre",
   "Forward_chat": "Chat továbbítása",
   "Forward_to_department": "Továbbítás a részlegnek",
@@ -825,8 +825,10 @@
   "Off_the_record_conversation": "Off-the-record beszélgetés",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record beszélgetés nem érhető el a böngésző vagy az eszköz.",
   "Offline": "Offline",
+  "Offline_DM_Email": "Te már közvetlen üzenetben által __user__",
   "Offline_form": "Offline nyomtatvány",
   "Offline_form_unavailable_message": "Offline formában érhető el az üzenetet",
+  "Offline_Mention_Email": "Meg kellett volna említeni a __user__ a #__room__",
   "Offline_message": "Offline üzenet",
   "Offline_success_message": "Offline siker üzenet",
   "Offline_unavailable": "Offline nem érhető el",
@@ -1102,19 +1104,19 @@
   "The_user_wont_be_able_to_type_in_s": "A felhasználó nem lesz képes, hogy írja be a %s",
   "Theme": "Téma",
   "theme-color-content-background-color": "Tartalom háttérszíne",
+  "theme-color-custom-scrollbar-color": "Egyedi Scrollbar Color",
+  "theme-color-info-font-color": "Info Betűszín",
+  "theme-color-link-font-color": "Link Betűszín",
   "theme-color-primary-background-color": "Elsődleges háttérszíne",
   "theme-color-primary-font-color": "Elsődleges Betűszín",
   "theme-color-secondary-background-color": "Másodlagos háttérszíne",
   "theme-color-secondary-font-color": "Másodlagos Betűszín",
-  "theme-color-tertiary-background-color": "Harmadlagos háttérszíne",
-  "theme-color-tertiary-font-color": "Harmadlagos Betűszín",
-  "theme-color-link-font-color": "Link Betűszín",
-  "theme-color-info-font-color": "Info Betűszín",
-  "theme-color-custom-scrollbar-color": "Egyedi Scrollbar Color",
   "theme-color-status-away": "Idegenben állapot Szín",
   "theme-color-status-busy": "Foglalt állapot Szín",
   "theme-color-status-offline": "Offline állapot Szín",
   "theme-color-status-online": "Online állapot Szín",
+  "theme-color-tertiary-background-color": "Harmadlagos háttérszíne",
+  "theme-color-tertiary-font-color": "Harmadlagos Betűszín",
   "theme-color-unread-notification-color": "Olvasatlan értesítés Color",
   "theme-custom-css": "egyéni CSS",
   "There_are_no_agents_added_to_this_department_yet": "Nincsenek ügynökök hozzá ezen az osztályon még.",
@@ -1285,4 +1287,4 @@
   "Your_mail_was_sent_to_s": "A mail-ben küldött %s",
   "Your_password_is_wrong": "A jelszó rossz!",
   "Your_push_was_sent_to_s_devices": "Push küldték %s eszközök"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/id.i18n.json b/packages/rocketchat-i18n/i18n/id.i18n.json
index de0ef95430b..b06f650fbd5 100644
--- a/packages/rocketchat-i18n/i18n/id.i18n.json
+++ b/packages/rocketchat-i18n/i18n/id.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "Off-the-record Conversation",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record percakapan tidak tersedia untuk browser atau perangkat.",
   "Offline": "Offline",
+  "Offline_DM_Email": "Anda telah langsung mengirim pesan oleh __user__",
   "Offline_form": "formulir Offline",
   "Offline_form_unavailable_message": "Formulir Offline pesan tidak tersedia",
+  "Offline_Mention_Email": "Anda telah disebutkan oleh __user__ di #__room__",
   "Offline_message": "pesan Offline",
   "Offline_success_message": "pesan sukses Offline",
   "Offline_unavailable": "Offline tidak tersedia",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "Pengguna tidak akan dapat mengetikkan% s",
   "Theme": "Tema",
   "theme-color-content-background-color": "Konten Warna Background",
+  "theme-color-custom-scrollbar-color": "Kustom Warna Scrollbar",
+  "theme-color-info-font-color": "Info Font Color",
+  "theme-color-link-font-color": "Link Font Color",
   "theme-color-primary-background-color": "Primer Warna Background",
   "theme-color-primary-font-color": "Primary Color Font",
   "theme-color-secondary-background-color": "Sekunder Warna Background",
   "theme-color-secondary-font-color": "Sekunder Font Color",
-  "theme-color-tertiary-background-color": "Tersier Warna Background",
-  "theme-color-tertiary-font-color": "Tersier Font Color",
-  "theme-color-link-font-color": "Link Font Color",
-  "theme-color-info-font-color": "Info Font Color",
-  "theme-color-custom-scrollbar-color": "Kustom Warna Scrollbar",
   "theme-color-status-away": "Jauh Warna Status",
   "theme-color-status-busy": "Sibuk Warna Status",
   "theme-color-status-offline": "Offline Warna Status",
   "theme-color-status-online": "Secara online Color Status",
+  "theme-color-tertiary-background-color": "Tersier Warna Background",
+  "theme-color-tertiary-font-color": "Tersier Font Color",
   "theme-color-unread-notification-color": "Belum dibaca Pemberitahuan Warna",
   "theme-custom-css": "CSS kustom",
   "There_are_no_agents_added_to_this_department_yet": "Tidak ada agen ditambahkan ke departemen ini.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "email Anda dikirim ke% s",
   "Your_password_is_wrong": "password Anda salah!",
   "Your_push_was_sent_to_s_devices": "push dikirim ke% s perangkat"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json
index e3d95807f95..cf072551c8b 100644
--- a/packages/rocketchat-i18n/i18n/it.i18n.json
+++ b/packages/rocketchat-i18n/i18n/it.i18n.json
@@ -95,6 +95,8 @@
   "Accounts_OAuth_Meteor_callback_url": "URL Callback Meteor",
   "Accounts_OAuth_Meteor_id": "ID Meteor",
   "Accounts_OAuth_Meteor_secret": "Chiave segreta Meteor",
+  "Accounts_OAuth_Proxy_host": "Host Proxy",
+  "Accounts_OAuth_Proxy_services": "Servizi Proxy",
   "Accounts_OAuth_Twitter": "Twitter Login",
   "Accounts_OAuth_Twitter_callback_url": "URL Callback Twitter ",
   "Accounts_OAuth_Twitter_id": "ID Twitter",
@@ -104,8 +106,6 @@
   "Accounts_OAuth_Wordpress_id": "ID WordPress",
   "Accounts_OAuth_Wordpress_secret": "Chiave segreta WordPress",
   "Accounts_PasswordReset": "Reimposta password",
-  "Accounts_OAuth_Proxy_host": "Host Proxy",
-  "Accounts_OAuth_Proxy_services": "Servizi Proxy",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Ruoli predefiniti per i Servizi di Autenticazione",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Ruoli predefiniti (separati da virgola) per gli utenti che saranno registrati tramite servizi di autenticazione",
   "Accounts_Registration_AuthenticationServices_Enabled": "Registrazione tramite servizi di autenticazione",
@@ -223,6 +223,7 @@
   "Authorization_URL": "URL di autorizzazione",
   "Authorize": "Autorizza",
   "Auto_Load_Images": "Auto-caricamento immagini",
+  "Auto_Translate": "Auto-traduci",
   "AutoLinker_Email": "AutoLinker Email",
   "AutoLinker_Phone": "AutoLinker Phone",
   "AutoLinker_Phone_Description": "Trasforma automaticamente i numeri di telefono in collegamenti. Ad esempio, `(123) 456-7890`",
@@ -233,10 +234,9 @@
   "AutoLinker_Urls_www": "AutoLinker 'www' URL ",
   "AutoLinker_UrlsRegExp": "AutoLinker URL Espressione Regolare",
   "Automatic_Translation": "Traduzione automatica",
-  "Auto_Translate": "Auto-traduci",
+  "AutoTranslate_Change_Language_Description": "Cambiando la lingua della traduzione automatica non traduce i messaggi precedenti.",
   "AutoTranslate_Enabled": "Abilita traduzione automatica",
   "AutoTranslate_Enabled_Description": "Abilitando la traduzione automatica consentirà alle persone con il permesso <code class=\"inline\">auto-traduci</code> di avere tutti i messaggi automaticamente tradotti nella loro lingua. Potranno essere richieste delle tariffe, leggere la <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">Documentazione di Google</a>",
-  "AutoTranslate_Change_Language_Description": "Cambiando la lingua della traduzione automatica non traduce i messaggi precedenti.",
   "AutoTranslate_GoogleAPIKey": "Chiave API Google",
   "Available": "Disponibile",
   "Available_agents": "Operatori disponibili",
@@ -252,8 +252,8 @@
   "Away_male": "Assente",
   "Back": "Indietro",
   "Back_to_applications": "Torna alle applicazioni",
-  "Back_to_integrations": "Torna alle integrazioni",
   "Back_to_integration_detail": "Torna ai dettagli della integrazione",
+  "Back_to_integrations": "Torna alle integrazioni",
   "Back_to_login": "Torna all'accesso",
   "Back_to_permissions": "Torna ai permessi",
   "Backup_codes": "Backup codici",
@@ -274,7 +274,6 @@
   "busy_male": "occupato",
   "Busy_male": "Occupato",
   "by": "di",
-  "Content": "Contenuto",
   "cache_cleared": "Svuota Cache",
   "Cancel": "Annulla",
   "Cancel_message_input": "Annulla",
@@ -300,14 +299,14 @@
   "CAS_version_Description": "Utilizza solo la versione CAS supportata dal tuo servizio CAS SSO.",
   "CDN_PREFIX": "Prefisso CDN",
   "Certificates_and_Keys": "Certificati e chiavi",
-  "Changing_email": "In fase di cambiamento dell'email",
   "Change_Room_Type": "Cambia la tipologia di stanza",
+  "Changing_email": "In fase di cambiamento dell'email",
   "channel": "canale",
   "Channel": "Canale",
   "Channel_already_exist": "Il canale `#%s` già esiste.",
-  "Channel_created": "Canale `#%s` creato.",
   "Channel_already_Unarchived": "Il canale con nome `#%s` è già in stato Disarchiviato",
   "Channel_Archived": "Il canale con nome `#%s` è stato archiviato con successo",
+  "Channel_created": "Canale `#%s` creato.",
   "Channel_doesnt_exist": "Il canale `# %s` non esiste.",
   "Channel_to_listen_on": "Canale da seguire su",
   "Channel_Unarchived": "Il canale con nome `#%s` è stato Disarchiviato con successo",
@@ -325,9 +324,9 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Scegli l'alias che verrà visualizzato prima del nome utente nei messaggi.",
   "Choose_the_username_that_this_integration_will_post_as": "Scegliere il nome utente che verrà usato per questa integrazione.",
   "clear": "Pulisci",
+  "Clear_all_unreads_question": "Marcare come letti tutti i messaggi non letti?",
   "clear_cache_now": "Svuota la cache ora",
   "clear_history": "Svuota lo storico",
-  "Clear_all_unreads_question": "Marcare come letti tutti i messaggi non letti?",
   "Click_here": "Clicca qui",
   "Click_here_for_more_info": "Clicca qui per altre informazioni",
   "Client_ID": "ID cliente",
@@ -344,6 +343,7 @@
   "Comment_to_leave_on_closing_session": "Commento da lasciare alla chiusura della sessione",
   "Compact": "Compatto",
   "Confirm_password": "Conferma la tua password",
+  "Content": "Contenuto",
   "Conversation": "Conversazione",
   "Conversation_closed": "Conversazione chiusa: __comment__.",
   "Convert_Ascii_Emojis": "Converti gli ASCII in Emoji",
@@ -359,8 +359,8 @@
   "Created_at": "Creato a",
   "Created_at_s_by_s": "Creato a <strong>%s</strong> da <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "Creato alle <strong>%s</strong> da <strong>%s</strong> scatenato da <strong>%s</strong>",
-  "CROWD_Reject_Unauthorized": "Rifiuta non autorizzati",
   "CRM_Integration": "Integrazione CRM",
+  "CROWD_Reject_Unauthorized": "Rifiuta non autorizzati",
   "Current_Chats": "Chat attuali",
   "Current_Status": "Stato attuale",
   "Custom": "Personalizzato",
@@ -376,10 +376,9 @@
   "Custom_Fields": "Campi personalizzati",
   "Custom_oauth_helper": "Quando si imposta l'OAuth Provider, è necessario impostare un URL Callback. Usa <pre>%s</pre> .",
   "Custom_oauth_unique_name": "Nome univoco dell'OAuth personalizzato",
-  "Custom_Scripts": "Script personalizzati",
   "Custom_Script_Logged_In": "Script personalizzato per gli utenti collegati",
   "Custom_Script_Logged_Out": "Script personalizzato per gli utenti scollegati",
-  "Custom_Sounds": "Suoni personalizzati",
+  "Custom_Scripts": "Script personalizzati",
   "Custom_Sound_Add": "Aggiungi suono personalizzato",
   "Custom_Sound_Delete_Warning": "La cancellazione di un suono non può essere annullata.",
   "Custom_Sound_Error_Invalid_Sound": "Suono non valido",
@@ -387,6 +386,7 @@
   "Custom_Sound_Has_Been_Deleted": "Il suono personalizzato è stato cancellato.",
   "Custom_Sound_Info": "Informazioni Suono Personalizzato",
   "Custom_Sound_Saved_Successfully": "Suono personalizzato salvato con successo",
+  "Custom_Sounds": "Suoni personalizzati",
   "Custom_Translations": "Traduzioni personalizzate",
   "Custom_Translations_Description": "Dovrebbe essere un JSON valido dove le chiavi sono le lingue che contengono un dizionario delle traduzioni. Esempio:<br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"pt\": {\n  \"Channels\": \"Salas\"\n }\n}</code> ",
   "CustomSoundsFilesystem": "Filesystem suoni personalizzati",
@@ -401,6 +401,16 @@
   "Decline": "Rifiuta",
   "Default": "Predefinito",
   "Delete": "Cancella",
+  "delete-c": "Cancella canali pubblici",
+  "delete-c_description": "Permesso di cancellare canali pubblici",
+  "delete-d": "Cancella messaggi diretti",
+  "delete-d_description": "Permesso di cancellare messaggi diretti",
+  "delete-message": "Cancella messaggio",
+  "delete-message_description": "Permesso di cancellare un messaggio all'interno del canale",
+  "delete-p": "Cancella canali privati",
+  "delete-p_description": "Permesso di cancellare canali privati",
+  "delete-user": "Cancella utente",
+  "delete-user_description": "Permesso di cancellare gli utente",
   "Delete_message": "Cancella messaggio",
   "Delete_my_account": "Cancella il mio account",
   "Delete_Room_Warning": "Cancellando un canale rimuoverà tutti i messaggi postati all'interno del canale. Questa azione non può essere annullata.",
@@ -429,6 +439,7 @@
   "Domain_added": "Dominio aggiunto",
   "Domain_removed": "Dominio rimosso",
   "Domains": "Domini",
+  "Domains_allowed_to_embed_the_livechat_widget": "Lista di domini permessi per l'embed del widget livechat. Lascia vuoto per permettere tutti i domini.",
   "Download_Snippet": "Scarica",
   "Drop_to_upload_file": "Rilascia per caricare il file",
   "Dry_run": "Invio di prova",
@@ -439,6 +450,7 @@
   "Duplicate_private_group_name": "Un gruppo privato con il nome ' %s' già esiste",
   "Duration": "Durata",
   "Edit": "Modifica",
+  "edit-other-user-info_description": "Permesso di cambiare gli altri nomi, nomi utente o indirizzi email.",
   "Edit_Custom_Field": "Modifica campo personalizzato",
   "Edit_Department": "Modifica dipartimento",
   "Edit_Trigger": "Modifica Trigger",
@@ -464,24 +476,22 @@
   "Empty_title": "Titolo vuoto",
   "Enable": "Abilita",
   "Enable_Desktop_Notifications": "Abilita notifiche desktop",
+  "Enable_Svg_Favicon": "Abilita Favicon SVG",
   "Enable_two-factor_authentication": "Abilita autenticazione a due fattori",
   "Enabled": "Abilitato",
-  "Enable_Svg_Favicon": "Abilita Favicon SVG",
   "Encrypted_message": "Messaggio cifrato",
   "End_OTR": "Termina OTR",
-  "Enter_authentication_code": "Inserisci codice di autenticazione",
-  "Enter_Alternative": "Modalità alternativa (invio con Invio + Ctrl/Alt/Shift/CMD)",
   "Enter_a_regex": "Inserisci una regex",
   "Enter_a_room_name": "Inserisci un nome al canale",
   "Enter_a_username": "Inserisci un nome utente",
+  "Enter_Alternative": "Modalità alternativa (invio con Invio + Ctrl/Alt/Shift/CMD)",
+  "Enter_authentication_code": "Inserisci codice di autenticazione",
   "Enter_Behaviour": "Comportamento Pulsante Invio",
   "Enter_Behaviour_Description": "Questi cambiamenti se il pulsante invio invierà un messaggio o il cursore andrà accapo",
   "Enter_name_here": "Inserisci il nome qui",
   "Enter_Normal": "Modalità normale (inviato con Invio)",
   "Enter_to": "Invio per",
   "Error": "Errore",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Errore: Rocket.Chat richiede la coda oplog quando in esecuzione su diverse instanze",
-  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Verifica che il tuo MongoDB è in modalità ReplicaSet e la variabile di sistema MONGO_OPLOG_URL è definita correttamente sul server dell'applicativo",
   "error-action-not-allowed": "__action__ non è permesso",
   "error-application-not-found": "Applicazione non trovata",
   "error-archived-duplicate-name": "C'è un canale archiviato con il nome '__room_name__'",
@@ -493,6 +503,7 @@
   "error-could-not-change-username": "Impossibile cambiare il nome utente",
   "error-delete-protected-role": "Impossibile cancellare un ruolo protetto",
   "error-department-not-found": "Dipartimento non trovato",
+  "error-direct-message-file-upload-not-allowed": "Condivisione dei file non permessa nei messaggi diretti",
   "error-duplicate-channel-name": "Un canale con il '__channel_name__' già esiste",
   "error-email-domain-blacklisted": "Il dominio dell'email è nella lista nera",
   "error-email-send-failed": "Errore nell'invio della mail: __message__",
@@ -514,7 +525,6 @@
   "error-invalid-email-address": "Indirizzo email non valido",
   "error-invalid-file-height": "Altezza del file non valido",
   "error-invalid-file-type": "Tipo di file non valido",
-  "error-direct-message-file-upload-not-allowed": "Condivisione dei file non permessa nei messaggi diretti",
   "error-invalid-file-width": "Larghezza file non valido",
   "error-invalid-from-address": "Hai specificato un indirizzo mittente non valido.",
   "error-invalid-integration": "Integrazione non valida",
@@ -549,12 +559,14 @@
   "error-the-field-is-required": "ll campo __field__ è richiesto",
   "error-too-many-requests": "Errore, troppe richieste. Si prega di rallentare. È necessario attendere __seconds__ secondi prima di riprovare.",
   "error-user-is-not-activated": "L'utente non è stato attivato",
+  "error-user-limit-exceeded": "Il numero di utenti che stai provando ad invitare a #channel_name eccede il limite impostato dall'amministratore",
   "error-user-not-in-room": "L'utente non è in questo canale",
   "error-user-registration-disabled": "La registrazione utente è disattivata",
-  "error-user-limit-exceeded": "Il numero di utenti che stai provando ad invitare a #channel_name eccede il limite impostato dall'amministratore",
   "error-user-registration-secret": "La registrazione utente è consentita solo tramite URL segreto",
   "error-you-are-last-owner": "Tu sei l'ultimo proprietario. Si prega di impostare il nuovo proprietario prima di lasciare il canale.",
   "Error_changing_password": "Errore nel cambio password",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Errore: Rocket.Chat richiede la coda oplog quando in esecuzione su diverse instanze",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Verifica che il tuo MongoDB è in modalità ReplicaSet e la variabile di sistema MONGO_OPLOG_URL è definita correttamente sul server dell'applicativo",
   "Esc_to": "Esc per",
   "Event_Trigger": "Evento scatenante",
   "Event_Trigger_Description": "Selezione quale tipo di evento verrà scatenato con questa Integrazione WebHook in uscita",
@@ -576,8 +588,8 @@
   "File_type_is_not_accepted": "Il tipo di file non è accettato.",
   "File_uploaded": "File caricato",
   "FileUpload": "Caricamento file",
-  "FileUpload_Enabled": "Caricamento file abilitato",
   "FileUpload_Disabled": "Caricamento file non permesso.",
+  "FileUpload_Enabled": "Caricamento file abilitato",
   "FileUpload_Enabled_Direct": "Caricamento file abilitato nei messaggi diretti",
   "FileUpload_File_Empty": "File vuoto",
   "FileUpload_FileSystemPath": "Percorso di sistema",
@@ -605,18 +617,20 @@
   "FileUpload_Storage_Type": "Tipo di archiviazione",
   "Flags": "Bandiere",
   "Follow_social_profiles": "Segui i nostri profili sociali, fai un fork su github e condividi i tuoi pensieri su  rocket.chat nella nostra bacheca Trello.",
+  "Fonts": "Caratteri",
   "Food_and_Drink": "Cibo & Bevande",
   "Footer": "Piè di pagina",
-  "Fonts": "Caratteri",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Per motivi di sicurezza, è necessario reinserire la password per continuare",
+  "force-delete-message": "Forza la cancellazione del messaggio",
+  "force-delete-message_description": "Permesso di cancellare un messaggio bypassando tutte le restrizioni",
   "Force_Disable_OpLog_For_Cache": "Forza la disabilitazione di OpLog per la Cache",
   "Force_Disable_OpLog_For_Cache_Description": "Non usare OpLog per sincronizzare la cache quanto disponibile",
   "Force_SSL": "Forza SSL",
   "Force_SSL_Description": "*Attenzione!* _Force SSL_ non dovrebbe mai essere usato con il reverse proxy. Se si dispone di un reverse proxy, si dovrebbe fare il redirect LÌ. Questa opzione esiste per ambienti come Heroku che non consentono la configurazione del re-indirizzamento del reverse proxy.",
   "Forgot_password": "Password dimenticata",
   "Forgot_Password_Description": "Puoi usare i seguenti segnaposti: <br/><ul><li>[Forgot_Password_Url] per la URL del recupero password.</li><li>[name], [fname], [lname] rispettivamente per il nome completo dell'utente, nome or cognome.</li><li>[email] per la email dell'utente.</li><li>[Site_Name] e [Site_URL] rispettivamente per il nome della applicazione e la URL.</li></ul>",
-  "Forgot_Password_Email_Subject": "[Site_Name] - Recupero Password",
   "Forgot_Password_Email": "Clicca <a href=\"[Forgot_Password_Url]\">qui</a> per resettare la tua password.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - Recupero Password",
   "Forgot_password_section": "Password dimenticata",
   "Forward": "Inoltra",
   "Forward_chat": "Inoltra Chat",
@@ -646,9 +660,9 @@
   "Hide_flextab": "Nascondi la barra destra con un click",
   "Hide_Group_Warning": "Sei sicuro di voler nascondere il gruppo \"%s\"?",
   "Hide_Private_Warning": "Sei sicuro di voler nascondere la discussione con \"%s\"?",
+  "Hide_roles": "Nascondi ruoli",
   "Hide_room": "Nascondi il canale",
   "Hide_Room_Warning": "Sei sicuro di voler nascondere il canale \"%s\"?",
-  "Hide_roles": "Nascondi ruoli",
   "Hide_Unread_Room_Status": "Nascondi lo stato del canale non letto",
   "Hide_usernames": "Nascondi nomi utente",
   "Highlights": "In evidenza",
@@ -676,13 +690,15 @@
   "Iframe_Integration_send_enable_Description": "Invia eventi alla finestra padre",
   "Iframe_Integration_send_target_origin": "Invia l'origine del target",
   "Iframe_Integration_send_target_origin_Description": "Solo pagine con una origine certa potranno ascoltare gli eventi o '*' per tutte le origini. Esempio `http://localhost`",
+  "Impersonate_user": "Impersona utente",
+  "Impersonate_user_description": "Quando abilitato i post integrati come l'utente che ha scatenato l'integrazione",
   "Importer_Archived": "Archiviato",
   "Importer_CSV_Information": "L'importatore CSV richiede un formato specifico, leggi la documentazione per scoprire come organizzare il tuo file zip:",
-  "Importer_HipChatEnterprise_Information": "Il file caricato deve essere un file tar.gz decriptato, leggi la documentazione per altre informazioni:",
-  "Importer_HipChatEnterprise_BetaWarning": "Nota che questa importazione è in sviluppo, riporta ogni errori che può avvenire su GitHub:",
   "Importer_done": "Importazione completata!",
   "Importer_finishing": "In fase di terminazione dell'importazione.",
   "Importer_From_Description": "Importa i dati da __from __  in Rocket.Chat.",
+  "Importer_HipChatEnterprise_BetaWarning": "Nota che questa importazione è in sviluppo, riporta ogni errori che può avvenire su GitHub:",
+  "Importer_HipChatEnterprise_Information": "Il file caricato deve essere un file tar.gz decriptato, leggi la documentazione per altre informazioni:",
   "Importer_import_cancelled": "Importazione annullata.",
   "Importer_import_failed": "Si è verificato un errore durante l'esecuzione dell'importazione.",
   "Importer_importing_channels": "In fase d'importazione dei canali.",
@@ -699,6 +715,7 @@
   "Importer_setup_error": "Si è verificato un errore durante l'impostazione dell'importatore.",
   "Importer_Source_File": "Selezione dei file sorgente",
   "Incoming_Livechats": "LiveChat in arrivo",
+  "Incoming_WebHook": "WebHook in Entrata",
   "inline_code": "inline_code",
   "Install_Extension": "Installa estensione",
   "Install_FxOs": "Installa Rocket.Chat sul tuo Firefox",
@@ -709,52 +726,49 @@
   "Installed_at": "Installato il",
   "Instance_Record": "Record d'istanza",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Istruzioni per il visitatore, compila il modulo per inviare un messaggio",
-  "Impersonate_user": "Impersona utente",
-  "Impersonate_user_description": "Quando abilitato i post integrati come l'utente che ha scatenato l'integrazione",
-  "Incoming_WebHook": "WebHook in Entrata",
-  "Integration_Advanced_Settings": "Impostazioni avanzate",
   "Integration_added": "L'integrazione è stata aggiunta",
+  "Integration_Advanced_Settings": "Impostazioni avanzate",
   "Integration_History_Cleared": "Integrazione Storico svuotata con successo",
   "Integration_Incoming_WebHook": "Integrazione WebHook In arrivo",
   "Integration_New": "Nuova integrazione",
-  "Integrations_Outgoing_Type_FileUploaded": "File caricato",
-  "Integrations_Outgoing_Type_RoomArchived": "Stanza Archiviata",
-  "Integrations_Outgoing_Type_RoomCreated": "Stanza creata (pubblica e privata)",
-  "Integrations_Outgoing_Type_RoomJoined": "Utente è entrato nella stanza",
-  "Integrations_Outgoing_Type_RoomLeft": "Utente lascia la stanza",
-  "Integrations_Outgoing_Type_SendMessage": "Messaggio inviato",
-  "Integrations_Outgoing_Type_UserCreated": "Utente creato",
   "Integration_Outgoing_WebHook": "Integrazione WebHook in uscita",
   "Integration_Outgoing_WebHook_History": "Storico Integrazioni Webhook in uscita",
-  "Integration_Outgoing_WebHook_No_History": "Questa integrazione webhook in uscita non ha ancora nessun elemento.",
-  "Integration_Outgoing_WebHook_History_Time_Triggered": "Tempo integrazione evento",
-  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Tempo di conclusione o di errore",
-  "Integration_Outgoing_WebHook_History_Trigger_Step": "Ultimo evento",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Messaggi inviato dal punto di preparazione",
-  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Messaggi inviato dal punto di risposta del processo",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Dati passati alla integrazione",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Dati passati alla URL",
-  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Risposta errore HTTP",
-  "Integration_Outgoing_WebHook_History_Http_Response": "Risposta HTTP",
   "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Stacktrace errore",
-  "Integration_Retry_Failed_Url_Calls": "Riprova la chiamata URL fallita",
-  "Integration_Retry_Failed_Url_Calls_Description": "L'integrazione dovrebbe chiedere un tempo ragionale in caso di chiamata URL fallita?",
+  "Integration_Outgoing_WebHook_History_Http_Response": "Risposta HTTP",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Risposta errore HTTP",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Messaggi inviato dal punto di preparazione",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Messaggi inviato dal punto di risposta del processo",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Tempo di conclusione o di errore",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Tempo integrazione evento",
+  "Integration_Outgoing_WebHook_History_Trigger_Step": "Ultimo evento",
+  "Integration_Outgoing_WebHook_No_History": "Questa integrazione webhook in uscita non ha ancora nessun elemento.",
   "Integration_Retry_Count": "Riprova conteggio",
   "Integration_Retry_Count_Description": "Quante volte l'integrazione dovrebbe provare se la chiamata alla URL fallisce?",
   "Integration_Retry_Delay": "Riprova ritardo",
   "Integration_Retry_Delay_Description": "Quale algoritmo di ritardo per i tentativi si deve utilizzare? <code class=\"inline\">10^x</code> or <code class=\"inline\">2^x</code> or <code class=\"inline\">x*2</code>",
+  "Integration_Retry_Failed_Url_Calls": "Riprova la chiamata URL fallita",
+  "Integration_Retry_Failed_Url_Calls_Description": "L'integrazione dovrebbe chiedere un tempo ragionale in caso di chiamata URL fallita?",
   "Integration_Run_When_Message_Is_Edited": "Avvia con modifiche",
   "Integration_Run_When_Message_Is_Edited_Description": "L'integrazione dovrebbe avviarsi quando il messaggio viene modificato? Impostando questa opzione a false, l'integrazione verrà eseguita solo sui <strong>nuovi</strong> messaggi.",
+  "Integration_updated": "L'integrazione è stata aggiornata",
   "Integration_Word_Trigger_Placement": "Posizione parole ovunque",
   "Integration_Word_Trigger_Placement_Description": "La parola dovrebbe essere scatenata quando posizionata ovunque nella frase oltre che all'inizio?",
-  "Integration_updated": "L'integrazione è stata aggiornata",
   "Integrations": "Integrazioni",
   "Integrations_for_all_channels": "Inserisci <strong>all_public_channels</strong> per ascoltare su tutti i canali pubblici, <strong>all_private_groups</strong> per ascoltare su tutti i gruppi privati e <strong>all_direct_messages</strong> per ascoltare su tutti i messaggi diretti.",
+  "Integrations_Outgoing_Type_FileUploaded": "File caricato",
+  "Integrations_Outgoing_Type_RoomArchived": "Stanza Archiviata",
+  "Integrations_Outgoing_Type_RoomCreated": "Stanza creata (pubblica e privata)",
+  "Integrations_Outgoing_Type_RoomJoined": "Utente è entrato nella stanza",
+  "Integrations_Outgoing_Type_RoomLeft": "Utente lascia la stanza",
+  "Integrations_Outgoing_Type_SendMessage": "Messaggio inviato",
+  "Integrations_Outgoing_Type_UserCreated": "Utente creato",
   "InternalHubot": "Hubot interno",
-  "InternalHubot_ScriptsToLoad": "Script da caricare",
-  "InternalHubot_ScriptsToLoad_Description": "Si prega di inserire un elenco separato da virgole degli gli script da caricare dalla tua cartella personalizzata",
   "InternalHubot_PathToLoadCustomScripts": "Cartella per caricare gli script",
   "InternalHubot_reload": "Ricarica gli script",
+  "InternalHubot_ScriptsToLoad": "Script da caricare",
+  "InternalHubot_ScriptsToLoad_Description": "Si prega di inserire un elenco separato da virgole degli gli script da caricare dalla tua cartella personalizzata",
   "InternalHubot_Username_Description": "Deve essere un nome utente valido di un bot registrato sul tuo server.",
   "Invalid_confirm_pass": "La password di conferma non corrisponde con la password",
   "Invalid_email": "L'email inserita non è valida",
@@ -776,19 +790,19 @@
   "Invitation_Subject": "Oggetto dell'invito",
   "Invitation_Subject_Default": "Sei stato invitato su [Site_Name]",
   "Invite_user_to_join_channel": "Invita un utente ad entrare in questo canale",
-  "Invite_user_to_join_channel_all_to": "Invita tutti gli utenti di questo canale a unirsi [#channel]",
   "Invite_user_to_join_channel_all_from": "Invita tutti gli utenti da [#channell] per unirsi a questo canale",
+  "Invite_user_to_join_channel_all_to": "Invita tutti gli utenti di questo canale a unirsi [#channel]",
   "Invite_Users": "Invita utenti",
+  "IRC_Channel_Join": "Output del comando JOIN",
+  "IRC_Channel_Leave": "Output del comando PART",
+  "IRC_Description": "Internet Relay Chat (IRC) è uno strumento di comunicazione di gruppo basato su testo. Gli utenti entrano in canali univocamente denominati o in canali per discussioni aperte. IRC inoltre supporta messaggi privati tra utenti individuali e la possibilità di condividere file. Questo pacchetto integra questi livelli di funzionalità con Rocket.Chat.",
+  "IRC_Quit": "Output alla uscita della sessione IRC.",
   "is_also_typing": "sta anche scrivendo",
   "is_also_typing_female": "sta anche scrivendo",
   "is_also_typing_male": "sta anche scrivendo",
   "is_typing": "sta scrivendo",
   "is_typing_female": "sta scrivendo",
   "is_typing_male": "sta scrivendo",
-  "IRC_Channel_Join": "Output del comando JOIN",
-  "IRC_Channel_Leave": "Output del comando PART",
-  "IRC_Description": "Internet Relay Chat (IRC) è uno strumento di comunicazione di gruppo basato su testo. Gli utenti entrano in canali univocamente denominati o in canali per discussioni aperte. IRC inoltre supporta messaggi privati tra utenti individuali e la possibilità di condividere file. Questo pacchetto integra questi livelli di funzionalità con Rocket.Chat.",
-  "IRC_Quit": "Output alla uscita della sessione IRC.",
   "It_works": "Funziona",
   "italics": "corsivo",
   "Jitsi_Chrome_Extension": "ID estensione Chrome",
@@ -798,7 +812,6 @@
   "Join_default_channels": "Partecipa ai canali predefiniti",
   "Join_the_Community": "Entra nella Comunità",
   "Join_the_given_channel": "Entra nel canale specificato",
-  "Show_the_keyboard_shortcut_list": "Mostra l'elenco delle scorciatoie per la tastiera",
   "Join_video_call": "Partecipa alla videochiamata",
   "Joined": "Entrato",
   "Jump": "Salta",
@@ -851,6 +864,18 @@
   "LDAP_Enable_Description": "Tenta di utilizzare LDAP per l'autenticazione.",
   "LDAP_Encryption": "Crittografia",
   "LDAP_Encryption_Description": "Il metodo di cifratura utilizzato per proteggere le comunicazioni con il server LDAP. Gli esempi includono `plain` (senza crittografia),` SSL / LDAPS` (criptato dall'inizio), e `StartTLS` (passaggio ad una comunicazione criptata una volta connesso).",
+  "LDAP_Group_Filter_Enable": "Abilita il controllo del gruppo",
+  "LDAP_Group_Filter_Enable_Description": "Limita l'accesso agli utenti che appartengono ad uno specifico gruppo LDAP<br/>Utile per i server OpenLDAP che *non* hanno il filtro *memberOf*",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Nome del campo che identifica i gruppi",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Ad esempio *OpenLDAP:*cn",
+  "LDAP_Group_Filter_Group_Member_Attribute": "Nome del campo che identifica i membri di un gruppo",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Ad esempio *OpenLDAP:*uniqueMember",
+  "LDAP_Group_Filter_Group_Member_Format": "Formato dei membri di un gruppo",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "Ad esempio *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
+  "LDAP_Group_Filter_Group_Name": "Nome del gruppo",
+  "LDAP_Group_Filter_Group_Name_Description": "Nome del gruppo al quale appartiene l'utente",
+  "LDAP_Group_Filter_ObjectClass": "ObjectClass dei gruppi",
+  "LDAP_Group_Filter_ObjectClass_Description": "*objectclass* che identifica i gruppi LDAP.<br/> E.g. OpenLDAP:groupOfUniqueNames",
   "LDAP_Host": "Host",
   "LDAP_Host_Description": "Host LDAP, ad esempio `ldap.example.com` o` 10.0.0.30`.",
   "LDAP_Idle_Timeout": "Timeout attesa (ms)",
@@ -876,18 +901,6 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Scrive il tuo filtro per cercare gli utenti nel server LDAP.",
   "LDAP_Username_Field": "Nome utente campo",
   "LDAP_Username_Field_Description": "Quale campo verrà utilizzato come *username* per i nuovi utenti. Lascia vuoto per usare il nome utente informato sulla pagina di login. <br/> È possibile utilizzare i tag modello di troppo, come `#{givenName}.#{sn}`. <br/> Il valore predefinito è `sAMAccountName`.",
-  "LDAP_Group_Filter_Enable": "Abilita il controllo del gruppo",
-  "LDAP_Group_Filter_Enable_Description": "Limita l'accesso agli utenti che appartengono ad uno specifico gruppo LDAP<br/>Utile per i server OpenLDAP che *non* hanno il filtro *memberOf*",
-  "LDAP_Group_Filter_ObjectClass": "ObjectClass dei gruppi",
-  "LDAP_Group_Filter_ObjectClass_Description": "*objectclass* che identifica i gruppi LDAP.<br/> E.g. OpenLDAP:groupOfUniqueNames",
-  "LDAP_Group_Filter_Group_Id_Attribute": "Nome del campo che identifica i gruppi",
-  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Ad esempio *OpenLDAP:*cn",
-  "LDAP_Group_Filter_Group_Member_Attribute": "Nome del campo che identifica i membri di un gruppo",
-  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Ad esempio *OpenLDAP:*uniqueMember",
-  "LDAP_Group_Filter_Group_Member_Format": "Formato dei membri di un gruppo",
-  "LDAP_Group_Filter_Group_Member_Format_Description": "Ad esempio *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
-  "LDAP_Group_Filter_Group_Name": "Nome del gruppo",
-  "LDAP_Group_Filter_Group_Name_Description": "Nome del gruppo al quale appartiene l'utente",
   "Least_Amount": "Importo Minimo",
   "Leave_Group_Warning": "Sei sicuro di voler lasciare il gruppo \"%s\"?",
   "Leave_Private_Warning": "Sei sicuro di volere lasciare la discussione con \"%s\"?",
@@ -899,7 +912,6 @@
   "List_of_Direct_Messages": "Elenco dei messaggi privati",
   "Livechat_agents": "Operatori livechat",
   "Livechat_AllowedDomainsList": "Domini permessi per Livechat",
-  "Domains_allowed_to_embed_the_livechat_widget": "Lista di domini permessi per l'embed del widget livechat. Lascia vuoto per permettere tutti i domini.",
   "Livechat_Dashboard": "Dashboard livechat",
   "Livechat_enabled": "Livechat abilitato",
   "Livechat_forward_open_chats": "Inoltra le chat aperte",
@@ -1001,18 +1013,18 @@
   "Message_ShowEditedStatus": "Mostra lo stato modificato",
   "Message_ShowFormattingTips": "Mostra suggerimenti di formattazione",
   "Message_starring": "Segnalibro Messaggio",
-  "Message_TimeFormat": "Formato orario",
   "Message_TimeAndDateFormat": "Formato data e ora",
-  "Message_TimeFormat_Description": "Vedi anche: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeAndDateFormat_Description": "Vedi anche: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
+  "Message_TimeFormat": "Formato orario",
+  "Message_TimeFormat_Description": "Vedi anche: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Messaggio troppo lungo",
   "Message_VideoRecorderEnabled": "Registrazione Video Abilitata",
   "Message_VideoRecorderEnabledDescription": "Richiede che i file del tipo 'video/webm' siano fra gli accettati nella sezione 'Caricamento File'.",
   "Messages": "Messaggi",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "I messaggi inviati WebHook In Arrivo verranno pubblicati qui.",
   "Meta": "Meta",
-  "Meta_fb_app_id": "Facebook App Id",
   "Meta_custom": "Meta tag personalizzati",
+  "Meta_fb_app_id": "Facebook App Id",
   "Meta_google-site-verification": "Google Site Verification",
   "Meta_language": "Lingua",
   "Meta_msvalidate01": "MSValidate.01",
@@ -1049,8 +1061,8 @@
   "New_password": "Nuova password",
   "New_role": "Nuovo ruolo",
   "New_Room_Notification": "Notifica nuovo canale",
-  "New_videocall_request": "Nuova richiesta video",
   "New_Trigger": "Nuovo trigger",
+  "New_videocall_request": "Nuova richiesta video",
   "No_available_agents_to_transfer": "Nessun operatore disponibile da trasferire",
   "No_channel_with_name_%s_was_found": "Non è stato trovato nessun canale con nome <strong>\" %s\"</strong> !",
   "No_channels_yet": "Non fai ancora parte di nessun canale.",
@@ -1063,9 +1075,9 @@
   "No_mentions_found": "Nessuna menzione trovata",
   "No_pinned_messages": "Nessun messaggio in evidenza",
   "No_results_found": "Nessun risultato trovato",
+  "No_snippet_messages": "Nessun snippet",
   "No_starred_messages": "Nessun messaggio evidenziato",
   "No_such_command": "Nessun comando: `/__command__`",
-  "No_snippet_messages": "Nessun snippet",
   "No_user_with_username_%s_was_found": "Non è stato trovato nessun utente con nome <strong>\" %s\"</strong> !",
   "Nobody_available": "Nessuno disponibile",
   "Node_version": "Versione Node",
@@ -1078,8 +1090,8 @@
   "Nothing_found": "Non abbiamo trovato nulla",
   "Notification_Duration": "Durata notifica",
   "Notifications": "Notifiche",
-  "Notify_all_in_this_room": "Notifica tutti in questo canale",
   "Notify_active_in_this_room": "Notifica utenti attivi in questa stanza",
+  "Notify_all_in_this_room": "Notifica tutti in questo canale",
   "Num_Agents": "# Operatori",
   "Number_of_messages": "Numero di messaggi",
   "OAuth_Application": "Applicazione OAuth",
@@ -1091,9 +1103,11 @@
   "Office_Hours": "Ore d'ufficio",
   "Office_hours_enabled": "Orario ufficio attivo",
   "Offline": "Offline",
+  "Offline_DM_Email": "Hai ricevuto un messaggio diretto da __user__",
   "Offline_form": "Modulo offline",
   "Offline_form_unavailable_message": "Messaggio non disponibile se il modulo è offline",
   "Offline_Link_Message": "VAI AL MESSAGGIO",
+  "Offline_Mention_Email": "Sei stato citato da __user__ in #__room__",
   "Offline_message": "Messaggio offline",
   "Offline_success_message": "Messaggio di successo offline",
   "Offline_unavailable": "Offline non disponibile",
@@ -1109,7 +1123,6 @@
   "Opened_in_a_new_window": "Apri in una nuova finestra",
   "Opens_a_channel_group_or_direct_message": "Apre un canale, canale privato o messaggi diretto",
   "optional": "facoltativo",
-  "Use_minor_colors": "Usa la palette dei colori semplici (predefinito per i colori principali)",
   "or": "o",
   "Order": "Ordina",
   "OS_Arch": "Architettura",
@@ -1137,21 +1150,6 @@
   "People": "Persone",
   "Permalink": "Permalink",
   "Permissions": "Permessi",
-  "delete-c": "Cancella canali pubblici",
-  "delete-c_description": "Permesso di cancellare canali pubblici",
-  "delete-d": "Cancella messaggi diretti",
-  "delete-d_description": "Permesso di cancellare messaggi diretti",
-  "delete-p": "Cancella canali privati",
-  "delete-p_description": "Permesso di cancellare canali privati",
-  "delete-message": "Cancella messaggio",
-  "delete-message_description": "Permesso di cancellare un messaggio all'interno del canale",
-  "delete-user": "Cancella utente",
-  "delete-user_description": "Permesso di cancellare gli utente",
-  "edit-other-user-info_description": "Permesso di cambiare gli altri nomi, nomi utente o indirizzi email.",
-  "force-delete-message": "Forza la cancellazione del messaggio",
-  "force-delete-message_description": "Permesso di cancellare un messaggio bypassando tutte le restrizioni",
-  "remove-user": "Rimuovi utente",
-  "remove-user_description": "Permesso di rimuovere un utente dal canale",
   "Pin_Message": "Appunta Messaggio",
   "Pinned_a_message": "Ha appuntato un messaggio:",
   "Pinned_Messages": "Messaggi appuntati",
@@ -1162,10 +1160,10 @@
   "Please_add_a_comment": "Aggiungi un commento",
   "Please_add_a_comment_to_close_the_room": "Si prega di aggiungere un commento per chiudere il canale",
   "Please_answer_survey": "Prenditi un momento per rispondere a un rapido sondaggio su questa chat",
+  "please_enter_valid_domain": "Inserisci un dominio valido",
   "Please_enter_value_for_url": "Inserisci un valore per la URL del tuo avatar.",
   "Please_enter_your_new_password_below": "Si prega di inserire la nuova password sotto:",
   "Please_enter_your_password": "Reinserisci la password",
-  "please_enter_valid_domain": "Inserisci un dominio valido",
   "Please_fill_a_label": "Compila una etichetta",
   "Please_fill_a_name": "Compila un nome",
   "Please_fill_a_username": "Compila un nome utente",
@@ -1224,8 +1222,8 @@
   "Read_only_group": "Gruppo in sola lettura",
   "Record": "Record",
   "Redirect_URI": "Redirect URI",
-  "Refresh_oauth_services": "Ricarica servizi OAuth",
   "Refresh_keys": "Aggiorna Chiavi",
+  "Refresh_oauth_services": "Ricarica servizi OAuth",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "Aggiornare la pagina dopo l'installazione per consentire la condivisione dello schermo",
   "Register": "Registra una nuovo account",
   "Registration": "Registrazione",
@@ -1234,6 +1232,8 @@
   "Regular_Expressions": "Espressioni regolari",
   "Release": "Release",
   "Remove": "Rimuovi",
+  "remove-user": "Rimuovi utente",
+  "remove-user_description": "Permesso di rimuovere un utente dal canale",
   "Remove_Admin": "Rimuovi Amministratore",
   "Remove_as_moderator": "Rimuovi come moderatore",
   "Remove_as_owner": "Rimuovi come proprietario",
@@ -1243,16 +1243,16 @@
   "Remove_someone_from_room": "Rimuovi qualcuno dal canale",
   "Removed": "Rimosso",
   "Reply": "Rispondi",
-  "Reporting": "Resoconti",
   "Report_Abuse": "Segnala un abuso",
   "Report_exclamation_mark": "Rapporto!",
   "Report_sent": "Rapporto inviato",
   "Report_this_message_question_mark": "Segnalare questo messaggio?",
+  "Reporting": "Resoconti",
   "Require_password_change": "Richiedi cambio password",
   "Resend_verification_email": "Invia nuovamente email di verifica",
   "Reset": "Reimposta",
-  "Reset_section_settings": "Resetta le impostazioni della sezione",
   "Reset_password": "Reimposta password",
+  "Reset_section_settings": "Resetta le impostazioni della sezione",
   "Restart": "Riavvia",
   "Restart_the_server": "Riavvia il server",
   "Role": "Ruolo",
@@ -1269,10 +1269,9 @@
   "room_changed_privacy": "Tipo di canale cambiato in: <em>__room_type__</em> da <em>__user_by__</em>",
   "room_changed_topic": "Argomento del canale cambiato in: <em>__room_topic__</em> da <em>__user_by__</em>",
   "Room_description_changed_successfully": "Descrizione del canale cambiata con successo",
-  "Room_has_been_deleted": "Il canale è stato eliminato",
   "Room_has_been_archived": "La stanza è stata archiviata",
+  "Room_has_been_deleted": "Il canale è stato eliminato",
   "Room_has_been_unarchived": "La stanza è stata tolta dall'archivio",
-  "Room_type_of_default_rooms_cant_be_changed": "Questo è un canale predefinito e il tipo non può essere cambiato, si prega di consultarsi con un amministratore.",
   "Room_Info": "Informazioni canale",
   "room_is_blocked": "La stanza è sbloccata",
   "room_is_read_only": "Questo canale è in sola lettura",
@@ -1283,6 +1282,7 @@
   "Room_password_changed_successfully": "Password della stanza cambiata con successo",
   "Room_topic_changed_successfully": "Argomento del canale cambiato con successo",
   "Room_type_changed_successfully": "Tipo di canale cambiato con successo",
+  "Room_type_of_default_rooms_cant_be_changed": "Questo è un canale predefinito e il tipo non può essere cambiato, si prega di consultarsi con un amministratore.",
   "Room_unarchived": "Canale disarchiviato",
   "Room_uploaded_file_list": "Elenco dei file",
   "Room_uploaded_file_list_empty": "Nessun file disponibile.",
@@ -1295,9 +1295,9 @@
   "SAML_Custom_Generate_Username": "Genera Nome utente",
   "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO Redirect URL",
   "SAML_Custom_Issuer": "Custom Issuer",
+  "SAML_Custom_Private_Key": "Contenuto chiave privata",
   "SAML_Custom_Provider": "Custom Provider",
   "SAML_Custom_Public_Cert": "Public cert contents",
-  "SAML_Custom_Private_Key": "Contenuto chiave privata",
   "Sandstorm_Powerbox_Share": "Condividi un Sandstorm grain",
   "Saturday": "Sabato",
   "Save": "Salva",
@@ -1358,6 +1358,7 @@
   "Show_only_online": "Mostra solo on-line",
   "Show_preregistration_form": "Mostra il modulo di pre-registrazione",
   "Show_queue_list_to_all_agents": "Mostra coda a tutti gli operatori",
+  "Show_the_keyboard_shortcut_list": "Mostra l'elenco delle scorciatoie per la tastiera",
   "Showing_archived_results": "<p>Mostra <b>%s</b> risultati archiviati</p>",
   "Showing_online_users": "Visualizzati <b>__total_showing__</b> su __total__users",
   "Showing_results": "<p>Visualizzati <b>%s</b> risultati</p>",
@@ -1367,11 +1368,11 @@
   "Site_Url_Description": "Esempio: https://chat.domain.com/",
   "Skip": "Salta",
   "SlackBridge_error": "SlackBridge ha rilevato un errore durante l'importazione dei messaggi alle %s: %s",
+  "SlackBridge_finish": "SlackBridge ha finito di importare i messaggi alle %s. Ricarica per vedere tutti i messaggi.",
   "SlackBridge_Out_All": "SlackBridge Out All",
   "SlackBridge_Out_All_Description": "Invia messaggi da tutti i canali che esistono in Slack e che il bot è entrato",
   "SlackBridge_Out_Channels": "SlackBridge Out Canali",
   "SlackBridge_Out_Channels_Description": "Scegli quale canale invierà i messaggi a Slack",
-  "SlackBridge_finish": "SlackBridge ha finito di importare i messaggi alle %s. Ricarica per vedere tutti i messaggi.",
   "SlackBridge_Out_Enabled": "SlackBridge Out Abilitato",
   "SlackBridge_Out_Enabled_Description": "Scegli quale Slackbridge deve anche inviate i messaggi a Slack",
   "SlackBridge_start": "@%s ha avviato un import SlackBridge alle `#%s`. Ti faremo sapere quando verrà ultimato.",
@@ -1429,9 +1430,9 @@
   "Stats_Total_Livechat_Rooms": "Totale stanze Livechat",
   "Stats_Total_Messages": "Messaggi totali",
   "Stats_Total_Messages_Channel": "Messaggi totali nei canali",
-  "Stats_Total_Messages_PrivateGroup": "Messaggi totali nei gruppi privati",
   "Stats_Total_Messages_Direct": "Messaggi totali nei messaggi diretti",
   "Stats_Total_Messages_Livechat": "Messaggi totali nelle livechat",
+  "Stats_Total_Messages_PrivateGroup": "Messaggi totali nei gruppi privati",
   "Stats_Total_Private_Groups": "Totale Gruppi Privati",
   "Stats_Total_Rooms": "Canali Totali",
   "Stats_Total_Users": "Utenti Totali",
@@ -1471,32 +1472,32 @@
   "The_user_will_be_removed_from_s": "L'utente sarà rimosso da %s",
   "The_user_wont_be_able_to_type_in_s": "L'utente non potrà più scrivere sul canale %s",
   "Theme": "Tema",
-  "theme-color-transparent-darker": "Trasparente molto scuro",
-  "theme-color-transparent-dark": "Trasparente scuro",
-  "theme-color-transparent-light": "Trasparente chiaro",
-  "theme-color-transparent-lighter": "Trasparente molto chiaro",
-  "theme-color-transparent-lightest": "Trasparente veramente molto chiaro",
+  "theme-color-component-color": "Colore componente",
   "theme-color-content-background-color": "Colore di Sfondo del contenuto",
+  "theme-color-custom-scrollbar-color": "Colore Personalizzato della Barra Scorrevole",
+  "theme-color-error-color": "Colore Errore",
+  "theme-color-info-font-color": "Colore del Carattere delle Informazioni",
+  "theme-color-link-font-color": "Colore del Carattere dei Link",
+  "theme-color-pending-color": "Colore in attesa",
+  "theme-color-primary-action-color": "Colore azione primario",
   "theme-color-primary-background-color": "Colore di Sfondo Primario",
   "theme-color-primary-font-color": "Colore del Carattere Primario ",
-  "theme-color-primary-action-color": "Colore azione primario",
+  "theme-color-secondary-action-color": "Colore azione secondario",
   "theme-color-secondary-background-color": "Colore di Sfondo Secondario",
   "theme-color-secondary-font-color": "Colore del Carattere Secondario",
-  "theme-color-secondary-action-color": "Colore azione secondario",
-  "theme-color-component-color": "Colore componente",
-  "theme-color-success-color": "Colore \"Successo\"",
-  "theme-color-pending-color": "Colore in attesa",
-  "theme-color-error-color": "Colore Errore",
   "theme-color-selection-color": "Colore selezione",
-  "theme-color-tertiary-background-color": "Colore di Sfondo Terziario",
-  "theme-color-tertiary-font-color": "Colore del Carattere Terzario",
-  "theme-color-link-font-color": "Colore del Carattere dei Link",
-  "theme-color-info-font-color": "Colore del Carattere delle Informazioni",
-  "theme-color-custom-scrollbar-color": "Colore Personalizzato della Barra Scorrevole",
   "theme-color-status-away": "Colore di stato Assente",
   "theme-color-status-busy": "Colore dello Stato Occupato",
   "theme-color-status-offline": "Colore dello Stato Offline ",
   "theme-color-status-online": "Colore dello Stato Online ",
+  "theme-color-success-color": "Colore \"Successo\"",
+  "theme-color-tertiary-background-color": "Colore di Sfondo Terziario",
+  "theme-color-tertiary-font-color": "Colore del Carattere Terzario",
+  "theme-color-transparent-dark": "Trasparente scuro",
+  "theme-color-transparent-darker": "Trasparente molto scuro",
+  "theme-color-transparent-light": "Trasparente chiaro",
+  "theme-color-transparent-lighter": "Trasparente molto chiaro",
+  "theme-color-transparent-lightest": "Trasparente veramente molto chiaro",
   "theme-color-unread-notification-color": "Colore notifiche non lette",
   "theme-custom-css": "CSS personalizzato",
   "theme-font-body-font-family": "Famiglia del Font per il Corpo del Testo",
@@ -1519,11 +1520,11 @@
   "to_see_more_details_on_how_to_integrate": "per vedere altri dettagli su come integrarlo.",
   "To_users": "Agli Utenti",
   "Topic": "Argomento",
-  "Travel_and_Places": "Viaggi & Luoghi",
   "Transcript_Enabled": "Chiedi al visitatore se vuole una trascrizione dopo la chiusura della chat",
   "Transcript_message": "Messaggio da mostrare quando si chiede la transcrizione",
   "Transcript_of_your_livechat_conversation": "Transcrizione della tua conversazione livechat",
   "Translations": "Traduzioni",
+  "Travel_and_Places": "Viaggi & Luoghi",
   "Trigger_removed": "Trigger rimosso",
   "Trigger_Words": "Parole Trigger",
   "Triggers": "Trigger",
@@ -1557,6 +1558,7 @@
   "Use_Emojis": "Utilizzare Emojis",
   "Use_Global_Settings": "Usa Impostazioni Globali",
   "Use_initials_avatar": "Usa le iniziali del tuo nome utente",
+  "Use_minor_colors": "Usa la palette dei colori semplici (predefinito per i colori principali)",
   "Use_service_avatar": "Usa l'avatar %s",
   "Use_this_username": "Usa questo nome utente",
   "Use_uploaded_avatar": "Usa l'avatar caricato",
@@ -1622,9 +1624,9 @@
   "Validate_email_address": "Verifica indirizzo email",
   "Verification": "Verifica",
   "Verification_Description": "Puoi usare i seguenti segnaposti: <br/><ul><li>[Forgot_Password_Url] per la URL del recupero password.</li><li>[name], [fname], [lname] rispettivamente per il nome completo dell'utente, nome or cognome.</li><li>[email] per la email dell'utente.</li><li>[Site_Name] e [Site_URL] rispettivamente per il nome della applicazione e la URL.</li></ul>",
+  "Verification_Email": "Clicca <a href=\"[Verification_Url]\">qui</a> per verificare il tuo account",
   "Verification_email_sent": "Invio Verifica email",
   "Verification_Email_Subject": "[Site_Name] - Verifica il tuo account",
-  "Verification_Email": "Clicca <a href=\"[Verification_Url]\">qui</a> per verificare il tuo account",
   "Verified": "Verificata",
   "Version": "Versione",
   "Video_Chat_Window": "Chat Video",
@@ -1663,13 +1665,13 @@
   "Would_you_like_to_return_the_inquiry": "Vuoi tornare alla richiesta",
   "Yes": "Sì",
   "Yes_archive_it": "Si, archivialo!",
-  "Yes_unarchive_it": "Si, togli dall'archivio!",
   "Yes_clear_all": "Sì, svuota tutti!",
   "Yes_delete_it": "Sì, cancellalo!",
   "Yes_hide_it": "Sì, nascondilo!",
   "Yes_leave_it": "Sì, lascia!",
   "Yes_mute_user": "Sì, silenzia l'utente!",
   "Yes_remove_user": "Sì, rimuovi l'utente!",
+  "Yes_unarchive_it": "Si, togli dall'archivio!",
   "You": "Tu",
   "you_are_in_preview_mode_of": "Sei in modalità di anteprima del canale # <strong>__room_name__</strong>",
   "You_are_logged_in_as": "Sei loggato come",
@@ -1703,4 +1705,4 @@
   "your_message_optional": "il tuo messaggio (opzionale)",
   "Your_password_is_wrong": "La password è sbagliata!",
   "Your_push_was_sent_to_s_devices": "La tua richiesta è stata inviata ai %s dispositivi."
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ja.i18n.json b/packages/rocketchat-i18n/i18n/ja.i18n.json
index 574b58900db..f0cc047ab9c 100644
--- a/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -657,17 +657,16 @@
   "Managing_assets": "資産を管理します",
   "Managing_integrations": "統合管理",
   "Mark_as_read": "既読にする",
-  "Markdown_Parser": "Markdown パーサー",
-  "Original": "オリジナル",
   "Markdown_Headers": "ヘッダーを有効にする",
-  "Markdown_SupportSchemesForLink": "リンクでサポートするスキーマリスト",
-  "Markdown_SupportSchemesForLink_Description": "許可するスキーマをカンマ区切りで記述してください。",
-  "Markdown_Marked_GFM": "Marked GFM を有効にする",
-  "Markdown_Marked_Tables": "Marked Tables を有効にする",
   "Markdown_Marked_Breaks": "Marked Breaks を有効にする",
+  "Markdown_Marked_GFM": "Marked GFM を有効にする",
   "Markdown_Marked_Pedantic": "Marked Pedantic を有効にする",
   "Markdown_Marked_SmartLists": "Marked Smart Lists を有効にする",
   "Markdown_Marked_Smartypants": "Marked Smartypants を有効にする",
+  "Markdown_Marked_Tables": "Marked Tables を有効にする",
+  "Markdown_Parser": "Markdown パーサー",
+  "Markdown_SupportSchemesForLink": "リンクでサポートするスキーマリスト",
+  "Markdown_SupportSchemesForLink_Description": "許可するスキーマをカンマ区切りで記述してください。",
   "Members_List": "メンバーリスト",
   "Mentions": "メンション",
   "Mentions_default": "メンション (デフォルト)",
@@ -776,8 +775,10 @@
   "Off_the_record_conversation": "オフレコ会話",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "ご利用のブラウザーやデバイスでは、オフレコ会話を利用できません",
   "Offline": "オフライン",
+  "Offline_DM_Email": "ダイレクトメッセージが届いています by __user__",
   "Offline_form": "オフラインフォーム",
   "Offline_form_unavailable_message": "オフラインフォーム不可メッセージ",
+  "Offline_Mention_Email": "あなたについて #__room__ でコメントされています by __user__",
   "Offline_message": "オフラインメッセージ",
   "Offline_success_message": "オフライン成功メッセージ",
   "Offline_unavailable": "オフライン利用できません",
@@ -789,6 +790,7 @@
   "Opened": "開いた状態",
   "optional": "オプション",
   "Order": "注文",
+  "Original": "オリジナル",
   "OS_Arch": "OS アーキテクチャー",
   "OS_Cpus": "OS CPU 数",
   "OS_Freemem": "OS 空きメモリー",
@@ -1058,19 +1060,19 @@
   "The_user_wont_be_able_to_type_in_s": "そのユーザーは、 %s で入力できなくなります",
   "Theme": "テーマ",
   "theme-color-content-background-color": "コンテンツ 背景色",
+  "theme-color-custom-scrollbar-color": "カスタム スクロールバー色",
+  "theme-color-info-font-color": "情報 文字色",
+  "theme-color-link-font-color": "リンク 文字色",
   "theme-color-primary-background-color": "基本 背景色",
   "theme-color-primary-font-color": "基本 文字色",
   "theme-color-secondary-background-color": "二次 背景色",
   "theme-color-secondary-font-color": "二次 文字色",
-  "theme-color-tertiary-background-color": "三次 背景色",
-  "theme-color-tertiary-font-color": "三次 文字色",
-  "theme-color-link-font-color": "リンク 文字色",
-  "theme-color-info-font-color": "情報 文字色",
-  "theme-color-custom-scrollbar-color": "カスタム スクロールバー色",
   "theme-color-status-away": "離席中 ステータス色",
   "theme-color-status-busy": "取り込み中 ステータス色",
   "theme-color-status-offline": "状態を隠す ステータス色",
   "theme-color-status-online": "オンライン ステータス色",
+  "theme-color-tertiary-background-color": "三次 背景色",
+  "theme-color-tertiary-font-color": "三次 文字色",
   "theme-color-unread-notification-color": "未読 通知色",
   "theme-custom-css": "カスタム CSS",
   "There_are_no_agents_added_to_this_department_yet": "この部門には、まだ担当者がいません。",
@@ -1243,4 +1245,4 @@
   "Your_mail_was_sent_to_s": "メールは %s へを送信されました",
   "Your_password_is_wrong": "パスワードが間違っています!",
   "Your_push_was_sent_to_s_devices": "プッシュ通知が %s 台のデバイスへ送信されました"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json
index c6c28acfb5e..be3d59aa11d 100644
--- a/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "បិទការកត់ត្រាការសន្ទនា",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "បិទការកត់ត្រាការសន្ទនាគឺជាការមិនអាចរកបានសម្រាប់កម្មវិធីរុករកឬឧបករណ៍របស់អ្នក។",
   "Offline": "ក្រៅបណ្តាញ",
+  "Offline_DM_Email": "អ្នកត្រូវបាន messaged ដោយផ្ទាល់ដោយ __user__",
   "Offline_form": "សំណុំបែបបទដែលបានក្រៅបណ្តាញ",
   "Offline_form_unavailable_message": "សំណុំបែបបទដែលបានក្រៅបណ្តាញសារមិនអាចប្រើបាន",
+  "Offline_Mention_Email": "អ្នកត្រូវបានលើកឡើងដោយ __user__ ក្នុង #__room__",
   "Offline_message": "សារក្រៅបណ្តាញ",
   "Offline_success_message": "សារដែលទទួលបានជោគជ័យក្រៅបណ្តាញ",
   "Offline_unavailable": "មិនអាចប្រើបានក្រៅបណ្តាញ",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "អ្នកប្រើនឹងមិនអាចវាយនៅក្នុង %s",
   "Theme": "ស្បែក",
   "theme-color-content-background-color": "ពណ៌ផ្ទៃខាងក្រោយអត្ថបទ",
+  "theme-color-custom-scrollbar-color": "របាររមូរផ្ទាល់ខ្លួន Color",
+  "theme-color-info-font-color": "ពណ៌ពុម្ពអក្សររបស់ Info",
+  "theme-color-link-font-color": "ពណ៌ពុម្ពអក្សរតំណភ្ជាប់",
   "theme-color-primary-background-color": "ពណ៌អាទិភាពផ្ទៃខាងក្រោយ",
   "theme-color-primary-font-color": "ពណ៌អាទិភាពពុម្ពអក្សរ",
   "theme-color-secondary-background-color": "ពណ៌បន្ទាប់បន្សំផ្ទៃខាងក្រោយ",
   "theme-color-secondary-font-color": "ពណ៌បន្ទាប់បន្សំពុម្ពអក្សរ",
-  "theme-color-tertiary-background-color": "ផ្ទៃខាងក្រោយឧត្តមសិក្សា",
-  "theme-color-tertiary-font-color": "ឧត្តមសិក្សាល័ពុម្ពអក្សរ",
-  "theme-color-link-font-color": "ពណ៌ពុម្ពអក្សរតំណភ្ជាប់",
-  "theme-color-info-font-color": "ពណ៌ពុម្ពអក្សររបស់ Info",
-  "theme-color-custom-scrollbar-color": "របាររមូរផ្ទាល់ខ្លួន Color",
   "theme-color-status-away": "ពណ៌ស្ថានភាពនៅឆ្ងាយ",
   "theme-color-status-busy": "ពណ៌ស្ថានភាពរវល់",
   "theme-color-status-offline": "ពណ៌ស្ថានភាពក្រៅបណ្តាញ",
   "theme-color-status-online": "ពណ៌ស្ថានភាពលើបណ្តាញ",
+  "theme-color-tertiary-background-color": "ផ្ទៃខាងក្រោយឧត្តមសិក្សា",
+  "theme-color-tertiary-font-color": "ឧត្តមសិក្សាល័ពុម្ពអក្សរ",
   "theme-color-unread-notification-color": "មិនទាន់អាន​​ Color ជូនដំណឹង",
   "theme-custom-css": "CSS ផ្ទាល់ខ្លួន",
   "There_are_no_agents_added_to_this_department_yet": "មានភ្នាក់ងារបានបន្ថែមទៅនាយកដ្ឋាននេះនៅឡើយទេ។",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "សំបុត្ររបស់អ្នកត្រូវបានបញ្ជូនទៅកាន់ %s",
   "Your_password_is_wrong": "ពាក្យសម្ងាត់របស់អ្នកគឺខុស!",
   "Your_push_was_sent_to_s_devices": "ការជំរុញរបស់អ្នកត្រូវបានបញ្ជូនទៅកាន់ឧបករណ៍ %s បាន"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ko.i18n.json b/packages/rocketchat-i18n/i18n/ko.i18n.json
index 203cce12129..4355f2eaa22 100644
--- a/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -95,6 +95,8 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor 콜백 URL",
   "Accounts_OAuth_Meteor_id": "Meteor ID",
   "Accounts_OAuth_Meteor_secret": "Meteor 암호",
+  "Accounts_OAuth_Proxy_host": "프록시 호스트",
+  "Accounts_OAuth_Proxy_services": "프록시 서비스",
   "Accounts_OAuth_Twitter": "트위터 로그인",
   "Accounts_OAuth_Twitter_callback_url": "트위터 콜백 URL",
   "Accounts_OAuth_Twitter_id": "트위터 아이디",
@@ -104,8 +106,6 @@
   "Accounts_OAuth_Wordpress_id": "워드 프레스 아이디",
   "Accounts_OAuth_Wordpress_secret": "워드 프레스 암호",
   "Accounts_PasswordReset": "암호 재설정",
-  "Accounts_OAuth_Proxy_host": "프록시 호스트",
-  "Accounts_OAuth_Proxy_services": "프록시 서비스",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "인증서비스용 기본 역할",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "인증 서비스를 통해서 등록된 사용자는 기본 역할이 주어지게 됩니다.",
   "Accounts_Registration_AuthenticationServices_Enabled": "인증 서비스에 등록",
@@ -218,6 +218,7 @@
   "Authorization_URL": "인증 URL",
   "Authorize": "권한 부여",
   "Auto_Load_Images": "이미지 자동 로드",
+  "Auto_Translate": "자동 번역",
   "AutoLinker_Email": "AutoLinker 이메일",
   "AutoLinker_Phone": "AutoLinker 전화",
   "AutoLinker_Phone_Description": "자동으로 전화 번호를 연결. 예를 들어`(123) 456-7890`",
@@ -228,7 +229,6 @@
   "AutoLinker_Urls_www": "AutoLinker 'WWW'의 URL",
   "AutoLinker_UrlsRegExp": "AutoLinker URL 정규 표현식",
   "Automatic_Translation": "자동 번역",
-  "Auto_Translate": "자동 번역",
   "AutoTranslate_Enabled": "자동 번역 활성화",
   "AutoTranslate_GoogleAPIKey": "구글 API 키",
   "Available": "유효한",
@@ -245,8 +245,8 @@
   "Away_male": "자리비움",
   "Back": "뒤로",
   "Back_to_applications": "응용 프로그램으로 돌아가기",
-  "Back_to_integrations": "Integrations 로 돌아가기",
   "Back_to_integration_detail": "Integration detail 로 돌아가기",
+  "Back_to_integrations": "Integrations 로 돌아가기",
   "Back_to_login": "로그인으로 돌아가기",
   "Back_to_permissions": "권한 으로 돌아가기",
   "Backup_codes": "백업 코드",
@@ -267,7 +267,6 @@
   "busy_male": "바쁨",
   "Busy_male": "바쁨",
   "by": "으로",
-  "Content": "내용",
   "cache_cleared": "캐시가 삭제됨",
   "Cancel": "취소",
   "Cancel_message_input": "취소",
@@ -321,6 +320,7 @@
   "Commands": "명령",
   "Compact": "콤팩트",
   "Confirm_password": "암호를 확인하세요",
+  "Content": "내용",
   "Conversation": "대화",
   "Conversation_closed": "대화 종료 : __comment__.",
   "Convert_Ascii_Emojis": "이모지를 ASCII로 변환",
@@ -336,8 +336,8 @@
   "Created_at": "만든",
   "Created_at_s_by_s": "<strong> %s에</strong> 의해 <strong> %s로</strong> 만든",
   "Created_at_s_by_s_triggered_by_s": "<strong>%s</strong> 에 트리거 된 <strong>%s</strong> 에 의해 <strong> %s </strong> 에 생성됨",
-  "CROWD_Reject_Unauthorized": "인증되지않은 것 거부",
   "CRM_Integration": "CRM Integration",
+  "CROWD_Reject_Unauthorized": "인증되지않은 것 거부",
   "Current_Chats": "현재 채팅",
   "Current_Status": "현재 상태",
   "Custom": "맞춤",
@@ -353,10 +353,9 @@
   "Custom_Fields": "사용자 정의 필드",
   "Custom_oauth_helper": "OAuth Provider를 설정할때, 콜백 URL을 알려줘야합니다. <pre>%s</pre>를 사용.",
   "Custom_oauth_unique_name": "사용자 정의 OAuth 고유 이름",
-  "Custom_Scripts": "사용자 정의 스크립트",
   "Custom_Script_Logged_In": "로그인 한 사용자를 위한 사용자 정의 스크립트 ",
   "Custom_Script_Logged_Out": "로그 아웃 사용자를 위한 사용자 정의 스크립트 ",
-  "Custom_Sounds": "사용자 정의 사운드",
+  "Custom_Scripts": "사용자 정의 스크립트",
   "Custom_Sound_Add": "사용자 정의 사운드 추가",
   "Custom_Sound_Delete_Warning": "사운드 삭제는 복구 할 수 없습니다.",
   "Custom_Sound_Error_Invalid_Sound": "잘못된 사운드",
@@ -364,6 +363,7 @@
   "Custom_Sound_Has_Been_Deleted": "사용자 정의 사운드가 삭제되었습니다.",
   "Custom_Sound_Info": "사용자 정의 사운드 정보",
   "Custom_Sound_Saved_Successfully": "사용자 정의 사운드가 성공적으로 저장 되었습니다",
+  "Custom_Sounds": "사용자 정의 사운드",
   "Custom_Translations": "사용자 정의 번역(해석)",
   "Custom_Translations_Description": " Key는 Key와 번역의 딕셔너리가 포함된 언어 인 유효한 JSON 이어야 합니다. 예:<br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"pt\": {\n  \"Channels\": \"Salas\"\n }\n}</code>",
   "CustomSoundsFilesystem": "사용자 정의 사운드 파일시스템",
@@ -865,8 +865,10 @@
   "Off_the_record_conversation": "오프 - 더 - 레코드 대화",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "오프 - 더 - 레코드 대화는 브라우저 나 장치를 사용할 수 없습니다.",
   "Offline": "오프라인",
+  "Offline_DM_Email": "당신이 직접 __user__에 의해 메세지되었습니다",
   "Offline_form": "오프라인 형태",
   "Offline_form_unavailable_message": "오프라인 형태로 사용할 수없는 메시지",
+  "Offline_Mention_Email": "당신은 #__room__에 __user__ 언급 한",
   "Offline_message": "오프라인 메시지",
   "Offline_success_message": "오프라인 성공 메시지",
   "Offline_unavailable": "오프라인으로 사용할 수 없습니다",
@@ -1142,19 +1144,19 @@
   "The_user_wont_be_able_to_type_in_s": "사용자는 %s에 입력 할 수 없습니다",
   "Theme": "테마",
   "theme-color-content-background-color": "콘텐츠 배경색",
+  "theme-color-custom-scrollbar-color": "사용자 지정 스크롤 막대 색상",
+  "theme-color-info-font-color": "글자 색상 정보",
+  "theme-color-link-font-color": "링크 글꼴 색상",
   "theme-color-primary-background-color": "기본 배경색",
   "theme-color-primary-font-color": "기본 글자 색상",
   "theme-color-secondary-background-color": "보조 배경색",
   "theme-color-secondary-font-color": "보조 글자 색상",
-  "theme-color-tertiary-background-color": "차 배경 색상",
-  "theme-color-tertiary-font-color": "차 글꼴 색상",
-  "theme-color-link-font-color": "링크 글꼴 색상",
-  "theme-color-info-font-color": "글자 색상 정보",
-  "theme-color-custom-scrollbar-color": "사용자 지정 스크롤 막대 색상",
   "theme-color-status-away": "자리비움 상태 색상",
   "theme-color-status-busy": "바쁨 상태 색상",
   "theme-color-status-offline": "보지않음 상태 색상",
   "theme-color-status-online": "온라인 상태 색상",
+  "theme-color-tertiary-background-color": "차 배경 색상",
+  "theme-color-tertiary-font-color": "차 글꼴 색상",
   "theme-color-unread-notification-color": "읽지 않은 알림 색상",
   "theme-custom-css": "사용자 정의 CSS",
   "There_are_no_agents_added_to_this_department_yet": "아직이 부서에 추가에는 에이전트가 없습니다.",
@@ -1325,4 +1327,4 @@
   "Your_mail_was_sent_to_s": "메일은 %s의 전송되었습니다",
   "Your_password_is_wrong": "암호가 잘못되었습니다!",
   "Your_push_was_sent_to_s_devices": "귀하의 푸시는 %의 기기에 전송"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ku.i18n.json b/packages/rocketchat-i18n/i18n/ku.i18n.json
index 477b85a38eb..bd485ce1a3b 100644
--- a/packages/rocketchat-i18n/i18n/ku.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ku.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "Off-the-record Conversation",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record hevpeyvînekê de ye ji bo browser an amûrê xwe ne amade ne.",
   "Offline": "Ne girêdayî",
+  "Offline_DM_Email": "Te direct by __user__ messaged dîtin",
   "Offline_form": "forma is offline",
   "Offline_form_unavailable_message": "Ne girêdayî form message unavailable",
+  "Offline_Mention_Email": "Te by __user__ li #__room__ bêşê",
   "Offline_message": "peyamek Negirêdayî",
   "Offline_success_message": "message serkeftina is offline",
   "Offline_unavailable": "Ne girêdayî ne amade ye",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "The user bi wê bikaribin kes li %s",
   "Theme": "Mijad",
   "theme-color-content-background-color": "Content Color Background",
+  "theme-color-custom-scrollbar-color": "Custom scrollbar Color",
+  "theme-color-info-font-color": "Info Font Color",
+  "theme-color-link-font-color": "Link Font Color",
   "theme-color-primary-background-color": "Primary Color Background",
   "theme-color-primary-font-color": "Primary Font Color",
   "theme-color-secondary-background-color": "Navîn Color Background",
   "theme-color-secondary-font-color": "Navîn Font Color",
-  "theme-color-tertiary-background-color": "Kirmashan Color Background",
-  "theme-color-tertiary-font-color": "Kirmashan Font Color",
-  "theme-color-link-font-color": "Link Font Color",
-  "theme-color-info-font-color": "Info Font Color",
-  "theme-color-custom-scrollbar-color": "Custom scrollbar Color",
   "theme-color-status-away": "Rewş Away Color",
   "theme-color-status-busy": "Rewş Mijûl Color",
   "theme-color-status-offline": "Rewş is Color",
   "theme-color-status-online": "Bike Status Color",
+  "theme-color-tertiary-background-color": "Kirmashan Color Background",
+  "theme-color-tertiary-font-color": "Kirmashan Font Color",
   "theme-color-unread-notification-color": "Unread Notifications Color",
   "theme-custom-css": "CSS Custom",
   "There_are_no_agents_added_to_this_department_yet": "are no ajanên added ji bo vê beşê yet hene.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "nameya te ji bo %s hate şandin",
   "Your_password_is_wrong": "Te şîfreya xwe ji xelet e!",
   "Your_push_was_sent_to_s_devices": "push xwe ji bo cîhazên %s hate şandin"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/lo.i18n.json b/packages/rocketchat-i18n/i18n/lo.i18n.json
index fbbff912ebc..713ae363a8f 100644
--- a/packages/rocketchat-i18n/i18n/lo.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lo.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "ໄປໄດ້, ການບັນທຶກການສົນທະນາ",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "ໄປໄດ້, ການບັນທຶກການສົນທະນາແມ່ນບໍ່ສາມາດໃຊ້ສໍາລັບຕົວທ່ອງເວັບຫຼືອຸປະກອນຂອງທ່ານ.",
   "Offline": "ອອຟໄລ",
+  "Offline_DM_Email": "ທ່ານໄດ້ຮັບການ messaged ໂດຍກົງໂດຍ __user__",
   "Offline_form": "ຮູບແບບອອຟໄລ",
   "Offline_form_unavailable_message": "ຮູບແບບອອຟໄລຂໍ້ຄວາມບໍ່ສາມາດໃຊ້",
+  "Offline_Mention_Email": "ທ່ານໄດ້ຮັບການທີ່ໄດ້ກ່າວມາໂດຍ __user__ ໃນ #__room__",
   "Offline_message": "ຂໍ້ຄວາມອອຟໄລ",
   "Offline_success_message": "ຂໍ້ຄວາມສໍາເລັດອອຟໄລ",
   "Offline_unavailable": "ບໍ່ສາມາດໃຊ້ອອຟໄລ",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "ຜູ້ໃຊ້ຈະບໍ່ສາມາດຢູ່ໃນປະເພດ %s",
   "Theme": "Theme",
   "theme-color-content-background-color": "ເນື້ອໃນສີຄວາມເປັນມາ",
+  "theme-color-custom-scrollbar-color": "Custom ເລື່ອນສີ",
+  "theme-color-info-font-color": "ຂໍ້ມູນ Font ສີ",
+  "theme-color-link-font-color": "ການເຊື່ອມຕໍ່ສີຕົວອັກສອນ",
   "theme-color-primary-background-color": "ປະຖົມສີຄວາມເປັນມາ",
   "theme-color-primary-font-color": "ປະຖົມສີຕົວອັກສອນ",
   "theme-color-secondary-background-color": "ມັດທະຍົມສີຄວາມເປັນມາ",
   "theme-color-secondary-font-color": "ມັດທະຍົມສີຕົວອັກສອນ",
-  "theme-color-tertiary-background-color": "ສາມສີຄວາມເປັນມາ",
-  "theme-color-tertiary-font-color": "ສາມສີຕົວອັກສອນ",
-  "theme-color-link-font-color": "ການເຊື່ອມຕໍ່ສີຕົວອັກສອນ",
-  "theme-color-info-font-color": "ຂໍ້ມູນ Font ສີ",
-  "theme-color-custom-scrollbar-color": "Custom ເລື່ອນສີ",
   "theme-color-status-away": "ໄປສີສະຖານະ",
   "theme-color-status-busy": "ທຸລະກິດສີສະຖານະ",
   "theme-color-status-offline": "ອອຟໄລສີສະຖານະ",
   "theme-color-status-online": "ອອນໄລນ໌ສີສະຖານະ",
+  "theme-color-tertiary-background-color": "ສາມສີຄວາມເປັນມາ",
+  "theme-color-tertiary-font-color": "ສາມສີຕົວອັກສອນ",
   "theme-color-unread-notification-color": "ຍັງບໍ່ໄດ້ອ່ານສີການແຈ້ງເຕືອນ",
   "theme-custom-css": "CSS Custom",
   "There_are_no_agents_added_to_this_department_yet": "ມີຕົວແທນເພີ່ມບໍ່ມີການພະແນກນີ້ຍັງ.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "ອີເມລຂອງທ່ານໄດ້ຖືກສົ່ງໄປ %s",
   "Your_password_is_wrong": "ລະຫັດຜ່ານຂອງທ່ານແມ່ນຜິດພາດ!",
   "Your_push_was_sent_to_s_devices": "ການຊຸກຍູ້ຂອງທ່ານໄດ້ຖືກສົ່ງໄປອຸປະກອນ %s"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
index ddcb6418fd6..3787041ffe9 100644
--- a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "Off-the-rekod Perbualan",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-rekod perbualan tidak tersedia untuk pelayar atau peranti anda.",
   "Offline": "offline",
+  "Offline_DM_Email": "Anda telah menghantar mesej langsung oleh __user__",
   "Offline_form": "bentuk offline",
   "Offline_form_unavailable_message": "bentuk Offline mesej tersedia",
+  "Offline_Mention_Email": "Anda telah disebut oleh __user__ dalam #__room__",
   "Offline_message": "mesej offline",
   "Offline_success_message": "mesej kejayaan Offline",
   "Offline_unavailable": "luar talian tidak tersedia",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "Pengguna tidak akan dapat untuk menaip dalam %s",
   "Theme": "tema",
   "theme-color-content-background-color": "Warna Latar Belakang kandungan",
+  "theme-color-custom-scrollbar-color": "Custom Scrollbar Color",
+  "theme-color-info-font-color": "Maklumat Font Warna",
+  "theme-color-link-font-color": "Link Font Warna",
   "theme-color-primary-background-color": "Warna Latar Belakang Utama",
   "theme-color-primary-font-color": "Primary Font Warna",
   "theme-color-secondary-background-color": "Warna Latar Belakang Menengah",
   "theme-color-secondary-font-color": "Menengah Font Warna",
-  "theme-color-tertiary-background-color": "Warna Latar Belakang Tertiary",
-  "theme-color-tertiary-font-color": "Tertiary Font Warna",
-  "theme-color-link-font-color": "Link Font Warna",
-  "theme-color-info-font-color": "Maklumat Font Warna",
-  "theme-color-custom-scrollbar-color": "Custom Scrollbar Color",
   "theme-color-status-away": "Status Away Warna",
   "theme-color-status-busy": "Status Busy Warna",
   "theme-color-status-offline": "Status Offline Warna",
   "theme-color-status-online": "Online Status Warna",
+  "theme-color-tertiary-background-color": "Warna Latar Belakang Tertiary",
+  "theme-color-tertiary-font-color": "Tertiary Font Warna",
   "theme-color-unread-notification-color": "Belum Baca Pemberitahuan Warna",
   "theme-custom-css": "CSS Custom",
   "There_are_no_agents_added_to_this_department_yet": "Tiada ejen ditambah kepada jabatan ini.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "mel anda telah dihantar ke %s",
   "Your_password_is_wrong": "Kata laluan anda adalah salah!",
   "Your_push_was_sent_to_s_devices": "push anda telah dihantar ke peranti %s"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json
index 662faa400b4..7c95bdf6d5b 100644
--- a/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "Off-the-opname Conversation",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-opname gesprek is niet beschikbaar voor uw browser of apparaat.",
   "Offline": "offline",
+  "Offline_DM_Email": "Je hebt direct zijn messaged door __user__",
   "Offline_form": "offline vorm",
   "Offline_form_unavailable_message": "Offline vorm beschikbaar bericht",
+  "Offline_Mention_Email": "Je bent genoemd door __user__ in #__room__",
   "Offline_message": "offline bericht",
   "Offline_success_message": "Offline succes bericht",
   "Offline_unavailable": "offline beschikbaar",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "De gebruiker kan niet typen in %s",
   "Theme": "Thema",
   "theme-color-content-background-color": "Inhoud Achtergrondkleur",
+  "theme-color-custom-scrollbar-color": "Handmatige Scrollbarkleur",
+  "theme-color-info-font-color": "Info Tekstkleur",
+  "theme-color-link-font-color": "Link Tekstkleur",
   "theme-color-primary-background-color": "Primaire Achtergrondkleur",
   "theme-color-primary-font-color": "Primaire Tekstkleur",
   "theme-color-secondary-background-color": "Secondaire Achtergrondkleur",
   "theme-color-secondary-font-color": "Secondaire Tekstkleur",
-  "theme-color-tertiary-background-color": "Tertiaire Achtergronkleur",
-  "theme-color-tertiary-font-color": "Tertiaire Tekstkleur ",
-  "theme-color-link-font-color": "Link Tekstkleur",
-  "theme-color-info-font-color": "Info Tekstkleur",
-  "theme-color-custom-scrollbar-color": "Handmatige Scrollbarkleur",
   "theme-color-status-away": "Afwezig Statuskleur",
   "theme-color-status-busy": "Bezet Statuskleur",
   "theme-color-status-offline": "Offline Statuskleur",
   "theme-color-status-online": "Online Statuskleur",
+  "theme-color-tertiary-background-color": "Tertiaire Achtergronkleur",
+  "theme-color-tertiary-font-color": "Tertiaire Tekstkleur ",
   "theme-color-unread-notification-color": "Ongelezen Notificaties Kleur",
   "theme-custom-css": "Custom CSS",
   "There_are_no_agents_added_to_this_department_yet": "Er zijn nog geen agenten aan deze afdeling toegevoegd.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "Uw e-mail werd verzonden naar %s",
   "Your_password_is_wrong": "Je wachtwoord is verkeerd!",
   "Your_push_was_sent_to_s_devices": "Je push werd verzonden naar %s apparaten"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/no.i18n.json b/packages/rocketchat-i18n/i18n/no.i18n.json
index e71892775f9..9d0ef72b114 100644
--- a/packages/rocketchat-i18n/i18n/no.i18n.json
+++ b/packages/rocketchat-i18n/i18n/no.i18n.json
@@ -60,9 +60,9 @@
   "busy_male": "opptatt",
   "Busy_male": "Opptatt",
   "by": "av",
-  "Content": "Innhold",
   "Cancel": "Avbryt",
   "Cancel_message_input": "Avbryt",
   "channel": "kanal",
-  "Channel": "Kanal"
+  "Channel": "Kanal",
+  "Content": "Innhold"
 }
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json
index f5780fad3fc..a6788570c0d 100644
--- a/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -6,7 +6,7 @@
   "403": "Zabronione",
   "500": "Wewnętrzny błąd serwera",
   "@username": "@nazwa użytkownika",
-  "@username_message": "@nazwa użytkownika<message>",
+  "@username_message": "@nazwa użytkownika <message>",
   "__username__is_no_longer__role__defined_by__user_by_": "__username__ nie jest już __role__ przez __user_by__",
   "__username__was_set__role__by__user_by_": "__username__ ustalono __role__ przez __user_by__",
   "Accept": "Akceptuj",
@@ -54,10 +54,12 @@
   "Accounts_OAuth_Custom_id": "Id",
   "Accounts_OAuth_Custom_Identity_Path": "Identity Path",
   "Accounts_OAuth_Custom_Login_Style": "Styl logowania",
+  "Accounts_OAuth_Custom_Merge_Users": "Przenieś użytkowników",
   "Accounts_OAuth_Custom_Scope": "Zakres",
   "Accounts_OAuth_Custom_Secret": "Secret",
   "Accounts_OAuth_Custom_Token_Path": "Token Path",
   "Accounts_OAuth_Custom_Token_Sent_Via": "Token wysyłany przez",
+  "Accounts_OAuth_Custom_Username_Field": "Pole nazwa użytkownika",
   "Accounts_OAuth_Facebook": "Facebook Login",
   "Accounts_OAuth_Facebook_callback_url": "Facebook Callback URL",
   "Accounts_OAuth_Facebook_id": "Facebook App Id",
@@ -86,6 +88,7 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor Callback URL",
   "Accounts_OAuth_Meteor_id": "Meteor Id",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_services": "Usługi Proxy",
   "Accounts_OAuth_Twitter": "Twitter Login",
   "Accounts_OAuth_Twitter_callback_url": "Twitter Callback URL",
   "Accounts_OAuth_Twitter_id": "Twitter Id",
@@ -105,6 +108,7 @@
   "Accounts_RegistrationForm_SecretURL_Description": "Musisz podać losowy ciąg znaków, który zostanie dodany do adresu URL rejestracji. Przykład: https://demo.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Wymagaj podana nazwy podczas rejestracji",
   "Accounts_RequirePasswordConfirmation": "Wymagaj potwierdzenia hasła",
+  "Accounts_SetDefaultAvatar": "Ustaw domyślny Avatar",
   "Accounts_ShowFormLogin": "Pokaż formularz logowania",
   "Accounts_UseDefaultBlockedDomainsList": "Użyj domyślnego Lista zablokowanych domen",
   "Accounts_UseDNSDomainCheck": "Użyj DNS domeny Check",
@@ -116,7 +120,10 @@
   "Add": "Dodaj",
   "Add_agent": "Dodaj agenta",
   "Add_custom_oauth": "Dodaj własne OAuth",
+  "Add_Domain": "Dodaj domenę",
+  "Add_files_from": "Dodaj pliki z",
   "Add_manager": "Dodaj menedżera",
+  "Add_Role": "Dodaj rolę",
   "Add_user": "Dodaj użytkownika",
   "Add_User": "Dodaj użytkownika",
   "Add_users": "Dodaj użytkowników",
@@ -126,6 +133,7 @@
   "Additional_emails": "Dodatkowe adresy e-mail",
   "Additional_Feedback": "Dodatkowy komentarz",
   "Administration": "Administracja",
+  "Adult_images_are_not_allowed": "Obrazy dla dorosłych nie są dozwolone",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "Po uwierzytelnieniu OAuth2, użytkownik zostanie przekierowany na ten adres URL",
   "Agent": "Agent",
   "Agent_added": "Agent dodany",
@@ -150,6 +158,7 @@
   "Announcement": "Ogłoszenie",
   "API": "API",
   "API_Analytics": "Analytics",
+  "API_Default_Count": "Domyślny licznik",
   "API_Embed": "Osadź",
   "API_Embed_Description": "Czy podgląd umieszczanych linków do stron przez użytkownika jest aktywny.",
   "API_EmbedDisabledFor": "Wyłącz osadzanie dla użytkowników",
@@ -179,6 +188,7 @@
   "Assign_admin": "Przypisywanie admina",
   "at": "w",
   "Attachment_File_Uploaded": "Plik wysłany",
+  "Audio_message": "Wiadomość audio",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
   "Authorization_URL": "URL autoryzacji",
@@ -193,6 +203,7 @@
   "AutoLinker_Urls_TLD": "URL AutoLinker TLD",
   "AutoLinker_Urls_www": "URL AutoLinker \"www\"",
   "AutoLinker_UrlsRegExp": "AutoLinker URL Regular Expression",
+  "Automatic_Translation": "Automatyczne tłumaczenie",
   "Available": "Dostępny",
   "Available_agents": "Dostępni agenci",
   "Avatar": "Avatary",
@@ -207,9 +218,11 @@
   "Away_male": "Zaraz wracam",
   "Back": "Wstecz",
   "Back_to_applications": "Powrót do aplikacji",
+  "Back_to_chat": "Wróć do czatu",
   "Back_to_integrations": "Powrót do integracji",
   "Back_to_login": "Wróć do strony logowania",
   "Back_to_permissions": "Powrót do uprawnień",
+  "Block_User": "Zablokować użytkownika",
   "Body": "Zawartość",
   "bold": "pogrubienie",
   "bot_request": "Żądanie bota",
@@ -223,6 +236,7 @@
   "busy_male": "zajęty",
   "Busy_male": "Zajęty",
   "by": "by",
+  "cache_cleared": "Wyczyszczono cache",
   "Cancel": "Anuluj",
   "Cancel_message_input": "Anuluj",
   "Cannot_invite_users_to_direct_rooms": "Nie możnesz zaprosić użytkowników do bezpośrednich pokoi",
@@ -240,6 +254,7 @@
   "CAS_version": "Wersja CAS",
   "CDN_PREFIX": "Prefiks CDN",
   "Certificates_and_Keys": "Certyfikaty i klucze",
+  "Change_Room_Type": "Zmiana typu pokoju",
   "Changing_email": "Zmiana e-mail",
   "channel": "kanał",
   "Channel": "Kanał",
@@ -277,6 +292,7 @@
   "Comment_to_leave_on_closing_session": "Komentarz pozostawiany przy zamknięciu sesji",
   "Compact": "Kompaktowy",
   "Confirm_password": "Potwierdź hasło",
+  "Content": "Zawartość",
   "Conversation": "Rozmowa",
   "Conversation_closed": "Rozmowa zamknięty: __comment__.",
   "Convert_Ascii_Emojis": "Konwertuj ASCII do Emoji",
@@ -308,8 +324,11 @@
   "Custom_Script_Logged_In": "Skrypt dla zalogowanych użytkowników",
   "Custom_Script_Logged_Out": "Skrypt dla niezalogowanych użytkowników",
   "Custom_Translations": "Własne tłumaczenia",
+  "CustomSoundsFilesystem": "Niestandardowy system plików dźwiękowych",
   "Dashboard": "Panel",
   "Date": "Data",
+  "Date_From": "Od",
+  "Date_to": "do",
   "days": "dni",
   "DB_Migration": "Migracja bazy danych",
   "DB_Migration_Date": "Data migracji bazy danych",
@@ -342,22 +361,25 @@
   "Direct_Reply_Enable": "Włącz bezpośrednią odpowiedź",
   "Direct_Reply_Frequency": "Częstotliwość sprawdzania poczty e-mail",
   "Direct_Reply_Frequency_Description": "(w minutach, domyślnie/minimum 2)",
-  "Direct_Reply_Protocol": "Protokół bezpośredniej odpowiedzi",
   "Direct_Reply_Host": "Odpowiedź Bezpośrednia Host",
-  "Direct_Reply_Port": "Odpowiedź Bezpośrednia Port",
   "Direct_Reply_IgnoreTLS": "Ignoruj TLS",
-  "Direct_Reply_Username": "Nazwa użytkownika",
-  "Direct_Reply_Username_Description": "Proszę użyj absolutnego adresu e-mail, tagowanie nie jest dozwolone, bo byłoby nadpisane",
   "Direct_Reply_Password": "Hasło",
+  "Direct_Reply_Port": "Odpowiedź Bezpośrednia Port",
+  "Direct_Reply_Protocol": "Protokół bezpośredniej odpowiedzi",
   "Direct_Reply_Separator": "Separator",
   "Direct_Reply_Separator_Description": "[Zmiana tylko wtedy, gdy wiesz dokładnie, co robisz, zapoznaj się z dokumentami]<br/>Separator pomiędzy częścią bazową i znacznikiem wiadomości e-mail",
+  "Direct_Reply_Username": "Nazwa użytkownika",
+  "Direct_Reply_Username_Description": "Proszę użyj absolutnego adresu e-mail, tagowanie nie jest dozwolone, bo byłoby nadpisane",
   "Disable_Notifications": "Wyłącz powiadomienia",
   "Disable_two-factor_authentication": "Wyłącz uwierzytelnianie dwuskładnikowe",
   "Display_offline_form": "Pokaż formularz nieaktywny",
   "Displays_action_text": "Wyświetla tekst akcji",
   "Do_you_want_to_change_to_s_question": "Czy chcesz zmienić na <strong>%s</strong>?",
   "Domain": "Domena",
+  "Domain_added": "domena dodana",
+  "Domain_removed": "Usunięto domenę",
   "Domains": "domeny",
+  "Download_Snippet": "Pobierz",
   "Drop_to_upload_file": "Przeciągnij, aby przesłać plik",
   "Dry_run": "Próba",
   "Dry_run_description": "Wyśle tylko jedną wiadomość e-mail, na adres podany w polu `Od`. Adres e-mail musi należeć do istniejącego użytkownika.",
@@ -391,13 +413,16 @@
   "Empty_title": "Pusty tytuł",
   "Enable": "Włącz",
   "Enable_Desktop_Notifications": "Włącz powiadomienia na pulpicie",
+  "Enable_two-factor_authentication": "Włącz uwierzytelnianie dwuskładnikowe",
   "Enabled": "Włączone",
   "Encrypted_message": "Zaszyfrowana wiadomość",
   "End_OTR": "Koniec OTR",
   "Enter_a_regex": "Wprowadź regex",
   "Enter_a_room_name": "Wpisz nazwę pokoju",
   "Enter_a_username": "Nazwa użytkownika",
+  "Enter_authentication_code": "Wprowadź kod uwierzytelnienia",
   "Enter_name_here": "Wpisz nazwę tutaj",
+  "Enter_Normal": "Tryb normalny (wysyłaj klawiszem Enter)",
   "Enter_to": "Naciśnij Enter: ",
   "Error": "Błąd",
   "error-action-not-allowed": "__action__ jest niedozwolone",
@@ -425,9 +450,11 @@
   "error-invalid-channel-start-with-chars": "Nieprawidłowy kanał. Rozpocznij z @ lub #",
   "error-invalid-custom-field": "Nieprawidłowe pole",
   "error-invalid-custom-field-name": "Nieprawidłowa nazwa pole niestandardowe. Używaj tylko litery, cyfry, łączniki i podkreślenia.",
+  "error-invalid-date": "Nieprawidłowa data.",
   "error-invalid-description": "Nieprawidłowy opis",
   "error-invalid-domain": "Nieprawidłowa domena",
   "error-invalid-email": "Nieprawidłowy email: __email__",
+  "error-invalid-email-address": "Niepoprawny adres email",
   "error-invalid-file-height": "Nieprawidłowa wysokość pliku",
   "error-invalid-file-type": "Nieprawidłowy typ pliku",
   "error-invalid-file-width": "Nieprawidłowa szerokość pliku",
@@ -512,6 +539,8 @@
   "Force_SSL": "Wymuś SSL",
   "Force_SSL_Description": "* Uwaga! * _Force SSL_ nigdy nie powinno być stosowane z reverse proxy. Jeśli masz reverse proxy, należy zrobić przekierowanie tam. Opcja ta istnieje dla wdrożeń, np. na Heroku, który nie pozwala na konfigurację przekierowania przez reverse proxy.",
   "Forgot_password": "Zapomniałeś hasła",
+  "Forgot_Password_Email": "Kliknij <a href=\"[Forgot_Password_Url]\"> tutaj</a>, aby zresetować hasło.\n",
+  "Forgot_password_section": "Zapomniałeś hasła",
   "Forward": "Przekaż",
   "Forward_chat": "Przekaż czat",
   "Forward_to_department": "Przekaż do oddziału",
@@ -527,16 +556,24 @@
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Nadaj aplikacji nazwę. Będzie ona widoczna dla użytkowników.",
   "Global": "Światowy",
   "GoogleTagManager_id": "Menedżer tagów Google Id",
+  "GoogleVision_Type_Document": "Wykrywanie tekstu dokumentu",
+  "GoogleVision_Type_Faces": "Wykrywanie twarzy",
+  "GoogleVision_Type_Labels": "Wykrywanie etykiet",
+  "GoogleVision_Type_Landmarks": "Wykrywanie cech charakterystycznych",
+  "GoogleVision_Type_Logos": "Wykrywanie logotypu",
+  "GoogleVision_Type_Similar": "Znajdź podobne obrazy",
   "Hash": "Hash",
   "Header": "Nagłówek",
+  "Header_and_Footer": "Nagłówek i stopka",
   "Hidden": "Ukryty",
   "Hide_Avatars": "Ukryj avatary",
   "Hide_flextab": "Ukryj prawy sidebar po kliknięciu",
   "Hide_Group_Warning": "Czy na pewno chcesz ukryć grupę \" %s\"?",
+  "Hide_Livechat_Warning": "Czy na pewno chcesz ukryć livechat z \"%s\"?",
   "Hide_Private_Warning": "Czy na pewno chcesz ukryć dyskusję z \"%s\"?",
+  "Hide_roles": "Ukryj role",
   "Hide_room": "Ukryj pokój",
   "Hide_Room_Warning": "Czy na pewno chcesz ukryć pokój \" %s\"?",
-  "Hide_roles": "Ukryj role",
   "Hide_Unread_Room_Status": "Ukryj nieprzeczytany stan pokoju",
   "Hide_usernames": "Ukrywanie nazw użytkowników",
   "Highlights": "Podświetlane słowa",
@@ -554,6 +591,9 @@
   "How_to_handle_open_sessions_when_agent_goes_offline": "Co robić z otwartymi sesjami gdy agent offline",
   "If_you_are_sure_type_in_your_password": "Jeżeli jesteś pewien, wpisz swoje hasło:",
   "If_you_are_sure_type_in_your_username": "Jeżeli jesteś pewien, wpisz swoją nazwę użytkownika:",
+  "Iframe_Integration": "Integracja z ramkami iframe",
+  "Iframe_Integration_receive_enable": "Włącz Odbierz",
+  "Iframe_Integration_send_enable": "Włącz Send",
   "Importer_Archived": "Zarchiwizowane",
   "Importer_done": "Importowanie zakończone!",
   "Importer_finishing": "Kończąc się na import.",
@@ -582,11 +622,21 @@
   "Installed_at": "Zainstalowany o",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instrukcje dla odwiedzającego wypełnić formularz, aby wysłać wiadomość",
   "Integration_added": "Integracja została dodana",
+  "Integration_Advanced_Settings": "Zaawansowane ustawienia",
   "Integration_Incoming_WebHook": "Integracja: Przychodzący WebHook",
   "Integration_New": "Nowy Integracja",
   "Integration_Outgoing_WebHook": "Integracja: Wychodzący WebHook",
+  "Integration_Retry_Delay": "Ponów próbę opóźnienia",
+  "Integration_Run_When_Message_Is_Edited": "Uruchom Edytory",
   "Integration_updated": "Integracja została zaktualizowana",
   "Integrations": "Integracje",
+  "Integrations_Outgoing_Type_FileUploaded": "Plik przesłany",
+  "Integrations_Outgoing_Type_RoomArchived": "Pokój zarchiwizowany",
+  "Integrations_Outgoing_Type_RoomCreated": "Pokój utworzony (publiczny i prywatny)",
+  "Integrations_Outgoing_Type_RoomJoined": "Użytkownik dołączył do pokoju",
+  "Integrations_Outgoing_Type_RoomLeft": "Użytkownik opuścił pokoju",
+  "Integrations_Outgoing_Type_SendMessage": "Wiadomość wysłana",
+  "Integrations_Outgoing_Type_UserCreated": "Użytkownik utworzony",
   "InternalHubot": "Wewnętrzny Hubot",
   "InternalHubot_ScriptsToLoad": "Skrypty do załadowania",
   "InternalHubot_ScriptsToLoad_Description": "Wpisz oddzielone przecinkami listę skryptów załadować z https://github.com/github/hubot-scripts/tree/master/src/scripts",
@@ -609,6 +659,7 @@
   "Invitation_Subject_Default": "Zostałeś zaproszony do [Site_Name]",
   "Invite_user_to_join_channel": "Zaproś użytkownika by dołączył do kanału",
   "Invite_Users": "Zaproś użytkowników",
+  "IRC_Hostname": "Serwer hosta IRC, z którym się nawiążesz.",
   "is_also_typing": "również pisze",
   "is_also_typing_female": "pisze",
   "is_also_typing_male": "również pisze",
@@ -630,12 +681,19 @@
   "Jump_to_first_unread": "Przejdź do pierwszej nieprzeczytanej",
   "Jump_to_message": "Skocz do wiadomości",
   "Jump_to_recent_messages": "Przejdź do ostatnich wiadomości",
+  "Just_invited_people_can_access_this_channel": "Zaproszeni ludzie mogą uzyskać dostęp do tego kanału",
   "Katex_Dollar_Syntax": "Pozwól Dolar Składnia",
   "Katex_Dollar_Syntax_Description": "Pozwól użyciu bloku KATEX $$ $$ $ i $ inline KATEX składnie",
   "Katex_Enabled": "KATEX Włączony",
   "Katex_Enabled_Description": "Pozwól użyciu <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">KATEX</a> do składu matematyki w wiadomościach",
   "Katex_Parenthesis_Syntax": "Pozwól Parenthesis Składnia",
   "Katex_Parenthesis_Syntax_Description": "Pozwól używając \\ [blokowe KATEX \\] i \\ (inline KATEX \\) składnie",
+  "Keyboard_Shortcuts_Edit_Previous_Message": "Edytuj poprzednią wiadomość",
+  "Keyboard_Shortcuts_Keys_2": "<kbd>Strzałka w górę</kbd>",
+  "Keyboard_Shortcuts_Keys_3": "<kbd>Polecenie</kbd> (lub <kbd>Alt</kbd>) + <kbd>Strzałka w lewo</kbd>",
+  "Keyboard_Shortcuts_Keys_4": "<kbd>Polecenie</kbd> (lub <kbd>Alt</kbd>) + <kbd>Strzałka w górę</kbd>",
+  "Keyboard_Shortcuts_Keys_5": "<kbd>Polecenie</kbd> (lub <kbd>Alt</kbd>) + <kbd>Strzałka w prawo\n</kbd>",
+  "Keyboard_Shortcuts_Keys_6": "<kbd>Polecenie</kbd> (lub <kbd>Alt</kbd>) + <kbd>Strzałka w dół\n</kbd>",
   "Knowledge_Base": "Baza wiedzy",
   "Label": "Etykieta",
   "Language": "Język",
@@ -819,6 +877,7 @@
   "Mute_user": "Wycisz użytkownika",
   "Muted": "Wyciszony",
   "My_Account": "Moje konto",
+  "My_location": "Moja lokalizacja",
   "n_messages": "%s wiadomości",
   "N_new_messages": " %s nowych wiadomości",
   "Name": "Nazwa",
@@ -857,6 +916,7 @@
   "Nothing_found": "Nic nie znaleziono",
   "Notification_Duration": "Czas trwania powiadomienia",
   "Notifications": "Powiadomienia",
+  "Notifications_Sound_Volume": "Głośność powiadomienia ",
   "Notify_all_in_this_room": "Powiadom wszystkich w pokoju",
   "Num_Agents": "# agentów",
   "Number_of_messages": "Ilość wiadomości",
@@ -866,8 +926,10 @@
   "Off_the_record_conversation": "Konwersacja \"Off-the-record\"",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Konwersacja \"Off-the-record\" nie jest dostępna dla przeglądarki lub urządzenia.",
   "Offline": "Offline",
+  "Offline_DM_Email": "Dostałeś nową wiadomość bezpośrednią od __user__",
   "Offline_form": "Formularz nieaktywny",
   "Offline_form_unavailable_message": "Formularz niedostępny niedostępny wiadomość",
+  "Offline_Mention_Email": "[__site__] Zostałeś wspomniany przez __user__ w #__room__",
   "Offline_message": "Wiadomość offline",
   "Offline_success_message": "Offline wiadomości sukces",
   "Offline_unavailable": "Offline niedostępna",
@@ -881,6 +943,7 @@
   "optional": "opcjonalne",
   "or": "lub",
   "Order": "Kolejność",
+  "Original": "Oryginalny",
   "OS_Arch": "Architektura systemu",
   "OS_Cpus": "Ilość procesorów",
   "OS_Freemem": "Ilość wolnej pamięci",
@@ -939,6 +1002,8 @@
   "Private_Groups": "Prywatne grupy",
   "Private_Groups_list": "Lista prywatnych grup",
   "Profile": "Profil",
+  "Profile_details": "Szczegóły profilu",
+  "Profile_picture": "Zdjęcie profilowe",
   "Profile_saved_successfully": "Dane zostały zapisane",
   "Public": "Publiczny",
   "Push": "Powiadomienia",
@@ -1046,6 +1111,7 @@
   "Search_Private_Groups": "Wyszukaj prywatne grupy",
   "seconds": "sekund",
   "Secret_token": "Tajny tokena",
+  "Security": "Bezpieczeństwo",
   "Select_a_department": "Wybierz dział",
   "Select_a_user": "Wybierz użytkownika",
   "Select_an_avatar": "Wybierz awatar",
@@ -1140,6 +1206,7 @@
   "Stats_Total_Private_Groups": "Liczba grup prywatnych",
   "Stats_Total_Rooms": "Liczba wszystkich pokoi",
   "Stats_Total_Users": "Liczba użytkowników",
+  "Status": "Status",
   "Stop_Recording": "Zatrzymaj nagrywanie",
   "strike": "przekreślenie",
   "Subject": "Temat",
@@ -1171,19 +1238,19 @@
   "The_user_wont_be_able_to_type_in_s": "Użytkownik nie będzie mógł wpisać w %s",
   "Theme": "Motyw",
   "theme-color-content-background-color": "Kolor tła zawartości",
+  "theme-color-custom-scrollbar-color": "Niestandardowy kolor Scrollbar`a",
+  "theme-color-info-font-color": "Kolor czcionki informacji",
+  "theme-color-link-font-color": "Kolor czcionki odnośników",
   "theme-color-primary-background-color": "Podstawowy kolor tła",
   "theme-color-primary-font-color": "Podstawowy kolor czcionki",
   "theme-color-secondary-background-color": "Dodatkowy kolor tła",
   "theme-color-secondary-font-color": "Dodatkowy kolor czcionki",
-  "theme-color-tertiary-background-color": "Trzeciorzędny kolor tła",
-  "theme-color-tertiary-font-color": "Trzeciorzędny kolor czcionki",
-  "theme-color-link-font-color": "Kolor czcionki odnośników",
-  "theme-color-info-font-color": "Kolor czcionki informacji",
-  "theme-color-custom-scrollbar-color": "Niestandardowy kolor Scrollbar`a",
   "theme-color-status-away": "Kolor statusu Zaraz wracam",
   "theme-color-status-busy": "Kolor statusu Zajęty",
   "theme-color-status-offline": "Kolor statusu Niedostępny",
   "theme-color-status-online": "Kolor statusu Online",
+  "theme-color-tertiary-background-color": "Trzeciorzędny kolor tła",
+  "theme-color-tertiary-font-color": "Trzeciorzędny kolor czcionki",
   "theme-color-unread-notification-color": "Kolor nieprzeczytanych powiadomień",
   "theme-custom-css": "Niestandardowy CSS",
   "There_are_no_agents_added_to_this_department_yet": "Nie ma agentów dodanych do tego oddziału.",
@@ -1205,15 +1272,19 @@
   "to_see_more_details_on_how_to_integrate": "aby zobaczyć więcej szczegółów na temat integracji.",
   "To_users": "Do użytkowników",
   "Topic": "Temat",
-  "Travel_and_Places": "Podróże & Miejsca",
   "Transcript_Enabled": "Zapytaj odwiedzających czy potrzebują transkryptu rozmowy po jej zakończeniu.",
   "Transcript_message": "Wiadomość do wyświetlenia przy zapytaniu o transkrypt.",
   "Transcript_of_your_livechat_conversation": "Transkrypt twojej rozmowy.",
+  "Travel_and_Places": "Podróże & Miejsca",
   "Trigger_removed": "Wyzwalacz usunięty",
   "Trigger_Words": "Słowa wyzwalające",
   "Triggers": "Wyzwalacze",
   "True": "Tak",
   "Tuesday": "Wtorek",
+  "Two-factor_authentication": "Uwierzytelnianie dwuskładnikowe",
+  "Two-factor_authentication_disabled": "Wyłączono uwierzytelnianie dwuskładnikowe",
+  "Two-factor_authentication_enabled": "Włączono uwierzytelnianie dwuskładnikowe",
+  "Two-factor_authentication_is_currently_disabled": "Obecnie uwierzytelnianie dwuskładnikowe jest wyłączone\n",
   "Type": "Rodzaj",
   "Type_your_email": "Wpisz swój e-mail",
   "Type_your_message": "Wpisz wiadomość",
@@ -1246,6 +1317,7 @@
   "Use_uploaded_avatar": "Użyj dodany awatar",
   "Use_url_for_avatar": "Użyj adresu URL",
   "Use_User_Preferences_or_Global_Settings": "Użyj ustawień użytkownika lub ustawień globalnych",
+  "User": "Użytkownik",
   "User__username__is_now_a_moderator_of__room_name_": "Użytkownik __username__ jest teraz moderatorem pokoju __room_name__",
   "User__username__is_now_a_owner_of__room_name_": "Użytkownik __username__ jest teraz właścicielem pokoju __room_name__",
   "User__username__removed_from__room_name__moderators": "Użytkownik __username__ usunięty z moderatorów pokoju __room_name__",
@@ -1299,10 +1371,13 @@
   "UTF8_Names_Slugify": "Nazwy UTF8 Slugify",
   "UTF8_Names_Validation": "Walidacja UTF8 nazw",
   "UTF8_Names_Validation_Description": "Nie dopuszczaj znaków specjalnych i spacji. Można użyć `-`, `_` i `.`, ale nie na końcu nazwy",
+  "Verification": "Weryfikacja",
   "Verification_email_sent": "E-mail weryfikacyjny został wysłany",
   "Verified": "Zweryfikowany",
   "Version": "Wersja",
   "Video_Chat_Window": "Video Chat",
+  "Video_Conference": "Konferencja wideo",
+  "Video_message": "Wiadomość wideo",
   "Videocall_declined": "Rozmowa video odrzucona.",
   "Videocall_enabled": "Rozmowa video uruchomiona",
   "View_All": "Pokaż wszystko",
@@ -1318,6 +1393,7 @@
   "Visitor_page_URL": "Adres URL gościa",
   "Visitor_time_on_site": "Czas gościa na stronie",
   "Wait_activation_warning": "Zanim się zalogujesz, twoje konto musi być aktywowane przez administratora.",
+  "Warnings": "Ostrzeżenia",
   "We_are_offline_Sorry_for_the_inconvenience": "Jesteśmy offline. Przepraszamy za niedogodności.",
   "We_have_sent_password_email": "Wysłaliśmy Ci e-mail z instrukcjami resetowania hasła. Jeśli nie dostaniesz wiadomości, prosimy spróbować ponownie.",
   "We_have_sent_registration_email": "Wysłaliśmy e-mail w celu potwierdzenie Twojej rejestracji. Jeśli nie dostaniesz wiadomości, prosimy spróbować ponownie.",
@@ -1334,6 +1410,7 @@
   "Why_do_you_want_to_report_question_mark": "Dlaczego chcesz to zgłosić?",
   "will_be_able_to": "będzie zdolny do",
   "Yes": "Tak",
+  "Yes_archive_it": "Tak, archiwizuj!",
   "Yes_clear_all": "Tak, wyczyść!",
   "Yes_delete_it": "Tak, usuń to!",
   "Yes_hide_it": "Tak, ukryj!",
@@ -1369,6 +1446,8 @@
   "Your_entry_has_been_deleted": "Twój wpis został usunięty.",
   "Your_file_has_been_deleted": "Twój plik został usunięty.",
   "Your_mail_was_sent_to_s": "Twoja wiadomość została wysłana do użytkownika %s",
+  "your_message": "twoja wiadomość",
+  "your_message_optional": "twoja wiadomość (opcjonalnie)",
   "Your_password_is_wrong": "To nie jest poprawne hasło!",
   "Your_push_was_sent_to_s_devices": "Twój push została wysłany do urządzeń: %s"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 92e22c60c44..70dbf7049cd 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -795,8 +795,8 @@
   "New_password": "Nova senha",
   "New_role": "Novo papel",
   "New_Room_Notification": "Notificação de nova sala",
-  "New_videocall_request": "Nova requisição de chamada de vídeo",
   "New_Trigger": "Novo Gatilho",
+  "New_videocall_request": "Nova requisição de chamada de vídeo",
   "No_available_agents_to_transfer": "Nenhum agente disponível para transferir",
   "No_channel_with_name_%s_was_found": "Nenhum canal com nome <strong>\"%s\"</strong> foi encontrado!",
   "No_channels_yet": "Você não faz parte de nenhum canal ainda.",
@@ -829,8 +829,10 @@
   "Off_the_record_conversation": "Conversa Off-the-record",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Conversa Off-the-record não está disponível para o seu navegador ou dispositivo.",
   "Offline": "Offline",
+  "Offline_DM_Email": "Você recebeu uma mensagem direta de __user__",
   "Offline_form": "Formulário offline",
   "Offline_form_unavailable_message": "Mensage quando formulário offline indisponível",
+  "Offline_Mention_Email": "Você foi mencionado por __user__ em #__room__",
   "Offline_message": "Mensagem quando offline",
   "Offline_success_message": "Mensagem de sucesso ao enviar formulário offline",
   "Offline_unavailable": "Form offline indisponível",
@@ -1119,19 +1121,19 @@
   "The_user_wont_be_able_to_type_in_s": "O usuário não será capaz de escrever em %s",
   "Theme": "Tema",
   "theme-color-content-background-color": "Cor de fundo do conteúdo principal",
+  "theme-color-custom-scrollbar-color": "Cor da Barra de Rolagem Customizada",
+  "theme-color-info-font-color": "Cor da fonte de informação",
+  "theme-color-link-font-color": "Cor da fonte de link",
   "theme-color-primary-background-color": "Cor de fundo primária",
   "theme-color-primary-font-color": "Cor de fonte primária",
   "theme-color-secondary-background-color": "Cor de fundo secundária",
   "theme-color-secondary-font-color": "Cor de fonte secundária",
-  "theme-color-tertiary-background-color": "Cor de fundo terciária",
-  "theme-color-tertiary-font-color": "Cor de fonte terciária",
-  "theme-color-link-font-color": "Cor da fonte de link",
-  "theme-color-info-font-color": "Cor da fonte de informação",
-  "theme-color-custom-scrollbar-color": "Cor da Barra de Rolagem Customizada",
   "theme-color-status-away": "Cor da situação ausente",
   "theme-color-status-busy": "Cor da situação ocupado",
   "theme-color-status-offline": "Cor da situação offline",
   "theme-color-status-online": "Cor da situação online",
+  "theme-color-tertiary-background-color": "Cor de fundo terciária",
+  "theme-color-tertiary-font-color": "Cor de fonte terciária",
   "theme-color-unread-notification-color": "Cor das Notificações Não Lidas",
   "theme-custom-css": "CSS Customizado",
   "There_are_no_agents_added_to_this_department_yet": "Não há agentes adicionados a este departamento ainda.",
@@ -1310,4 +1312,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index bec992f305f..cfad9f35e2e 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -92,6 +92,8 @@
   "Accounts_OAuth_Meteor_callback_url": "URL de Callback do Meteor",
   "Accounts_OAuth_Meteor_id": "Meteor Id",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_host": "Host de Proxy",
+  "Accounts_OAuth_Proxy_services": "Serviços de Proxy",
   "Accounts_OAuth_Twitter": "Login do Twitter",
   "Accounts_OAuth_Twitter_callback_url": "URL de Callback do Twitter",
   "Accounts_OAuth_Twitter_id": "Twitter Id",
@@ -101,8 +103,6 @@
   "Accounts_OAuth_Wordpress_id": "WordPress ID",
   "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "Resetar senha",
-  "Accounts_OAuth_Proxy_host": "Host de Proxy",
-  "Accounts_OAuth_Proxy_services": "Serviços de Proxy",
   "Accounts_Registration_AuthenticationServices_Enabled": "Registro com os Serviços de Autenticação",
   "Accounts_RegistrationForm": "Formulário de Registro",
   "Accounts_RegistrationForm_Disabled": "Desativado",
@@ -200,6 +200,7 @@
   "Authorization_URL": "URL de Autorização",
   "Authorize": "Autorizar",
   "Auto_Load_Images": "Auto Carregar Imagens",
+  "Auto_Translate": "Tradução-Automática",
   "AutoLinker_Email": "Aplicar para Email",
   "AutoLinker_Phone": "Aplicar para Telefone",
   "AutoLinker_Phone_Description": "Links automáticos para para números de telefone. Por exemplo, `(123) 456-7890`",
@@ -209,7 +210,6 @@
   "AutoLinker_Urls_TLD": "Auto-linkar URLs de TLD",
   "AutoLinker_Urls_www": "Auto-linkar URLs com 'www'",
   "AutoLinker_UrlsRegExp": "Expressão Regular para URL",
-  "Auto_Translate": "Tradução-Automática",
   "AutoTranslate_Enabled": "Activar Tradução-Automática",
   "AutoTranslate_GoogleAPIKey": "Google API Key",
   "Available": "Disponível",
@@ -243,7 +243,6 @@
   "busy_male": "ocupado",
   "Busy_male": "Ocupado",
   "by": "por",
-  "Content": "Conteúdo",
   "cache_cleared": "Cache limpa",
   "Cancel": "Cancelar",
   "Cancel_message_input": "Cancelar",
@@ -297,6 +296,7 @@
   "Comment_to_leave_on_closing_session": "Comentário ao fechar sessão",
   "Compact": "Compacto",
   "Confirm_password": "Confirmar a senha",
+  "Content": "Conteúdo",
   "Conversation": "Conversa",
   "Conversation_closed": "Chat encerrado: __comment__.",
   "Convert_Ascii_Emojis": "Converter ASCII para Emoji",
@@ -327,12 +327,12 @@
   "Custom_Fields": "Campos Personalizados",
   "Custom_oauth_helper": "Ao configurar o seu Provedor de OAuth, você terá que informar uma URL de retorno de chamada. Use <pre>%s</pre>.",
   "Custom_oauth_unique_name": "Nome exclusivo para oauth customizado",
-  "Custom_Scripts": "Scripts Customizados",
   "Custom_Script_Logged_In": "Script Personalizado para usuários logados",
   "Custom_Script_Logged_Out": "Script Personalizado para usuários não logados",
-  "Custom_Sounds": "Sons Customizados",
+  "Custom_Scripts": "Scripts Customizados",
   "Custom_Sound_Add": "Adicionar Som Customizado",
   "Custom_Sound_Error_Invalid_Sound": "Som inválido",
+  "Custom_Sounds": "Sons Customizados",
   "Custom_Translations": "Traduções Customizadas",
   "Dashboard": "Dashboard",
   "Date": "Data",
@@ -385,6 +385,7 @@
   "Edit": "Editar",
   "Edit_Custom_Field": "Editar Campo Personalizado",
   "Edit_Department": "Editar Departamento",
+  "Edit_previous_message": "`%s` - Editar mensagem anterior",
   "Edit_Trigger": "Editar Gatilho",
   "edited": "editado",
   "Editing_room": "Edição de sala",
@@ -408,15 +409,15 @@
   "Empty_title": "Título vazio",
   "Enable": "Habilitar",
   "Enable_Desktop_Notifications": "Habilitar Notificações Desktop",
+  "Enable_Svg_Favicon": "Activar favicon SVG",
   "Enable_two-factor_authentication": "Activar autenticação de dois passos",
   "Enabled": "Ativado",
-  "Enable_Svg_Favicon": "Activar favicon SVG",
   "Encrypted_message": "Mensagem criptografada",
   "End_OTR": "Finalizar OTR",
-  "Enter_authentication_code": "Introduzir código de autenticação",
   "Enter_a_regex": "Introduza um regex",
   "Enter_a_room_name": "Digite um nome de sala",
   "Enter_a_username": "Nome de usuário",
+  "Enter_authentication_code": "Introduzir código de autenticação",
   "Enter_name_here": "Insira o nome aqui",
   "Enter_Normal": "Modo normal (enviar com Enter)",
   "Enter_to": "Enter para",
@@ -633,12 +634,6 @@
   "Join_default_channels": "Entrar em canais predefinidos",
   "Join_the_Community": "Junte-se à Comunidade",
   "Join_the_given_channel": "Entrar no canal informado",
-  "Show_the_keyboard_shortcut_list": "Exibe a lisgta de atalhos do teclado",
-  "Open_channel_user_search": "`%s` - Abrir Canal / Busca de Usuário",
-  "Edit_previous_message": "`%s` - Editar mensagem anterior",
-  "Move_beginning_message": "`%s` - Ir para o início da mensagem",
-  "Move_end_message": "`%s` - Ir para o fim da mensagem",
-  "New_line_message_compose_input": "`%s` - Adicionar nova linha a mensagem",
   "Join_video_call": "Entrar na chamada de vídeo",
   "Joined": "Entrou",
   "Jump": "Saltar",
@@ -816,6 +811,8 @@
   "More_direct_messages": "Mais mensagens diretas",
   "More_groups": "Mais grupos privados",
   "More_unreads": "Mais não lidos",
+  "Move_beginning_message": "`%s` - Ir para o início da mensagem",
+  "Move_end_message": "`%s` - Ir para o fim da mensagem",
   "Msgs": "Msgs",
   "multi": "multi",
   "Mute_someone_in_room": "Silenciar alguém na sala",
@@ -833,14 +830,15 @@
   "New_Custom_Field": "Novo Campo Personalizado",
   "New_Department": "Novo Departamento",
   "New_integration": "Nova integração",
+  "New_line_message_compose_input": "`%s` - Adicionar nova linha a mensagem",
   "New_logs": "Novos logs",
   "New_Message_Notification": "Notificação de nova mensagem",
   "New_messages": "Novas mensagens",
   "New_password": "Nova senha",
   "New_role": "Novo papel",
   "New_Room_Notification": "Notificação de nova sala",
-  "New_videocall_request": "Nova requisição de chamada de vídeo",
   "New_Trigger": "Novo Gatilho",
+  "New_videocall_request": "Nova requisição de chamada de vídeo",
   "No_available_agents_to_transfer": "Nenhum agente disponível para transferir",
   "No_channel_with_name_%s_was_found": "Nenhum canal com nome <strong>\"%s\"</strong> foi encontrado!",
   "No_channels_yet": "Você não faz parte de nenhum canal ainda.",
@@ -872,8 +870,10 @@
   "Off_the_record_conversation": "Conversa Off-the-record",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Conversa Off-the-record não está disponível para o seu navegador ou dispositivo.",
   "Offline": "Offline",
+  "Offline_DM_Email": "Você recebeu uma mensagem direta de __user__",
   "Offline_form": "Formulário offline",
   "Offline_form_unavailable_message": "Mensage quando formulário offline indisponível",
+  "Offline_Mention_Email": "Você foi mencionado por __user__ em #__room__",
   "Offline_message": "Mensagem quando offline",
   "Offline_success_message": "Mensagem de sucesso ao enviar formulário offline",
   "Offline_unavailable": "Form offline indisponível",
@@ -881,6 +881,7 @@
   "Only_you_can_see_this_message": "Apenas você pode ver esta mensagem",
   "Oops!": "Ops",
   "Open": "Aberto",
+  "Open_channel_user_search": "`%s` - Abrir Canal / Busca de Usuário",
   "Opened": "Aberto",
   "Opened_in_a_new_window": "Aberto em nova janela.",
   "Opens_a_channel_group_or_direct_message": "Abre um canal, grupo ou mensagem direta",
@@ -1082,6 +1083,7 @@
   "Show_only_online": "Mostrar apenas online",
   "Show_preregistration_form": "Mostrar formulário de pré-registro",
   "Show_queue_list_to_all_agents": "Mostrar link da roleta à todos agentes",
+  "Show_the_keyboard_shortcut_list": "Exibe a lisgta de atalhos do teclado",
   "Showing_archived_results": "<p>Exibindo <b>%s</b> resultados arquivados</p>",
   "Showing_online_users": "Mostrando <b>__total_showing__</b> de __total__ usuários",
   "Showing_results": "<p>Exibindo <b>%s</b> resultados</p>",
@@ -1162,19 +1164,19 @@
   "The_user_wont_be_able_to_type_in_s": "O usuário não será capaz de escrever em %s",
   "Theme": "Tema",
   "theme-color-content-background-color": "Cor de fundo do conteúdo principal",
+  "theme-color-custom-scrollbar-color": "Cor da Barra de Rolagem Customizada",
+  "theme-color-info-font-color": "Cor da fonte de informação",
+  "theme-color-link-font-color": "Cor da fonte de link",
   "theme-color-primary-background-color": "Cor de fundo primária",
   "theme-color-primary-font-color": "Cor de fonte primária",
   "theme-color-secondary-background-color": "Cor de fundo secundária",
   "theme-color-secondary-font-color": "Cor de fonte secundária",
-  "theme-color-tertiary-background-color": "Cor de fundo terciária",
-  "theme-color-tertiary-font-color": "Cor de fonte terciária",
-  "theme-color-link-font-color": "Cor da fonte de link",
-  "theme-color-info-font-color": "Cor da fonte de informação",
-  "theme-color-custom-scrollbar-color": "Cor da Barra de Rolagem Customizada",
   "theme-color-status-away": "Cor da situação ausente",
   "theme-color-status-busy": "Cor da situação ocupado",
   "theme-color-status-offline": "Cor da situação offline",
   "theme-color-status-online": "Cor da situação online",
+  "theme-color-tertiary-background-color": "Cor de fundo terciária",
+  "theme-color-tertiary-font-color": "Cor de fonte terciária",
   "theme-color-unread-notification-color": "Cor das Notificações Não Lidas",
   "theme-custom-css": "CSS Customizado",
   "There_are_no_agents_added_to_this_department_yet": "Não há agentes adicionados a este departamento ainda.",
@@ -1353,4 +1355,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ro.i18n.json b/packages/rocketchat-i18n/i18n/ro.i18n.json
index 2862f4d6f70..42292a09012 100644
--- a/packages/rocketchat-i18n/i18n/ro.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ro.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "Off-the-record conversație",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record de conversație nu este disponibilă pentru browser-ul sau dispozitivul.",
   "Offline": "Deconectat",
+  "Offline_DM_Email": "Ai fost messaged directe de __user__",
   "Offline_form": "formularul offline",
   "Offline_form_unavailable_message": "Formularul Offline Mesaj indisponibil",
+  "Offline_Mention_Email": "Ați fost menționat de către __user__ în #__room__",
   "Offline_message": "mesaj offline",
   "Offline_success_message": "Mesajul de succes offline",
   "Offline_unavailable": "offline nu sunt disponibile",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "Utilizatorul nu va putea să introducă text în %s",
   "Theme": "Temă",
   "theme-color-content-background-color": "Culoare de fundal conținut",
+  "theme-color-custom-scrollbar-color": "Culoare Scrollbar personalizat",
+  "theme-color-info-font-color": "Culoare text info",
+  "theme-color-link-font-color": "Culoare text link",
   "theme-color-primary-background-color": "Culoare de fundal primară",
   "theme-color-primary-font-color": "Culoare text primară",
   "theme-color-secondary-background-color": "Culoare de fundal secundară",
   "theme-color-secondary-font-color": "Culoare text secundară",
-  "theme-color-tertiary-background-color": "Culoare de fundal terțiară",
-  "theme-color-tertiary-font-color": "Culoare text terțiară",
-  "theme-color-link-font-color": "Culoare text link",
-  "theme-color-info-font-color": "Culoare text info",
-  "theme-color-custom-scrollbar-color": "Culoare Scrollbar personalizat",
   "theme-color-status-away": "Culoare status 'Away'",
   "theme-color-status-busy": "Culoare status 'Ocupat'",
   "theme-color-status-offline": "Culoare status 'Offline'",
   "theme-color-status-online": "Culoare status 'Activ'",
+  "theme-color-tertiary-background-color": "Culoare de fundal terțiară",
+  "theme-color-tertiary-font-color": "Culoare text terțiară",
   "theme-color-unread-notification-color": "Culoare notificări mesaje necitite",
   "theme-custom-css": "CSS personalizat",
   "There_are_no_agents_added_to_this_department_yet": "Încă există agenți adăugați la acest departament.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "E-mail-ul a fost trimis la %s",
   "Your_password_is_wrong": "Parola dvs. este greșită!",
   "Your_push_was_sent_to_s_devices": "Mesajul Push a fost trimis la %s dispozitive"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json
index 13bbdcedced..3ae1bd813c1 100644
--- a/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -12,6 +12,9 @@
   "Accept": "Принять",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Принимать входящие запросы с livechat, даже если нет подключенных сотрудников",
   "Accept_with_no_online_agents": "Принимать с не подключенными сотрудниками",
+  "access-mailer_description": "Разрешить рассылку электронного сообщения всем пользователям",
+  "access-permissions": "Доступ к странице разрешений",
+  "access-permissions_description": "Изменяйте разрешения для разных ролей",
   "Access_not_authorized": "Не авторизованный доступ",
   "Access_Token_URL": "Маркер доступа URL-адреса",
   "Accessing_permissions": "Права доступа",
@@ -34,6 +37,7 @@
   "Accounts_BlockedUsernameList": "Список заблокированных пользователей",
   "Accounts_BlockedUsernameList_Description": "Список заблокированных имен пользователей (без учета регистра), разделенных запятой",
   "Accounts_CustomFields_Description": "Ожидается валидный JSON-объект, в котором каждый ключ - это имя поля, а содержимое - словарь настроек поля. Пример:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}\n</code>",
+  "Accounts_CustomFieldsToShowInUserInfo": "Кастомные поля для отображения в информации пользователя",
   "Accounts_DefaultUsernamePrefixSuggestion": "Предлагаемая подсказка префикса логина",
   "Accounts_denyUnverifiedEmail": "Запретить неподтверждённые адреса электронной почты",
   "Accounts_EmailVerification": "Подтверждение адреса электронной почты",
@@ -95,6 +99,8 @@
   "Accounts_OAuth_Meteor_callback_url": "Обратный URL-адрес Meteor",
   "Accounts_OAuth_Meteor_id": "Meteor Id",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_host": "Прокси хост",
+  "Accounts_OAuth_Proxy_services": "Прокси сервисы",
   "Accounts_OAuth_Twitter": "Логин Twitter",
   "Accounts_OAuth_Twitter_callback_url": "Обратный URL-адрес Twitter",
   "Accounts_OAuth_Twitter_id": "Twitter ID",
@@ -104,15 +110,13 @@
   "Accounts_OAuth_Wordpress_id": "WordPress ID",
   "Accounts_OAuth_Wordpress_secret": "Пароль WordPress",
   "Accounts_PasswordReset": "Восстановление пароля",
-  "Accounts_OAuth_Proxy_host": "Прокси хост",
-  "Accounts_OAuth_Proxy_services": "Прокси сервисы",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Роли по-умолчанию для сервисов аутентификации",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Роли по-умолчанию (разделенные запятой), назначаемые пользователям при регистрации через сервисы аутентификации",
   "Accounts_Registration_AuthenticationServices_Enabled": "Регистрация со службами проверки подлинности",
   "Accounts_RegistrationForm": "Регистрационная форма",
   "Accounts_RegistrationForm_Disabled": "Отключена",
   "Accounts_RegistrationForm_LinkReplacementText": "Текст замены ссылки регистрационной формы",
-  "Accounts_RegistrationForm_Public": "Доступна публично",
+  "Accounts_RegistrationForm_Public": "Открытая",
   "Accounts_RegistrationForm_Secret_URL": "Секретный URL-адрес",
   "Accounts_RegistrationForm_SecretURL": "Секретный URL-адрес регистрационной формы",
   "Accounts_RegistrationForm_SecretURL_Description": "Вы должны предоставить случайную строку, которая будет добавлена к вашему регистрационному URL-адресу. Например: https://demo.rocket.chat/register/[secret_hash]",
@@ -129,10 +133,22 @@
   "Activate": "Активировать",
   "Activity": "Активность",
   "Add": "Добавить",
+  "add-oauth-service": "Добавлять сервисы Oauth",
+  "add-oauth-service_description": "Разрешение на добавление новых сервисов Oauth",
+  "add-user": "Добавлять пользователей",
+  "add-user-to-any-c-room": "Добавить пользователя к любому публичному чату",
+  "add-user-to-any-c-room_description": "Разрешение не добавление пользователя к любому публичному чату",
+  "add-user-to-any-p-room": "Добавить пользователя к любому приватному чату",
+  "add-user-to-any-p-room_description": "Разрешение на добавление пользователя к любому приватному чату",
+  "add-user-to-joined-room": "Добавить пользователя к любому публичному чату, к которому присоединён",
+  "add-user-to-joined-room_description": "Разрешение на добавление пользователя к тому публичному чату, к которому сейчас присоединён",
+  "add-user_description": "Разрешение на добавление новых пользователей на сервер на странице пользователей",
   "Add_agent": "Добавить сотрудника",
-  "Add_custom_oauth": "Добавить пользовательский OAuth",
+  "Add_custom_oauth": "Добавить кастомный OAuth",
   "Add_Domain": "Добавить домен",
+  "Add_files_from": "Добавить файлы",
   "Add_manager": "Добавить менеджера",
+  "Add_Role": "Добавить роль",
   "Add_user": "Добавить пользователя",
   "Add_User": "Добавить пользователя",
   "Add_users": "Добавить пользователей",
@@ -142,6 +158,7 @@
   "Additional_emails": "Дополнительные адреса электронной почты",
   "Additional_Feedback": "Дополнительная обратная связь",
   "Administration": "Администрирование",
+  "Adult_images_are_not_allowed": "Изображения для взрослых запрещены",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "После аутентификации OAuth2, пользователи будут перенаправляться на этот URL-адрес",
   "Agent": "Агент",
   "Agent_added": "Сотрудник добавлен",
@@ -149,6 +166,7 @@
   "Alias": "Алиас",
   "Alias_Format": "Формат псевдонима",
   "Alias_Format_Description": "Импортировать сообщения из Slack с псевдонимом; %s заменяется на логин. Если не указано, псевдоним не будет использоваться.",
+  "Alias_Set": "Настроки алиаса",
   "All": "Все",
   "All_channels": "Все каналы",
   "All_logs": "Все записи",
@@ -171,12 +189,14 @@
   "API_Allow_Infinite_Count": "Разрешить получить всё",
   "API_Allow_Infinite_Count_Description": "Могут ли вызовы к REST API возвращать всё за один вызов?",
   "API_Analytics": "Аналитика",
+  "API_CORS_Origin": "Заголовок CORS Origin",
   "API_Default_Count": "Количество по-умолчанию",
   "API_Default_Count_Description": "Количество результатов REST API для использования по-умолчанию, если потребитель не указал его.",
   "API_Drupal_URL": "URL сервера Drupal",
   "API_Drupal_URL_Description": "Пример: https://domain.com (без слэша в конце)",
   "API_Embed": "Embed вставки",
   "API_Embed_Description": "Включить ли предварительный просмотр ссылок, когда пользователь выкладывает ссылку на веб-сайт.",
+  "API_Embed_UserAgent": "Встроенный user agent",
   "API_EmbedCacheExpirationDays": "Время хранения кэша предварительного просмотра в днях",
   "API_EmbedDisabledFor": "Запретить Embed для пользователей",
   "API_EmbedDisabledFor_Description": "Разделенный запятыми список имен пользователей",
@@ -205,20 +225,24 @@
   "Application_added": "Приложение добавлено",
   "Application_Name": "Наименование приложения",
   "Application_updated": "Приложение обновлено",
-  "Apply_and_refresh_all_clients": "Применить и обновить все клиенты",
-  "Archive": "Удалить",
+  "Apply_and_refresh_all_clients": "Применить",
+  "Archive": "Отправить канал в архив",
+  "archive-room_description": "Разрешение на архивирование публичного чата",
   "are_also_typing": "тоже печатает...",
   "are_typing": "печатает...",
   "Are_you_sure": "Вы уверены?",
   "Are_you_sure_you_want_to_delete_your_account": "Вы уверены, что хотите удалить свой аккаунт?",
+  "Assign_admin": "Назначенный администратор",
   "at": "в",
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Файл загружен",
+  "Audio_message": "Звуковое сообщение",
   "Auth_Token": "Auth Токен",
   "Author": "автор",
   "Authorization_URL": "Авторизация URL-адреса",
   "Authorize": "Разрешить",
   "Auto_Load_Images": "Автозагрузка изображений",
+  "Auto_Translate": "Авто-перевод",
   "AutoLinker_Email": "Подсвечивать адрес электронной почты",
   "AutoLinker_Phone": "Подсвечивать телефоны",
   "AutoLinker_Phone_Description": "Автоматически выделять телефонные номера, например `(123)456-7890`",
@@ -229,8 +253,10 @@
   "AutoLinker_Urls_www": "URL-адреса AutoLinker 'WWW'",
   "AutoLinker_UrlsRegExp": "Сокращать URL через регулярное выражение",
   "Automatic_Translation": "Автоматический перевод",
-  "Auto_Translate": "Авто-перевод",
+  "AutoTranslate_Change_Language_Description": "Изменение языка автоматического перевода не переводит предыдущие сообщения",
   "AutoTranslate_Enabled": "включить авто-перевод",
+  "AutoTranslate_Enabled_Description": "<code class=\"inline\">Автоматический перевод</code> дает пользователю возможность переводить все сообщения на его язык. За перевод может взыматься оплата, обратитесь к <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">документации Google</a>",
+  "AutoTranslate_GoogleAPIKey": "Google API ключ",
   "Available": "Доступен",
   "Available_agents": "Свободные сотрудники",
   "Avatar": "Аватар",
@@ -245,12 +271,18 @@
   "Away_male": "Отошёл",
   "Back": "Назад",
   "Back_to_applications": "Вернуться к приложениям",
-  "Back_to_integrations": "Назад к интеграциям",
+  "Back_to_chat": "Назад в чат",
+  "Back_to_integration_detail": "Назад к инеграции",
+  "Back_to_integrations": "Назад",
   "Back_to_login": "На страницу авторизации",
   "Back_to_permissions": "Назад к настройкам прав",
+  "Backup_codes": "Коды резервного копирования",
+  "ban-user_description": "Разрешение банить пользователей в публичном чате",
+  "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Функция в бета тестировании. Зависит от Video Conference.",
   "Block_User": "Заблокировать пользователя",
   "Body": "Основная часть",
   "bold": "жирный",
+  "bot_request": "Запрос бота",
   "BotHelpers_userFields": "Пользовательские поля",
   "Branch": "Ветка",
   "busy": "занят",
@@ -260,7 +292,6 @@
   "busy_male": "занят",
   "Busy_male": "Занят",
   "by": "от",
-  "Content": "Содержимое",
   "cache_cleared": "Кэш очищен",
   "Cancel": "Отмена",
   "Cancel_message_input": "Отменить",
@@ -275,21 +306,26 @@
   "CAS_Sync_User_Data_FieldMap_Description": "Используйте этот JSON для создания внутренних атрибутов (ключ) из внешних атрибутов (значение). Имена внешних атрибутов, обрамленные '%', будут интерполированы в строки значений.<br/>Например, `{\"email\":\"%email%\", \"name\":\"%firstname%, %lastname%\"}`<br/><br/>Map атрибутов всегда интерполируется. В CAS 1.0 доступен только атрибут `username`. Из внутренних атрибутов доступны: логин (username), имя (name), адрес электронной почты (email), комнаты (rooms); комнаты - это список комнат, к которым присоединить пользователя после создания, разделенный запятой, например: {\"rooms\": \"%team%,%department%\"} присоединит пользователей CAS при создании к каналам их команды и отдела.",
   "CDN_PREFIX": "CDN префикс",
   "Certificates_and_Keys": "Ключи и сертификаты",
+  "Change_Room_Type": "Изменить тип канала",
   "Changing_email": "Изменение адреса электронной почты",
   "channel": "чат",
-  "Channel": "Публичный чат",
+  "Channel": "Канал",
   "Channel_already_exist": "Чат '#% s' уже существует.",
-  "Channel_created": "Чат `#%s` создан.",
+  "Channel_already_exist_static": "Такой канал уже существует",
   "Channel_already_Unarchived": "Чат с именем `#% s` уже находится в состоянии \"разархивирован\"",
   "Channel_Archived": "Чат с именем `#% s` заархивирован успешно",
-  "Channel_doesnt_exist": "Чат `#%s` не существует.",
+  "Channel_created": "Чат `#%s` создан.",
+  "Channel_doesnt_exist": "Канал `#%s` не существует.",
+  "Channel_name": "Имя канала",
   "Channel_to_listen_on": "Чат для прослушивания",
   "Channel_Unarchived": "Чат с именем `#% s` разархивирован успешно",
   "Channels": "Каналы",
-  "Channels_list": "Список общих чатов",
+  "Channels_are_where_your_team_communicate": "Каналы для общения вашей команды",
+  "Channels_list": "Список каналов",
   "Chat_button": "кнопка чат",
   "Chat_closed": "чат закрыт",
   "Chat_closed_successfully": "Чат успешно закрыт",
+  "Chat_Now": "Общатся сейчас",
   "Chat_window": "окно чата",
   "Chatops_Enabled": "Включить Chatops",
   "Chatops_Title": "Панель Chatops",
@@ -298,24 +334,28 @@
   "Choose_messages": "Выбрать сообщения",
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Выберите псевдоним, который появится перед логином в сообщениях.",
   "Choose_the_username_that_this_integration_will_post_as": "Выберите логин, под которым эта интеграция будет постить.",
+  "clean-channel-history": "Очистить историю публичного чата",
+  "clear": "Очистить",
+  "Clear_all_unreads_question": "Удалить все \"непрочитанные\"?",
   "clear_cache_now": "Очистить кэш сейчас",
   "clear_history": "Очистить историю",
-  "Clear_all_unreads_question": "Удалить все \"непрочитанные\"?",
   "Click_here": "кликните сюда",
   "Click_here_for_more_info": "Больше информации здесь",
-  "UI_Click_Direct_Message": "Нажмите, чтобы создать личное сообщение",
   "Client_ID": "Client ID",
   "Client_Secret": "Client Secret",
   "Clients_will_refresh_in_a_few_seconds": "Клиенты обновятся через пару секунд",
   "close": "закрыть",
   "Close": "Закрыть",
+  "close-livechat-room_description": "Разрешение на закрытие текущего чата LiveChat",
   "Closed": "Закрыто",
+  "Closed_by_visitor": "Закрыто посетителем",
   "Closing_chat": "Закрыть чат",
   "Collapse_Embedded_Media_By_Default": "Сворачивать вложенные медиа по умолчанию",
   "Color": "Цвет",
   "Commands": "Команды",
   "Compact": "Компактный",
   "Confirm_password": "Подтвердить пароль",
+  "Content": "Содержимое",
   "Conversation": "Диалог",
   "Conversation_closed": "Разговор закрыт: __comment__.",
   "Convert_Ascii_Emojis": "Конвертировать ASCII в Emoji",
@@ -326,10 +366,19 @@
   "Count": "Количество",
   "Cozy": "Удобный",
   "Create": "Создать",
+  "create-c": "Создавать публичные чаты",
+  "create-c_description": "Разрешение на создание публичных чатов",
+  "create-d": "Создавать чаты личных сообщений",
+  "create-d_description": "Разрешение на создание чатов личных сообщений",
+  "create-p": "Создавать закрытые чаты",
+  "create-p_description": "Разрешение создавать закрытые чаты",
+  "create-user": "Создавать пользователей",
+  "create-user_description": "Разрешение на создание пользователей",
   "Create_A_New_Channel": "Создать новый чат",
   "Create_new": "Создать чат",
   "Created_at": "Создан",
   "Created_at_s_by_s": "Создано в <strong>%s</strong> при помощи <strong>%s</strong>",
+  "CRM_Integration": "Интеграция с CRM",
   "Current_Chats": "Текущие чаты",
   "Current_Status": "Текущий статус",
   "Custom": "Индивидуальное",
@@ -344,11 +393,10 @@
   "Custom_Emoji_Updated_Successfully": "Пользовательский смайл успешно обновлен",
   "Custom_Fields": "Пользовательские поля",
   "Custom_oauth_helper": "Настраивая вашего поставщика OAuth, вам необходимо сообщить обратный URL-адрес. Используйте <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Уникальное имя пользовательского OAuth",
-  "Custom_Scripts": "Пользовательские скрипты",
+  "Custom_oauth_unique_name": "Кастомный uniquie name OAuth",
   "Custom_Script_Logged_In": "Пользовательский сценарий для зарегистрированных пользователей",
   "Custom_Script_Logged_Out": "Пользовательский сценарий для незарегистрированных пользователей",
-  "Custom_Sounds": "Пользовательские звуки",
+  "Custom_Scripts": "Пользовательские скрипты",
   "Custom_Sound_Add": "Добавить свой звук",
   "Custom_Sound_Delete_Warning": "Удаление звука нельзя отменить",
   "Custom_Sound_Error_Invalid_Sound": "Некорректный звук",
@@ -356,6 +404,7 @@
   "Custom_Sound_Has_Been_Deleted": "Звук успешно удален",
   "Custom_Sound_Info": "Информация о пользовательском звуке",
   "Custom_Sound_Saved_Successfully": "Пользовательский звук успешно сохранен",
+  "Custom_Sounds": "Пользовательские звуки",
   "Custom_Translations": "Пользовательские переводы",
   "Custom_Translations_Description": "Должен быть валидным JSON, где ключи - языки, значения - словари ключей и их переводов. Пример:<br/><code>\n    \"en\": {\n        \"Channels\": \"Rooms\"\n    },\n    \"pt\": {\n        \"Channels\": \"Salas\"\n    }\n}</code>",
   "CustomSoundsFilesystem": "Файловая система пользовательских звуков",
@@ -367,8 +416,19 @@
   "DB_Migration": "Миграция базы данных",
   "DB_Migration_Date": "База данных Дата миграции",
   "Deactivate": "Деактивировать",
+  "Decline": "Отклнонить",
   "Default": "По умолчанию",
   "Delete": "Удалить",
+  "delete-c": "Удалять публичные чаты",
+  "delete-c_description": "Разрешение на удаление публичных чатов",
+  "delete-d": "Удалять личные сообщения",
+  "delete-d_description": "Разрешение на удаление личных сообщений",
+  "delete-message": "Удалять сообщения",
+  "delete-message_description": "Разрешение на удаление сообщений из чатов",
+  "delete-p": "Удалять закрытые чаты",
+  "delete-p_description": "Разрешение на удаление закрытых чатов",
+  "delete-user": "Удалять пользователей",
+  "delete-user_description": "Разрешение на удаление пользователей",
   "Delete_message": "Удаленное сообщение",
   "Delete_my_account": "Удалить мой аккаунт",
   "Delete_Room_Warning": "Удаление чата так же удалит все сообщения в нем. Это действие невозможно отменить.",
@@ -381,14 +441,18 @@
   "Description": "Описание",
   "Desktop": "Рабочий стол",
   "Desktop_Notification_Test": "Проверка уведомлений рабочего стола",
-  "Desktop_Notifications": "Уведомления на рабочем столе",
-  "Desktop_Notifications_Disabled": "Уведомления на рабочем столе отключены. Измените настройки браузера, если вам нужно включить уведомления.",
-  "Desktop_Notifications_Duration": "Длительность отображения уведомлений",
+  "Desktop_Notifications": "Оповещения на рабочем столе",
+  "Desktop_Notifications_Default_Alert": "Стандартные оповещения на рабочем столе",
+  "Desktop_Notifications_Disabled": "Оповещения отключены. Измените настройки браузера, чтобы включить уведомления.",
+  "Desktop_Notifications_Duration": "Длительность",
   "Desktop_Notifications_Duration_Description": "Секунды для отображения уведомлений на рабочем столе. Это может повлиять на OS X Центр уведомлений. Введите 0, чтобы использовать настройки браузера по умолчанию и не влиять на OS X Центр уведомлений.",
   "Desktop_Notifications_Enabled": "Уведомления на рабочем столе включены",
   "Different_Style_For_User_Mentions": "Другой стиль для упоминаний пользователей",
   "Direct_message_someone": "Личное сообщение кому-либо",
   "Direct_Messages": "Личные сообщения",
+  "Direct_Reply": "Прямой ответ",
+  "Direct_Reply_Debug": "Отладка прямого ответа",
+  "Direct_Reply_Debug_Description": "[ВНИМАНИЕ] Режим отлатки будет отображать ваш пароль в открытом виде в консоли администратора",
   "Disable_Notifications": "Отключить уведомления",
   "Disable_two-factor_authentication": "Выключить двухфакторную аутентификацию",
   "Display_offline_form": "Показать оффлайн сообщение",
@@ -406,8 +470,20 @@
   "Duplicate_private_group_name": "Приватный групповой чат с именем '%s' уже существует",
   "Duration": "Длительность",
   "Edit": "Редактировать",
+  "edit-message": "Редактировать сообщения",
+  "edit-message_description": "Разрешение на редактирование сообщений в чатах",
+  "edit-other-user-active-status": "Редактировать статус активности другого пользователя",
+  "edit-other-user-active-status_description": "Разрешение на блокировку и разблокировку аккаунтов",
+  "edit-other-user-info": "Редактировать информацию другого пользователя",
+  "edit-other-user-info_description": "Разрешить изменять имя, логин или адрес электронной почты другого пользователя.",
+  "edit-other-user-password": "Редактировать пароль другого пользователя",
+  "edit-other-user-password_description": "Разрешение на редактирование пароля другого пользователя. Требует разрешения на редактирование информации другого пользователя",
+  "edit-privileged-setting_description": "Возможность редактирование настроек",
+  "edit-room": "Редактировать чат",
+  "edit-room_description": "Разрешение на редактирование имени, темы, типа (приватный или публичный) и статуса (активный или архивный) чата.",
   "Edit_Custom_Field": "Редактировать поле",
   "Edit_Department": "Редактировать отдел",
+  "Edit_previous_message": "'%s' - редактировать предыдущее сообщение",
   "edited": "отредактировано",
   "Editing_room": "Редактирование номера",
   "Editing_user": "Редактирование пользователя",
@@ -419,7 +495,7 @@
   "Email_Footer_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[Site_Name] и [Site_URL] для имени приложения и его URL соответственно.</li></ul>",
   "Email_from": "От",
   "Email_Header_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[Site_Name] и [Site_URL] для имени приложения и его URL соответственно.</li></ul>",
-  "Email_Notification_Mode": "Офлайн уведомления по электронной почте",
+  "Email_Notification_Mode": "Уведомления на Email",
   "Email_Notification_Mode_All": "Каждое упоминание",
   "Email_Notification_Mode_Disabled": "Отключено",
   "Email_or_username": "Адрес электронной почты или логин",
@@ -430,15 +506,16 @@
   "Empty_title": "Пустой заголовок",
   "Enable": "Включить",
   "Enable_Desktop_Notifications": "Включить уведомления на рабочем столе",
+  "Enable_Svg_Favicon": "Включить SVG favicon",
   "Enable_two-factor_authentication": "Включить двухфакторную аутентификацию",
   "Enabled": "Включено",
   "Encrypted_message": "Зашифрованное сообщение",
   "End_OTR": "Завершить конфиденциальную беседу",
-  "Enter_authentication_code": "Введите код аутантификации",
-  "Enter_Alternative": "Альтернативный режим (отправка по Ctrl/Alt/Shift/CMD + Enter)",
   "Enter_a_regex": "Введите regex",
   "Enter_a_room_name": "Введите название чата",
   "Enter_a_username": "Введите логин",
+  "Enter_Alternative": "Альтернативный режим (отправка по Ctrl/Alt/Shift/CMD + Enter)",
+  "Enter_authentication_code": "Введите код аутантификации",
   "Enter_Behaviour": "Поведение клавиши Enter",
   "Enter_Behaviour_Description": "Эта настройка определяет, будет Enter отправлять сообщение или добавлять новую строку",
   "Enter_name_here": "Введите название",
@@ -456,6 +533,7 @@
   "error-could-not-change-username": "Не удалось изменить логин",
   "error-delete-protected-role": "Нельзя удалить защищённую позицию",
   "error-department-not-found": "Отдел не найден",
+  "error-direct-message-file-upload-not-allowed": "Передача файлов не разрешена в личных сообщениях",
   "error-duplicate-channel-name": "Чат с именем '__channel_name__' уже существует",
   "error-email-domain-blacklisted": "Домен адреса электронной почты находится в черном списке",
   "error-email-send-failed": "Ошибка отправки электронного сообщения: __message__",
@@ -471,23 +549,22 @@
   "error-invalid-custom-field": "Неверное поле",
   "error-invalid-custom-field-name": "Неверное имя для поля. Используйте тельно буквы, цифры, дефисы и подчеркивания.",
   "error-invalid-date": "Указана неверная дата",
-  "error-invalid-description": "Неверное описание",
+  "error-invalid-description": "Недопустимое описание",
   "error-invalid-domain": "Ошибочный домен",
   "error-invalid-email": "Некорректный адрес электронной почты __email__",
   "error-invalid-email-address": "Некорректный адрес электронной почты",
   "error-invalid-file-height": "Недопустимая высота файла",
   "error-invalid-file-type": "Неверный тип файла",
-  "error-direct-message-file-upload-not-allowed": "Передача файлов не разрешена в личных сообщениях",
   "error-invalid-file-width": "Недопустимая ширина файла",
   "error-invalid-from-address": "Вы сообщили неверный адрес отправителя.",
   "error-invalid-integration": "Invalid интеграция",
   "error-invalid-message": "Неверное сообщение",
   "error-invalid-method": "Недопустимый метод",
-  "error-invalid-name": "Ошибочное имя",
+  "error-invalid-name": "Неверное имя",
   "error-invalid-password": "Неверный пароль",
   "error-invalid-redirectUri": "Ошибочный redirectUri",
   "error-invalid-role": "недопустимая роль",
-  "error-invalid-room": "Несуществующий чат",
+  "error-invalid-room": "Такой комнаты не существует",
   "error-invalid-room-name": "<strong>%s</strong> is not a valid room name,<br/> use only letters, numbers, hyphens and underscores",
   "error-invalid-room-type": "<strong>__type__</strong> недопустимый тип чата.",
   "error-invalid-settings": "Неверные настройки, предоставляемые",
@@ -505,24 +582,29 @@
   "error-no-tokens-for-this-user": "Нет токенов для этого пользователя",
   "error-not-allowed": "Не разрешено",
   "error-not-authorized": "Не допускается",
-  "error-push-disabled": "Push уведомления отключены",
+  "error-push-disabled": "Push оповещения отключены",
   "error-remove-last-owner": "Это последний владелец. Пожалуйста, назначьте нового владельца до удаления этого.",
   "error-role-in-use": "Нельзя удалить позицию, потому что она используется",
   "error-role-name-required": "Необходимо название роли",
   "error-the-field-is-required": "Поле __field__ требуется.",
   "error-too-many-requests": "Слишком много запросов. вы должны подождать __seconds__ секунд перед тем, как попробовать снова.",
   "error-user-is-not-activated": "Пользователь не активирован",
+  "error-user-limit-exceeded": "Число пользователей, которых вы пытаетесь пригласить в #channel_name превышает лимит, установленный администратором",
   "error-user-not-in-room": "Пользователь не в этом чате",
   "error-user-registration-disabled": "Регистрация пользователей отключена",
-  "error-user-limit-exceeded": "Число пользователей, которых вы пытаетесь пригласить в #channel_name превышает лимит, установленный администратором",
   "error-user-registration-secret": "Регистрация пользователя допускается только с помощью секретной URL",
   "error-you-are-last-owner": "Вы последний владелец чата. Пожалуйста, назначьте нового владельца до выхода из этого чата.",
   "Error_changing_password": "Ошибка при изменении пароля",
   "Esc_to": "Выйти и",
+  "Event_Trigger": "Событие",
+  "Event_Trigger_Description": "Выберите тим события который будет запускать этот webhook",
   "every_30_minutes": "Раз в 30 минут",
   "every_hour": "Раз в час",
   "every_six_hours": "Раз в 6 часов",
+  "Everyone_can_access_this_channel": "У всех есть доступ в этот канал",
   "Example_s": "Пример: <code class=\"inline\">%s</code>",
+  "Exclude_Botnames": "Исключить ботов",
+  "Exclude_Botnames_Description": "Не обрабатывать сообщения от ботов, имена которых совпадают с регулярным выражением выше. Если незаполнено все сообщения будут обработаны.",
   "False": "Нет",
   "Favorite_Rooms": "Включить избранные каналы",
   "Favorites": "Избранное",
@@ -535,8 +617,8 @@
   "File_type_is_not_accepted": "Недопустимый тип файла",
   "File_uploaded": "Файл загружен",
   "FileUpload": "Загрузка файлов",
-  "FileUpload_Enabled": "Загрузка файлов включена",
   "FileUpload_Disabled": "Загрузка файлов выключена.",
+  "FileUpload_Enabled": "Загрузка файлов включена",
   "FileUpload_Enabled_Direct": "Включить загрузку файлов в личных сообщениях",
   "FileUpload_File_Empty": "Пустой файл",
   "FileUpload_FileSystemPath": "Системный путь",
@@ -557,18 +639,21 @@
   "FileUpload_S3_CDN": "Домен CDN для загрузок",
   "FileUpload_S3_Region": "Регион",
   "FileUpload_Storage_Type": "Тип хранения",
+  "First_Channel_After_Login": "Открыть канал после авторизации",
   "Flags": "Флаги",
   "Follow_social_profiles": "Добавляйте нас в друзья в социальных сетях, форкайте на github и пишите свои отзывы о нашем приложении у нас в trello.",
+  "Fonts": "Шрифты",
   "Food_and_Drink": "Еда и питьё",
   "Footer": "Нижний колонтитул",
-  "Fonts": "Шрифты",
   "For_your_security_you_must_enter_your_current_password_to_continue": "Чтобы продолжить, вы должны повторно ввести свой пароль для вашей безопасности",
+  "force-delete-message": "Принудительное удаление сообщений",
+  "force-delete-message_description": "Разрешение на удаление сообщений в обход всех ограничений",
   "Force_SSL": "Принудительный SSL",
   "Force_SSL_Description": "*ВНИМАНИЕ!* Ни в коем случае не используйте _Принудительный SSL_ в установках с обратным прокси (например, nginx). В таком случае вы должны делать переадресацию на нем, а не в Rocket.Chat.",
   "Forgot_password": "Забыли пароль?",
   "Forgot_Password_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[Forgot_Password_Url] для URL восстановления пароля. </li><li>[name], [fname], [lname] для полного имени, имени или фамилии пользователя.</li><li>[email] для адреса электронной почты пользователя.</li><li>[Site_Name] и [Site_URL] для имени приложения и его URL.</li></ul>",
-  "Forgot_Password_Email_Subject": "[Site_Name] - восстановление пароля",
   "Forgot_Password_Email": "Нажмите <a href=\"[Forgot_Password_Url]\">сюда</a> для сброса вашего пароля.",
+  "Forgot_Password_Email_Subject": "[Site_Name] - восстановление пароля",
   "Forgot_password_section": "Забыл пароль",
   "Forward": "Отправить",
   "Forward_chat": "Отправить чат",
@@ -581,7 +666,7 @@
   "From_email_warning": "<b>Внимание</b>: Поле <b>От</b> зависит от настроек вашего почтового сервера.",
   "General": "Общие настройки",
   "github_no_public_email": "В настройках GitHub отсутствует публично доступный адрес электронной почты",
-  "Give_a_unique_name_for_the_custom_oauth": "Задайте уникальное имя для пользовательского OAuth",
+  "Give_a_unique_name_for_the_custom_oauth": "Задайте uniquie name OAuth",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Задайте приложению имя. Оно будет видно всем пользователям.",
   "Global": "Общие",
   "GoogleTagManager_id": "Google Tag Manager Id",
@@ -596,12 +681,12 @@
   "Hide_flextab": "Скрывать правую боковую панель по клику",
   "Hide_Group_Warning": "Вы уверены, что хотите спрятать приватный групповой чат \"%s\"?",
   "Hide_Private_Warning": "Вы уверены, что хотите спрятать беседу с \"%s\"?",
-  "Hide_room": "Скрыть чат",
-  "Hide_Room_Warning": "Вы уверены, что хотите спрятать чат \"%s\"?",
   "Hide_roles": "Скрывать роли пользователей",
+  "Hide_room": "Скрыть комнату",
+  "Hide_Room_Warning": "Вы уверены, что хотите спрятать комнату \"%s\"?",
   "Hide_Unread_Room_Status": "Не помечать чат как непрочитанный",
   "Hide_usernames": "Скрыть имена пользователей",
-  "Highlights": "Отметка сообщений",
+  "Highlights": "Подсветка сообщений",
   "Highlights_How_To": "Чтобы получать уведомления, когда кто-то упоминает слово или фразу, добавьте её здесь. Вы можете разделять слова или фразы запятыми. Слова не чувствительны к регистру.",
   "Highlights_List": "Подсвечивать слова",
   "History": "История",
@@ -615,7 +700,9 @@
   "If_this_email_is_registered": "Если этот адрес электронной почты зарегистрирован, мы отправим на него инструкцию по сбросу пароля. Если вы не получили электронное сообщение, попробуйте снова позже.",
   "If_you_are_sure_type_in_your_password": "Если вы уверены, введите пароль:",
   "If_you_are_sure_type_in_your_username": "Если вы уверены, введите ваш логин:",
-  "Importer_Archived": "Удаленные",
+  "Impersonate_user": "Представляться пользователем",
+  "Impersonate_user_description": "Когда включено, инеграция отправляет сообщения от имени пользователя, который заставил интеграцию сработать",
+  "Importer_Archived": "Архивные",
   "Importer_done": "Импорт данных завершен!",
   "Importer_finishing": "Завершить импорт данных.",
   "Importer_From_Description": "Импортировать данные из __from__ в Rocket.Chat.",
@@ -628,11 +715,12 @@
   "Importer_not_in_progress": "Импортер на данный момент не в сети.",
   "Importer_Prepare_Restart_Import": "Перезапустить импорт данных.",
   "Importer_Prepare_Start_Import": "Начать импорт данных.",
-  "Importer_Prepare_Uncheck_Archived_Channels": "Снимите флажок с удаленных каналов",
+  "Importer_Prepare_Uncheck_Archived_Channels": "Снимите флажок с архивных каналов",
   "Importer_Prepare_Uncheck_Deleted_Users": "Снимите флажок с удаленных пользователей",
   "Importer_progress_error": "Произошла ошибка при выполнении импорта данных.",
   "Importer_setup_error": "При настройке импортера возникла ошибка.",
-  "inline_code": "внутренний код",
+  "Incoming_WebHook": "Входящий webhook",
+  "inline_code": "код",
   "Install_Extension": "Установить расширение",
   "Install_FxOs": "Установить Rocket.Chat на Firefox",
   "Install_FxOs_done": "Отлично! Теперь вы можете использовать Rocket.Chat через иконку на вашем рабочем столе. Развлекайтесь вместе с Rocket.Chat!",
@@ -641,48 +729,46 @@
   "Installation": "Установка",
   "Installed_at": "Установленно",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Инструкции для вашего посетителя заполнить форму, чтобы отправить сообщение",
-  "Impersonate_user": "Представляться пользователем",
-  "Impersonate_user_description": "Когда включено, инеграция отправляет сообщения от имени пользователя, который заставил интеграцию сработать",
-  "Incoming_WebHook": "Входящий webhook",
-  "Integration_Advanced_Settings": "Дополнительные настройки",
   "Integration_added": "Интеграция была добавлена",
+  "Integration_Advanced_Settings": "Дополнительные настройки",
   "Integration_History_Cleared": "История интеграций успешно очищена",
   "Integration_Incoming_WebHook": "Входящая интеграция WebHook",
   "Integration_New": "Новая интеграция",
-  "Integrations_Outgoing_Type_FileUploaded": "Файл загружен",
-  "Integrations_Outgoing_Type_RoomArchived": "Комната заархивирована",
-  "Integrations_Outgoing_Type_RoomJoined": "Пользователь присоединился к комнате",
-  "Integrations_Outgoing_Type_RoomLeft": "Пользователь покинул комнату",
-  "Integrations_Outgoing_Type_SendMessage": "Сообщение отправлено",
-  "Integrations_Outgoing_Type_UserCreated": "Пользователь создан",
   "Integration_Outgoing_WebHook": "Исходящая интеграция WebHook",
   "Integration_Outgoing_WebHook_History": "История исходящих webhook-интеграций",
-  "Integration_Outgoing_WebHook_No_History": "Эта исходящая webhook-интеграция ещё не имеет записанной истории.",
-  "Integration_Outgoing_WebHook_History_Time_Triggered": "Время срабатывания интеграции",
-  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Время завершения выполнения интеграции",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_Trigger": "Данные, переданные в интеграцию",
   "Integration_Outgoing_WebHook_History_Data_Passed_To_URL": "Данные, переданные по URL",
-  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Ошибка ответа HTTP",
-  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP ответ",
   "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Стек ошибки",
-  "Integration_Retry_Failed_Url_Calls": "Повторный запрос по неудавшемуся URL",
-  "Integration_Retry_Failed_Url_Calls_Description": "Должна ли инеграция пытаться снова в течение небольшого промежутка времени, если вызов по URL неудачен?",
+  "Integration_Outgoing_WebHook_History_Http_Response": "HTTP ответ",
+  "Integration_Outgoing_WebHook_History_Http_Response_Error": "Ошибка ответа HTTP",
+  "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Время завершения выполнения интеграции",
+  "Integration_Outgoing_WebHook_History_Time_Triggered": "Время срабатывания интеграции",
+  "Integration_Outgoing_WebHook_No_History": "Эта исходящая webhook-интеграция ещё не имеет записанной истории.",
   "Integration_Retry_Count": "Число повторных попыток",
   "Integration_Retry_Count_Description": "Сколько попыток вызова интеграции предпринять, если запрос к URL не удается?",
   "Integration_Retry_Delay": "Задержка перед повторной попыткой",
   "Integration_Retry_Delay_Description": "Какой алгоритм задержки перед повторной попыткой использовать? <code class=\"inline\">10^x</code>, <code class=\"inline\">2^x</code> или <code class=\"inline\">x*2</code>",
+  "Integration_Retry_Failed_Url_Calls": "Повторный запрос по неудавшемуся URL",
+  "Integration_Retry_Failed_Url_Calls_Description": "Должна ли инеграция пытаться снова в течение небольшого промежутка времени, если вызов по URL неудачен?",
   "Integration_Run_When_Message_Is_Edited": "Запускать после изменения",
   "Integration_Run_When_Message_Is_Edited_Description": "Запускать ли интеграцию после редактирования сообщения? Если нет, то интеграция будет запущена только для <strong>новых</strong> сообщений.",
+  "Integration_updated": "Интеграция была загружена",
   "Integration_Word_Trigger_Placement": "Слово может быть где угодно",
   "Integration_Word_Trigger_Placement_Description": "Может ли быть слово быть расположено где угодно в сообщении, а не только в начале?",
-  "Integration_updated": "Интеграция была загружена",
   "Integrations": "Интеграции",
   "Integrations_for_all_channels": "Введите <strong>all_public_channels</strong> для прослушивания всех публичных чатов, <strong>all_private_groups</strong> для прослушивания всех закрытых чатов, <strong>all_direct_messages</strong> - для прослушивания всех личных сообщений.",
+  "Integrations_Outgoing_Type_FileUploaded": "Файл загружен",
+  "Integrations_Outgoing_Type_RoomArchived": "Комната заархивирована",
+  "Integrations_Outgoing_Type_RoomCreated": "Создана комната (канал или приватный канал)",
+  "Integrations_Outgoing_Type_RoomJoined": "Пользователь присоединился к комнате",
+  "Integrations_Outgoing_Type_RoomLeft": "Пользователь покинул комнату",
+  "Integrations_Outgoing_Type_SendMessage": "Сообщение отправлено",
+  "Integrations_Outgoing_Type_UserCreated": "Пользователь создан",
   "InternalHubot": "Внутренний Hubot",
-  "InternalHubot_ScriptsToLoad": "Сценарии для загрузки",
-  "InternalHubot_ScriptsToLoad_Description": "Пожалуйста, введите разделенный запятыми список скриптов для загрузки из https://github.com/github/hubot-scripts/tree/master/src/scripts",
   "InternalHubot_PathToLoadCustomScripts": "Папка для загрузки скриптов",
   "InternalHubot_reload": "Перезагрузить скрипты",
+  "InternalHubot_ScriptsToLoad": "Сценарии для загрузки",
+  "InternalHubot_ScriptsToLoad_Description": "Пожалуйста, введите разделенный запятыми список скриптов для загрузки из https://github.com/github/hubot-scripts/tree/master/src/scripts",
   "InternalHubot_Username_Description": "Должно быть действительным логином бота, зарегистрированным на сервере.",
   "Invalid_confirm_pass": "Пароли не совпадают",
   "Invalid_email": "Введен некорректный адрес электронной почты",
@@ -691,7 +777,7 @@
   "Invalid_name": "Имя не может быть пустым",
   "Invalid_notification_setting_s": "Неверная настройка уведомлений: %s",
   "Invalid_pass": "Пароль не может быть пустым",
-  "Invalid_room_name": "<strong>%s</strong> - недопустимое имя для чата,<br/> допустимые символы: цифры, подчеркивание и латинские буквы.",
+  "Invalid_room_name": "<strong>%s</strong> - недопустимое имя для комнаты,<br/> допустимые символы: цифры, подчеркивание и латинские буквы.",
   "Invalid_secret_URL_message": "Предоставленный URL-адрес недействителен.",
   "Invalid_setting_s": "Неправильная настройка: %s",
   "Invalid_two_factor_code": "Неверный двухфакторный код",
@@ -703,36 +789,32 @@
   "Invitation_HTML_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[email] для электронной почты получателя.</li><li>[Site_Name] и [Site_URL] для названия приложения и его URL.</li></ul>",
   "Invitation_Subject": "Предмет приглашения",
   "Invitation_Subject_Default": "Вы были приглашены [Site_Name]",
-  "Invite_user_to_join_channel": "Пригласить пользователя присоединиться к этому публичному чату",
-  "Invite_user_to_join_channel_all_to": "Пригласить всех пользователей этого чата присоединиться к [#channel]",
+  "Invite_user_to_join_channel": "Пригласить пользователя в канал",
   "Invite_user_to_join_channel_all_from": "Пригласить всех пользователей [#channel] присоединиться к этому чату",
+  "Invite_user_to_join_channel_all_to": "Пригласить всех пользователей этого чата присоединиться к [#channel]",
   "Invite_Users": "Пригласить пользователей",
+  "IRC_Channel_Join": "Вывод команды JOIN",
+  "IRC_Channel_Leave": "Вывод команды PART",
+  "IRC_Channel_Users": "Вывод команды NAMES",
+  "IRC_Channel_Users_End": "Конец вывода команды NAMES",
+  "IRC_Private_Message": "Вывод команды PRIVMSG",
   "is_also_typing": "все ещё печатает",
   "is_also_typing_female": "все ещё печатает",
   "is_also_typing_male": "все ещё печатает",
   "is_typing": "печатает",
   "is_typing_female": "печатает",
   "is_typing_male": "печатает",
-  "IRC_Channel_Join": "Вывод команды JOIN",
-  "IRC_Channel_Leave": "Вывод команды PART",
-  "IRC_Private_Message": "Вывод команды PRIVMSG",
-  "IRC_Channel_Users": "Вывод команды NAMES",
-  "IRC_Channel_Users_End": "Конец вывода команды NAMES",
   "It_works": "Оно работает",
   "italics": "курсив",
   "Jitsi_Chrome_Extension": "Chrome Id Extension",
   "Jitsi_Enable_Channels": "Включение в каналах",
   "join": "Присоединиться",
+  "join-without-join-code": "Присоединяться к публичным чатам без кода входа",
+  "join-without-join-code_description": "Разрешение на обход кода входа для публичных чатов с включенным кодом входа",
   "Join_audio_call": "Присоединиться к разговору",
   "Join_default_channels": "Присоединить к публичным чатам по-умолчанию",
   "Join_the_Community": "Присоединиться к сообществу",
-  "Join_the_given_channel": "Присоединиться к этому публичному чату",
-  "Show_the_keyboard_shortcut_list": "Показывать список горячих клавиш",
-  "Open_channel_user_search": "`%s` - открыть чат / поиск пользователей",
-  "Edit_previous_message": "'%s' - редактировать предыдущее сообщение",
-  "Move_beginning_message": "'%s' - перейти к началу сообщения",
-  "Move_end_message": "'%s' - перейти в конец сообщения",
-  "New_line_message_compose_input": "'%s' - добавить новую строку в сообщение",
+  "Join_the_given_channel": "Присоединиться к этому каналу",
   "Join_video_call": "Присоединиться к видеозвонку",
   "Joined": "Участвую",
   "Jump": "Перейти",
@@ -745,6 +827,7 @@
   "Katex_Enabled_Description": "Разрешить используя <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">Katex</a> для верстки математики в сообщениях",
   "Katex_Parenthesis_Syntax": "Разрешить Скобки Синтаксис",
   "Katex_Parenthesis_Syntax_Description": "Разрешить использование \\ [Katex блок \\] и \\ (встроенный Katex \\) синтаксисом",
+  "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Открыть канал / поиск пользователей",
   "Knowledge_Base": "База знаний",
   "Label": "Подпись",
   "Language": "Язык",
@@ -752,7 +835,7 @@
   "Last_login": "Последний раз заходил",
   "Last_Message_At": "Последнее сообщение",
   "Last_seen": "Последняя активность",
-  "Layout": "Макет",
+  "Layout": "Внешний вид",
   "Layout_Home_Body": "Контент на главной",
   "Layout_Home_Title": "Название главной",
   "Layout_Login_Terms": "Правила составления логина",
@@ -778,13 +861,14 @@
   "LDAP_Domain_Search_Password": "Пароль к доменному поиску",
   "LDAP_Domain_Search_Password_Description": "Пароль для пользователя доменного поиска",
   "LDAP_Domain_Search_User": "Пользователь доменного поиска",
-  "LDAP_Domain_Search_User_Description": "Пользователь LDAP, который выполняет пользовательские поиски, чтобы подтвердить подлинность других пользователей, когда они регистрируются. <br/>Это, как правило - сервисный аккаунт, созданный определенно для сторонней интеграции. Используйте полностью составное имя, например `cn=Administrator,cn=Users,dc=Example,dc=com`.",
+  "LDAP_Domain_Search_User_Description": "Пользователь LDAP, который выполняет пользовательские поиски, чтобы подтвердить подлинность других пользователей, когда они регистрируются. <br/>Это, как правило - сервисный аккаунт, созданный определенно для сторонней интеграции. Используйте полностью составное имя, например `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Domain_Search_User_ID": "Идентификатор пользователя доменного поиска",
   "LDAP_Domain_Search_User_ID_Description": "Атрибут LDAP, который идентифицирует пользователя LDAP, делающего попытку аутентификации. Это поле должно иметь значение `sAMAccountName` для большинства установок Active Directory, но она может иметь значение `uid` для других LDAP решений, таких как OpenLDAP. Вы можете использовать `mail` для указания пользователей по электронной почте или любой атрибут, какой пожелаете. <br>Вы можете использовать несколько значений, разделенных запятой, чтобы разрешить пользователям войти, используя множественные идентификаторы, такие как имя пользователя или электронная почта.",
   "LDAP_Enable": "Включить LDAP",
   "LDAP_Enable_Description": "Попытка использовать LDAP для аутентификации.",
   "LDAP_Encryption": "Шифрование",
   "LDAP_Encryption_Description": "Метод шифрования раньше обеспечивал безопасность коммуникаций с сервером LDAP. Примеры содержат `plain` (без шифрования), `SSL/LDAPS`(зашифрованный с начала), а также `StartTLS`(модернизируйте до зашифрованной коммуникации после подключения).",
+  "LDAP_Group_Filter_Group_Member_Format_Description": "Например, *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
   "LDAP_Host": "Хост",
   "LDAP_Host_Description": "Хост LDAP, например `ldap.example.com` или `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Таймаут бездействия (мсек)",
@@ -806,13 +890,12 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Напишите свой собственный фильтр, чтобы искать пользователей в сервере LDAP.",
   "LDAP_Username_Field": "Поле \"Логин\"",
   "LDAP_Username_Field_Description": "Какое поле будет устанавливаться в качестве логина для новых пользователей. Оставьте поле пустым, чтобы использовать логин, введенный на странице входа.<br/>Вы также можете использовать теги шаблонов, например `#{givenName}.#{sn}`.<br/>Значение по умолчанию - `sAMAccountName`.",
-  "LDAP_Group_Filter_Group_Member_Format_Description": "Например, *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
-  "Leave_Group_Warning": "Вы уверены, что хотите покинуть групповой чат \"%s\"?",
+  "Leave_Group_Warning": "Вы уверены, что хотите покинуть группу \"%s\"?",
   "Leave_Private_Warning": "Вы уверены, что хотите покинуть беседу с \"%s\"?",
-  "Leave_room": "Покинуть чат",
-  "Leave_Room_Warning": "Вы уверены, что хотите покинуть чат \"%s\"?",
+  "Leave_room": "Покинуть комнату",
+  "Leave_Room_Warning": "Вы уверены, что хотите покинуть комнату \"%s\"?",
   "Leave_the_current_channel": "Покинуть текущий чат",
-  "line": "линия",
+  "line": "строк",
   "List_of_Channels": "Список чатов",
   "List_of_Direct_Messages": "Список личных сообщений",
   "Livechat_agents": "Сотрудники Livechat",
@@ -835,15 +918,17 @@
   "Localization": "Язык",
   "Log_Exceptions_to_Channel": "Логировать исключения в чат",
   "Log_Exceptions_to_Channel_Description": "Чат, который получит все захваченные исключения. Оставьте пустым, чтобы игнорировать исключения.",
-  "Log_File": "Показать файл и строки",
+  "Log_File": "Отображать файл и строки",
   "Log_Level": "Уровень логирования ",
-  "Log_Package": "Показать комплект",
-  "Log_View_Limit": "Максимум строк в логе",
+  "Log_Package": "Отображать сборку",
+  "Log_View_Limit": "Лимит строк",
   "Logged_out_of_other_clients_successfully": "Сеансы в других клиентах успешно завершены",
   "Login": "Войти",
   "Login_with": "Авторизация через %s",
   "Logout": "Выйти",
   "Logout_Others": "Выйти со всех устройств",
+  "mail-messages": "Посылать электронные сообщения",
+  "mail-messages_description": "Разрешение на использование функции отправки электронных сообщений",
   "Mail_Message_Invalid_emails": "Вы предоставили один или более недействительных адресов электронной почты: %s",
   "Mail_Message_Missing_to": "Вы должны выбрать одного или нескольких пользователей или указать один или несколько адресов электронной почты, разделенных запятыми.",
   "Mail_Message_No_messages_selected_select_all": "Вы не выбрали ни одного сообщения. Хотели бы вы сделать <a href='#' class='select-all'>select all</a> сообщения видимыми?",
@@ -854,6 +939,18 @@
   "Mailer_body_tags": "Вам <b>необходимо</b> использовать [unsubscribe] как ссылку для отписки.<br/>Вы можете использовать [name], [fname] и [lname] в качестве полного имени пользователя, имени или фамилии.<br/>Вы можете использовать [email] для адреса электронной почты пользователя.",
   "Mailing": "Почтовое отправление",
   "Make_Admin": "Сделать администратором",
+  "manage-assets": "Управлять ресурсами",
+  "manage-assets_description": "Разрешение на управление ресурсами сервера",
+  "manage-emoji": "Управлять смайлами",
+  "manage-emoji_description": "Разрешение на управление смайлами сервера",
+  "manage-integrations": "Управлять интеграциями",
+  "manage-integrations_description": "Разрешение на управление интеграциями сервера",
+  "manage-oauth-apps": "Управлять приложениями OAuth",
+  "manage-oauth-apps_description": "Разрешение на управление приложениями OAuth",
+  "manage-own-integrations": "Создавать свои интеграции",
+  "manage-own-integrations_description": "Возможность разрешения создавать и редактировать свои интеграции и webhook'и",
+  "manage-sounds": "Управлять звуками",
+  "manage-sounds_description": "Разрешение на управление звуками сервера",
   "Manager_added": "Менеджер добавлен",
   "Manager_removed": "Менеджер удален",
   "Managing_assets": "Управление активами",
@@ -864,6 +961,8 @@
   "Markdown_SupportSchemesForLink": "Поддерживать Markdown систему ссылок",
   "Markdown_SupportSchemesForLink_Description": "Разрешённые Markdown системы через запятую",
   "Members_List": "Пользователи",
+  "mention-all": "Упоминать всех",
+  "mention-all_description": "Разрешение на использование упоминания @all",
   "Mentions": "Упоминания",
   "Mentions_default": "Упоминания (по умолчанию)",
   "Message": "Сообщение",
@@ -885,7 +984,7 @@
   "Message_BadWordsFilterListDescription": "Добавить список разделенных запятыми список плохих слов, чтобы фильтровать",
   "Message_DateFormat": "Формат даты",
   "Message_DateFormat_Description": "Смотрите также: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
-  "Message_deleting_blocked": "Это сообщение больше не может быть удалено",
+  "Message_deleting_blocked": "Это сообщение уже не может быть удалено",
   "Message_editing": "редактирование сообщений",
   "Message_GroupingPeriod": "Период объединения (в секундах)",
   "Message_GroupingPeriodDescription": "Сообщения будут сгруппированы вместе с предыдущим сообщением, если они оба от одного пользователя и затраченное время было меньше, чем установленное в секундах.",
@@ -904,18 +1003,18 @@
   "Message_ShowEditedStatus": "Отображать статус \"Отредактировано\"",
   "Message_ShowFormattingTips": "Показывать советы по форматированию",
   "Message_starring": "Сообщение в главной роли",
-  "Message_TimeFormat": "Формат времени",
   "Message_TimeAndDateFormat": "Формат даты и времени",
-  "Message_TimeFormat_Description": "Смотрите также: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeAndDateFormat_Description": "Подробнее в: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
+  "Message_TimeFormat": "Формат времени",
+  "Message_TimeFormat_Description": "Смотрите также: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Сообщение слишком длинное",
   "Message_VideoRecorderEnabled": "Запись видео включена",
   "Message_VideoRecorderEnabledDescription": "Тип файлов 'video/webm' должен быть в списке разрешенных к передаче файлов в разделе настроек \"загрузка файлов\"",
   "Messages": "Сообщения",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Сообщения, отосланные на Входящие WebHook, будут публиковаться здесь.",
   "Meta": "Мета",
-  "Meta_fb_app_id": "Facebook App Id",
   "Meta_custom": "Пользовательские мета-теги",
+  "Meta_fb_app_id": "Facebook App Id",
   "Meta_google-site-verification": "Google Site Verification",
   "Meta_language": "Язык",
   "Meta_msvalidate01": "MSValidate.01",
@@ -929,10 +1028,14 @@
   "More_direct_messages": "Больше личных сообщений",
   "More_groups": "Больше приватных чатов",
   "More_unreads": "Еще \"непрочитанные\"",
+  "Move_beginning_message": "'%s' - перейти к началу сообщения",
+  "Move_end_message": "'%s' - перейти в конец сообщения",
   "Msgs": "Сообщения",
-  "multi": "много",
+  "multi": "несколько",
+  "mute-user": "Заглушить пользователя",
+  "mute-user_description": "Разрешение на заглушение других пользователей в том же публичном чате",
   "Mute_someone_in_room": "Заблокировать кого-нибудь в чате",
-  "Mute_user": "Заблокировать пользователя",
+  "Mute_user": "Заглушить",
   "Muted": "Заблокировано",
   "My_Account": "Мой аккаунт",
   "n_messages": "%s сообщений",
@@ -940,33 +1043,34 @@
   "Name": "Имя",
   "Name_cant_be_empty": "Имя не может быть пустым",
   "Name_of_agent": "Имя сотрудника",
-  "Name_optional": "Имя (необязательно)",
+  "Name_optional": "Имя (опционально)",
   "Navigation_History": "История навигации",
   "New_Application": "Новое приложение",
   "New_Custom_Field": "Новое пользовательское поле",
   "New_Department": "Новый отдел",
   "New_integration": "Новая интеграция",
+  "New_line_message_compose_input": "'%s' - добавить новую строку в сообщение",
   "New_logs": "Новые регистрации",
   "New_Message_Notification": "Уведомление о новом сообщении",
   "New_messages": "Новые сообщения",
   "New_password": "Новый пароль",
   "New_role": "Новая роль",
   "New_Room_Notification": "Уведомление о новом публичном чате",
-  "New_videocall_request": "Новый запрос на видео-звонок",
   "New_Trigger": "Новый триггер",
-  "No_channel_with_name_%s_was_found": "Чат с названием <strong>\"%s\"</strong> не найден!",
+  "New_videocall_request": "Новый запрос на видео-звонок",
+  "No_channel_with_name_%s_was_found": "Канал с названием <strong>\"%s\"</strong> не найден!",
   "No_channels_yet": "Вы пока не состоите в публичных чатах.",
   "No_direct_messages_yet": "Можно писать пользователям приватные сообщения.",
   "No_Encryption": "Без шифрования",
-  "No_group_with_name_%s_was_found": "Приватный чат с названием <strong>\"%s\"</strong> не найден!",
+  "No_group_with_name_%s_was_found": "Приватный канал с названием <strong>\"%s\"</strong> не найден!",
   "No_groups_yet": "Вы не состоите ни в одном приватном чате.",
   "No_livechats": "У вас нет livechats.",
   "No_mentions_found": "Упоминания не найдены",
   "No_pinned_messages": "Нет прикрепленных сообщений",
-  "No_results_found": "Результатов не найдено",
+  "No_results_found": "Ничего не найдено",
+  "No_snippet_messages": "Нет сниппетов",
   "No_starred_messages": "Нет отмеченных сообщений",
   "No_such_command": "Несуществующая команда: \"__command__\"",
-  "No_snippet_messages": "Нет сниппетов",
   "No_user_with_username_%s_was_found": "Пользователь с логином  <strong>\"%s\"</strong> не найден!",
   "Node_version": "Node версия",
   "Normal": "Обычный",
@@ -975,10 +1079,13 @@
   "Not_found_or_not_allowed": "Чат не существует или владелец ограничил доступ",
   "Nothing": "Пусто",
   "Nothing_found": "Ничего не найдено",
+  "Notification_Desktop_Default_For": "Отображать уведомления для",
   "Notification_Duration": "Длительность показа уведомления",
+  "Notification_Mobile_Default_For": "Включить push для",
   "Notifications": "Уведомления",
-  "Notify_all_in_this_room": "Уведомить всех в этом чате",
+  "Notifications_Sound_Volume": "Громкость уведомления",
   "Notify_active_in_this_room": "Уведомить всех активных в этом чате",
+  "Notify_all_in_this_room": "Уведомить всех в этом чате",
   "Num_Agents": "# Сотрудники",
   "Number_of_messages": "Количество сообщений",
   "OAuth_Application": "Приложение OAuth",
@@ -988,8 +1095,10 @@
   "Off_the_record_conversation": "Конфиденциальная беседа",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Конфиденциальная беседа недоступна в вашем браузере или на вашем устройстве.",
   "Offline": "Не в сети",
+  "Offline_DM_Email": " вам было отправлено сообщение пользователем __user__",
   "Offline_form": "Офлайн форма",
   "Offline_form_unavailable_message": "Офлайн сообщение",
+  "Offline_Mention_Email": " вас упомянул(а) __user__ в #__room__",
   "Offline_message": "Офлайн сообщение",
   "Offline_success_message": "Офлайн сообщение об отправке",
   "Offline_unavailable": "Offline недоступен",
@@ -999,11 +1108,12 @@
   "Only_you_can_see_this_message": "Только вы можете видеть это сообщение",
   "Oops!": "Ой",
   "Open": "Открыть",
+  "Open_channel_user_search": "`%s` - открыть чат / поиск пользователей",
+  "Open_your_authentication_app_and_enter_the_code": "Откройте ваше приложение аутентификации и введите код. Вы также можете использовать один из кодов восстановления (backup codes).",
   "Opened": "Открыто",
   "Opens_a_channel_group_or_direct_message": "Открывает чат, приватный чат или личное сообщение",
-  "optional": "дополнительно",
+  "optional": "Опционально",
   "or": "или",
-  "Open_your_authentication_app_and_enter_the_code": "Откройте ваше приложение аутентификации и введите код. Вы также можете использовать один из кодов восстановления (backup codes).",
   "Order": "Последовательность",
   "OS_Arch": "Архитектура ОС",
   "OS_Cpus": "Количество процессоров в ОС",
@@ -1030,130 +1140,24 @@
   "People": "Люди",
   "Permalink": "Постоянная ссылка",
   "Permissions": "Настройка прав",
-  "access-mailer_description": "Разрешить рассылку электронного сообщения всем пользователям",
-  "access-permissions": "Доступ к странице разрешений",
-  "access-permissions_description": "Изменяйте разрешения для разных ролей",
-  "add-oauth-service": "Добавлять сервисы Oauth",
-  "add-oauth-service_description": "Разрешение на добавление новых сервисов Oauth",
-  "add-user": "Добавлять пользователей",
-  "add-user_description": "Разрешение на добавление новых пользователей на сервер на странице пользователей",
-  "add-user-to-any-c-room": "Добавить пользователя к любому публичному чату",
-  "add-user-to-any-c-room_description": "Разрешение не добавление пользователя к любому публичному чату",
-  "add-user-to-any-p-room": "Добавить пользователя к любому приватному чату",
-  "add-user-to-any-p-room_description": "Разрешение на добавление пользователя к любому приватному чату",
-  "add-user-to-joined-room": "Добавить пользователя к любому публичному чату, к которому присоединён",
-  "add-user-to-joined-room_description": "Разрешение на добавление пользователя к тому публичному чату, к которому сейчас присоединён",
-  "archive-room_description": "Разрешение на архивирование публичного чата",
-  "ban-user_description": "Разрешение банить пользователей в публичном чате",
-  "clean-channel-history": "Очистить историю публичного чата",
-  "close-livechat-room_description": "Разрешение на закрытие текущего чата LiveChat",
-  "create-c": "Создавать публичные чаты",
-  "create-c_description": "Разрешение на создание публичных чатов",
-  "create-d": "Создавать чаты личных сообщений",
-  "create-d_description": "Разрешение на создание чатов личных сообщений",
-  "create-p": "Создавать закрытые чаты",
-  "create-p_description": "Разрешение создавать закрытые чаты",
-  "create-user": "Создавать пользователей",
-  "create-user_description": "Разрешение на создание пользователей",
-  "delete-c": "Удалять публичные чаты",
-  "delete-c_description": "Разрешение на удаление публичных чатов",
-  "delete-d": "Удалять личные сообщения",
-  "delete-d_description": "Разрешение на удаление личных сообщений",
-  "delete-p": "Удалять закрытые чаты",
-  "delete-p_description": "Разрешение на удаление закрытых чатов",
-  "delete-message": "Удалять сообщения",
-  "delete-message_description": "Разрешение на удаление сообщений из чатов",
-  "delete-user": "Удалять пользователей",
-  "delete-user_description": "Разрешение на удаление пользователей",
-  "edit-message": "Редактировать сообщения",
-  "edit-message_description": "Разрешение на редактирование сообщений в чатах",
-  "edit-other-user-active-status": "Редактировать статус активности другого пользователя",
-  "edit-other-user-active-status_description": "Разрешение на блокировку и разблокировку аккаунтов",
-  "edit-other-user-info": "Редактировать информацию другого пользователя",
-  "edit-other-user-info_description": "Разрешить изменять имя, логин или адрес электронной почты другого пользователя.",
-  "edit-other-user-password": "Редактировать пароль другого пользователя",
-  "edit-other-user-password_description": "Разрешение на редактирование пароля другого пользователя. Требует разрешения на редактирование информации другого пользователя",
-  "edit-room": "Редактировать чат",
-  "edit-room_description": "Разрешение на редактирование имени, темы, типа (приватный или публичный) и статуса (активный или архивный) чата.",
-  "force-delete-message": "Принудительное удаление сообщений",
-  "force-delete-message_description": "Разрешение на удаление сообщений в обход всех ограничений",
-  "join-without-join-code": "Присоединяться к публичным чатам без кода входа",
-  "join-without-join-code_description": "Разрешение на обход кода входа для публичных чатов с включенным кодом входа",
-  "mail-messages": "Посылать электронные сообщения",
-  "mail-messages_description": "Разрешение на использование функции отправки электронных сообщений",
-  "manage-assets": "Управлять ресурсами",
-  "manage-assets_description": "Разрешение на управление ресурсами сервера",
-  "manage-emoji": "Управлять смайлами",
-  "manage-emoji_description": "Разрешение на управление смайлами сервера",
-  "manage-integrations": "Управлять интеграциями",
-  "manage-integrations_description": "Разрешение на управление интеграциями сервера",
-  "manage-oauth-apps": "Управлять приложениями OAuth",
-  "manage-oauth-apps_description": "Разрешение на управление приложениями OAuth",
-  "manage-sounds": "Управлять звуками",
-  "manage-sounds_description": "Разрешение на управление звуками сервера",
-  "mention-all": "Упоминать всех",
-  "mention-all_description": "Разрешение на использование упоминания @all",
-  "mute-user": "Заглушить пользователя",
-  "mute-user_description": "Разрешение на заглушение других пользователей в том же публичном чате",
   "pin-message": "Прикрепить сообщение",
   "pin-message_description": "Разрешение прикреплять сообщение в публичном чате",
-  "post-readonly_description": "Разрешение на отправку сообщений в публичный чат только для чтения",
-  "preview-c-room": "Предварительный просмотр публичного чата",
-  "preview-c-room_description": "Разрешение на просмотр содержимого публичного чата перед присоединением",
-  "remove-user": "Удалить пользователя",
-  "remove-user_description": "Разрешение на удаление пользователя из чата",
-  "run-import": "Запускать импорт",
-  "run-import_description": "Разрешение на запуск импортеров",
-  "set-moderator_description": "Разрешение на назначение другого пользователя модератором публичного чата",
-  "set-owner_description": "Разрешение на назначение другого пользователя владельцем публичного чата",
-  "set-react-when-readonly_description": "Разрешение на изменение возможности реакций на сообщения в публичном чате только для чтения",
-  "set-readonly_description": "Разрешение переводить публичный чат в режим только для чтения",
-  "snippet-message": "Сообщение со сниппетом",
-  "snippet-message_description": "Разрешение на создание сообщений со сниппетом",
-  "unarchive-room": "Разархивировать чат",
-  "unarchive-room_description": "Разрешение на разархивирование чатов",
-  "view-c-room": "Просматривать публичный чат",
-  "view-c-room_description": "Разрешение на просмотр публичных чатов",
-  "view-d-room": "Просматривать личные сообщения",
-  "view-d-room_description": "Разрешение на просмотр личных сообщений",
-  "view-full-other-user-info": "Просмотр полной информации о других пользователях",
-  "view-full-other-user-info_description": "Разрешение на просмотр полных профилей других пользователей, включая дату создания аккаунта, последнего входа и т. д.",
-  "view-history": "Просматривать историю",
-  "view-history_description": "Разрешение на просмотр истории публичного чата",
-  "view-join-code_description": "Разрешение на просмотр кода присоединения публичного чата",
-  "view-joined-room": "Просматривать чаты, к которым присоединился",
-  "view-joined-room_description": "Разрешение на просмотр чатов, к которым сейчас присоединён",
-  "view-l-room": "Просматривать LiveChat чаты",
-  "view-l-room_description": "Разрешение на просмотр LiveChat чатов",
-  "view-livechat-manager": "Просматривать LiveChat Manager",
-  "view-livechat-manager_description": "Разрешение на просмотр других LiveChat Manager",
-  "view-livechat-rooms": "Просматривать LiveChat чаты",
-  "view-livechat-rooms_description": "Разрешение на просмотр других LiveChat чатов",
-  "view-logs": "Просматривать логи",
-  "view-logs_description": "Разрешение на просмотр логов сервера",
-  "view-p-room": "Просматривать закрытые чаты",
-  "view-p-room_description": "Разрешение на просмотр закрытых чатов",
-  "view-other-user-channels": "Просматривать публичные чаты, принадлежащие другим пользователям",
-  "view-other-user-channels_description": "Разрешение на просмотр каналов, владельцами которых являются другие пользователи",
-  "view-room-administration": "Просматривать административную информацию чатов",
-  "view-room-administration_description": "Разрешение на просмотр статистики общих, закрытых и личных чатов. Не включает возможность просматривать сообщения в чатах или архивах",
-  "view-statistics": "Просматривать статистику",
-  "view-statistics_description": "Разрешение на просмотр системной статистики, например число пользователей онлайн, ",
-  "view-user-administration_description": "Разрешение на частичный просмотр списка других пользователей, которые сейчас в системе. Это разрешение не дает доступа к пользовательской информации из аккаунтов",
   "Pin_Message": "Прикрепить сообщение",
   "Pinned_a_message": "Прикрепленное сообщение:",
   "Pinned_Messages": "Прикрепленные сообщения",
-  "PiwikAnalytics_siteId_Description": "Идентификатор сайта будет использовать для идентификации этого сайта. Пример: 17",
+  "PiwikAdditionalTrackers_Description": "Вы можете отправлять статистику на несколько серверов Piwik добавив URL и siteId. Пример: \n[ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]",
+  "PiwikAnalytics_prependDomain": "Добавить имя домена",
+  "PiwikAnalytics_siteId_Description": "Идентификатор. Используетя для идентификации этого сайта. Пример: 17",
   "PiwikAnalytics_url_Description": "URL, где находится Piwik, обязательно должен содержать слэш в конце. Пример: //piwik.rocket.chat/",
   "Placeholder_for_email_or_username_login_field": "Подсказка адреса электронной почты или логина пользователя для поля при входе",
   "Placeholder_for_password_login_field": "Подсказка для поля пароля при входе",
   "Please_add_a_comment": "Пожалуйста, добавьте комментарий",
   "Please_add_a_comment_to_close_the_room": "Пожалуйста, добавьте комментарий, чтобы закрыть комнату",
   "Please_answer_survey": "Пожалуйста, уделите минуту для того, чтобы ответить на несколько вопросов об этом чате",
+  "please_enter_valid_domain": "Пожалуйста, введите валидный домен",
   "Please_enter_value_for_url": "Пожалуйста, введите значение для URL-адреса вашего аватара.",
   "Please_enter_your_new_password_below": "Введите ваш новый пароль ниже:",
   "Please_enter_your_password": "Повторно введите свой пароль",
-  "please_enter_valid_domain": "Пожалуйста, введите валидный домен",
   "Please_fill_a_label": "Заполните подпись",
   "Please_fill_a_name": "Введите имя",
   "Please_fill_a_username": "Заполните логин",
@@ -1166,19 +1170,26 @@
   "Please_wait_while_your_account_is_being_deleted": "Подождите, ваш аккаунт удаляется...",
   "Please_wait_while_your_profile_is_being_saved": "Подождите, пока ваш профиль сохраняется...",
   "Port": "Порт",
-  "Post_as": "Опубликовать как",
+  "post-readonly": "Сообщение только для чтения",
+  "post-readonly_description": "Разрешение на отправку сообщений в публичный чат только для чтения",
+  "Post_as": "Отправить от имени",
   "Post_to_Channel": "Опубликовать в публичный чат",
-  "Post_to_s_as_s": "Опубликовать в <strong>%s</strong> как <strong>%s</strong>",
+  "Post_to_s_as_s": "Отправить в <strong>%s</strong> от <strong>%s</strong>",
   "Preferences": "Настройки",
   "Preferences_saved": "Настройки сохранены",
+  "preview-c-room": "Предварительный просмотр публичного чата",
+  "preview-c-room_description": "Разрешение на просмотр содержимого публичного чата перед присоединением",
   "Privacy": "Приватность",
-  "Private": "Частный",
-  "Private_Group": "Приватный чат",
+  "Private": "Приватный канал",
+  "Private_Channel": "Приватный канал",
+  "Private_Group": "Приватная группа",
   "Private_Groups": "Приватные чаты",
   "Private_Groups_list": "Список приватных чатов",
   "Profile": "Профиль",
+  "Profile_details": "Детали профиля",
   "Profile_saved_successfully": "Профиль успешно сохранен",
-  "Public": "общественного",
+  "Public": "Открытый",
+  "Public_Channel": "Канал",
   "Push": "Push уведомления",
   "Push_apn_cert": "APN сертификат",
   "Push_apn_dev_cert": "APN Dev сертификат",
@@ -1192,7 +1203,7 @@
   "Push_gateway": "Шлюз",
   "Push_gcm_api_key": "GCM API-ключ",
   "Push_gcm_project_number": "GCM номер проекта",
-  "Push_production": "Продакшн\n",
+  "Push_production": "Продакшн",
   "Push_show_message": "Показать сообщение в уведомлении",
   "Push_show_username_room": "Показать имя чата/логин пользователя в уведомлении",
   "Push_test_push": "Тест",
@@ -1221,12 +1232,14 @@
   "Release": "Выпуск",
   "Reload": "Перезагрузить",
   "Remove": "Удалить",
+  "remove-user": "Удалить пользователя",
+  "remove-user_description": "Разрешение на удаление пользователя из чата",
   "Remove_Admin": "Разжаловать администратора",
   "Remove_as_moderator": "Удалить из модераторов",
   "Remove_as_owner": "Удалить из владельцев",
   "Remove_custom_oauth": "Удалить пользовательский OAuth",
-  "Remove_from_room": "Удалить из чата",
-  "Remove_someone_from_room": "Удалить кого-то из чата",
+  "Remove_from_room": "Удалить из канала",
+  "Remove_someone_from_room": "Удалить кого-то из канала",
   "Removed": "Удаленные",
   "Reply": "Ответить",
   "Report_Abuse": "Сообщить о нарушениях",
@@ -1235,8 +1248,9 @@
   "Report_this_message_question_mark": "Сообщить об этом сообщении?",
   "Require_password_change": "Требуется смена пароля",
   "Resend_verification_email": "Отправить проверочное электронное письмо ещё раз",
-  "Reset": "Сбросить",
-  "Reset_password": "Сбросить пароль",
+  "Reset": "Восстановить",
+  "Reset_password": "Восстановить пароль",
+  "Reset_section_settings": "Восстановить значения по умолчанию",
   "Restart": "Перезапустить",
   "Restart_the_server": "Перезапустить сервер",
   "Retry_Count": "Число повторных попыток",
@@ -1248,17 +1262,17 @@
   "Room_archivation_state": "Статус",
   "Room_archivation_state_false": "В сети",
   "Room_archivation_state_true": "Заархивировано",
-  "Room_archived": "Чат удалён",
+  "Room_archived": "Комната в архиве",
   "room_changed_announcement": "Объявление чата изменено на: <em>__room_announcement__</em> пользователем <em>__user_by__</em>",
   "room_changed_description": "Описание чата изменено на: <em>__room_description__</em> пользователем <em>__user_by__</em>",
   "room_changed_privacy": "<em>__user_by__</em> изменил тип чата на <em>__room_type__</em>",
   "room_changed_topic": "<em>__user_by__</em>  изменил тему чата на <em>__room_topic__</em>",
-  "Room_description_changed_successfully": "Описание комнаты изменено",
-  "Room_has_been_deleted": "Чат был удалён",
+  "Room_default_change_to_private_will_be_default_no_more": "Этот публичный чат назначен по-умолчанию, если сделать его приватным, он перестанет быть чатом по-умолчанию. Продолжить?",
+  "Room_description_changed_successfully": "Описание обновлено",
   "Room_has_been_archived": "Чат был архивирован",
+  "Room_has_been_deleted": "Чат был удалён",
   "Room_has_been_unarchived": "Чат был разархивирован",
-  "Room_default_change_to_private_will_be_default_no_more": "Этот публичный чат назначен по-умолчанию, если сделать его приватным, он перестанет быть чатом по-умолчанию. Продолжить?",
-  "Room_Info": "Информация о чате",
+  "Room_Info": "Информация канала",
   "room_is_read_only": "Эта группа доступна только для чтения",
   "room_name": "Имя комнаты",
   "Room_name_changed": "Название чата изменено: <em>__room_name__</em> пользователем <em>__user_by__</em>",
@@ -1268,9 +1282,13 @@
   "Room_topic_changed_successfully": "Тема чата успешно изменена",
   "Room_type_changed_successfully": "Тип чата успешно изменен",
   "Room_unarchived": "Чат в архиве",
-  "Room_uploaded_file_list": "Список файлов",
+  "Room_uploaded_file_list": "Список файлов канала",
   "Room_uploaded_file_list_empty": "Нет доступных файлов",
   "Rooms": "Чаты",
+  "run-import": "Запускать импорт",
+  "run-import_description": "Разрешение на запуск импортеров",
+  "run-migration": "Запустить миграцию",
+  "run-migration_description": "Разрешение на запуск миграций",
   "Running_Instances": "Запущенные инстансы",
   "S_new_messages_since_s": "%s новых сообщений с %s",
   "SAML": "SAML разметка",
@@ -1281,14 +1299,16 @@
   "SAML_Custom_Provider": "Пользовательский поставщик",
   "Saturday": "Суббота",
   "Save": "Сохранить",
-  "Save_changes": "Сохранить изменения",
+  "save-others-livechat-room-info": "Сохранить информацию о других комнатах livechat",
+  "save-others-livechat-room-info_description": "Разрешение сохранять информацию от других комнатах livechat",
+  "Save_changes": "Применить",
   "Save_Mobile_Bandwidth": "Включить режим экономии трафика",
   "Save_to_enable_this_action": "Сохранить, чтобы активировать это действие",
   "Saved": "Сохранено",
   "Saving": "Сохранение",
   "Scope": "Область",
   "Screen_Share": "Демонстрация экрана",
-  "Script_Enabled": "Сценарий включен",
+  "Script_Enabled": "Использовать скрипт",
   "Search": "Поиск",
   "Search_by_username": "Поиск по логину",
   "Search_Messages": "Поиск сообщений",
@@ -1306,8 +1326,8 @@
   "Selected_agents": "Выбранные сотрудники",
   "Send": "Отправить",
   "Send_a_message": "Отправить сообщение",
-  "Send_a_test_mail_to_my_user": "Отправить тестовое сообщение моему пользователю",
-  "Send_a_test_push_to_my_user": "Отправить тестовое push-уведомление моему пользователю",
+  "Send_a_test_mail_to_my_user": "Проверка",
+  "Send_a_test_push_to_my_user": "Протестировать push-уведомления",
   "Send_confirmation_email": "Отправить электронное письмо с подтверждением",
   "Send_data_into_RocketChat_in_realtime": "Отправьте данные в Rocket.Chat в режиме реального времени.",
   "Send_email": "Отправить электронное письмо",
@@ -1322,13 +1342,21 @@
   "Send_your_JSON_payloads_to_this_URL": "Отправить ваши полезные данные формата JSON на этот URL-адрес.",
   "Sending": "Отправка...",
   "Service": "Обработчик",
+  "set-moderator": "Назначить модератора",
+  "set-moderator_description": "Разрешение на назначение другого пользователя модератором публичного чата",
+  "set-owner": "Назначить владельца",
+  "set-owner_description": "Разрешение на назначение другого пользователя владельцем публичного чата",
+  "set-react-when-readonly_description": "Разрешение на изменение возможности реакций на сообщения в публичном чате только для чтения",
+  "set-readonly": "Установить только для чтения",
+  "set-readonly_description": "Разрешение переводить публичный чат в режим только для чтения",
+  "Set_as_leader": "Назначит лидером",
   "Set_as_moderator": "Назначить модератором",
   "Set_as_owner": "Назначить владельцом",
   "Settings": "Настройки",
   "Settings_updated": "Настройки обновлены",
   "Share_Location_Title": "Поделиться местоположением?",
   "Shared_Location": "Предоставленное местоположение",
-  "Should_be_a_URL_of_an_image": "Это должен быть URL-адрес или изображение.",
+  "Should_be_a_URL_of_an_image": "Введите URL изображения.",
   "Should_exists_a_user_with_this_username": "Пользователь уже должен существовать.",
   "Show_all": "Показать всех",
   "Show_more": "Показать больше",
@@ -1336,9 +1364,11 @@
   "Show_on_registration_page": "Показывать на странице регистрации",
   "Show_only_online": "Показать только online",
   "Show_preregistration_form": "Показать предварительную регистрационную форму",
-  "Showing_archived_results": "<p>Демонстрация <b>%s</b> архивных результатов</p>",
+  "Show_the_keyboard_shortcut_list": "Показывать список горячих клавиш",
+  "Showing_archived_results": "<p>показано <b>%s</b> архивных результатов</p>",
   "Showing_online_users": "Показано <b>__total_showing__</b> из __total__ пользователей",
   "Showing_results": "<p>Отображено <b>%s</b> результатов</p>",
+  "Sidebar_list_mode": "Режим отображения списка каналов",
   "Sign_in_to_start_talking": "Войдите, чтобы начать разговор",
   "since_creation": "с %s",
   "Site_Name": "Название сайта",
@@ -1346,18 +1376,18 @@
   "Site_Url_Description": "Пример: https://chat.domain.com/",
   "Skip": "Пропустить",
   "SlackBridge_error": "В SlackBridge произошла ошибка во время импорта ваших сообщений в %s:%s",
+  "SlackBridge_finish": "SlackBridge закончил импорт сообщений в %s. Пожалуйста, перезагрузите приложение, чтобы увидеть все сообщения.",
   "SlackBridge_Out_All_Description": "Отправлять сообщения со всех общих чатов, которые есть в Slack и в которых есть бот",
   "SlackBridge_Out_Channels": "Общие чаты для SlackBridge Out",
   "SlackBridge_Out_Channels_Description": "Выберите, с каких общих чатов отправлять сообщения обратно в Slack",
-  "SlackBridge_finish": "SlackBridge закончил импорт сообщений в %s. Пожалуйста, перезагрузите приложение, чтобы увидеть все сообщения.",
   "SlackBridge_Out_Enabled": "Включить SlackBridge Out",
   "SlackBridge_Out_Enabled_Description": "Должен ли SlackBridge также отправлять ваши сообщения обратно в Slack",
   "SlackBridge_start": "@%s начал импорт через SlackBridge в `#%s`. Вы получите уведомление после завершения.",
-  "Slash_Gimme_Description": "Отображение  (つ ◕_◕) つ  перед тем ваше сообщение",
-  "Slash_LennyFace_Description": "Отображение  (͡ ° ͜ʖ ͡ °)  после того, как ваше сообщение",
-  "Slash_Shrug_Description": "Отображает ¯ \\ _ (ツ) _ / ¯ после вашего сообщения",
-  "Slash_Tableflip_Description": "Отображение  (╯ ° □ °) ╯( ┻━┻",
-  "Slash_TableUnflip_Description": "Дисплеи ┬─┬ ノ (゜ - ゜ ノ)",
+  "Slash_Gimme_Description": "Показать  (つ ◕_◕) つ  перед сообщением",
+  "Slash_LennyFace_Description": "Показать  (͡ ° ͜ʖ ͡ °) после сообщения",
+  "Slash_Shrug_Description": "Показать ¯ \\ _ (ツ) _ / ¯ после сообщения",
+  "Slash_Tableflip_Description": "Показать  (╯ ° □ °) ╯( ┻━┻",
+  "Slash_TableUnflip_Description": "Показать ┬─┬ ノ (゜ - ゜ ノ)",
   "Slash_Topic_Description": "Установить тему",
   "Slash_Topic_Params": "тема сообщения",
   "Smarsh_Email": "Адрес электронной почты Smarsh",
@@ -1374,10 +1404,14 @@
   "SMTP_Port": "SMTP Порт",
   "SMTP_Test_Button": "Настройка тестового протокола SMTP",
   "SMTP_Username": "SMTP логин",
+  "snippet-message": "Сообщение со сниппетом",
+  "snippet-message_description": "Разрешение на создание сообщений со сниппетом",
   "Snippet_Added": "Создано %s",
   "Snippet_Messages": "Сообщения со сниппетами",
   "Snippeted_a_message": "Создан сниппет __snippetLink__",
-  "Sound": "Звук",
+  "Sound": "Звуковые оповещения",
+  "Sound_File_mp3": "Звуковой файл (mp3)",
+  "Split_by_categories": "Отдельно по категориям",
   "SSL": "SSL",
   "Star_Message": "Отметить сообщение",
   "Starred_Messages": "Отмеченные сообщения",
@@ -1404,9 +1438,9 @@
   "Stats_Total_Livechat_Rooms": "Всего чатов Livechat",
   "Stats_Total_Messages": "Всего сообщений",
   "Stats_Total_Messages_Channel": "Всего сообщений в публичных чатах",
-  "Stats_Total_Messages_PrivateGroup": "Всего сообщений в приватных чатах",
   "Stats_Total_Messages_Direct": "Всего личных сообщений",
   "Stats_Total_Messages_Livechat": "Всего сообщений в Livechat чатах",
+  "Stats_Total_Messages_PrivateGroup": "Всего сообщений в приватных чатах",
   "Stats_Total_Private_Groups": "Всего приватных чатов",
   "Stats_Total_Rooms": "Всего чатов",
   "Stats_Total_Users": "Всего пользователей",
@@ -1425,6 +1459,7 @@
   "Sync_Users": "Синхронизация пользователей",
   "System_messages": "Системные сообщения",
   "Tag": "Тег",
+  "Team": "Команда",
   "Test_Connection": "Проверка соединения",
   "Test_Desktop_Notifications": "Протестировать работу уведомлений рабочего стола",
   "Thank_you_exclamation_mark": "Спасибо!",
@@ -1438,23 +1473,23 @@
   "The_server_will_restart_in_s_seconds": "Сервер перезапустится через % секунд",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "Параметр <strong>%s</strong> настраивается на <strong>%s</strong> и вы получаете доступ из <strong>%s</strong>!",
   "The_user_will_be_removed_from_s": "Пользователь будет удален из %s",
-  "The_user_wont_be_able_to_type_in_s": "Пользователь не сможет ввести в %s",
+  "The_user_wont_be_able_to_type_in_s": "Пользователь не сможет отправлять сообщения в %s",
   "Theme": "Тема",
   "theme-color-content-background-color": "Цвет фона содержимого",
+  "theme-color-custom-scrollbar-color": "Пользовательский цвет полосы прокрутки",
+  "theme-color-info-font-color": "Цвет шрифта информации",
+  "theme-color-link-font-color": "Цвет шрифта ссылки",
   "theme-color-primary-background-color": "Основной цвет фона",
   "theme-color-primary-font-color": "Основной цвет шрифта",
   "theme-color-secondary-background-color": "Второй цвет фона",
   "theme-color-secondary-font-color": "Второй цвет шрифта",
   "theme-color-selection-color": "Цвет выделения",
-  "theme-color-tertiary-background-color": "Третий цвет фона",
-  "theme-color-tertiary-font-color": "Третий цвет шрифта",
-  "theme-color-link-font-color": "Цвет шрифта ссылки",
-  "theme-color-info-font-color": "Цвет шрифта информации",
-  "theme-color-custom-scrollbar-color": "Пользовательский цвет полосы прокрутки",
   "theme-color-status-away": "Цвет статуса \"Нет на месте\"",
   "theme-color-status-busy": "Цвет статуса \"Занят\"",
   "theme-color-status-offline": "Цвет статуса \"Не в сети\"",
   "theme-color-status-online": "Цвет статуса \"В сети\"",
+  "theme-color-tertiary-background-color": "Третий цвет фона",
+  "theme-color-tertiary-font-color": "Третий цвет шрифта",
   "theme-color-unread-notification-color": "Цвет непрочитанных уведомлений",
   "theme-custom-css": "Пользовательский CSS",
   "theme-font-body-font-family": "Шрифт для тега body",
@@ -1467,10 +1502,6 @@
   "This_is_a_push_test_messsage": "Это тестовое push-уведомление",
   "This_room_has_been_archived_by__username_": "__username__ отправил этот чат в архив",
   "This_room_has_been_unarchived_by__username_": "__username__ вернул этот чат из архива",
-  "Two-factor_authentication": "Двухфакторная аутентификация",
-  "Two-factor_authentication_disabled": "Двухфакторная аутентификация выключена",
-  "Two-factor_authentication_enabled": "Двухфакторная аутентификация включена",
-  "Two-factor_authentication_is_currently_disabled": "Двухфакторная аутентификация сейчас выключена",
   "Thursday": "Четверг",
   "Time_in_seconds": "Время в секундах",
   "Title": "Заголовок",
@@ -1482,34 +1513,43 @@
   "To_users": "Пользователям",
   "Toggle_original_translated": "Переключить оригинал/перевод",
   "Topic": "Тема",
-  "Travel_and_Places": "Путешествия и места",
   "Translated": "Переведено",
   "Translations": "Переводы",
+  "Travel_and_Places": "Путешествия и места",
   "Trigger_removed": "Триггер удален",
   "Trigger_Words": "Слова запуска",
   "Triggers": "Триггер",
   "True": "Да",
   "Tuesday": "Вторник",
+  "Two-factor_authentication": "Двухфакторная аутентификация",
+  "Two-factor_authentication_disabled": "Двухфакторная аутентификация выключена",
+  "Two-factor_authentication_enabled": "Двухфакторная аутентификация включена",
+  "Two-factor_authentication_is_currently_disabled": "Двухфакторная аутентификация сейчас выключена",
+  "Two-factor_authentication_native_mobile_app_warning": "Внимание: Если вы активируете эту функцию вы не сможете работать с мобильных приложений на данный момент.",
   "Type": "Тип",
   "Type_your_email": "Введите адрес электронной почты",
   "Type_your_message": "Текст сообщения",
   "Type_your_name": "Введите свое имя",
   "Type_your_new_password": "Введите новый пароль",
+  "UI_Click_Direct_Message": "Нажмите, чтобы создать личное сообщение",
+  "UI_Click_Direct_Message_Description": "Не открывать профиль, перейти к диалогу",
   "UI_DisplayRoles": "Показывать роли пользователей в сообщениях",
-  "UI_Merge_Channels_Groups": "Объединение частных групп с каналами",
+  "UI_Merge_Channels_Groups": "Отображать каналы и приватные каналы в одном списке",
   "UI_Use_Name_Avatar": "Использовать инициалы полного имени для создания аватара",
   "UI_Use_Real_Name": "Использовать настоящее имя",
   "Unarchive": "Восстановить",
+  "unarchive-room": "Разархивировать чат",
+  "unarchive-room_description": "Разрешение на разархивирование чатов",
   "Unblock_User": "Разблокировать пользователя",
   "Unmute_someone_in_room": "Разблокировать кого-нибудь в чате",
   "Unmute_user": "Разблокировать пользователя",
   "Unnamed": "Без названия",
   "Unpin_Message": "Открепить сообщение",
   "Unread_Count": "Количество непрочитанных",
-  "Unread_Tray_Icon_Alert": "Иконка уведомлений о непрочитанном в трее",
   "Unread_Messages": "Непрочитанные сообщения",
   "Unread_Rooms": "Непрочитанные чаты",
   "Unread_Rooms_Mode": "Режим \"непрочитанные чаты\"",
+  "Unread_Tray_Icon_Alert": "Иконка уведомлений о непрочитанном в трее",
   "Unstar_Message": "Убрать отметку",
   "Updated_at": "Обновлено в",
   "Upload_file_description": "Описание файла",
@@ -1518,22 +1558,27 @@
   "Uploading_file": "Загрузка файла...",
   "Uptime": "Аптайм",
   "URL": "URL",
-  "Use_account_preference": "Использовать параметры аккаунта",
+  "Use_account_preference": "Параметры профиля",
   "Use_Emojis": "Использовать Emojis",
   "Use_Global_Settings": "Использовать глобальные настройки",
   "Use_initials_avatar": "Использовать инициалы имени пользователя",
   "Use_service_avatar": "Использовать %s аватар",
   "Use_this_username": "Использовать этот логин",
   "Use_uploaded_avatar": "Использовать загруженную аватарку",
-  "Use_url_for_avatar": "Использовать аватар по URL",
+  "Use_url_for_avatar": "Использовать аватар по ссылке",
   "Use_User_Preferences_or_Global_Settings": "Использовать пользовательские или глобальные настройки",
+  "User": "Пользователь",
+  "user-generate-access-token_description": "Разрешение создания токенов",
+  "User__username__is_now_a_leader_of__room_name_": "Пользователь __username__ теперь лидер канала __room_name__",
   "User__username__is_now_a_moderator_of__room_name_": "Пользователь  __username__ теперь является модератором __room_name__",
   "User__username__is_now_a_owner_of__room_name_": "Пользователь __username__ теперь является владельцем __room_name__",
+  "User__username__removed_from__room_name__leaders": "Пользователь __username__ исключен из лидеров канала __room_name__",
   "User__username__removed_from__room_name__moderators": "Пользователь __username__ удален из модераторов __room_name__",
   "User__username__removed_from__room_name__owners": "Пользователь __username__ удален из владельцев __room_name__",
   "User_added": "Пользователь <em>__user_added__</em> добавлен.",
   "User_added_by": "Пользователь <em>__user_added__</em> добавлен <em>__user_by__</em>.",
   "User_added_successfully": "Пользователь успешно добавлен",
+  "User_and_group_mentions_only": "Только уведомления пользователя и группы",
   "User_doesnt_exist": "Пользователя с логином `@%s` не существует.",
   "User_has_been_activated": "Пользователь активирован",
   "User_has_been_deactivated": "Пользователь деактивирован",
@@ -1541,18 +1586,20 @@
   "User_has_been_muted_in_s": "Пользователь заблокирован в %s",
   "User_has_been_removed_from_s": "Пользователь удален из %s",
   "User_Info": "Информация о пользователе",
+  "User_Interface": "Пользовательский интерфейс",
   "User_is_blocked": "Пользователь заблокирован",
-  "User_is_no_longer_an_admin": "Пользователь больше не администратор",
+  "User_is_no_longer_an_admin": "Пользователь теперь не администратор",
   "User_is_now_an_admin": "Пользователь теперь администратор",
   "User_is_unblocked": "Пользователь разблокирован",
-  "User_joined_channel": "Присоединился к чату.",
-  "User_joined_channel_female": "Присоединился к чату.",
-  "User_joined_channel_male": "Присоединился к чату.",
-  "User_left": "<em>__user_left__</em> покинул чат.",
-  "User_left_female": "<em>__user_left__</em> покинула чат.",
-  "User_left_male": "<em>__user_left__</em> покинул чат.",
+  "User_joined_channel": "Присоединился к каналу",
+  "User_joined_channel_female": "Присоединился к каналу",
+  "User_joined_channel_male": "Присоединился к каналу",
+  "User_left": "<em>__user_left__</em> покинул канал.",
+  "User_left_female": "<em>__user_left__</em> покинула канал.",
+  "User_left_male": "<em>__user_left__</em> покинул канал.",
   "User_logged_out": "Пользователь не в сети",
   "User_management": "Управление пользователями",
+  "User_mentions_only": "Только уведомления",
   "User_muted": "Пользователь заглушен",
   "User_muted_by": "Пользователь <em>__user_muted__</em> заблокирован пользователем <em>__user_by__</em>.",
   "User_not_found": "Пользователь не найден",
@@ -1564,6 +1611,8 @@
   "User_unmuted_by": "Пользователь <em>__user_unmuted__</em> разблокирован пользователем <em>__user_by__</em>.",
   "User_unmuted_in_room": "Пользователь разблокирован в чате",
   "User_updated_successfully": "Пользователь успешно обновлен",
+  "User_uploaded_file": "Загрузил файл",
+  "User_uploaded_image": "Загрузил изображение",
   "Username": "Логин",
   "Username_and_message_must_not_be_empty": "Логин и сообщение не должны быть пустыми",
   "Username_cant_be_empty": "Логин не может быть пустым",
@@ -1578,22 +1627,57 @@
   "Username_title": "Зарегистрировать логин",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ хочет начать конфиденциальную беседу. Принять?",
   "Users": "Пользователи",
+  "Users_added": "Пользователь добавлен",
   "Users_in_role": "Пользователи с ролью",
   "UTF8_Names_Slugify": "UTF-8 имена",
   "UTF8_Names_Validation": "Проверка имён в UTF8",
   "UTF8_Names_Validation_Description": "Специальные символы запрещены. Можно использовать - _ и . но только не в конце имени",
   "Validate_email_address": "Подтвердите адрес электронной почты",
+  "Verification": "Подвтерждение",
   "Verification_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[Verification_Url] для URL верификации.</li><li>[name], [fname], [lname] для полного имени, имени или фамилии пользователя.</li><li>[email] для адреса электронной почты пользователя.</li><li>[Site_Name] и [Site_URL] для имени приложения и его URL.</li></ul>",
+  "Verification_Email": "Нажмите <a href=\"[Verification_Url]\">сюда</a> чтобы подтвердить ваш аккаунт.",
   "Verification_email_sent": "Проверочное электронное письмо отправлено",
+  "Verification_Email_Subject": "[Site_Name] - Подтвердите ваш аккаунт",
   "Verified": "Подтверждён",
+  "Verify": "Подтверждение",
   "Version": "Версия",
   "Video_Chat_Window": "Видео-чат",
   "Video_Conference": "Видеоконференция",
+  "Video_message": "Видеосообщение",
   "Videocall_declined": "Видео-звонок отклонён.",
   "Videocall_enabled": "Включить видео-звонки",
+  "view-c-room": "Просматривать публичный чат",
+  "view-c-room_description": "Разрешение на просмотр публичных чатов",
+  "view-d-room": "Просматривать личные сообщения",
+  "view-d-room_description": "Разрешение на просмотр личных сообщений",
+  "view-full-other-user-info": "Просмотр полной информации о других пользователях",
+  "view-full-other-user-info_description": "Разрешение на просмотр полных профилей других пользователей, включая дату создания аккаунта, последнего входа и т. д.",
+  "view-history": "Просматривать историю",
+  "view-history_description": "Разрешение на просмотр истории публичного чата",
+  "view-join-code_description": "Разрешение на просмотр кода присоединения публичного чата",
+  "view-joined-room": "Просматривать чаты, к которым присоединился",
+  "view-joined-room_description": "Разрешение на просмотр чатов, к которым сейчас присоединён",
+  "view-l-room": "Просматривать LiveChat чаты",
+  "view-l-room_description": "Разрешение на просмотр LiveChat чатов",
+  "view-livechat-manager": "Просматривать LiveChat Manager",
+  "view-livechat-manager_description": "Разрешение на просмотр других LiveChat Manager",
+  "view-livechat-rooms": "Просматривать LiveChat чаты",
+  "view-livechat-rooms_description": "Разрешение на просмотр других LiveChat чатов",
+  "view-logs": "Просматривать логи",
+  "view-logs_description": "Разрешение на просмотр логов сервера",
+  "view-other-user-channels": "Просматривать публичные чаты, принадлежащие другим пользователям",
+  "view-other-user-channels_description": "Разрешение на просмотр каналов, владельцами которых являются другие пользователи",
+  "view-p-room": "Просматривать закрытые чаты",
+  "view-p-room_description": "Разрешение на просмотр закрытых чатов",
+  "view-privileged-setting_description": "Разрешение просмотра настроек",
+  "view-room-administration": "Просматривать административную информацию чатов",
+  "view-room-administration_description": "Разрешение на просмотр статистики общих, закрытых и личных чатов. Не включает возможность просматривать сообщения в чатах или архивах",
+  "view-statistics": "Просматривать статистику",
+  "view-statistics_description": "Разрешение на просмотр системной статистики, например число пользователей онлайн, ",
+  "view-user-administration_description": "Разрешение на частичный просмотр списка других пользователей, которые сейчас в системе. Это разрешение не дает доступа к пользовательской информации из аккаунтов",
   "View_All": "Посмотреть всех",
   "View_Logs": "Показать лог",
-  "View_mode": "Режим просмотра",
+  "View_mode": "Внешний вид сообщений",
   "View_mode_info": "Сколько места сообщений занимают на экране.",
   "Viewing_room_administration": "Администрация Просмотр номера",
   "Visibility": "Видимость",
@@ -1610,7 +1694,7 @@
   "We_have_sent_registration_email": "Чтобы подтвердить вашу регистрацию, мы отправили вам электронное сообщение. Пожалуйста, следуйте инструкциям в этом сообщении. Если вы не получили электронное сообщение, попробуйте ещё раз позже.",
   "Webhook_URL": "URL Webhook",
   "Webhooks": "Webhooks",
-  "WebRTC_Enable_Channel": "Включить для публичных чатов",
+  "WebRTC_Enable_Channel": "Включить для каналов",
   "WebRTC_Enable_Direct": "Включить для личных сообщений",
   "WebRTC_Enable_Private": "Включить для приватных чатов",
   "WebRTC_Servers": "Серверы STUN/TURN",
@@ -1626,13 +1710,14 @@
   "Yes_delete_it": "Да, удалить его!",
   "Yes_hide_it": "Да, спрятать!",
   "Yes_leave_it": "Да, покинуть!",
-  "Yes_mute_user": "Да, заблокировать пользователя!",
+  "Yes_mute_user": "Да, заглушить пользователя!",
   "Yes_remove_user": "Да, удалить пользователя!",
+  "Yes_unarchive_it": "Да, разархивировать.",
   "You": "Вы",
   "you_are_in_preview_mode_of": "Вы находитесь в режиме предварительного просмотра публичного чата #<strong>__room_name__</strong>",
   "You_are_logged_in_as": "Вы вошли как",
   "You_are_not_authorized_to_view_this_page": "Недостаточно прав для просмотра страницы.",
-  "You_can_change_a_different_avatar_too": "Вы можете не принимать аватар, используемый для публикации из интеграции.",
+  "You_can_change_a_different_avatar_too": "Вы можете заменить аватар, используемый в интеграции.",
   "You_can_search_using_RegExp_eg": "Искать можно используя RegExp, например:",
   "You_can_use_an_emoji_as_avatar": "Вы также можете использовать emoji в качестве аватара.",
   "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "Вы можете использовать webhooks легко интегрировать с LiveChat CRM.",
@@ -1657,6 +1742,8 @@
   "Your_entry_has_been_deleted": "Ваша запись была удалена.",
   "Your_file_has_been_deleted": "Ваш файл был удалён.",
   "Your_mail_was_sent_to_s": "Ваше сообщение было отправлено на %s",
+  "your_message": "Ваше сообщение",
+  "your_message_optional": "Сообщение (опционально)",
   "Your_password_is_wrong": "Неверный пароль!",
-  "Your_push_was_sent_to_s_devices": "Ваше push-уведомление было отправлено на % устройств."
-}
+  "Your_push_was_sent_to_s_devices": "Оповещение было отправлено на % устройств."
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
new file mode 100644
index 00000000000..7cb0319c613
--- /dev/null
+++ b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
@@ -0,0 +1,3 @@
+{
+  "#channel": "#kanal"
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/sq.i18n.json b/packages/rocketchat-i18n/i18n/sq.i18n.json
index 62f243f4d1d..485504219b0 100644
--- a/packages/rocketchat-i18n/i18n/sq.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sq.i18n.json
@@ -758,8 +758,10 @@
   "Off_the_record_conversation": "Off-the-rekord bisedë",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-rekord biseda nuk është në dispozicion për shfletuesit tuaj ose pajisje.",
   "Offline": "në linjë",
+  "Offline_DM_Email": "Ju keni qenë mesazhi direkt nga __user__",
   "Offline_form": "Forma Offline",
   "Offline_form_unavailable_message": "Forma Offline mesazh padisponueshëm",
+  "Offline_Mention_Email": "Ju keni përmendur nga __user__ në #__room__",
   "Offline_message": "mesazhi në linjë",
   "Offline_success_message": "Mesazhi Offline sukses",
   "Offline_unavailable": "Offline padisponueshëm",
@@ -1035,19 +1037,19 @@
   "The_user_wont_be_able_to_type_in_s": "Ky përdorues nuk do të jetë në gjendje të shkruani në %s",
   "Theme": "temë",
   "theme-color-content-background-color": "Përmbajtja Background Color",
+  "theme-color-custom-scrollbar-color": "Custom Scrollbar Color",
+  "theme-color-info-font-color": "Info Font Color",
+  "theme-color-link-font-color": "Link Font Color",
   "theme-color-primary-background-color": "Primar Background Color",
   "theme-color-primary-font-color": "Primar Font Color",
   "theme-color-secondary-background-color": "Mesme Background Color",
   "theme-color-secondary-font-color": "Mesme Font Color",
-  "theme-color-tertiary-background-color": "Terciar Background Color",
-  "theme-color-tertiary-font-color": "Terciar Font Color",
-  "theme-color-link-font-color": "Link Font Color",
-  "theme-color-info-font-color": "Info Font Color",
-  "theme-color-custom-scrollbar-color": "Custom Scrollbar Color",
   "theme-color-status-away": "Away Status Color",
   "theme-color-status-busy": "Busy Status Color",
   "theme-color-status-offline": "Offline Status Color",
   "theme-color-status-online": "Online Status Color",
+  "theme-color-tertiary-background-color": "Terciar Background Color",
+  "theme-color-tertiary-font-color": "Terciar Font Color",
   "theme-color-unread-notification-color": "Palexuar Njoftimet Color",
   "theme-custom-css": "Custom CSS",
   "There_are_no_agents_added_to_this_department_yet": "Nuk ka agjentë të shtuar në këtë departament ende.",
@@ -1218,4 +1220,4 @@
   "Your_mail_was_sent_to_s": "maili juaj u dërgua në %s",
   "Your_password_is_wrong": "Fjalëkalimi juaj është e gabuar!",
   "Your_push_was_sent_to_s_devices": "shtytje juaj u dërgua në pajisjet %s"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/sr.i18n.json b/packages/rocketchat-i18n/i18n/sr.i18n.json
index 3ba30598a37..e0b4ef692ce 100644
--- a/packages/rocketchat-i18n/i18n/sr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sr.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "Офф-тхе-рецорд Разговор",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Офф-тхе-рецорд разговор није доступан за ваш прегледач или уређај.",
   "Offline": "оффлине",
+  "Offline_DM_Email": "Сте били директно поручио је __user__",
   "Offline_form": "оффлине образац",
   "Offline_form_unavailable_message": "Оффлине облик недоступан порука",
+  "Offline_Mention_Email": "Сте је поменуо __user__ у #__room__",
   "Offline_message": "оффлине порука",
   "Offline_success_message": "Оффлине успех порука",
   "Offline_unavailable": "оффлине недоступан",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "Корисник неће бити у могућности да уносите у% с",
   "Theme": "тема",
   "theme-color-content-background-color": "Садржај Боја позадине",
+  "theme-color-custom-scrollbar-color": "Цустом Сцроллбар Боја",
+  "theme-color-info-font-color": "Инфо Боја фонта",
+  "theme-color-link-font-color": "Линк Боја фонта",
   "theme-color-primary-background-color": "Примарна Боја позадине",
   "theme-color-primary-font-color": "Примарна Боја фонта",
   "theme-color-secondary-background-color": "Секундарна Боја позадине",
   "theme-color-secondary-font-color": "Секундарна Боја фонта",
-  "theme-color-tertiary-background-color": "Терцијарни Боја позадине",
-  "theme-color-tertiary-font-color": "Терцијарни Боја фонта",
-  "theme-color-link-font-color": "Линк Боја фонта",
-  "theme-color-info-font-color": "Инфо Боја фонта",
-  "theme-color-custom-scrollbar-color": "Цустом Сцроллбар Боја",
   "theme-color-status-away": "Гост статус Боја",
   "theme-color-status-busy": "Буси статус Боја",
   "theme-color-status-offline": "Оффлине статус Боја",
   "theme-color-status-online": "Онлине статус Боја",
+  "theme-color-tertiary-background-color": "Терцијарни Боја позадине",
+  "theme-color-tertiary-font-color": "Терцијарни Боја фонта",
   "theme-color-unread-notification-color": "Непрочитану Обавештења Боја",
   "theme-custom-css": "цустом ЦСС",
   "There_are_no_agents_added_to_this_department_yet": "Нема додају у овом одељењу још агенти.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "Ваш маил је послат на% с",
   "Your_password_is_wrong": "Ваша лозинка није у реду!",
   "Your_push_was_sent_to_s_devices": "Ваш притиском је послат на% с уређајима"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/sv.i18n.json b/packages/rocketchat-i18n/i18n/sv.i18n.json
index cc1e18ebb77..727d444d6c8 100644
--- a/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -113,6 +113,7 @@
   "Activate": "Aktivera",
   "Activity": "Aktivitet",
   "Add": "Skapa",
+  "add-user": "Lägg till användare",
   "Add_agent": "Skapa agent",
   "Add_custom_oauth": "Lägg till anpassad oauth",
   "Add_Domain": "Lägg till domän",
@@ -172,6 +173,7 @@
   "Application_updated": "Applikation uppdaterad",
   "Apply_and_refresh_all_clients": "Tillämpa och uppdatera alla klienter",
   "Archive": "Arkiv",
+  "archive-room": "Arkivera Rum",
   "are_also_typing": "skriver också",
   "are_typing": "skriver",
   "Are_you_sure": "Är du säker?",
@@ -185,6 +187,7 @@
   "Authorization_URL": "URL-auktorisering",
   "Authorize": "Godkänn",
   "Auto_Load_Images": "Hämta bilder automatiskt",
+  "Auto_Translate": "Automatisk översättning",
   "AutoLinker_Email": "AutoLinker E",
   "AutoLinker_Phone": "AutoLinker Phone",
   "AutoLinker_Phone_Description": "Automatiskt kopplade till telefonnummer. t.ex. `(123) 456-7890`",
@@ -195,7 +198,6 @@
   "AutoLinker_Urls_www": "AutoLinker \"www\" webbadresser",
   "AutoLinker_UrlsRegExp": "AutoLinker URL reguljärt uttryck",
   "Automatic_Translation": "Automatisk översättning",
-  "Auto_Translate": "Automatisk översättning",
   "Available": "Tillgängliga",
   "Available_agents": "Tillgängliga agenter",
   "Avatar": "Avatar",
@@ -215,6 +217,7 @@
   "Back_to_login": "Tillbaka till inloggningen",
   "Back_to_permissions": "Tillbaka till tillstånd",
   "Backup_codes": "Backupkoder",
+  "ban-user": "Banna Användare",
   "Block_User": "Blockera användare",
   "Body": "Kropp",
   "bold": "fetstil",
@@ -227,7 +230,6 @@
   "busy_male": "upptagen",
   "Busy_male": "Upptagen",
   "by": "av",
-  "Content": "Innehåll",
   "Cancel": "Avbryt",
   "Cancel_message_input": "Avbryta",
   "Cannot_invite_users_to_direct_rooms": "Det går inte att bjuda in användare att styra rum",
@@ -236,8 +238,8 @@
   "CAS_version": "CAS Version",
   "CDN_PREFIX": "CDN Prefix",
   "Certificates_and_Keys": "Certifikat och nycklar",
-  "Changing_email": "Ändra e-post",
   "Change_Room_Type": "Ändra rumstyp",
+  "Changing_email": "Ändra e-post",
   "channel": "kanal",
   "Channel": "Kanal",
   "Channel_already_exist": "Kanalens #% s \"finns redan.",
@@ -262,8 +264,8 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Välj alias som ska visas före användarnamnet i meddelanden.",
   "Choose_the_username_that_this_integration_will_post_as": "Välj det användarnamn som denna integration kommer att lägga upp som.",
   "clear": "Rensa",
-  "clear_history": "Rensa historiken",
   "Clear_all_unreads_question": "Rensa alla olästa?",
+  "clear_history": "Rensa historiken",
   "Click_here": "Klicka här",
   "Click_here_for_more_info": "Klicka här för mer information",
   "Client_ID": "Klient-ID",
@@ -279,6 +281,7 @@
   "Commands": "Kommandon",
   "Compact": "Kompakt",
   "Confirm_password": "Bekräfta ditt lösenord",
+  "Content": "Innehåll",
   "Conversation": "Konversation",
   "Conversation_closed": "Konversation stängd: __comment__.",
   "Convert_Ascii_Emojis": "Konvertera ASCII till Emoji",
@@ -289,6 +292,9 @@
   "Count": "Räkna",
   "Cozy": "Mysig",
   "Create": "Skapa",
+  "create-d": "Skapa Direktmeddelanden",
+  "create-p": "Skapa Privata Kanaler",
+  "create-user": "Skapa Användare",
   "Create_A_New_Channel": "Skapa en ny kanal",
   "Create_new": "Skapa ny",
   "Created_at": "Skapad ",
@@ -307,11 +313,11 @@
   "Custom_Fields": "Anpassade fält",
   "Custom_oauth_helper": "När du ställer in din OAuth leverantör, måste du informera en återuppringning webbadress. Användning <pre> %s </pre> .",
   "Custom_oauth_unique_name": "Anpassad oauth unikt namn",
-  "Custom_Scripts": "Anpassade Skript",
   "Custom_Script_Logged_In": "Custom Script för inloggade användare",
   "Custom_Script_Logged_Out": "Custom Script för utloggade användare",
-  "Custom_Sounds": "Anpassade Ljud",
+  "Custom_Scripts": "Anpassade Skript",
   "Custom_Sound_Add": "Lägg till anpassat ljud",
+  "Custom_Sounds": "Anpassade Ljud",
   "Dashboard": "instrumentbräda",
   "Date": "Datum",
   "Date_From": "Från",
@@ -323,6 +329,9 @@
   "Decline": "Tacka nej",
   "Default": "Standard",
   "Delete": "Radera",
+  "delete-message": "Ta bort meddelande",
+  "delete-p": "Ta Bort Privata Kanaler",
+  "delete-user": "Ta bort användare",
   "Delete_message": "Radera meddelande",
   "Delete_my_account": "Radera mitt konto",
   "Delete_Room_Warning": "Om man raderar ett rum, raderas alla postade meddelanden i det rummet. Denna åtgärd kan inte ångras.",
@@ -360,8 +369,11 @@
   "Duplicate_private_group_name": "En privat grupp med namnet \\\"%s\\\" finns redan",
   "Duration": "Varaktighet",
   "Edit": "Redigera",
+  "edit-message": "Ändra meddelande",
+  "edit-room": "Ändra rum",
   "Edit_Custom_Field": "Redigera anpassat fält",
   "Edit_Department": "Redigera avdelning",
+  "Edit_previous_message": "`%s` - Modifiera föregående meddelande",
   "edited": "redigerad",
   "Editing_room": "klipprummet",
   "Editing_user": "redigera användare",
@@ -519,9 +531,9 @@
   "Hide_Avatars": "Göm Avatarer",
   "Hide_Group_Warning": "Är du säker att du vill dölja gruppen \"%s\"?",
   "Hide_Private_Warning": "Är du säker att du vill dölja diskussionen med \"%s\"?",
+  "Hide_roles": "Göm roller",
   "Hide_room": "Dölj rum",
   "Hide_Room_Warning": "Är du säker att du vill dölja rummet \"%s\"?",
-  "Hide_roles": "Göm roller",
   "Hide_usernames": "Göm användarnamn",
   "Highlights": "Markeringar",
   "Highlights_How_To": "För att bli meddelad när någon nämner ett ord eller en fras, lägg till ordet eller frasen här. Du kan separera ord eller fraser med kommatecken. Markerade ord är inte skiftlägeskänsliga.\n",
@@ -561,21 +573,21 @@
   "Installation": "Installation",
   "Installed_at": "installerad vid",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instruktioner till besökaren fylla i formuläret för att skicka ett meddelande",
-  "Integration_Advanced_Settings": "Avancerade inställningar",
   "Integration_added": "Integrationen har lagts",
+  "Integration_Advanced_Settings": "Avancerade inställningar",
   "Integration_Incoming_WebHook": "Inkommande WebHook Integration",
   "Integration_New": "Ny integrering",
+  "Integration_Outgoing_WebHook": "Utgående WebHook Integration",
+  "Integration_updated": "Integrationen har uppdaterats",
+  "Integrations": "Integreringar",
   "Integrations_Outgoing_Type_FileUploaded": "Uppladdad fil",
   "Integrations_Outgoing_Type_RoomArchived": "Rum arkiverat",
   "Integrations_Outgoing_Type_RoomLeft": "Användare lämnade rummet",
   "Integrations_Outgoing_Type_UserCreated": "Användare skapad",
-  "Integration_Outgoing_WebHook": "Utgående WebHook Integration",
-  "Integration_updated": "Integrationen har uppdaterats",
-  "Integrations": "Integreringar",
   "InternalHubot": "intern Hubot",
+  "InternalHubot_reload": "Ladda om skript",
   "InternalHubot_ScriptsToLoad": "Skript för att ladda",
   "InternalHubot_ScriptsToLoad_Description": "Ange en kommaseparerad lista med skript för att ladda från https://github.com/github/hubot-scripts/tree/master/src/scripts",
-  "InternalHubot_reload": "Ladda om skript",
   "InternalHubot_Username_Description": "Detta måste vara ett giltigt användarnamn av en bot är registrerad på din server.",
   "Invalid_confirm_pass": "Bekräftelsen matchar inte lösenordet",
   "Invalid_email": "Den angivna epostadressen är ogiltig",
@@ -612,10 +624,6 @@
   "Join_default_channels": "Gå med standardkanaler",
   "Join_the_Community": "Gå med i communityt",
   "Join_the_given_channel": "Gå med i den givna kanalen",
-  "Open_channel_user_search": "`%s` - Öppna kanal / Sök Användare",
-  "Edit_previous_message": "`%s` - Modifiera föregående meddelande",
-  "Move_beginning_message": "`%s` - Gå till början av meddelande",
-  "Move_end_message": "`%s` - Gå till slutet av meddelande",
   "Join_video_call": "Gå med i videosamtal",
   "Joined": "Ansluten",
   "Jump": "Hoppa",
@@ -667,6 +675,7 @@
   "LDAP_Enable_Description": "Försök att använda LDAP för autentisering.",
   "LDAP_Encryption": "kryptering",
   "LDAP_Encryption_Description": "Krypteringsmetod som används för att säkra kommunikationen till LDAP-servern. Som exempel kan nämnas `plain` (ingen kryptering),` SSL / LDAPS` (krypterad från början), och `StartTLS` (uppgradera till krypterad kommunikation när ansluten).",
+  "LDAP_Group_Filter_Group_Name": "Gruppnamn",
   "LDAP_Host": "Värd",
   "LDAP_Host_Description": "LDAP värd, t.ex. `ldap.example.com` eller` 10.0.0.30`.",
   "LDAP_Idle_Timeout": "Timeout för inaktivitet (ms)",
@@ -688,7 +697,6 @@
   "LDAP_Use_Custom_Domain_Search_Description": "Skriv ditt eget filter för att söka användare i LDAP-servern.",
   "LDAP_Username_Field": "Användarnamn Field",
   "LDAP_Username_Field_Description": "Vilket fält kommer att användas som * användarnamn * för nya användare. Lämna tomt för att använda användarnamn informerad om inloggningssidan. <br/> Du kan använda malltaggar också, som `#{givenName}.#{sn}`. <br/> Standardvärdet är 'sAMAccountName`.",
-  "LDAP_Group_Filter_Group_Name": "Gruppnamn",
   "Leave_Group_Warning": "Är du säker att du vill lämna gruppen \"%s\"?",
   "Leave_Private_Warning": "Är du säker att du vill lämna diskussionen med \"%s\"?",
   "Leave_room": "Lämna rum",
@@ -733,6 +741,9 @@
   "Mailer_body_tags": "Du <b>måste</b> använda [unsubscribe] för prenumeration länken. <br /> Du kan använda [name], [fname], [lname] för användarens fullständiga namn, förnamn eller efternamn, respektive. <br /> Du kan använda [email] för användarens e-post.",
   "Mailing": "Mailing",
   "Make_Admin": "Gör till administratör",
+  "manage-emoji": "Hantera Emojis",
+  "manage-integrations": "Hantera integreringar",
+  "manage-sounds": "Hantera Ljud",
   "Manager_added": "manager sattes",
   "Manager_removed": "manager avlägsnades",
   "Managing_assets": "hantera tillgångar",
@@ -777,8 +788,8 @@
   "Message_ShowEditedStatus": "Visa Redigerad status",
   "Message_ShowFormattingTips": "Visa Formatera Tips",
   "Message_starring": "meddelande starring",
-  "Message_TimeFormat": "Tidsformat",
   "Message_TimeAndDateFormat": "Tid och datumformat",
+  "Message_TimeFormat": "Tidsformat",
   "Message_TimeFormat_Description": "Se även: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Meddelandet är för långt",
   "Messages": "Meddelanden",
@@ -796,6 +807,8 @@
   "More_direct_messages": "Fler direktmeddelanden",
   "More_groups": "Fler privata grupper",
   "More_unreads": "Fler olästa",
+  "Move_beginning_message": "`%s` - Gå till början av meddelande",
+  "Move_end_message": "`%s` - Gå till slutet av meddelande",
   "Msgs": "Meddelanden ",
   "multi": "mång",
   "Mute_someone_in_room": "Tysta någon i rummet",
@@ -851,12 +864,14 @@
   "Off": "Av",
   "Off_the_record_conversation": "Off-the-record konversation",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record konversationen finns inte tillgänglig för din webbläsare eller enhet.",
+  "Office_Hours": "Kontorstider",
   "Offline": "Offline",
+  "Offline_DM_Email": "Du har fått ett meddelande av __user__",
   "Offline_form": "offline formen",
   "Offline_form_unavailable_message": "Offline formen tillgänglig meddelande",
-  "Offline_message": "Offlinemeddelande",
-  "Office_Hours": "Kontorstider",
   "Offline_Link_Message": "GÅ TILL MEDDELANDE",
+  "Offline_Mention_Email": "Du har nämnts av __user__ i #__room__",
+  "Offline_message": "Offlinemeddelande",
   "Offline_success_message": "Offline framgång meddelande",
   "Offline_unavailable": "Offline ej tillgänglig",
   "On": "På",
@@ -864,6 +879,7 @@
   "Only_you_can_see_this_message": "Bara du kan se detta meddelande",
   "Oops!": "Oj",
   "Open": "Öppna",
+  "Open_channel_user_search": "`%s` - Öppna kanal / Sök Användare",
   "Opened": "Öppnad",
   "optional": "valfritt",
   "or": "eller",
@@ -890,36 +906,14 @@
   "People": "Folk",
   "Permalink": "Länka meddelande",
   "Permissions": "Tillstånd",
-  "add-user": "Lägg till användare",
-  "archive-room": "Arkivera Rum",
-  "ban-user": "Banna Användare",
-  "create-d": "Skapa Direktmeddelanden",
-  "create-p": "Skapa Privata Kanaler",
-  "create-user": "Skapa Användare",
-  "delete-p": "Ta Bort Privata Kanaler",
-  "delete-message": "Ta bort meddelande",
-  "delete-user": "Ta bort användare",
-  "edit-message": "Ändra meddelande",
-  "edit-room": "Ändra rum",
-  "manage-emoji": "Hantera Emojis",
-  "manage-integrations": "Hantera integreringar",
-  "manage-sounds": "Hantera Ljud",
   "pin-message": "Pinna Meddelande",
   "pin-message_description": "Tillstång att pinna ett meddelande i en kanal",
-  "run-import": "Kör Import",
-  "run-migration": "Kör Migrering",
-  "set-moderator": "Välj Moderator",
-  "set-owner": "Välj Ägare",
-  "view-d-room": "Visa direktmeddelanden",
-  "view-history": "Se historik",
-  "view-logs": "Visa loggar",
-  "view-statistics": "Visa Statistik",
   "Pin_Message": "Pinna Meddelande",
   "Pinned_a_message": "Pinnade ett meddelande",
   "Pinned_Messages": "Pinnade Meddelanden",
-  "PiwikAnalytics_siteId_Description": "Webbplatsen id som ska användas för att identifiera denna webbplats. Exempel: 17",
   "PiwikAnalytics_cookieDomain": "Alla subdomäner",
   "PiwikAnalytics_domains": "Göm utgående länkar",
+  "PiwikAnalytics_siteId_Description": "Webbplatsen id som ska användas för att identifiera denna webbplats. Exempel: 17",
   "PiwikAnalytics_url_Description": "Url där Piwik bor, se till att inkludera den trialing snedstreck. Exempel: //piwik.rocket.chat/",
   "Placeholder_for_email_or_username_login_field": "Platshållare för e-post- eller användarnamnsinloggningsfältet",
   "Placeholder_for_password_login_field": "Platshållare för lösenordsinloggningsfältet",
@@ -1002,11 +996,11 @@
   "Remove_someone_from_room": "Ta bort någon från detta rum",
   "Removed": "Borttagen",
   "Reply": "Svara",
-  "Reporting": "Rapportering",
   "Report_Abuse": "Anmäl inlägg",
   "Report_exclamation_mark": "Anmäl!",
   "Report_sent": "rapport skickas",
   "Report_this_message_question_mark": "Rapportera det här meddelandet?",
+  "Reporting": "Rapportering",
   "Require_password_change": "Kräv byte av lösenord",
   "Resend_verification_email": "Skicka verifieringsemail igen",
   "Reset": "Nollställ",
@@ -1036,6 +1030,8 @@
   "Room_uploaded_file_list": "Fillista",
   "Room_uploaded_file_list_empty": "Inga filer tillgängliga.",
   "Rooms": "Rum",
+  "run-import": "Kör Import",
+  "run-migration": "Kör Migrering",
   "Running_Instances": "kör instanser",
   "S_new_messages_since_s": "%s nya meddelanden sedan %s",
   "SAML": "SAML",
@@ -1084,6 +1080,8 @@
   "Send_your_JSON_payloads_to_this_URL": "Skicka dina JSON nyttolaster till denna URL.",
   "Sending": "Skickar...",
   "Service": "Service",
+  "set-moderator": "Välj Moderator",
+  "set-owner": "Välj Ägare",
   "Set_as_moderator": "Ange som moderator",
   "Set_as_owner": "Ange som ägare",
   "Settings": "Inställningar",
@@ -1181,19 +1179,19 @@
   "The_user_wont_be_able_to_type_in_s": "Användaren kommer inte att kunna skriva i %s",
   "Theme": "Tema",
   "theme-color-content-background-color": "Innehåll bakgrundsfärg",
+  "theme-color-custom-scrollbar-color": "Beställnings Scrollbar Färg",
+  "theme-color-info-font-color": "Info Font Color",
+  "theme-color-link-font-color": "Länk Font Color",
   "theme-color-primary-background-color": "Primära bakgrundsfärg",
   "theme-color-primary-font-color": "Primär Font Color",
   "theme-color-secondary-background-color": "Sekundär bakgrundsfärg",
   "theme-color-secondary-font-color": "Sekundär Teckenfärg",
-  "theme-color-tertiary-background-color": "Tertiary bakgrundsfärg",
-  "theme-color-tertiary-font-color": "Tertiary Teckenfärg",
-  "theme-color-link-font-color": "Länk Font Color",
-  "theme-color-info-font-color": "Info Font Color",
-  "theme-color-custom-scrollbar-color": "Beställnings Scrollbar Färg",
   "theme-color-status-away": "Statusfärg för Borta",
   "theme-color-status-busy": "Statusfärg för Upptagen",
   "theme-color-status-offline": "Statusfärg för Offline",
   "theme-color-status-online": "Statusfärg för Online",
+  "theme-color-tertiary-background-color": "Tertiary bakgrundsfärg",
+  "theme-color-tertiary-font-color": "Tertiary Teckenfärg",
   "theme-color-unread-notification-color": "Olästa meddelanden Färg",
   "theme-custom-css": "anpassade CSS",
   "There_are_no_agents_added_to_this_department_yet": "Det finns inga medel har lagts till i avdelning ännu.",
@@ -1214,9 +1212,9 @@
   "to_see_more_details_on_how_to_integrate": "att se mer information om hur man kan integrera.",
   "To_users": "Till användare",
   "Topic": "Ämne",
-  "Travel_and_Places": "Fordon & Platser",
   "Translated": "Översatt",
   "Translations": "Översättningar",
+  "Travel_and_Places": "Fordon & Platser",
   "Trigger_removed": "trigger avlägsnades",
   "Trigger_Words": "trigger ord",
   "Triggers": "triggers",
@@ -1321,6 +1319,10 @@
   "Video_Chat_Window": "Videochatt",
   "Video_Conference": "Videokonferens",
   "Video_message": "Videomeddelande",
+  "view-d-room": "Visa direktmeddelanden",
+  "view-history": "Se historik",
+  "view-logs": "Visa loggar",
+  "view-statistics": "Visa Statistik",
   "View_All": "Visa Alla",
   "View_Logs": "Visa Loggar",
   "View_mode": "Visningsläge",
@@ -1390,4 +1392,4 @@
   "your_message_optional": "ditt meddelande (valfri)",
   "Your_password_is_wrong": "Ditt lösenord är fel!",
   "Your_push_was_sent_to_s_devices": "Din push skickades till %s enheter"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
index db05eb2df74..4456691c482 100644
--- a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "பதிவில் உரையாடல்",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "பதிவில் உரையாடல் உங்களது உலாவி அல்லது சாதனம் கிடைக்கவில்லை.",
   "Offline": "ஆஃப்லைன்",
+  "Offline_DM_Email": "நீங்கள் நேரடி __user__ மூலம் குறுஞ்செய்தி வருகின்றன",
   "Offline_form": "ஆஃப்லைன் வடிவம்",
   "Offline_form_unavailable_message": "ஆஃப்லைன் வடிவம் கிடைக்கவில்லை செய்தி",
+  "Offline_Mention_Email": "நீங்கள் #__room__ உள்ள __user__ குறிப்பிட்டுள்ள",
   "Offline_message": "ஆஃப்லைன் செய்தி",
   "Offline_success_message": "ஆஃப்லைன் வெற்றி செய்தியை",
   "Offline_unavailable": "ஆஃப்லைனில் கிடையாது",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "பயனர் தட்டச்சு %s முடியாது",
   "Theme": "தீம்",
   "theme-color-content-background-color": "உள்ளடக்க பின்புல வண்ணம்",
+  "theme-color-custom-scrollbar-color": "விருப்ப சுருள் கலர்",
+  "theme-color-info-font-color": "தகவல் எழுத்துரு வண்ணம்",
+  "theme-color-link-font-color": "இணைப்பு எழுத்துரு வண்ணம்",
   "theme-color-primary-background-color": "முதன்மை பின்னணி வண்ணம்",
   "theme-color-primary-font-color": "முதன்மை எழுத்துரு வண்ணம்",
   "theme-color-secondary-background-color": "பின்னணி வண்ணமாக",
   "theme-color-secondary-font-color": "இரண்டாம் எழுத்துரு வண்ணம்",
-  "theme-color-tertiary-background-color": "மூன்றாம் நிலை பின்னணி வண்ணம்",
-  "theme-color-tertiary-font-color": "மூன்றாம் நிலை எழுத்துரு வண்ணம்",
-  "theme-color-link-font-color": "இணைப்பு எழுத்துரு வண்ணம்",
-  "theme-color-info-font-color": "தகவல் எழுத்துரு வண்ணம்",
-  "theme-color-custom-scrollbar-color": "விருப்ப சுருள் கலர்",
   "theme-color-status-away": "அவே நிலைமை கலர்",
   "theme-color-status-busy": "பிஸி நிலை கலர்",
   "theme-color-status-offline": "அந்தஸ்து கலர்",
   "theme-color-status-online": "ஆன்லைன் அந்தஸ்து கலர்",
+  "theme-color-tertiary-background-color": "மூன்றாம் நிலை பின்னணி வண்ணம்",
+  "theme-color-tertiary-font-color": "மூன்றாம் நிலை எழுத்துரு வண்ணம்",
   "theme-color-unread-notification-color": "படிக்காத அறிவிப்புகள் கலர்",
   "theme-custom-css": "தனிப்பயன் CSS",
   "There_are_no_agents_added_to_this_department_yet": "இன்னும் இந்த துறை சேர்க்கப்பட்டது எந்த முகவர் உள்ளன.",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "உங்கள் மெயில்% கள் அனுப்பப்பட்டது",
   "Your_password_is_wrong": "உங்கள் கடவுச்சொல் தவறு!",
   "Your_push_was_sent_to_s_devices": "உங்கள் மிகுதி% கள் சாதனங்கள் அனுப்பப்பட்டது"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json
index cdf72459331..d156b44703a 100644
--- a/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -10,13 +10,19 @@
   "__username__is_no_longer__role__defined_by__user_by_": "__username__ adlı kullanıcı __user_by__ tarafından __role__ rolünden çıkarıldı.",
   "__username__was_set__role__by__user_by_": "__username__ adlı kullanıcı __user_by__ tarafından __role__ rolüne atandı.",
   "Accept": "Kabul Et",
-  "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Canlı sohbet isteklerini çevrimiçi 'Firma Temsilcisi' yoksa da kabul et",
+  "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Canlı sohbet isteklerini çevrimiçi 'Müşteri Temsilcisi' yoksa da kabul et",
   "Accept_with_no_online_agents": "Çevrimiçi 'Firma Temsilcisi' Olmadan da Kabul Et",
-  "Access_not_authorized": "Erişim yetkisi yok",
-  "Access_Token_URL": "Erişim Jetonu URL",
+  "access-mailer": "Posta Göndericisine Erişim",
+  "access-mailer_description": "Kullanıcılara toplu e-posta gönderme izni",
+  "access-permissions": "İzinler Ekranına Giriş",
+  "access-permissions_description": "Belirli roller için izinleri değiştir",
+  "Access_not_authorized": "Yetkisiz erişim",
+  "Access_Token_URL": "Erişim anahtarı URL",
   "Accessing_permissions": "Erişim izinleri",
   "Account_SID": "Hesap SID",
   "Accounts": "Hesaplar",
+  "Accounts_AllowAnonymousRead": "Anonim okumaya izin ver",
+  "Accounts_AllowAnonymousWrite": "Anonim yazmaya izin ver",
   "Accounts_AllowDeleteOwnAccount": "Kullanıcıların kendi hesaplarını silmelerine izin ver",
   "Accounts_AllowedDomainsList": "İzinli Alan Adları Listesi",
   "Accounts_AllowedDomainsList_Description": "Virgülle ayrılmış izin verilen alan adları listesi",
@@ -32,11 +38,13 @@
   "Accounts_BlockedUsernameList": "Engellenen Kullanıcı Adı Listesi",
   "Accounts_BlockedUsernameList_Description": "Engellenen kullanıcı adlarının virgülle ayrılmış listesi (harf büyüklüğüne duyarsız)",
   "Accounts_CustomFields_Description": "Anahtarların, alan ayarları sözlüğü bulunduran alan isimleri olduğu geçerli bir JSON olmalı. Örnek:<br/><code>{\n\n \"role\": {\n\n  \"type\": \"select\",\n\n  \"defaultValue\": \"student\",\n\n  \"options\": [\"teacher\", \"student\"],\n\n  \"required\": true,\n\n  \"modifyRecordField\": {\n\n   \"array\": true,\n\n   \"field\": \"roles\"\n\n  }\n\n },\n\n \"twitter\": {\n\n  \"type\": \"text\",\n\n  \"required\": true,\n\n  \"minLength\": 2,\n\n  \"maxLength\": 10\n\n }\n\n}</code> ",
+  "Accounts_CustomFieldsToShowInUserInfo": "Kullanıcı Bilgilerini Göstermek için Özel alanlar",
+  "Accounts_DefaultUsernamePrefixSuggestion": "Varsayılan kullanıcı adı ön eki tavsiyesi",
   "Accounts_denyUnverifiedEmail": "Doğrulanmamış e-posta'yı reddet",
   "Accounts_EmailVerification": "E-Posta Doğrulama",
   "Accounts_EmailVerification_Description": "Bu özelliği kullanmak için doğru SMTP ayarlarına sahip olduğunuza emin olun",
   "Accounts_Enrollment_Email": "Kayıt E-Postası",
-  "Accounts_Enrollment_Email_Default": "<h2> <h1> [Site_Name] </h1>  sitesine hoşgeldiniz! </h2><p> [Site_URL] 'a gidin ve şu an mevcut en iyi açık kaynak sohbet çözümünü deneyin! </p>",
+  "Accounts_Enrollment_Email_Default": "<h2> <h1> [Site_Name] </h1>  sitesine hoşgeldiniz! </h2><p> [Site_URL] 'a gidin ve şu an mevcut en iyi açık kaynak sohbet çözümünü deneyin! </p>",
   "Accounts_Enrollment_Email_Description": "Kullanıcının tam adı, ad veya soyadı için sırayla,  [lname], [name], [fname] kullanabilirsiniz. <br/> Kullanıcının e-postası için [email] kullanabilirsiniz.",
   "Accounts_Enrollment_Email_Subject_Default": "[Site_Name] sitesine hoşgeldiniz!",
   "Accounts_ForgetUserSessionOnWindowClose": "Pencere kapandığında kullanıcı oturumunu unut",
@@ -54,10 +62,16 @@
   "Accounts_OAuth_Custom_id": "Kimlik",
   "Accounts_OAuth_Custom_Identity_Path": "Kimlik Yolu",
   "Accounts_OAuth_Custom_Login_Style": "Giriş Stili",
+  "Accounts_OAuth_Custom_Merge_Users": "Kullanıcıları birleştir",
   "Accounts_OAuth_Custom_Scope": "Yetki Alanı",
   "Accounts_OAuth_Custom_Secret": "Gizli Kod",
   "Accounts_OAuth_Custom_Token_Path": "Token Yolu",
   "Accounts_OAuth_Custom_Token_Sent_Via": "Token'ı Gönder",
+  "Accounts_OAuth_Custom_Username_Field": "Kullanıcı adı alanı",
+  "Accounts_OAuth_Drupal": "Drupal ile giriş yapma aktifleştirildi",
+  "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Yönlendirme URI",
+  "Accounts_OAuth_Drupal_id": "Drupal oAuth2 Müşteri Kimliği",
+  "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 Müşteri Gizli Kodu",
   "Accounts_OAuth_Facebook": "Facebook ile giriş",
   "Accounts_OAuth_Facebook_callback_url": "Facebook Callback URL",
   "Accounts_OAuth_Facebook_id": "Facebook Uygulama Kimliği",
@@ -86,6 +100,8 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor Callback URL",
   "Accounts_OAuth_Meteor_id": "Meteor Kimliği",
   "Accounts_OAuth_Meteor_secret": "Meteor Gizli Kodu",
+  "Accounts_OAuth_Proxy_host": "Vekil Sunucu",
+  "Accounts_OAuth_Proxy_services": "Proxy Hizmetleri",
   "Accounts_OAuth_Twitter": "Twitter ile giriş",
   "Accounts_OAuth_Twitter_callback_url": "Twitter Callback URL",
   "Accounts_OAuth_Twitter_id": "Twitter Kimliği",
@@ -95,6 +111,7 @@
   "Accounts_OAuth_Wordpress_id": "WordPress Kimliği",
   "Accounts_OAuth_Wordpress_secret": "WordPress Gizli Kodu",
   "Accounts_PasswordReset": "Parola Sıfırlama",
+  "Accounts_Registration_AuthenticationServices_Default_Roles": "Doğrulama Servisi için Varsayılan İşlem",
   "Accounts_Registration_AuthenticationServices_Enabled": "Kimlik Doğrulama Hizmetleri ile Kayıt Olma",
   "Accounts_RegistrationForm": "Kayıt formu",
   "Accounts_RegistrationForm_Disabled": "Devre Dışı",
@@ -105,6 +122,7 @@
   "Accounts_RegistrationForm_SecretURL_Description": "Kayıt URL'sine eklenmesi için rastgele bir harf dizisi sağlamalısınız. Örnek: https://demo.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Üye Olmak İçin Ad İste",
   "Accounts_RequirePasswordConfirmation": "Şifre Doğrulaması Gerektir",
+  "Accounts_SetDefaultAvatar": "Varsayılanı Avatar Seç",
   "Accounts_ShowFormLogin": "Form-tabanlı Girişi Göster",
   "Accounts_UseDefaultBlockedDomainsList": "Standart Engelli Domain Listesini Kullan",
   "Accounts_UseDNSDomainCheck": "DNS Alan Adı Kontrolü'nü Kullan",
@@ -114,9 +132,17 @@
   "Activate": "Etkinleştir",
   "Activity": "Etkinlik",
   "Add": "Ekle",
+  "add-oauth-service": "Oauth Hizmeti Ekle",
+  "add-oauth-service_description": "Yeni bir Oauth hizmeti ekleme izni",
+  "add-user": "Kullanıcı Ekle",
+  "add-user-to-any-c-room": "Herhangi bir Açık Kanal'a Kullanıcı Ekle",
+  "add-user-to-any-c-room_description": "Herhangi bir Açık Kanal'a Kullanıcı Ekleme İzni",
   "Add_agent": "Firma Temsilcisi Ekle",
   "Add_custom_oauth": "Özel oauth ekle",
+  "Add_Domain": "Alan Adı Ekle",
+  "Add_files_from": "-den dosyalar ekle",
   "Add_manager": "Yönetici ekle",
+  "Add_Role": "Rol EKle",
   "Add_user": "Kullanıcı Ekle",
   "Add_User": "Kullanıcı Ekle",
   "Add_users": "Kullanıcı ekle",
@@ -126,6 +152,7 @@
   "Additional_emails": "Ek E-postalar",
   "Additional_Feedback": "Ek Geri Bildirim",
   "Administration": "Yönetim",
+  "Adult_images_are_not_allowed": "Erişkin görüntülere izin verilmez",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "OAuth2 kimlik doğrulamadan sonra, kullanıcılar bu URL'ye yönlendirilecektir",
   "Agent": "Firma Temsilcisi",
   "Agent_added": "Firma Temsilcisi Eklendi",
@@ -134,21 +161,28 @@
   "Alias_Format": "Takma Ad Formatı",
   "Alias_Format_Description": "Slack'tan mesajları bir takma ad ile içe aktar. %s kullanıcının kullanıcı adı ile değiştirilecek. Eğer boşsa, herhangi bir takma ad kullanılmayacak.",
   "Alias_Set": "Takma Ad Seti",
-  "All": "Tüm",
+  "All": "Tümü",
   "All_channels": "Daha fazla",
   "All_logs": "Tüm Kayıtlar",
   "All_messages": "Tüm mesajlar",
+  "All_users_in_the_channel_can_write_new_messages": "Kanaldaki tüm kullanıcılar yeni mesaj yazabilir.",
   "Allow_Invalid_SelfSigned_Certs": "Kendinden İmzalı Sertifikalara İzin Ver",
   "Allow_Invalid_SelfSigned_Certs_Description": "Bağlantı doğrulama ve önizlemeleri için geçersiz ve kendinden imzalı SSL sertifikalarına izin verin.",
+  "Allow_switching_departments": "Ziyaretçilerin bölüm değiştirmesine izin ver ",
+  "Always_open_in_new_window": "Her zaman yeni sekmede aç",
   "Analytics_features_enabled": "Özellikler Etkin",
   "Analytics_features_messages_Description": "Bir kullanıcının iletilerde yaptığı eylemlerle bağlantılı özel olayları izler.",
   "Analytics_features_rooms_Description": "Bir kanal veya grup (silme, ayrılma, oluşturma) üzerindeki eylemlerle bağlantılı özel olayları izler.",
   "Analytics_features_users_Description": "Kullanıcılar (Parola sıfırlama süreleri, profil resmi değiştirme, vb) ile ilgili eylemlerle bağlantılı özel olayları izler.",
+  "Analytics_Google": "Google Analytics",
+  "Analytics_Google_id": "İzleme Kimliği",
   "and": "ve",
   "And_more": "Ve __length __ kadar daha fazla",
   "Animals_and_Nature": "Hayvanlar ve Doğa",
+  "Announcement": "Duyuru",
   "API": "API",
   "API_Analytics": "Mantıksal Analiz",
+  "API_Drupal_URL_Description": "Örnek: https://domain.com ( Sonunda slash (eğik çizgi) olmayacak şekilde )",
   "API_Embed": "Gömülü ",
   "API_Embed_Description": "Bir kullanıcı web sitesi linki paylaştığında, bu linkin önizlemesinin gösterilip gösterilemeyeceği",
   "API_EmbedDisabledFor": "Kullanıcılar için Gömülü Özelliğini Devre Dışı Bırak",
@@ -157,10 +191,12 @@
   "API_EmbedIgnoredHosts_Description": "Sunucuların veya CIDR adreslerinin virgülle ayrılmış listesi. Örnek : localhost, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16",
   "API_EmbedSafePorts": "Güvenli Portlar",
   "API_EmbedSafePorts_Description": "Önizleme için izin verilen portların virgülle ayrılmış listesi.",
+  "API_Enable_CORS": "CORS'u etkinleştir",
   "API_GitHub_Enterprise_URL": "Sunucu URL'si",
   "API_GitHub_Enterprise_URL_Description": "Örnek: http://domain.com (sondaki eğik çizgiyi dahil etmeyin)",
   "API_Gitlab_URL": "GitLab URL",
   "API_Token": "API Jetonu",
+  "API_Upper_Count_Limit": "Azami Kayıt Süresi",
   "API_User_Limit": "Kanala Eklenebilecek Tüm Kullanıcıların Sınırı",
   "API_Wordpress_URL": "WordPress URL",
   "Apiai_Key": "Api.ai Anahtar",
@@ -171,18 +207,26 @@
   "Application_updated": "uygulama güncellendi",
   "Apply_and_refresh_all_clients": "Uygulayın ve tüm istemcilerin yenilemek",
   "Archive": "Arşiv",
+  "archive-room": "Arşiv",
+  "archive-room_description": "Kanal Arşivleme İzni",
   "are_also_typing": "yazıyor",
   "are_typing": "yazıyor",
   "Are_you_sure": "Emin misiniz?",
   "Are_you_sure_you_want_to_delete_your_account": "Hesabınızı silmek istediğinizden emin misiniz?",
+  "assign-admin-role": "Admin Rolü Ata",
+  "assign-admin-role_description": "Diğer kullanıcılara admin rolü atama izmi",
   "Assign_admin": "Yönetici Görevlendiriliyor",
   "at": "at",
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Dosya Yüklendi",
+  "Audio_message": "Sesli Mesaj",
+  "Audio_Notifications_Default_Alert": "Sesli Mesaj için Varsayılan Uyarı",
+  "Audio_Notifications_Value": "Varsayılan mesaj bildirim sesi",
   "Auth_Token": "Kimlik Doğrulama Jetonu",
   "Author": "Yazar",
   "Authorization_URL": "yetkilendirme URL'si",
   "Authorize": "Yetki vermek",
+  "auto-translate_description": "Otomatik tercüme aracı kullanım izni",
   "Auto_Load_Images": "Fotoğrafları Otomatik Yükle",
   "AutoLinker_Email": "AutoLinker E-posta",
   "AutoLinker_Phone": "AutoLinker Telefon",
@@ -207,9 +251,12 @@
   "Away_male": "Uzakta",
   "Back": "Geri",
   "Back_to_applications": "Geri uygulamalara",
+  "Back_to_chat": "Sohbete Dön ",
   "Back_to_integrations": "Geri entegrasyonlar için",
   "Back_to_login": "Giriş sayfasına geri dön",
   "Back_to_permissions": "Geri izinleri",
+  "ban-user": "Kullanıcıyı Engelle",
+  "ban-user_description": "Kanaldan bir kullanıcıyı engelleme izni",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta özellik. Görüntülü konferans görüşmesinin aktif olmasını gerektirir.",
   "Body": "vücut",
   "bold": "kalın",
@@ -810,8 +857,10 @@
   "Off_the_record_conversation": "Off-the-record Konuşma",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-kayıt konuşma tarayıcınız veya aygıt için geçerli değildir.",
   "Offline": "Çevrimdışı",
+  "Offline_DM_Email": "Direkt __user__ tarafından mesajla edilmiştir",
   "Offline_form": "Çevrimdışı formu",
   "Offline_form_unavailable_message": "Çevrimdışı formu kullanılamıyor mesajı",
+  "Offline_Mention_Email": "Sen #__room__ içinde __user__ tarafından söz edilmiştir",
   "Offline_message": "Çevrimdışı mesaj",
   "Offline_success_message": "Çevrimdışı başarı mesajı",
   "Offline_unavailable": "Çevrimdışı kullanılamıyor",
@@ -1088,19 +1137,19 @@
   "The_user_wont_be_able_to_type_in_s": " %s kullanıcısı yazmaya mümkün olmayacaktır",
   "Theme": "Tema",
   "theme-color-content-background-color": "İçerik Arka Plan Rengi",
+  "theme-color-custom-scrollbar-color": "Özel Scrollbar Renk",
+  "theme-color-info-font-color": "Bilgi Yazı Rengi",
+  "theme-color-link-font-color": "Bağlantı Yazı Rengi",
   "theme-color-primary-background-color": "Birincil Arka Plan Rengi",
   "theme-color-primary-font-color": "Birincil Yazı Rengi",
   "theme-color-secondary-background-color": "İkincil Arka Plan Rengi",
   "theme-color-secondary-font-color": "İkincil Yazı Rengi",
-  "theme-color-tertiary-background-color": "Tersiyer Arka Plan Rengi",
-  "theme-color-tertiary-font-color": "Tersiyer Yazı Rengi",
-  "theme-color-link-font-color": "Bağlantı Yazı Rengi",
-  "theme-color-info-font-color": "Bilgi Yazı Rengi",
-  "theme-color-custom-scrollbar-color": "Özel Scrollbar Renk",
   "theme-color-status-away": "Uzakta Durumu Rengi",
   "theme-color-status-busy": "Meşgul Durumu Rengi",
   "theme-color-status-offline": "Çevrimdışı Durumu Rengi",
   "theme-color-status-online": "Çevrimiçi Durumu Rengi",
+  "theme-color-tertiary-background-color": "Tersiyer Arka Plan Rengi",
+  "theme-color-tertiary-font-color": "Tersiyer Yazı Rengi",
   "theme-color-unread-notification-color": "Okunmamış Bildirim Rengi",
   "theme-custom-css": "özel CSS",
   "There_are_no_agents_added_to_this_department_yet": "Bu bölüme eklenen herhangi bir müşteri temsilcisi henüz yoktur.",
@@ -1271,4 +1320,4 @@
   "Your_mail_was_sent_to_s": "Posta %s gönderildi",
   "Your_password_is_wrong": "Parolanız yanlış!",
   "Your_push_was_sent_to_s_devices": "Sizin itme %s cihazlara gönderildi"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ug.i18n.json b/packages/rocketchat-i18n/i18n/ug.i18n.json
index 663b06b0eb8..f0bc7998c97 100644
--- a/packages/rocketchat-i18n/i18n/ug.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ug.i18n.json
@@ -757,8 +757,10 @@
   "Off_the_record_conversation": "خاتىرىلەنمىگەن دىيالوگ",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "سىزنىڭ توركۆرگۈچىڭىز ياكى ئۈسكىنىڭىز خاتىرلەنمەيدىغان دىئالوگنى قوللىمايدۇ.",
   "Offline": "تورسىز",
+  "Offline_DM_Email": "سىز بىلەن بىۋاستە پاراڭلىشىشنى تەلەپ قىلىۋاتىدۇ__user__",
   "Offline_form": "تورسىز جەدۋەل",
   "Offline_form_unavailable_message": "تورسىز ھالەتتە ئىشلەتكىلى بولمايدىغان ئۇچۇر",
+  "Offline_Mention_Email": "تىن تىلغا ئېلىندىڭىز__user__دە#__room__سىز",
   "Offline_message": "تورسىز ئۇچۇر",
   "Offline_success_message": "ئۇتۇقلۇق تورسىز بولغان ئۇچۇر",
   "Offline_unavailable": "تورسىز ئىشلەتكىلى بولمايدۇ",
@@ -1034,19 +1036,19 @@
   "The_user_wont_be_able_to_type_in_s": "ئۆيدە گەپ قىلىشتىن چەكلىنىدۇ%sبۇ ئەزا",
   "Theme": "تېما",
   "theme-color-content-background-color": "مەزمۇنىنىڭ تەگلىك رەڭگى",
+  "theme-color-custom-scrollbar-color": "سيرىلما بەلگە رەڭگى ياسىتىش",
+  "theme-color-info-font-color": "ئۇچۇرخېتىنىڭ رەڭگى",
+  "theme-color-link-font-color": "خەتنىڭ ئۇلانما رەڭگى",
   "theme-color-primary-background-color": "ئاساسىي تەگلىك رەڭگى",
   "theme-color-primary-font-color": "ئاساسىي گىرافىكنىڭ رەڭگى",
   "theme-color-secondary-background-color": "ئىككىنچى تەگلىك رەڭگى",
   "theme-color-secondary-font-color": "ئىككىنچى گىرافىكا رەڭگى",
-  "theme-color-tertiary-background-color": "ئۈچىنچى تەگلىك رەڭگى",
-  "theme-color-tertiary-font-color": "ئۈچىنچى گرافىكا رەڭگى",
-  "theme-color-link-font-color": "خەتنىڭ ئۇلانما رەڭگى",
-  "theme-color-info-font-color": "ئۇچۇرخېتىنىڭ رەڭگى",
-  "theme-color-custom-scrollbar-color": "سيرىلما بەلگە رەڭگى ياسىتىش",
   "theme-color-status-away": "ئايرىلغان ھالەتتىكى رەڭگى",
   "theme-color-status-busy": "ئالدىراش ھالەتتىكى رەڭگى",
   "theme-color-status-offline": "تورسىز ھالەتتىكى رەڭگى",
   "theme-color-status-online": "تور ھالىتىدىكى رەڭگى",
+  "theme-color-tertiary-background-color": "ئۈچىنچى تەگلىك رەڭگى",
+  "theme-color-tertiary-font-color": "ئۈچىنچى گرافىكا رەڭگى",
   "theme-color-unread-notification-color": "ئوقۇلمىغان ئۇچۇرنىڭ رەڭگى",
   "theme-custom-css": "CSSئۆزى بېكىتكەن",
   "There_are_no_agents_added_to_this_department_yet": "بۇ بۆلۈم ھېچقانداق مۇلازىم بۆلمىدى",
@@ -1217,4 +1219,4 @@
   "Your_mail_was_sent_to_s": "يوللاندى %s سىزنىڭ ئىلخىتىڭىز ئاللىبۇرۇن",
   "Your_password_is_wrong": "پارول خاتا !",
   "Your_push_was_sent_to_s_devices": "ئۈسكىنىگە يوللاندى %s سىزنىڭ ئىتتىرگىنىڭىز"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/uk.i18n.json b/packages/rocketchat-i18n/i18n/uk.i18n.json
index f3c3bfcb318..1e190f7f6dc 100644
--- a/packages/rocketchat-i18n/i18n/uk.i18n.json
+++ b/packages/rocketchat-i18n/i18n/uk.i18n.json
@@ -761,8 +761,10 @@
   "Off_the_record_conversation": "Off-записувані Діалог",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off самого запису розмови не доступна для вашого браузера або пристрою.",
   "Offline": "Offline",
+  "Offline_DM_Email": "Ви були прямим шляхом __user__ обмінювалися повідомленнями",
   "Offline_form": "Offline форма",
   "Offline_form_unavailable_message": "Offline форма недоступний повідомлення",
+  "Offline_Mention_Email": "Ви були згадані __user__ в #__room__",
   "Offline_message": "Немає повідомлення",
   "Offline_success_message": "Немає повідомлення про успішне виконання",
   "Offline_unavailable": "Offline недоступний",
@@ -1038,19 +1040,19 @@
   "The_user_wont_be_able_to_type_in_s": "Користувач не зможе ввести в %s",
   "Theme": "тема",
   "theme-color-content-background-color": "Зміст Колір фону",
+  "theme-color-custom-scrollbar-color": "Призначені для користувача Scrollbar Колір",
+  "theme-color-info-font-color": "Інформація Колір шрифту",
+  "theme-color-link-font-color": "Посилання Колір шрифту",
   "theme-color-primary-background-color": "Основний колір фону",
   "theme-color-primary-font-color": "Первинний Колір шрифту",
   "theme-color-secondary-background-color": "Вторинний колір фону",
   "theme-color-secondary-font-color": "Вторинний колір шрифту",
-  "theme-color-tertiary-background-color": "Третинний Колір фону",
-  "theme-color-tertiary-font-color": "Третинний Колір шрифту",
-  "theme-color-link-font-color": "Посилання Колір шрифту",
-  "theme-color-info-font-color": "Інформація Колір шрифту",
-  "theme-color-custom-scrollbar-color": "Призначені для користувача Scrollbar Колір",
   "theme-color-status-away": "Відсутня Колір Стан",
   "theme-color-status-busy": "Зайнятий Колір Стан",
   "theme-color-status-offline": "Offline Колір Статус",
   "theme-color-status-online": "Інтернет Колір Статус",
+  "theme-color-tertiary-background-color": "Третинний Колір фону",
+  "theme-color-tertiary-font-color": "Третинний Колір шрифту",
   "theme-color-unread-notification-color": "Непрочитана Повідомлення Колір",
   "theme-custom-css": "призначені для користувача CSS",
   "There_are_no_agents_added_to_this_department_yet": "Там немає доданих в цей відділ поки агенти.",
@@ -1221,4 +1223,4 @@
   "Your_mail_was_sent_to_s": "Ваш лист було відправлено в %s",
   "Your_password_is_wrong": "Ваш невірний пароль!",
   "Your_push_was_sent_to_s_devices": "Ваш поштовх був відправлений в %s пристроїв"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index c1624a25330..a0607abd136 100644
--- a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -762,8 +762,10 @@
   "Off_the_record_conversation": "現成的通話記錄",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "現成的記錄談話不適用於您的瀏覽器或設備。",
   "Offline": "當前離線",
+  "Offline_DM_Email": "您已通過__user__被直接傳遞消息",
   "Offline_form": "離線表單",
   "Offline_form_unavailable_message": "離線形式不可用消息",
+  "Offline_Mention_Email": "你已經在#__room__ __user__提到",
   "Offline_message": "離線消息",
   "Offline_success_message": "離線成功消息",
   "Offline_unavailable": "離線不可用",
@@ -1039,19 +1041,19 @@
   "The_user_wont_be_able_to_type_in_s": "用戶將不能夠鍵入在%s",
   "Theme": "主題",
   "theme-color-content-background-color": "內容背景顏色",
+  "theme-color-custom-scrollbar-color": "自定義顏色滾動條",
+  "theme-color-info-font-color": "信息字體顏色",
+  "theme-color-link-font-color": "鏈接字體顏色",
   "theme-color-primary-background-color": "主要背景顏色",
   "theme-color-primary-font-color": "主要字體顏色",
   "theme-color-secondary-background-color": "二級背景顏色",
   "theme-color-secondary-font-color": "二級字體顏色",
-  "theme-color-tertiary-background-color": "第三背景顏色",
-  "theme-color-tertiary-font-color": "第三字體顏色",
-  "theme-color-link-font-color": "鏈接字體顏色",
-  "theme-color-info-font-color": "信息字體顏色",
-  "theme-color-custom-scrollbar-color": "自定義顏色滾動條",
   "theme-color-status-away": "客場狀態顏色",
   "theme-color-status-busy": "忙碌狀態顏色",
   "theme-color-status-offline": "離線狀態顏色",
   "theme-color-status-online": "在線狀態顏色",
+  "theme-color-tertiary-background-color": "第三背景顏色",
+  "theme-color-tertiary-font-color": "第三字體顏色",
   "theme-color-unread-notification-color": "未讀通知顏色",
   "theme-custom-css": "自定義CSS",
   "There_are_no_agents_added_to_this_department_yet": "有沒有加入到這個部門還沒有代理商。",
@@ -1222,4 +1224,4 @@
   "Your_mail_was_sent_to_s": "您的郵件已發送到%s",
   "Your_password_is_wrong": "您的密碼是錯誤的！",
   "Your_push_was_sent_to_s_devices": "你的推播被送到 %s 裝置"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index db11ba856d1..3cc76c682ee 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -90,6 +90,8 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor 回调地址",
   "Accounts_OAuth_Meteor_id": "Meteor ID",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_host": "代理主机",
+  "Accounts_OAuth_Proxy_services": "代理服务",
   "Accounts_OAuth_Twitter": "Twitter 账户登录",
   "Accounts_OAuth_Twitter_callback_url": "Twitter 回调地址",
   "Accounts_OAuth_Twitter_id": "Twitter ID",
@@ -99,8 +101,6 @@
   "Accounts_OAuth_Wordpress_id": "WordPress ID",
   "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "重置密码",
-  "Accounts_OAuth_Proxy_host": "代理主机",
-  "Accounts_OAuth_Proxy_services": "代理服务",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "认证服务的默认角色",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "当通过认证服务注册时被授予默认角色的用户（用逗号分隔）",
   "Accounts_Registration_AuthenticationServices_Enabled": "使用认证服务注册",
@@ -210,6 +210,7 @@
   "Authorization_URL": "授权 URL",
   "Authorize": "授权",
   "Auto_Load_Images": "自动载入图片",
+  "Auto_Translate": "自动翻译",
   "AutoLinker_Phone": "自动链接电话号码",
   "AutoLinker_Phone_Description": "自动为电话号码添加链接。例如：`（123）456-7890`",
   "AutoLinker_StripPrefix": "自动链接显示链接前缀",
@@ -219,10 +220,9 @@
   "AutoLinker_Urls_www": "自动链接以“www”开头的网址",
   "AutoLinker_UrlsRegExp": "自动链接网址正则表达式",
   "Automatic_Translation": "自动翻译",
-  "Auto_Translate": "自动翻译",
+  "AutoTranslate_Change_Language_Description": "修改自动翻译的语言不会翻译之前的消息。",
   "AutoTranslate_Enabled": "启用自动翻译",
   "AutoTranslate_Enabled_Description": "开启自动翻译功能将允许用户获得<code class=\"inline\">自动翻译</code>权限，所有消息都将被自动翻译成用户选择的语言。这可需要付费，请查阅 <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">Google 文档</a>",
-  "AutoTranslate_Change_Language_Description": "修改自动翻译的语言不会翻译之前的消息。",
   "AutoTranslate_GoogleAPIKey": "Google API Key",
   "Available": "可用",
   "Available_agents": "空闲客服",
@@ -238,8 +238,8 @@
   "Away_male": "离开",
   "Back": "返回",
   "Back_to_applications": "返回应用列表",
-  "Back_to_integrations": "返回集成页",
   "Back_to_integration_detail": "返回查看集成的详细信息",
+  "Back_to_integrations": "返回集成页",
   "Back_to_login": "返回登录界面",
   "Back_to_permissions": "返回权限页",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "测试功能。需要启用视频会议功能。",
@@ -258,7 +258,6 @@
   "busy_male": "忙碌",
   "Busy_male": "忙碌",
   "by": "通过",
-  "Content": "内容",
   "cache_cleared": "缓存已清理",
   "Cancel": "取消",
   "Cancel_message_input": "取消",
@@ -280,14 +279,14 @@
   "CAS_version": "CAS 版本",
   "CDN_PREFIX": "CDN 前缀",
   "Certificates_and_Keys": "证书和密钥",
-  "Changing_email": "正在更改电子邮件",
   "Change_Room_Type": "正在修改房间类型",
+  "Changing_email": "正在更改电子邮件",
   "channel": "频道",
   "Channel": "频道",
   "Channel_already_exist": "通道'#%s“已存在。",
-  "Channel_created": "`#%s` 频道已创建。",
   "Channel_already_Unarchived": "与名`#%s`通道已经处于未封存状态",
   "Channel_Archived": "与名`#%s`通道已成功存档",
+  "Channel_created": "`#%s` 频道已创建。",
   "Channel_doesnt_exist": "不存在 `#%s` 频道。",
   "Channel_to_listen_on": "监听频道",
   "Channel_Unarchived": "与名`#%s`通道已取消封存成功",
@@ -305,9 +304,9 @@
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "选择将在消息中的用户名前出现的别名。",
   "Choose_the_username_that_this_integration_will_post_as": "选择该集成以什么用户名身份发布信息",
   "clear": "清理",
+  "Clear_all_unreads_question": "清除所有未读标记？",
   "clear_cache_now": "立即清理缓存",
   "clear_history": "清理历史记录",
-  "Clear_all_unreads_question": "清除所有未读标记？",
   "Click_here": "点击这里",
   "Click_here_for_more_info": "点此查看更多信息",
   "Client_ID": "客户端 ID",
@@ -324,6 +323,7 @@
   "Comment_to_leave_on_closing_session": "为关闭的会话留下评论",
   "Compact": "紧凑",
   "Confirm_password": "确认密码",
+  "Content": "内容",
   "Conversation": "谈话",
   "Conversation_closed": "会话已关闭：__comment__。",
   "Convert_Ascii_Emojis": "自动识别文字中的表情",
@@ -339,8 +339,8 @@
   "Created_at": "创建于",
   "Created_at_s_by_s": "由 <strong>%s</strong> 创建于 <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "由 <strong>%s</strong> 创建于 <strong>%s</strong> 被 <strong>%s</strong> 触发",
-  "CROWD_Reject_Unauthorized": "拒绝未经授权的",
   "CRM_Integration": "CRM 集成",
+  "CROWD_Reject_Unauthorized": "拒绝未经授权的",
   "Current_Chats": "当前聊天",
   "Custom": "自定义",
   "Custom_Emoji": "自定义表情",
@@ -355,10 +355,9 @@
   "Custom_Fields": "自定义字段",
   "Custom_oauth_helper": "设置完 OAuth 提供者之后，你还需要设置回调 URL。请使用 <pre>%s</pre>。",
   "Custom_oauth_unique_name": "自定义 OAuth 唯一名称 ",
-  "Custom_Scripts": "自定义脚本",
   "Custom_Script_Logged_In": "为已登录用户准备的自定义脚本",
   "Custom_Script_Logged_Out": "为已登出用户准备的自定义脚本",
-  "Custom_Sounds": "自定义声音",
+  "Custom_Scripts": "自定义脚本",
   "Custom_Sound_Add": "添加自定义声音",
   "Custom_Sound_Delete_Warning": "声音删除操作无法撤销。",
   "Custom_Sound_Error_Invalid_Sound": "无效的声音",
@@ -366,6 +365,7 @@
   "Custom_Sound_Has_Been_Deleted": "自定义声音已删除。",
   "Custom_Sound_Info": "自定义声音信息",
   "Custom_Sound_Saved_Successfully": "自定义声音保存成功",
+  "Custom_Sounds": "自定义声音",
   "Custom_Translations": "自定义翻译",
   "Custom_Translations_Description": "应使用 JSON 文件格式，键为语言，值为翻译。例如：<br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"pt\": {\n  \"Channels\": \"Salas\"\n }\n}</code> ",
   "CustomSoundsFilesystem": "自定义声音文件系统",
@@ -441,14 +441,14 @@
   "Empty_title": "空标题",
   "Enable": "启用",
   "Enable_Desktop_Notifications": "启用桌面通知",
-  "Enabled": "已启用",
   "Enable_Svg_Favicon": "启用 SVG 图标",
+  "Enabled": "已启用",
   "Encrypted_message": "加密消息",
   "End_OTR": "结束无记录对话",
-  "Enter_Alternative": "替代模式（Enter +  Ctrl/Alt/Shift/CMD 发送消息）",
   "Enter_a_regex": "输入正则表达式",
   "Enter_a_room_name": "在这里输入房间名",
   "Enter_a_username": "输入用户名",
+  "Enter_Alternative": "替代模式（Enter +  Ctrl/Alt/Shift/CMD 发送消息）",
   "Enter_Behaviour": "回车键",
   "Enter_Behaviour_Description": "此项用来设置回车键发送消息还是换行",
   "Enter_name_here": "在这里输入名字",
@@ -466,6 +466,7 @@
   "error-could-not-change-username": "无法更改用户名",
   "error-delete-protected-role": "无法删除受保护的角色",
   "error-department-not-found": "找不到该部门",
+  "error-direct-message-file-upload-not-allowed": "私信中不允许文件共享",
   "error-duplicate-channel-name": "频道 '__channel_name__' 已存在",
   "error-email-domain-blacklisted": "电子邮箱域名被列入黑名单",
   "error-email-send-failed": "尝试发送邮件出错：__message__",
@@ -487,7 +488,6 @@
   "error-invalid-email-address": "邮件地址无效",
   "error-invalid-file-height": "无效的文件高度",
   "error-invalid-file-type": "无效的文件类型",
-  "error-direct-message-file-upload-not-allowed": "私信中不允许文件共享",
   "error-invalid-file-width": "无效的文件宽度",
   "error-invalid-from-address": "您的 FROM 地址无效。",
   "error-invalid-integration": "无效的集成",
@@ -522,9 +522,9 @@
   "error-the-field-is-required": "字段 __field__ 必填。",
   "error-too-many-requests": "错误，请求过多。请放慢速度。你必须等待__seconds__秒后再次重试。",
   "error-user-is-not-activated": "用户未激活",
+  "error-user-limit-exceeded": "你邀请加入 #channel_name 的用户数量超出了管理员设置的最大值限制",
   "error-user-not-in-room": "用户不是在这个房间里",
   "error-user-registration-disabled": "用户注册被禁用",
-  "error-user-limit-exceeded": "你邀请加入 #channel_name 的用户数量超出了管理员设置的最大值限制",
   "error-user-registration-secret": "用户注册只能通过私密地址",
   "error-you-are-last-owner": "你是房间当前的拥有者。请先重设拥有者再离开房间。",
   "Error_changing_password": "密码更改失败",
@@ -548,8 +548,8 @@
   "File_type_is_not_accepted": "文件类型不被系统接受。",
   "File_uploaded": "文件已上传",
   "FileUpload": "文件上传",
-  "FileUpload_Enabled": "文件上传已启用",
   "FileUpload_Disabled": "已禁用文件上传。",
+  "FileUpload_Enabled": "文件上传已启用",
   "FileUpload_Enabled_Direct": "私信已启用文件上传",
   "FileUpload_File_Empty": "文件为空",
   "FileUpload_FileSystemPath": "系统路径",
@@ -574,15 +574,15 @@
   "FileUpload_Storage_Type": "存储类型",
   "Flags": "旗帜",
   "Follow_social_profiles": "关注我们的社交资讯，fork我们在github的项目或者在trello上分享你关于rocket.chat的想法。",
+  "Fonts": "字体",
   "Food_and_Drink": "饮食",
   "Footer": "页脚",
-  "Fonts": "字体",
   "For_your_security_you_must_enter_your_current_password_to_continue": "出于安全考虑，您必须输入您的密码以便继续操作",
   "Force_SSL": "强制 SSL",
   "Force_SSL_Description": "*注意！* _Force SSL_ 不应该与反向代理同时使用。如果您有一个反向代理，您应该在那里设置重定向操作。这个选项用于像 Heroku 的特殊平台，此类平台不允许在反向代理中配置重定向。",
   "Forgot_password": "忘记密码",
-  "Forgot_Password_Email_Subject": "[Site_Name] - 密码恢复",
   "Forgot_Password_Email": "<a href=\"[Forgot_Password_Url]\">点此</a>重置你的密码。",
+  "Forgot_Password_Email_Subject": "[Site_Name] - 密码恢复",
   "Forgot_password_section": "忘记密码",
   "Forward": "转发",
   "Forward_chat": "转发对话",
@@ -609,9 +609,9 @@
   "Hide_flextab": "通过点击隐藏右边栏",
   "Hide_Group_Warning": "您确定要隐藏用户组“%s”吗？",
   "Hide_Private_Warning": "您确定要隐藏和“%s”的讨论吗？",
+  "Hide_roles": "隐藏角色",
   "Hide_room": "隐藏聊天室",
   "Hide_Room_Warning": "您确定要隐藏房间“%s”吗？",
-  "Hide_roles": "隐藏角色",
   "Hide_usernames": "隐藏用户名",
   "Highlights": "高亮",
   "Highlights_How_To": "当其他人发出的消息中包含此处的关键词时，你会收到提醒。请使用逗号分隔多个关键词。不区分大小写。",
@@ -632,12 +632,13 @@
   "Iframe_Integration_receive_enable_Description": "允许父窗口发送命令给 Rocket.Chat。",
   "Iframe_Integration_send_enable": "启用发送",
   "Iframe_Integration_send_enable_Description": "发送事件到父窗口",
+  "Impersonate_user": "模拟用户",
   "Importer_Archived": "已归档",
-  "Importer_HipChatEnterprise_Information": "上传的文件必须为未加密的 tar.gz 文件，请查阅文档进一步了解相关信息：",
-  "Importer_HipChatEnterprise_BetaWarning": "请注意，导入功能尚处于开发阶段，如有错误发生请在 GitHub 向我们反馈：",
   "Importer_done": "导入已完成！",
   "Importer_finishing": "导入即将完成。",
   "Importer_From_Description": "将 __from__ 数据导入 Rocket.Chat。",
+  "Importer_HipChatEnterprise_BetaWarning": "请注意，导入功能尚处于开发阶段，如有错误发生请在 GitHub 向我们反馈：",
+  "Importer_HipChatEnterprise_Information": "上传的文件必须为未加密的 tar.gz 文件，请查阅文档进一步了解相关信息：",
   "Importer_import_cancelled": "已取消导入。",
   "Importer_import_failed": "导入过程中发生错误！",
   "Importer_importing_channels": "正在导入频道。",
@@ -654,6 +655,7 @@
   "Importer_setup_error": "设置导入工具时发生了错误。",
   "Importer_Source_File": "选择源文件",
   "Incoming_Livechats": "入站聊天",
+  "Incoming_WebHook": "入站 WebHook",
   "inline_code": "inline_code",
   "Install_Extension": "安装扩展程序",
   "Install_FxOs": "在火狐浏览器中安装 Rocket.Chat",
@@ -663,16 +665,14 @@
   "Installation": "安装",
   "Installed_at": "安装在",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "给你访问者的说明，指导它们填写表格来发送一条消息",
-  "Impersonate_user": "模拟用户",
-  "Incoming_WebHook": "入站 WebHook",
-  "Integration_Advanced_Settings": "高级设置",
   "Integration_added": "集成已添加",
+  "Integration_Advanced_Settings": "高级设置",
   "Integration_History_Cleared": "已成功清理集成历史记录",
   "Integration_Incoming_WebHook": "Incoming WebHook 集成",
   "Integration_New": "新的集成",
   "Integration_Outgoing_WebHook": "Outgoing WebHook 集成",
-  "Integration_Word_Trigger_Placement_Description": "激发事件的单词是否允许放在句子中的任何位置，而不仅限于句首？",
   "Integration_updated": "集成已更新",
+  "Integration_Word_Trigger_Placement_Description": "激发事件的单词是否允许放在句子中的任何位置，而不仅限于句首？",
   "Integrations": "集成",
   "Integrations_for_all_channels": "输入 <strong>all_public_channels</strong> 监听所有公共频道，<strong>all_private_groups</strong> 监听所有私有组，<strong>all_direct_messages</strong> 监听所有私信。",
   "InternalHubot": "内部Hubot",
@@ -698,28 +698,28 @@
   "Invitation_Subject": "邀请邮件主题",
   "Invitation_Subject_Default": "您已被邀请到 [Site_Name]",
   "Invite_user_to_join_channel": "邀请一位用户加入这个频道",
-  "Invite_user_to_join_channel_all_to": "邀请此频道所有用户加入 [#channel]",
   "Invite_user_to_join_channel_all_from": "邀请 [#channel] 的所有用户加入此频道",
+  "Invite_user_to_join_channel_all_to": "邀请此频道所有用户加入 [#channel]",
   "Invite_Users": "邀请用户",
-  "is_also_typing": "也正在输入",
-  "is_also_typing_female": "正在输入",
-  "is_also_typing_male": "正在输入",
-  "is_typing": "正在输入",
-  "is_typing_female": "正在输入",
-  "is_typing_male": "正在输入",
   "IRC_Channel_Join": "JOIN 命令的输出",
   "IRC_Channel_Leave": "PART 命令的输出",
-  "IRC_Description": "互联网中继聊天（IRC）是基于文本的群组通信工具。用户加入具有唯一名称的频道或房间进行开放式的讨论。IRC 也支持个人用户之间的私人消息和文件共享功能。这个包将这些功能层与 Rocket.Chat 集成。",
-  "IRC_Enabled": "为了集成 IRC 支持。修改这个值需要重新启动 Rocket.Chat。",
-  "IRC_Private_Message": "PRIVMSG 命令的输出",
   "IRC_Channel_Users": "NAMES 命令的输出",
   "IRC_Channel_Users_End": "NAMES 命令输出的结尾",
+  "IRC_Description": "互联网中继聊天（IRC）是基于文本的群组通信工具。用户加入具有唯一名称的频道或房间进行开放式的讨论。IRC 也支持个人用户之间的私人消息和文件共享功能。这个包将这些功能层与 Rocket.Chat 集成。",
+  "IRC_Enabled": "为了集成 IRC 支持。修改这个值需要重新启动 Rocket.Chat。",
   "IRC_Hostname": "要连接的 IRC 主机服务器。",
   "IRC_Login_Fail": "在连接 IRC 服务器失败时输出。",
   "IRC_Login_Success": "在成功连接 IRC 服务器时输出。",
   "IRC_Message_Cache_Size": "处理外发消息的缓存限制。",
   "IRC_Port": "要绑定的 IRC 主机服务器的端口。",
+  "IRC_Private_Message": "PRIVMSG 命令的输出",
   "IRC_Quit": "在退出一个 IRC 会话时输出。",
+  "is_also_typing": "也正在输入",
+  "is_also_typing_female": "正在输入",
+  "is_also_typing_male": "正在输入",
+  "is_typing": "正在输入",
+  "is_typing_female": "正在输入",
+  "is_typing_male": "正在输入",
   "It_works": "成功了",
   "italics": "斜体",
   "Jitsi_Chrome_Extension": "Chrome 扩展标识",
@@ -781,6 +781,9 @@
   "LDAP_Enable_Description": "尝试使用 LDAP 进行身份验证。",
   "LDAP_Encryption": "加密方法",
   "LDAP_Encryption_Description": "请指定与 LDAP 服务器通信时，使用何种加密方法。可选方法包括：`不使用加密`，`SSL/LDAPS`（全程启用加密）和`StartTLS`（建立连接后启用加密）",
+  "LDAP_Group_Filter_Enable": "启用 LDAP 用户组过滤",
+  "LDAP_Group_Filter_Enable_Description": "限制对 LDAP 中某个组用户的访问。<br/>对于未设置不允许 *memberOf* 过滤器覆盖的 OpenLDAP 服务器有用。",
+  "LDAP_Group_Filter_ObjectClass": "组 ",
   "LDAP_Host": "服务器",
   "LDAP_Host_Description": "LDAP服务器的域名或 IP，如 `ldap.example.com` 或 `10.0.0.30`。",
   "LDAP_Idle_Timeout": "空闲超时（ms）",
@@ -806,9 +809,6 @@
   "LDAP_Use_Custom_Domain_Search_Description": "请输入在 LDAP 服务器中搜索用户时的筛选条件",
   "LDAP_Username_Field": "用户名字段",
   "LDAP_Username_Field_Description": "指定新用户登录时，使用 LDAP 中哪个字段的值作为*用户名*。若要使用登录页面所用的用户名，请留空。<br/>可使用模版标签，比如 `#{givenName}.#{sn}`。<br/>默认字段为 `sAMAccountName`。",
-  "LDAP_Group_Filter_Enable": "启用 LDAP 用户组过滤",
-  "LDAP_Group_Filter_Enable_Description": "限制对 LDAP 中某个组用户的访问。<br/>对于未设置不允许 *memberOf* 过滤器覆盖的 OpenLDAP 服务器有用。",
-  "LDAP_Group_Filter_ObjectClass": "组 ",
   "Leave_Group_Warning": "您确定要离开用户组“%s”吗？",
   "Leave_Private_Warning": "您确定要离开和“%s”的讨论吗？",
   "Leave_room": "离开聊天室",
@@ -971,9 +971,11 @@
   "Off_the_record_conversation": "无记录对话",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "您的浏览器或设备不支持无记录对话。",
   "Offline": "离线",
+  "Offline_DM_Email": "__user__ 请求和你直接对话",
   "Offline_form": "离线表单",
   "Offline_form_unavailable_message": "离线形式不可用消息",
   "Offline_Link_Message": "前往消息",
+  "Offline_Mention_Email": "您在 #__room__ 中被 __user__ 提及",
   "Offline_message": "离线消息",
   "Offline_success_message": "离线成功消息",
   "Offline_unavailable": "离线不可用",
@@ -1090,11 +1092,11 @@
   "Remove_someone_from_room": "将某人从房间中删除",
   "Removed": "已删除",
   "Reply": "回复",
-  "Reporting": "报告",
   "Report_Abuse": "报告滥用",
   "Report_exclamation_mark": "报告！",
   "Report_sent": "报告已发送",
   "Report_this_message_question_mark": "举报此消息？",
+  "Reporting": "报告",
   "Require_password_change": "要求修改密码",
   "Resend_verification_email": "重新发送确认邮件",
   "Reset": "重置",
@@ -1115,8 +1117,8 @@
   "room_changed_privacy": "<em>__user_by__</em> 将房间类型修改为：<em>__room_type__</em>",
   "room_changed_topic": "<em>__user_by__</em> 将房间主题修改为：<em>__room_topic__</em>",
   "Room_description_changed_successfully": "房间描述修改成功",
-  "Room_has_been_deleted": "房间已被删除",
   "Room_has_been_archived": "房间已归档",
+  "Room_has_been_deleted": "房间已被删除",
   "Room_has_been_unarchived": "已撤销房间归档",
   "Room_Info": "房间信息",
   "room_name": "房间名",
@@ -1138,9 +1140,9 @@
   "SAML_Custom_Generate_Username": "生成用户名",
   "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO 重定向 URL",
   "SAML_Custom_Issuer": "自定义 Issuer",
+  "SAML_Custom_Private_Key": "Private Key",
   "SAML_Custom_Provider": "自定义供应商",
   "SAML_Custom_Public_Cert": "Public Cert",
-  "SAML_Custom_Private_Key": "Private Key",
   "Saturday": "星期六",
   "Save": "保存",
   "Save_changes": "保存修改",
@@ -1248,9 +1250,9 @@
   "Stats_Total_Livechat_Rooms": "在线聊天房间总计",
   "Stats_Total_Messages": "消息总数",
   "Stats_Total_Messages_Channel": "频道消息总计",
-  "Stats_Total_Messages_PrivateGroup": "私有群组消息总计",
   "Stats_Total_Messages_Direct": "私信总数",
   "Stats_Total_Messages_Livechat": "在线聊天消息总计",
+  "Stats_Total_Messages_PrivateGroup": "私有群组消息总计",
   "Stats_Total_Private_Groups": "私有组数",
   "Stats_Total_Rooms": "房间总数",
   "Stats_Total_Users": "用户总数",
@@ -1287,19 +1289,19 @@
   "The_user_wont_be_able_to_type_in_s": "该用户将被禁止在 %s 房间中发言",
   "Theme": "主题",
   "theme-color-content-background-color": "内容的背景色",
+  "theme-color-custom-scrollbar-color": "定制滚动条颜色",
+  "theme-color-info-font-color": "信息字体颜色",
+  "theme-color-link-font-color": "链接字体颜色",
   "theme-color-primary-background-color": "主背景颜色",
   "theme-color-primary-font-color": "主要字体颜色",
   "theme-color-secondary-background-color": "第二背景颜色",
   "theme-color-secondary-font-color": "第二字体颜色",
-  "theme-color-tertiary-background-color": "第三背景颜色",
-  "theme-color-tertiary-font-color": "第三字体颜色",
-  "theme-color-link-font-color": "链接字体颜色",
-  "theme-color-info-font-color": "信息字体颜色",
-  "theme-color-custom-scrollbar-color": "定制滚动条颜色",
   "theme-color-status-away": "离开状态颜色",
   "theme-color-status-busy": "忙碌状态颜色",
   "theme-color-status-offline": "离线状态颜色",
   "theme-color-status-online": "在线状态颜色",
+  "theme-color-tertiary-background-color": "第三背景颜色",
+  "theme-color-tertiary-font-color": "第三字体颜色",
   "theme-color-unread-notification-color": "未读消息颜色",
   "theme-custom-css": "自定义 CSS",
   "There_are_no_agents_added_to_this_department_yet": "该部门尚未分配任何客服。",
@@ -1414,9 +1416,9 @@
   "UTF8_Names_Validation_Description": "禁止特殊字符和空格。你可以在名字末尾以为的地方使用 -、_ 和 . 。",
   "Validate_email_address": "验证邮箱",
   "Verification": "验证",
+  "Verification_Email": "<a href=\"[Verification_Url]\">点击这里</a> 验证你的账户。",
   "Verification_email_sent": "确认邮件已发送",
   "Verification_Email_Subject": "[Site_Name] - 验证你的账户",
-  "Verification_Email": "<a href=\"[Verification_Url]\">点击这里</a> 验证你的账户。",
   "Verified": "已验证",
   "Verify": "验证",
   "Version": "版本",
@@ -1491,4 +1493,4 @@
   "your_message_optional": "你的消息（可选）",
   "Your_password_is_wrong": "密码错误！",
   "Your_push_was_sent_to_s_devices": "您的推送已被送到 %s 台设备"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-livechat/app/i18n/de.i18n.json b/packages/rocketchat-livechat/app/i18n/de.i18n.json
index 625393ec291..e797bae4e1a 100644
--- a/packages/rocketchat-livechat/app/i18n/de.i18n.json
+++ b/packages/rocketchat-livechat/app/i18n/de.i18n.json
@@ -1,12 +1,12 @@
 {
   "Additional_Feedback": "Zusätzliches Feedback",
   "Appearance": "Erscheinungsbild",
-  "Are_you_sure_do_you_want_end_this_chat": "Sind Sie sich sicher diesen Chat zu beenden?",
-  "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Sind Sie sich sicher diesen Chat zu beenden und den Bereich zu wechseln?",
+  "Are_you_sure_do_you_want_end_this_chat": "Sind Sie sich sicher, dass Sie diesen Chat beenden wollen?",
+  "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Sind Sie sich sicher, dass Sie diesen Chat beenden und die Abteilung wechseln wollen",
   "Cancel": "Abbrechen",
   "Change": "Ändern",
   "Chat_ended": "Chat beendet!",
-  "Choose_a_new_department": "Wähle einen neuen Bereich",
+  "Choose_a_new_department": "Wählen Sie eine neue Abteilung",
   "Close_menu": "Menü schließen",
   "Conversation_finished": "Gespräch beendet",
   "End_chat": "Chat beenden",
@@ -19,13 +19,13 @@
   "No": "Nein",
   "Options": "Optionen",
   "Please_answer_survey": "Bitte nehmen Sie sich einen Moment Zeit, um kurz einige Fragen zu dem Gespräch zu beantworten.",
-  "Please_choose_a_department": "Wähle einen Bereich",
+  "Please_choose_a_department": "Wähle eine Abteilung",
   "Please_fill_name_and_email": "Bitte geben Sie einen Namen und eine E-Mail-Adresse ein.",
-  "Powered_by": "Unterstützt von",
+  "Powered_by": "Powered by",
   "Request_video_chat": "Video-Chat anfragen",
   "Select_a_department": "Abteilung auswählen",
   "Switch_department": "Abteilung wechseln",
-  "Department_switched": "Abteilung gewechselt",
+  "Department_switched": "Abteilung wurde gewechselt",
   "Send": "Senden",
   "Skip": "Überspringen",
   "Start_Chat": "Chat beginnen",
diff --git a/packages/rocketchat-livechat/app/i18n/fa.i18n.json b/packages/rocketchat-livechat/app/i18n/fa.i18n.json
index 074012b0851..1bf1f084417 100644
--- a/packages/rocketchat-livechat/app/i18n/fa.i18n.json
+++ b/packages/rocketchat-livechat/app/i18n/fa.i18n.json
@@ -1,16 +1,28 @@
 {
   "Additional_Feedback": "بازخورد اضافی",
   "Appearance": "ظاهر",
+  "Are_you_sure_do_you_want_end_this_chat": "آیا مطمئن هستید که می‌خواهید این جت را پایان دهید؟",
+  "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "آیا مطمئن هستید که می‌خواهید این چت را پایان دهید و بخش را عوض کنید؟",
+  "Cancel": "لغو",
+  "Change": "تغییر",
+  "Chat_ended": "چت پایان یافت!",
+  "Choose_a_new_department": "یک بخش جدید را انتخاب کنید",
+  "Close_menu": "بستن منو",
   "Conversation_finished": "مکالمه به پایان رسید",
-  "How_friendly_was_the_chat_agent": "عامل چت چگونه دوستانه بود؟",
-  "How_knowledgeable_was_the_chat_agent": "عامل چت چگونه آگاه بود؟",
-  "How_responsive_was_the_chat_agent": "عامل چت چگونه پاسخگو بود؟",
-  "How_satisfied_were_you_with_this_chat": "چگونه رضایت شما را با این چت بود؟",
+  "End_chat": "پایان دادن چت",
+  "How_friendly_was_the_chat_agent": "عامل چت چقدر دوستانه بود؟",
+  "How_knowledgeable_was_the_chat_agent": "عامل چت چقدر آگاه بود؟",
+  "How_responsive_was_the_chat_agent": "عامل چت چه میزان انعطاف پذیر بود ؟",
+  "How_satisfied_were_you_with_this_chat": "چقدر از این چت راضی بودید؟",
   "Installation": "نصب و راه اندازی",
-  "New_messages": "پیام های جدید",
+  "New_messages": "پیام‌های جدید",
+  "No": "خیر",
+  "Options": "گزینه‌ها",
   "Please_answer_survey": "لطفا یک لحظه به پاسخ به یک نظرسنجی در مورد این چت",
+  "Please_choose_a_department": "لطفا یک بخش انتخاب کنید",
   "Please_fill_name_and_email": "لطفا نام و ایمیل را پر کنید",
   "Powered_by": "طراحی شده توسط",
+  "Request_video_chat": "درخواست چت ویدیویی",
   "Select_a_department": "انتخاب بخش",
   "Send": "ارسال",
   "Skip": "رفتن",
diff --git a/packages/rocketchat-livechat/app/i18n/fi.i18n.json b/packages/rocketchat-livechat/app/i18n/fi.i18n.json
index 9efa433e873..4d231cc093d 100644
--- a/packages/rocketchat-livechat/app/i18n/fi.i18n.json
+++ b/packages/rocketchat-livechat/app/i18n/fi.i18n.json
@@ -22,6 +22,7 @@
   "Please_choose_a_department": "Ole hyvä ja valitse uusi osasto",
   "Please_fill_name_and_email": "Täytä nimi ja sähköpostiosoite",
   "Powered_by": "Palvelun tarjoaa",
+  "Request_video_chat": "Pyydä videochattia",
   "Select_a_department": "Valitse osasto",
   "Switch_department": "Vaihda osastoa",
   "Department_switched": "Osasto vaihdettu",
diff --git a/packages/rocketchat-livechat/app/i18n/pl.i18n.json b/packages/rocketchat-livechat/app/i18n/pl.i18n.json
index 2ccdf371c9d..2ecea65228e 100644
--- a/packages/rocketchat-livechat/app/i18n/pl.i18n.json
+++ b/packages/rocketchat-livechat/app/i18n/pl.i18n.json
@@ -1,5 +1,5 @@
 {
-  "Additional_Feedback": "dodatkowy komentarz",
+  "Additional_Feedback": "Dodatkowy Komentarz",
   "Appearance": "Wygląd",
   "Are_you_sure_do_you_want_end_this_chat": "Czy jesteś pewny że chcesz zakończyć rozmowę?",
   "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Czy jesteś pewny że chcesz zakończyć ten czat i zmienić departament?",
diff --git a/packages/rocketchat-livechat/app/i18n/sl-SI.i18n.json b/packages/rocketchat-livechat/app/i18n/sl-SI.i18n.json
new file mode 100644
index 00000000000..0a41ba267f6
--- /dev/null
+++ b/packages/rocketchat-livechat/app/i18n/sl-SI.i18n.json
@@ -0,0 +1,4 @@
+{
+  "Additional_Feedback": "Dodatne povratne informacije",
+  "Appearance": "Videz"
+}
\ No newline at end of file
diff --git a/packages/rocketchat-livechat/app/i18n/tr.i18n.json b/packages/rocketchat-livechat/app/i18n/tr.i18n.json
index 8502da11999..27c561623dc 100644
--- a/packages/rocketchat-livechat/app/i18n/tr.i18n.json
+++ b/packages/rocketchat-livechat/app/i18n/tr.i18n.json
@@ -1,25 +1,31 @@
 {
   "Additional_Feedback": "Ek Geri Bildirim",
   "Appearance": "Görünüm",
-  "Are_you_sure_do_you_want_end_this_chat": "Bu sohbeti bitirmek istediğinize emin misiniz?",
+  "Are_you_sure_do_you_want_end_this_chat": "Bu sohbeti kapatmak istediğinize emin misiniz?",
+  "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Bu sohbeti kapatıp bölüm değiştirmek istediğinize emin misiniz?",
   "Cancel": "Vazgeç",
+  "Change": "Değiştir",
   "Chat_ended": "Sohbet bitti!",
+  "Choose_a_new_department": "Yeni bölüm seç",
   "Close_menu": "Menüyü Kapat",
   "Conversation_finished": "Konuşma bitti",
   "End_chat": "Sohbeti bitir",
   "How_friendly_was_the_chat_agent": "Müşteri temsilcisi ne kadar dost canlısıydı?",
   "How_knowledgeable_was_the_chat_agent": "Müşteri temsilcisi ne kadar bilgiliydi?",
-  "How_responsive_was_the_chat_agent": "Müşteri temsilcisi ne kadar uyumluydu?",
+  "How_responsive_was_the_chat_agent": "Müşteri temsilcisi sorularınıza ne kadar cevap verdi?",
   "How_satisfied_were_you_with_this_chat": "Bu sohbetten ne kadar memnun kaldınız?",
   "Installation": "Kurulum",
   "New_messages": "Yeni Mesajlar",
   "No": "Hayır",
   "Options": "Seçenekler",
   "Please_answer_survey": "Lütfen bu sohbet hakkında hızlı bir anket yapmak için bir dakikanızı ayırın",
+  "Please_choose_a_department": "Lütfen bir bölüm seçin",
   "Please_fill_name_and_email": "Lütfen isim ve e-posta alanlarını doldurunuz",
   "Powered_by": "Tarafından Desteklenmektedir",
   "Request_video_chat": "Görüntülü sohbet isteği gönder",
-  "Select_a_department": "Bir bölüm seçin",
+  "Select_a_department": "Bölüm seç",
+  "Switch_department": "Bölüm değiştir",
+  "Department_switched": "Bölüm değiştirildi",
   "Send": "Gönder",
   "Skip": "Atla",
   "Start_Chat": "Sohbete Başla",

From a5c8e20985587971b4585cabc1301248785f21f7 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 30 Sep 2017 15:14:32 -0300
Subject: [PATCH 123/244] Merge pull request #8364 from
 RocketChat/meteor-deps-update

Update Meteor to 1.5.2.2
---
 .meteor/release                                   |  2 +-
 .meteor/versions                                  |  2 +-
 package.json                                      | 10 +++++-----
 packages/rocketchat-livechat/app/.meteor/release  |  2 +-
 packages/rocketchat-livechat/app/.meteor/versions |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.meteor/release b/.meteor/release
index 1395764d86f..099d5b9c0e8 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2.2-rc.0
+METEOR@1.5.2.2
diff --git a/.meteor/versions b/.meteor/versions
index 04ca6160f8f..752e9253d1d 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.4-rc1522.0
+accounts-base@1.3.4
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0
diff --git a/package.json b/package.json
index 405d79458bd..4b2af3cb6bb 100644
--- a/package.json
+++ b/package.json
@@ -90,21 +90,21 @@
 		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.50.0",
 		"conventional-changelog-cli": "^1.3.3",
-		"eslint": "^4.7.2",
+		"eslint": "^4.8.0",
 		"mock-require": "^2.0.2",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
 		"proxyquire": "^1.8.0",
 		"simple-git": "^1.77.0",
 		"stylelint": "^8.1.1",
-		"stylelint-order": "^0.6.0",
+		"stylelint-order": "^0.7.0",
 		"supertest": "^3.0.0",
 		"underscore": "^1.8.3",
 		"underscore.string": "^3.3.4"
 	},
 	"dependencies": {
-		"@google-cloud/storage": "^1.3.0",
-		"aws-sdk": "^2.122.0",
+		"@google-cloud/storage": "^1.3.1",
+		"aws-sdk": "^2.125.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
 		"codemirror": "^5.30.0",
@@ -120,7 +120,7 @@
 		"moment-timezone": "^0.5.13",
 		"photoswipe": "^4.1.2",
 		"poplib": "^0.1.7",
-		"prom-client": "^10.1.0",
+		"prom-client": "^10.1.1",
 		"semver": "^5.4.1",
 		"toastr": "^2.1.2",
 		"wolfy87-eventemitter": "^5.2.2"
diff --git a/packages/rocketchat-livechat/app/.meteor/release b/packages/rocketchat-livechat/app/.meteor/release
index 1395764d86f..099d5b9c0e8 100644
--- a/packages/rocketchat-livechat/app/.meteor/release
+++ b/packages/rocketchat-livechat/app/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2.2-rc.0
+METEOR@1.5.2.2
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index 7db162aeafa..78322274acf 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.4-rc1522.0
+accounts-base@1.3.4
 accounts-password@1.4.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.9

From 76935e3f452549590969c29d4ad88f36a85f4afc Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 2 Oct 2017 21:31:24 -0300
Subject: [PATCH 124/244] Merge pull request #8372 from
 RocketChat/improvements/ldap

[FIX] Various LDAP issues & Missing pagination
---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  54 +--
 packages/rocketchat-ldap/package.js           |  10 +-
 packages/rocketchat-ldap/server/index.js      |   5 +
 packages/rocketchat-ldap/server/ldap.js       | 314 ++++++++++--------
 .../rocketchat-ldap/server/loginHandler.js    |  30 +-
 packages/rocketchat-ldap/server/settings.js   | 114 ++++---
 packages/rocketchat-ldap/server/sync.js       | 211 ++++++++----
 packages/rocketchat-ldap/server/syncUsers.js  |  18 +-
 .../rocketchat-ldap/server/testConnection.js  |   3 +-
 packages/rocketchat-markdown/markdown.js      |  14 +-
 .../parser/marked/marked.js                   |   1 +
 .../rocketchat-ui-admin/client/admin.html     |   2 +-
 server/startup/migrations/v102.js             | 136 ++++++++
 13 files changed, 589 insertions(+), 323 deletions(-)
 create mode 100644 packages/rocketchat-ldap/server/index.js
 create mode 100644 server/startup/migrations/v102.js

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 2c8ff91128b..cecea32625a 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -987,24 +987,20 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
   "LDAP_Connect_Timeout": "Connection Timeout (ms)",
-  "LDAP_Custom_Domain_Search": "Custom Domain Search",
-  "LDAP_Custom_Domain_Search_Description": "A piece of JSON that governs bind and connection info and is of the form:<br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Default Domain",
+  "LDAP_Default_Domain_Description": "If provided the Default Domain will be used to create an unique email for users where email was not imported from LDAP. The email will be mounted as `username@default_domain` or `unique_id@default_domain`.<br/>Example: `rocket.chat`",
   "LDAP_Description": "LDAP is a hierarchical database that many companies use to provide single sign on - a facility for sharing one password between multiple sites and services. For advanced configuration information and examples, please consult our wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Domain Base",
-  "LDAP_Domain_Base_Description": "The fully qualified Distinguished Name (DN) of an LDAP subtree you want to search for users and groups. You can add as many as you like; however, each group must be defined in the same domain base as the users that belong to it. If you specify restricted user groups, only users that belong to those groups will be in scope. We recommend that you specify the top level of your LDAP directory tree as your domain base and use search filter to control access.",
-  "LDAP_Domain_Search_Filter": "Domain Search Filter",
-  "LDAP_Domain_Search_Filter_Description": "If specified, only users that match this filter will be allowed to log in. If no filter is specified, all users within the scope of the specified domain base will be able to sign in.<br/>E.g. for Active Directory `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>E.g. for OpenLDAP (extensible match search) `ou:dn:=ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search Object Category",
-  "LDAP_Domain_Search_Object_Category_Description": "The *objectCategory* that identify your users.<br/>Leave empty for *OpenLDAP*.<br/>E.g. `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Domain Search Object Class",
-  "LDAP_Domain_Search_Object_Class_Description": "The *objectclass* that identify your users. <br/>E.g. `organizationalPerson`, `user`, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Domain Search Password",
-  "LDAP_Domain_Search_Password_Description": "The password for the domain search user.",
-  "LDAP_Domain_Search_User": "Domain Search User",
-  "LDAP_Domain_Search_User_Description": "The LDAP user that performs user lookups to authenticate other users when they sign in. <br/>This is typically a service account created specifically for third-party integrations. Use a fully qualified name, such as `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search User ID",
-  "LDAP_Domain_Search_User_ID_Description": "The LDAP attribute that identifies the LDAP user who attempts authentication. This field should be `sAMAccountName` for most Active Directory installations, but it may be `uid` for other LDAP solutions, such as OpenLDAP. You can use `mail` to identify users by email or whatever attribute you want.<br>You can use multiple values separated by comma to allow users to login using multiple identifiers like username or email.",
+  "LDAP_BaseDN": "Base DN",
+  "LDAP_BaseDN_Description": "The fully qualified Distinguished Name (DN) of an LDAP subtree you want to search for users and groups. You can add as many as you like; however, each group must be defined in the same domain base as the users that belong to it. If you specify restricted user groups, only users that belong to those groups will be in scope. We recommend that you specify the top level of your LDAP directory tree as your domain base and use search filter to control access.",
+  "LDAP_User_Search_Field": "Search Field",
+  "LDAP_User_Search_Field_Description": "The LDAP attribute that identifies the LDAP user who attempts authentication. This field should be `sAMAccountName` for most Active Directory installations, but it may be `uid` for other LDAP solutions, such as OpenLDAP. You can use `mail` to identify users by email or whatever attribute you want.<br>You can use multiple values separated by comma to allow users to login using multiple identifiers like username or email.",
+  "LDAP_User_Search_Filter": "Filter",
+  "LDAP_User_Search_Filter_Description": "If specified, only users that match this filter will be allowed to log in. If no filter is specified, all users within the scope of the specified domain base will be able to sign in.<br/>E.g. for Active Directory `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>E.g. for OpenLDAP (extensible match search) `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_User_Search_Scope": "Scope",
+  "LDAP_Authentication": "Enable",
+  "LDAP_Authentication_Password": "Password",
+  "LDAP_Authentication_UserDN": "User DN",
+  "LDAP_Authentication_UserDN_Description": "The LDAP user that performs user lookups to authenticate other users when they sign in. <br/>This is typically a service account created specifically for third-party integrations. Use a fully qualified name, such as `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "Enable",
   "LDAP_Enable_Description": "Attempt to utilize LDAP for authentication.",
   "LDAP_Encryption": "Encryption",
@@ -1024,7 +1020,7 @@
   "LDAP_Host": "Host",
   "LDAP_Host_Description": "The LDAP host, e.g. `ldap.example.com` or `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Idle Timeout (ms)",
-  "LDAP_Import_Users": "Import LDAP users",
+  "LDAP_Idle_Timeout_Description": "How many mileseconds wait after the latest LDAP opration until close the connection. (Each opreation will open a new connection)",
   "LDAP_Import_Users_Description": "It True sync process will be import all LDAP users <br/> *Caution!* Specify search filter to not import excess users.",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "If the login on LDAP is not successful try to login in default/local account system. Helps when the LDAP is down for some reason.",
@@ -1033,19 +1029,28 @@
   "LDAP_Port": "Port",
   "LDAP_Port_Description": "Port to access LDAP. eg: `389` or `636` for LDAPS",
   "LDAP_Reject_Unauthorized": "Reject Unauthorized",
+  "LDAP_Reject_Unauthorized_Description": "Disable this option to allow certificates that can not be verified. Usually Self Signed Certificates will require this option disabled to work",
   "LDAP_Sync_User_Avatar": "Sync User Avatar",
-  "LDAP_Sync_User_Data": "Sync Data",
-  "LDAP_Sync_User_Data_Description": "Keep user data in sync with server on login (eg: name, email).",
+  "LDAP_Sync_Now": "Background Sync Now",
+  "LDAP_Sync_Now_Description": "Will execute the **Background Sync** now rather than wait the **Sync Interval** even if **Background Sync** is False.<br/>This Action is asynchronous, please see the logs for more information about the process",
+  "LDAP_Background_Sync": "Background Sync",
+  "LDAP_Background_Sync_Interval": "Background Sync Interval",
+  "LDAP_Background_Sync_Interval_Description": "The interval between synchronizations. Example `every 24 hours` or `on the first day of the week`, more examples at [Cron Text Parser](http://bunkat.github.io/later/parsers.html#text)",
+  "LDAP_Background_Sync_Import_New_Users": "Background Sync Import New Users",
+  "LDAP_Background_Sync_Import_New_Users_Description": "Will import all users (based on your filter criteria) that exists in LDAP and does not exists in Rocket.Chat",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated": "Background Sync Update Existing Users",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated_Description": "Will sync the avatar, fields, username, etc (based on your configuration) of all users already imported from LDAP on every **Sync Interval**",
+  "LDAP_Sync_User_Data": "Sync User Data",
+  "LDAP_Sync_User_Data_Description": "Keep user data in sync with server on **login** or on **background sync** (eg: name, email).",
   "LDAP_Sync_User_Data_FieldMap": "User Data Field Map",
-  "LDAP_Sync_User_Data_FieldMap_Description": "Configure how user account fields (like email) are populated from a record in LDAP (once found). <br/>As an example, `{\"cn\":\"name\", \"mail\":\"email\"}` will choose a person's human readable name from the cn attribute, and their email from the mail attribute. Additionally it is possible to use variables, for example: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` uses a combination of the user's first name and last name for the rocket chat `name` field.<br/>Available fields in Rocket.Chat: `name`, `email` and `customFields`.",
-  "LDAP_Sync_Users": "Sync Users",
-  "LDAP_Test_Connection": "Test Connection",
+  "LDAP_Sync_User_Data_FieldMap_Description": "Configure how user account fields (like email) are populated from a record in LDAP (once found). <br/>As an example, `{\"cn\":\"name\", \"mail\":\"email\"}` will choose a person's human readable name from the cn attribute, and their email from the mail attribute. Additionally it is possible to use variables, for example: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` uses a combination of the user's first name and last name for the rocket chat `name` field.<br/>Available fields in Rocket.Chat: `name`, `email` and `customFields`.",  "LDAP_Test_Connection": "Test Connection",
+  "LDAP_Timeout": "Timeout (ms)",
+  "LDAP_Timeout_Description": "How many mileseconds wait for a search result before return an error",
   "LDAP_Unique_Identifier_Field": "Unique Identifier Field",
   "LDAP_Unique_Identifier_Field_Description": "Which field will be used to link the LDAP user and the Rocket.Chat user. You can inform multiple values separated by comma to try to get the value from LDAP record.<br/>Default value is `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Use Custom Domain Search",
-  "LDAP_Use_Custom_Domain_Search_Description": "Write your own filter to search users in the LDAP server.",
   "LDAP_Username_Field": "Username Field",
   "LDAP_Username_Field_Description": "Which field will be used as *username* for new users. Leave empty to use the username informed on login page.<br/>You can use template tags too, like `#{givenName}.#{sn}`.<br/>Default value is `sAMAccountName`.",
+  "Execute_Synchronization_Now": "Execute Synchronization Now",
   "Least_Amount": "Least Amount",
   "Leave_Group_Warning": "Are you sure you want to leave the group \"%s\"?",
   "Leave_Livechat_Warning": "Are you sure you want to leave the livechat with \"%s\"?",
@@ -1702,6 +1707,7 @@
   "Survey_instructions": "Rate each question according to your satisfaction, 1 meaning you are completely unsatisfied and 5 meaning you are completely satisfied.",
   "Symbols": "Symbols",
   "Sync_success": "Sync success",
+  "Sync_in_progress": "Syncronization in progress",
   "Sync_Users": "Sync Users",
   "System_messages": "System Messages",
   "Tag": "Tag",
diff --git a/packages/rocketchat-ldap/package.js b/packages/rocketchat-ldap/package.js
index c7b073371fb..879b0ecfe6a 100644
--- a/packages/rocketchat-ldap/package.js
+++ b/packages/rocketchat-ldap/package.js
@@ -11,6 +11,7 @@ Package.onUse(function(api) {
 	api.use('rocketchat:lib');
 	api.use('yasaricli:slugify');
 	api.use('ecmascript');
+	api.use('underscore');
 	api.use('sha');
 
 	api.use('templating', 'client');
@@ -20,12 +21,5 @@ Package.onUse(function(api) {
 
 	api.addFiles('client/loginHelper.js', 'client');
 
-	api.addFiles('server/ldap.js', 'server');
-	api.addFiles('server/sync.js', 'server');
-	api.addFiles('server/loginHandler.js', 'server');
-	api.addFiles('server/settings.js', 'server');
-	api.addFiles('server/testConnection.js', 'server');
-	api.addFiles('server/syncUsers.js', 'server');
-
-	api.export('LDAP', 'server');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-ldap/server/index.js b/packages/rocketchat-ldap/server/index.js
new file mode 100644
index 00000000000..acdd21c00c4
--- /dev/null
+++ b/packages/rocketchat-ldap/server/index.js
@@ -0,0 +1,5 @@
+import './loginHandler';
+import './settings';
+import './testConnection';
+import './syncUsers';
+import './sync';
diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 412ffa1d679..65fa5f953a8 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -1,5 +1,4 @@
-/* globals LDAP:true, LDAPJS */
-/* exported LDAP */
+/* globals LDAPJS */
 
 const ldapjs = LDAPJS;
 
@@ -12,31 +11,28 @@ const logger = new Logger('LDAP', {
 	}
 });
 
-LDAP = class LDAP {
+export default class LDAP {
 	constructor() {
-		const self = this;
+		this.ldapjs = ldapjs;
 
-		self.ldapjs = ldapjs;
+		this.connected = false;
 
-		self.connected = false;
-
-		self.options = {
+		this.options = {
 			host: RocketChat.settings.get('LDAP_Host'),
 			port: RocketChat.settings.get('LDAP_Port'),
+			timeout: RocketChat.settings.get('LDAP_Timeout'),
 			connect_timeout: RocketChat.settings.get('LDAP_Connect_Timeout'),
 			idle_timeout: RocketChat.settings.get('LDAP_Idle_Timeout'),
 			encryption: RocketChat.settings.get('LDAP_Encryption'),
 			ca_cert: RocketChat.settings.get('LDAP_CA_Cert'),
 			reject_unauthorized: RocketChat.settings.get('LDAP_Reject_Unauthorized') || false,
-			domain_base: RocketChat.settings.get('LDAP_Domain_Base'),
-			use_custom_domain_search: RocketChat.settings.get('LDAP_Use_Custom_Domain_Search'),
-			custom_domain_search: RocketChat.settings.get('LDAP_Custom_Domain_Search'),
-			domain_search_user: RocketChat.settings.get('LDAP_Domain_Search_User'),
-			domain_search_password: RocketChat.settings.get('LDAP_Domain_Search_Password'),
-			domain_search_filter: RocketChat.settings.get('LDAP_Domain_Search_Filter'),
-			domain_search_user_id: RocketChat.settings.get('LDAP_Domain_Search_User_ID'),
-			domain_search_object_class: RocketChat.settings.get('LDAP_Domain_Search_Object_Class'),
-			domain_search_object_category: RocketChat.settings.get('LDAP_Domain_Search_Object_Category'),
+			Authentication: RocketChat.settings.get('LDAP_Authentication'),
+			Authentication_UserDN: RocketChat.settings.get('LDAP_Authentication_UserDN'),
+			Authentication_Password: RocketChat.settings.get('LDAP_Authentication_Password'),
+			BaseDN: RocketChat.settings.get('LDAP_BaseDN'),
+			User_Search_Filter: RocketChat.settings.get('LDAP_User_Search_Filter'),
+			User_Search_Scope: RocketChat.settings.get('LDAP_User_Search_Scope'),
+			User_Search_Field: RocketChat.settings.get('LDAP_User_Search_Field'),
 			group_filter_enabled: RocketChat.settings.get('LDAP_Group_Filter_Enable'),
 			group_filter_object_class: RocketChat.settings.get('LDAP_Group_Filter_ObjectClass'),
 			group_filter_group_id_attribute: RocketChat.settings.get('LDAP_Group_Filter_Group_Id_Attribute'),
@@ -44,36 +40,45 @@ LDAP = class LDAP {
 			group_filter_group_member_format: RocketChat.settings.get('LDAP_Group_Filter_Group_Member_Format'),
 			group_filter_group_name: RocketChat.settings.get('LDAP_Group_Filter_Group_Name')
 		};
+	}
 
-		self.connectSync = Meteor.wrapAsync(self.connectAsync, self);
-		self.searchAllSync = Meteor.wrapAsync(self.searchAllAsync, self);
+	connectSync(...args) {
+		if (!this._connectSync) {
+			this._connectSync = Meteor.wrapAsync(this.connectAsync, this);
+		}
+		return this._connectSync(...args);
 	}
 
-	connectAsync(callback) {
-		const self = this;
+	searchAllSync(...args) {
+		if (!this._searchAllSync) {
+			this._searchAllSync = Meteor.wrapAsync(this.searchAllAsync, this);
+		}
+		return this._searchAllSync(...args);
+	}
 
+	connectAsync(callback) {
 		logger.connection.info('Init setup');
 
 		let replied = false;
 
 		const connectionOptions = {
-			url: `${ self.options.host }:${ self.options.port }`,
-			timeout: 1000 * 60 * 10,
-			connectTimeout: self.options.connect_timeout,
-			idleTimeout: self.options.idle_timeout,
-			reconnect: false
+			url: `${ this.options.host }:${ this.options.port }`,
+			timeout: this.options.timeout,
+			connectTimeout: this.options.connect_timeout,
+			idleTimeout: this.options.idle_timeout,
+			reconnect: true
 		};
 
 		const tlsOptions = {
-			rejectUnauthorized: self.options.reject_unauthorized
+			rejectUnauthorized: this.options.reject_unauthorized
 		};
 
-		if (self.options.ca_cert && self.options.ca_cert !== '') {
+		if (this.options.ca_cert && this.options.ca_cert !== '') {
 			// Split CA cert into array of strings
 			const chainLines = RocketChat.settings.get('LDAP_CA_Cert').split('\n');
 			let cert = [];
 			const ca = [];
-			chainLines.forEach(function(line) {
+			chainLines.forEach((line) => {
 				cert.push(line);
 				if (line.match(/-END CERTIFICATE-/)) {
 					ca.push(cert.join('\n'));
@@ -83,7 +88,7 @@ LDAP = class LDAP {
 			tlsOptions.ca = ca;
 		}
 
-		if (self.options.encryption === 'ssl') {
+		if (this.options.encryption === 'ssl') {
 			connectionOptions.url = `ldaps://${ connectionOptions.url }`;
 			connectionOptions.tlsOptions = tlsOptions;
 		} else {
@@ -93,11 +98,11 @@ LDAP = class LDAP {
 		logger.connection.info('Connecting', connectionOptions.url);
 		logger.connection.debug('connectionOptions', connectionOptions);
 
-		self.client = ldapjs.createClient(connectionOptions);
+		this.client = ldapjs.createClient(connectionOptions);
 
-		self.bindSync = Meteor.wrapAsync(self.client.bind, self.client);
+		this.bindSync = Meteor.wrapAsync(this.client.bind, this.client);
 
-		self.client.on('error', function(error) {
+		this.client.on('error', (error) => {
 			logger.connection.error('connection', error);
 			if (replied === false) {
 				replied = true;
@@ -105,17 +110,25 @@ LDAP = class LDAP {
 			}
 		});
 
-		if (self.options.encryption === 'tls') {
+		this.client.on('idle', () => {
+			logger.search.info('Idle');
+			this.disconnect();
+		});
+
+		this.client.on('close', () => {
+			logger.search.info('Closed');
+		});
 
+		if (this.options.encryption === 'tls') {
 			// Set host parameter for tls.connect which is used by ldapjs starttls. This shouldn't be needed in newer nodejs versions (e.g v5.6.0).
 			// https://github.com/RocketChat/Rocket.Chat/issues/2035
 			// https://github.com/mcavage/node-ldapjs/issues/349
-			tlsOptions.host = self.options.host;
+			tlsOptions.host = this.options.host;
 
 			logger.connection.info('Starting TLS');
 			logger.connection.debug('tlsOptions', tlsOptions);
 
-			self.client.starttls(tlsOptions, null, function(error, response) {
+			this.client.starttls(tlsOptions, null, (error, response) => {
 				if (error) {
 					logger.connection.error('TLS connection', error);
 					if (replied === false) {
@@ -126,16 +139,16 @@ LDAP = class LDAP {
 				}
 
 				logger.connection.info('TLS connected');
-				self.connected = true;
+				this.connected = true;
 				if (replied === false) {
 					replied = true;
 					callback(null, response);
 				}
 			});
 		} else {
-			self.client.on('connect', function(response) {
+			this.client.on('connect', (response) => {
 				logger.connection.info('LDAP connected');
-				self.connected = true;
+				this.connected = true;
 				if (replied === false) {
 					replied = true;
 					callback(null, response);
@@ -143,126 +156,98 @@ LDAP = class LDAP {
 			});
 		}
 
-		setTimeout(function() {
+		setTimeout(() => {
 			if (replied === false) {
-				logger.connection.error('connection time out', connectionOptions.timeout);
+				logger.connection.error('connection time out', connectionOptions.connectTimeout);
 				replied = true;
 				callback(new Error('Timeout'));
 			}
-		}, connectionOptions.timeout);
+		}, connectionOptions.connectTimeout);
 	}
 
-	getDomainBindSearch() {
-		const self = this;
+	getUserFilter(username) {
+		const filter = [];
 
-		if (self.options.use_custom_domain_search === true) {
-			let custom_domain_search;
-			try {
-				custom_domain_search = JSON.parse(self.options.custom_domain_search);
-			} catch (error) {
-				throw new Error('Invalid Custom Domain Search JSON');
+		if (this.options.User_Search_Filter !== '') {
+			if (this.options.User_Search_Filter[0] === '(') {
+				filter.push(`${ this.options.User_Search_Filter }`);
+			} else {
+				filter.push(`(${ this.options.User_Search_Filter })`);
 			}
-
-			return {
-				filter: custom_domain_search.filter,
-				domain_search_user: custom_domain_search.userDN || '',
-				domain_search_password: custom_domain_search.password || ''
-			};
-		}
-
-		const filter = ['(&'];
-
-		if (self.options.domain_search_object_category !== '') {
-			filter.push(`(objectCategory=${ self.options.domain_search_object_category })`);
 		}
 
-		if (self.options.domain_search_object_class !== '') {
-			filter.push(`(objectclass=${ self.options.domain_search_object_class })`);
-		}
+		const usernameFilter = this.options.User_Search_Field.split(',').map(item => `(${ item }=${ username })`);
 
-		if (self.options.domain_search_filter !== '') {
-			filter.push(`(${ self.options.domain_search_filter })`);
-		}
-
-		const domain_search_user_id = self.options.domain_search_user_id.split(',');
-		if (domain_search_user_id.length === 1) {
-			filter.push(`(${ domain_search_user_id[0] }=#{username})`);
+		if (usernameFilter.length === 0) {
+			logger.error('LDAP_LDAP_User_Search_Field not defined');
+		} else if (usernameFilter.length === 1) {
+			filter.push(`${ usernameFilter[0] }`);
 		} else {
-			filter.push('(|');
-			domain_search_user_id.forEach((item) => {
-				filter.push(`(${ item }=#{username})`);
-			});
-			filter.push(')');
+			filter.push(`(|${ usernameFilter.join('') })`);
 		}
 
-		filter.push(')');
-
-		return {
-			filter: filter.join(''),
-			domain_search_user: self.options.domain_search_user || '',
-			domain_search_password: self.options.domain_search_password || ''
-		};
+		return `(&${ filter.join('') })`;
 	}
 
 	bindIfNecessary() {
-		const self = this;
-
-		if (self.domainBinded === true) {
+		if (this.domainBinded === true) {
 			return;
 		}
 
-		const domain_search = self.getDomainBindSearch();
-
-		if (domain_search.domain_search_user !== '' && domain_search.domain_search_password !== '') {
-			logger.bind.info('Binding admin user', domain_search.domain_search_user);
-			self.bindSync(domain_search.domain_search_user, domain_search.domain_search_password);
-			self.domainBinded = true;
+		if (this.options.Authentication !== true) {
+			return;
 		}
-	}
 
-	searchUsersSync(username) {
-		const self = this;
-
-		self.bindIfNecessary();
+		logger.bind.info('Binding UserDN', this.options.Authentication_UserDN);
+		this.bindSync(this.options.Authentication_UserDN, this.options.Authentication_Password);
+		this.domainBinded = true;
+	}
 
-		const domain_search = self.getDomainBindSearch();
+	searchUsersSync(username, page) {
+		this.bindIfNecessary();
 
 		const searchOptions = {
-			filter: domain_search.filter.replace(/#{username}/g, username),
-			scope: 'sub'
+			filter: this.getUserFilter(username),
+			scope: this.options.User_Search_Scope || 'sub',
+			paged: {
+				pageSize: 250,
+				pagePause: !!page
+			}
 		};
 
 		logger.search.info('Searching user', username);
 		logger.search.debug('searchOptions', searchOptions);
-		logger.search.debug('domain_base', self.options.domain_base);
+		logger.search.debug('BaseDN', this.options.BaseDN);
 
-		return self.searchAllSync(self.options.domain_base, searchOptions);
+		if (page) {
+			return this.searchAllPaged(this.options.BaseDN, searchOptions, page);
+		}
+
+		return this.searchAllSync(this.options.BaseDN, searchOptions);
 	}
 
 	getUserByIdSync(id, attribute) {
-		const self = this;
-
-		self.bindIfNecessary();
+		this.bindIfNecessary();
 
 		const Unique_Identifier_Field = RocketChat.settings.get('LDAP_Unique_Identifier_Field').split(',');
 
 		let filter;
 
 		if (attribute) {
-			filter = new self.ldapjs.filters.EqualityFilter({
+			filter = new this.ldapjs.filters.EqualityFilter({
 				attribute,
 				value: new Buffer(id, 'hex')
 			});
 		} else {
 			const filters = [];
-			Unique_Identifier_Field.forEach(function(item) {
-				filters.push(new self.ldapjs.filters.EqualityFilter({
+			Unique_Identifier_Field.forEach((item) => {
+				filters.push(new this.ldapjs.filters.EqualityFilter({
 					attribute: item,
 					value: new Buffer(id, 'hex')
 				}));
 			});
 
-			filter = new self.ldapjs.filters.OrFilter({filters});
+			filter = new this.ldapjs.filters.OrFilter({filters});
 		}
 
 		const searchOptions = {
@@ -272,9 +257,9 @@ LDAP = class LDAP {
 
 		logger.search.info('Searching by id', id);
 		logger.search.debug('search filter', searchOptions.filter.toString());
-		logger.search.debug('domain_base', self.options.domain_base);
+		logger.search.debug('BaseDN', this.options.BaseDN);
 
-		const result = self.searchAllSync(self.options.domain_base, searchOptions);
+		const result = this.searchAllSync(this.options.BaseDN, searchOptions);
 
 		if (!Array.isArray(result) || result.length === 0) {
 			return;
@@ -288,22 +273,18 @@ LDAP = class LDAP {
 	}
 
 	getUserByUsernameSync(username) {
-		const self = this;
-
-		self.bindIfNecessary();
-
-		const domain_search = self.getDomainBindSearch();
+		this.bindIfNecessary();
 
 		const searchOptions = {
-			filter: domain_search.filter.replace(/#{username}/g, username),
-			scope: 'sub'
+			filter: this.getUserFilter(username),
+			scope: this.options.User_Search_Scope || 'sub'
 		};
 
 		logger.search.info('Searching user', username);
 		logger.search.debug('searchOptions', searchOptions);
-		logger.search.debug('domain_base', self.options.domain_base);
+		logger.search.debug('BaseDN', this.options.BaseDN);
 
-		const result = self.searchAllSync(self.options.domain_base, searchOptions);
+		const result = this.searchAllSync(this.options.BaseDN, searchOptions);
 
 		if (!Array.isArray(result) || result.length === 0) {
 			return;
@@ -317,24 +298,22 @@ LDAP = class LDAP {
 	}
 
 	isUserInGroup(username) {
-		const self = this;
-
-		if (!self.options.group_filter_enabled) {
+		if (!this.options.group_filter_enabled) {
 			return true;
 		}
 
 		const filter = ['(&'];
 
-		if (self.options.group_filter_object_class !== '') {
-			filter.push(`(objectclass=${ self.options.group_filter_object_class })`);
+		if (this.options.group_filter_object_class !== '') {
+			filter.push(`(objectclass=${ this.options.group_filter_object_class })`);
 		}
 
-		if (self.options.group_filter_group_member_attribute !== '') {
-			filter.push(`(${ self.options.group_filter_group_member_attribute }=${ self.options.group_filter_group_member_format })`);
+		if (this.options.group_filter_group_member_attribute !== '') {
+			filter.push(`(${ this.options.group_filter_group_member_attribute }=${ this.options.group_filter_group_member_format })`);
 		}
 
-		if (self.options.group_filter_group_id_attribute !== '') {
-			filter.push(`(${ self.options.group_filter_group_id_attribute }=${ self.options.group_filter_group_name })`);
+		if (this.options.group_filter_group_id_attribute !== '') {
+			filter.push(`(${ this.options.group_filter_group_id_attribute }=${ this.options.group_filter_group_name })`);
 		}
 		filter.push(')');
 
@@ -345,7 +324,7 @@ LDAP = class LDAP {
 
 		logger.search.debug('Group filter LDAP:', searchOptions.filter);
 
-		const result = self.searchAllSync(self.options.domain_base, searchOptions);
+		const result = this.searchAllSync(this.options.BaseDN, searchOptions);
 
 		if (!Array.isArray(result) || result.length === 0) {
 			return false;
@@ -353,18 +332,64 @@ LDAP = class LDAP {
 		return true;
 	}
 
+	searchAllPaged(BaseDN, options, page) {
+		this.bindIfNecessary();
+
+		this.client.search(BaseDN, options, (error, res) => {
+			if (error) {
+				logger.search.error(error);
+				page(error);
+				return;
+			}
+
+			res.on('error', (error) => {
+				logger.search.error(error);
+				page(error);
+				return;
+			});
+
+			let entries = [];
+			const jsonEntries = [];
+
+			res.on('searchEntry', (entry) => {
+				entries.push(entry);
+				jsonEntries.push(entry.json);
+			});
 
-	searchAllAsync(domain_base, options, callback) {
-		const self = this;
+			res.on('page', (result, next) => {
+				logger.search.debug('Page');
+				// Force LDAP idle to wait the record processing
+				this.client._updateIdle(true);
+				page(null, entries, {end: false, next: () => {
+					// Reset idle timer
+					this.client._updateIdle();
+					next && next();
+				}});
+				entries = [];
+			});
 
-		self.client.search(domain_base, options, function(error, res) {
+			res.on('end', () => {
+				logger.search.info('Search result count', entries.length);
+				page(null, [], {end: true, next: () => {
+					// Reset idle timer
+					this.client._updateIdle();
+				}});
+				// logger.search.debug('Search result', JSON.stringify(jsonEntries, null, 2));
+			});
+		});
+	}
+
+	searchAllAsync(BaseDN, options, callback) {
+		this.bindIfNecessary();
+
+		this.client.search(BaseDN, options, (error, res) => {
 			if (error) {
 				logger.search.error(error);
 				callback(error);
 				return;
 			}
 
-			res.on('error', function(error) {
+			res.on('error', (error) => {
 				logger.search.error(error);
 				callback(error);
 				return;
@@ -373,26 +398,24 @@ LDAP = class LDAP {
 			const entries = [];
 			const jsonEntries = [];
 
-			res.on('searchEntry', function(entry) {
+			res.on('searchEntry', (entry) => {
 				entries.push(entry);
 				jsonEntries.push(entry.json);
 			});
 
-			res.on('end', function(/*result*/) {
+			res.on('end', () => {
 				logger.search.info('Search result count', entries.length);
-				logger.search.debug('Search result', JSON.stringify(jsonEntries, null, 2));
+				// logger.search.debug('Search result', JSON.stringify(jsonEntries, null, 2));
 				callback(null, entries);
 			});
 		});
 	}
 
 	authSync(dn, password) {
-		const self = this;
-
 		logger.auth.info('Authenticating', dn);
 
 		try {
-			self.bindSync(dn, password);
+			this.bindSync(dn, password);
 			logger.auth.info('Authenticated', dn);
 			return true;
 		} catch (error) {
@@ -403,10 +426,9 @@ LDAP = class LDAP {
 	}
 
 	disconnect() {
-		const self = this;
-
-		self.connected = false;
+		this.connected = false;
+		this.domainBinded = false;
 		logger.connection.info('Disconecting');
-		self.client.unbind();
+		this.client.unbind();
 	}
-};
+}
diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js
index d12240a33d7..8121381befa 100644
--- a/packages/rocketchat-ldap/server/loginHandler.js
+++ b/packages/rocketchat-ldap/server/loginHandler.js
@@ -1,6 +1,8 @@
-/* globals LDAP, slug, getLdapUsername, getLdapUserUniqueID, syncUserData, addLdapUser */
 /* eslint new-cap: [2, {"capIsNewExceptions": ["SHA256"]}] */
 
+import {slug, getLdapUsername, getLdapUserUniqueID, syncUserData, addLdapUser} from './sync';
+import LDAP from './ldap';
+
 const logger = new Logger('LDAPHandler', {});
 
 function fallbackDefaultAccountSystem(bind, username, password) {
@@ -62,8 +64,6 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 		logger.error(error);
 	}
 
-	ldap.disconnect();
-
 	if (ldapUser === undefined) {
 		if (RocketChat.settings.get('LDAP_Login_Fallback') === true) {
 			return fallbackDefaultAccountSystem(self, loginRequest.username, loginRequest.ldapPass);
@@ -72,14 +72,6 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 		throw new Meteor.Error('LDAP-login-error', `LDAP Authentication failed with provided username [${ loginRequest.username }]`);
 	}
 
-	let username;
-
-	if (RocketChat.settings.get('LDAP_Username_Field') !== '') {
-		username = slug(getLdapUsername(ldapUser));
-	} else {
-		username = slug(loginRequest.username);
-	}
-
 	// Look to see if user already exists
 	let userQuery;
 
@@ -97,6 +89,14 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 		user = Meteor.users.findOne(userQuery);
 	}
 
+	let username;
+
+	if (RocketChat.settings.get('LDAP_Username_Field') !== '') {
+		username = slug(getLdapUsername(ldapUser));
+	} else {
+		username = slug(loginRequest.username);
+	}
+
 	if (!user) {
 		userQuery = {
 			username
@@ -138,6 +138,14 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 
 	logger.info('User does not exist, creating', username);
 
+	if (RocketChat.settings.get('LDAP_Username_Field') === '') {
+		username = undefined;
+	}
+
+	if (RocketChat.settings.get('LDAP_Login_Fallback') !== true) {
+		loginRequest.ldapPass = undefined;
+	}
+
 	// Create new user
 	return addLdapUser(ldapUser, username, loginRequest.ldapPass);
 });
diff --git a/packages/rocketchat-ldap/server/settings.js b/packages/rocketchat-ldap/server/settings.js
index 71c8b7a271f..e92eb52e243 100644
--- a/packages/rocketchat-ldap/server/settings.js
+++ b/packages/rocketchat-ldap/server/settings.js
@@ -1,60 +1,78 @@
-Meteor.startup(function() {
-	RocketChat.settings.addGroup('LDAP', function() {
-		const enableQuery = {_id: 'LDAP_Enable', value: true};
-		const enableTLSQuery = [
-			{_id: 'LDAP_Enable', value: true},
-			{_id: 'LDAP_Encryption', value: {$in: ['tls', 'ssl']}}
-		];
-		const customBindSearchEnabledQuery = [
-			{_id: 'LDAP_Enable', value: true},
-			{_id: 'LDAP_Use_Custom_Domain_Search', value: true}
-		];
-		const customBindSearchDisabledQuery = [
-			{_id: 'LDAP_Enable', value: true},
-			{_id: 'LDAP_Use_Custom_Domain_Search', value: false}
-		];
-		const syncDataQuery = [
-			{_id: 'LDAP_Enable', value: true},
-			{_id: 'LDAP_Sync_User_Data', value: true}
-		];
-		const groupFilterQuery = [
-			{_id: 'LDAP_Enable', value: true},
-			{_id: 'LDAP_Group_Filter_Enable', value: true}
-		];
-
-		this.add('LDAP_Enable', false, { type: 'boolean', public: true });
-		this.add('LDAP_Login_Fallback', true, { type: 'boolean', enableQuery });
-		this.add('LDAP_Host', '', { type: 'string', enableQuery });
-		this.add('LDAP_Port', '389', { type: 'string', enableQuery });
-		this.add('LDAP_Connect_Timeout', 600000, {type: 'int', enableQuery});
-		this.add('LDAP_Idle_Timeout', 600000, {type: 'int', enableQuery});
-		this.add('LDAP_Encryption', 'plain', { type: 'select', values: [ { key: 'plain', i18nLabel: 'No_Encryption' }, { key: 'tls', i18nLabel: 'StartTLS' }, { key: 'ssl', i18nLabel: 'SSL/LDAPS' } ], enableQuery });
-		this.add('LDAP_CA_Cert', '', { type: 'string', multiline: true, enableQuery: enableTLSQuery });
-		this.add('LDAP_Reject_Unauthorized', true, { type: 'boolean', enableQuery: enableTLSQuery });
-		this.add('LDAP_Domain_Base', '', { type: 'string', enableQuery });
-		this.add('LDAP_Use_Custom_Domain_Search', false, { type: 'boolean', enableQuery });
-		this.add('LDAP_Custom_Domain_Search', '', { type: 'string', enableQuery: customBindSearchEnabledQuery });
-		this.add('LDAP_Domain_Search_User', '', { type: 'string', enableQuery: customBindSearchDisabledQuery });
-		this.add('LDAP_Domain_Search_Password', '', { type: 'password', enableQuery: customBindSearchDisabledQuery });
-		this.add('LDAP_Domain_Search_Filter', '', { type: 'string', enableQuery: customBindSearchDisabledQuery });
+RocketChat.settings.addGroup('LDAP', function() {
+	const enableQuery = {_id: 'LDAP_Enable', value: true};
+	const enableAuthentication = [
+		enableQuery,
+		{_id: 'LDAP_Authentication', value: true}
+	];
+	const enableTLSQuery = [
+		enableQuery,
+		{_id: 'LDAP_Encryption', value: {$in: ['tls', 'ssl']}}
+	];
+	const syncDataQuery = [
+		enableQuery,
+		{_id: 'LDAP_Sync_User_Data', value: true}
+	];
+	const groupFilterQuery = [
+		enableQuery,
+		{_id: 'LDAP_Group_Filter_Enable', value: true}
+	];
+	const backgroundSyncQuery = [
+		enableQuery,
+		{_id: 'LDAP_Background_Sync', value: true}
+	];
+
+	this.add('LDAP_Enable', false, { type: 'boolean', public: true });
+	this.add('LDAP_Login_Fallback', true, { type: 'boolean', enableQuery });
+	this.add('LDAP_Host', '', { type: 'string', enableQuery });
+	this.add('LDAP_Port', '389', { type: 'string', enableQuery });
+	this.add('LDAP_Encryption', 'plain', { type: 'select', values: [ { key: 'plain', i18nLabel: 'No_Encryption' }, { key: 'tls', i18nLabel: 'StartTLS' }, { key: 'ssl', i18nLabel: 'SSL/LDAPS' } ], enableQuery });
+	this.add('LDAP_CA_Cert', '', { type: 'string', multiline: true, enableQuery: enableTLSQuery });
+	this.add('LDAP_Reject_Unauthorized', true, { type: 'boolean', enableQuery: enableTLSQuery });
+	this.add('LDAP_BaseDN', '', { type: 'string', enableQuery });
+	this.add('LDAP_Test_Connection', 'ldap_test_connection', { type: 'action', actionText: 'Test_Connection' });
+
+	this.section('Authentication', function() {
+		this.add('LDAP_Authentication', false, { type: 'boolean', enableQuery });
+		this.add('LDAP_Authentication_UserDN', '', { type: 'string', enableQuery: enableAuthentication });
+		this.add('LDAP_Authentication_Password', '', { type: 'password', enableQuery: enableAuthentication });
+	});
+
+	this.section('Timeouts', function() {
+		this.add('LDAP_Timeout', 60000, {type: 'int', enableQuery});
+		this.add('LDAP_Connect_Timeout', 1000, {type: 'int', enableQuery});
+		this.add('LDAP_Idle_Timeout', 1000, {type: 'int', enableQuery});
+	});
+
+	this.section('User Search', function() {
+		this.add('LDAP_User_Search_Filter', '(objectclass=*)', { type: 'string', enableQuery });
+		this.add('LDAP_User_Search_Scope', 'sub', { type: 'string', enableQuery });
+		this.add('LDAP_User_Search_Field', 'sAMAccountName', { type: 'string', enableQuery });
+	});
+
+	this.section('User Search (Group Validation)', function() {
 		this.add('LDAP_Group_Filter_Enable', false, { type: 'boolean', enableQuery });
 		this.add('LDAP_Group_Filter_ObjectClass', 'groupOfUniqueNames', { type: 'string', enableQuery: groupFilterQuery });
 		this.add('LDAP_Group_Filter_Group_Id_Attribute', 'cn', { type: 'string', enableQuery: groupFilterQuery });
 		this.add('LDAP_Group_Filter_Group_Member_Attribute', 'uniqueMember', { type: 'string', enableQuery: groupFilterQuery });
 		this.add('LDAP_Group_Filter_Group_Member_Format', 'uniqueMember', { type: 'string', enableQuery: groupFilterQuery });
 		this.add('LDAP_Group_Filter_Group_Name', 'ROCKET_CHAT', { type: 'string', enableQuery: groupFilterQuery });
-		this.add('LDAP_Domain_Search_User_ID', 'sAMAccountName', { type: 'string', enableQuery: customBindSearchDisabledQuery });
-		this.add('LDAP_Domain_Search_Object_Class', 'user', { type: 'string', enableQuery: customBindSearchDisabledQuery });
-		this.add('LDAP_Domain_Search_Object_Category', 'person', { type: 'string', enableQuery: customBindSearchDisabledQuery });
+	});
+
+	this.section('Sync / Import', function() {
 		this.add('LDAP_Username_Field', 'sAMAccountName', { type: 'string', enableQuery });
 		this.add('LDAP_Unique_Identifier_Field', 'objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber', { type: 'string', enableQuery });
-		this.add('LDAP_Sync_User_Data', false, { type: 'boolean', enableQuery });
-		this.add('LDAP_Sync_User_Avatar', true, { type: 'boolean', enableQuery: syncDataQuery });
-		this.add('LDAP_Sync_User_Data_FieldMap', '{"cn":"name", "mail":"email"}', { type: 'string', enableQuery: syncDataQuery });
 		this.add('LDAP_Default_Domain', '', { type: 'string', enableQuery });
 		this.add('LDAP_Merge_Existing_Users', false, { type: 'boolean', enableQuery });
-		this.add('LDAP_Import_Users', false, { type: 'boolean', enableQuery: syncDataQuery });
-		this.add('LDAP_Test_Connection', 'ldap_test_connection', { type: 'action', actionText: 'Test_Connection' });
-		this.add('LDAP_Sync_Users', 'ldap_sync_users', { type: 'action', actionText: 'Sync_Users' });
+
+		this.add('LDAP_Sync_User_Data', false, { type: 'boolean', enableQuery });
+		this.add('LDAP_Sync_User_Data_FieldMap', '{"cn":"name", "mail":"email"}', { type: 'string', enableQuery: syncDataQuery });
+		this.add('LDAP_Sync_User_Avatar', true, { type: 'boolean', enableQuery });
+
+		this.add('LDAP_Background_Sync', false, { type: 'boolean', enableQuery });
+		this.add('LDAP_Background_Sync_Interval', 'Every 24 hours', { type: 'string', enableQuery: backgroundSyncQuery });
+		this.add('LDAP_Background_Sync_Import_New_Users', true, { type: 'boolean', enableQuery: backgroundSyncQuery });
+		this.add('LDAP_Background_Sync_Keep_Existant_Users_Updated', true, { type: 'boolean', enableQuery: backgroundSyncQuery });
+
+		this.add('LDAP_Sync_Now', 'ldap_sync_now', { type: 'action', actionText: 'Execute_Synchronization_Now' });
 	});
 });
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index ead2ebebf1a..7041725558a 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -1,17 +1,19 @@
-/* globals slug:true, slugify, LDAP, getLdapUsername:true, getLdapUserUniqueID:true, getDataToSyncUserData:true, syncUserData:true, sync:true, addLdapUser:true  */
+/* globals slugify, SyncedCron */
+
+import LDAP from './ldap';
 
 const logger = new Logger('LDAPSync', {});
 
-slug = function slug(text) {
+export function slug(text) {
 	if (RocketChat.settings.get('UTF8_Names_Slugify') !== true) {
 		return text;
 	}
 	text = slugify(text, '.');
 	return text.replace(/[^0-9a-z-_.]/g, '');
-};
+}
 
 
-getLdapUsername = function getLdapUsername(ldapUser) {
+export function getLdapUsername(ldapUser) {
 	const usernameField = RocketChat.settings.get('LDAP_Username_Field');
 
 	if (usernameField.indexOf('#{') > -1) {
@@ -21,10 +23,10 @@ getLdapUsername = function getLdapUsername(ldapUser) {
 	}
 
 	return ldapUser.object[usernameField];
-};
+}
 
 
-getLdapUserUniqueID = function getLdapUserUniqueID(ldapUser) {
+export function getLdapUserUniqueID(ldapUser) {
 	let Unique_Identifier_Field = RocketChat.settings.get('LDAP_Unique_Identifier_Field');
 
 	if (Unique_Identifier_Field !== '') {
@@ -33,15 +35,15 @@ getLdapUserUniqueID = function getLdapUserUniqueID(ldapUser) {
 		Unique_Identifier_Field = [];
 	}
 
-	let LDAP_Domain_Search_User_ID = RocketChat.settings.get('LDAP_Domain_Search_User_ID');
+	let User_Search_Field = RocketChat.settings.get('LDAP_User_Search_Field');
 
-	if (LDAP_Domain_Search_User_ID !== '') {
-		LDAP_Domain_Search_User_ID = LDAP_Domain_Search_User_ID.replace(/\s/g, '').split(',');
+	if (User_Search_Field !== '') {
+		User_Search_Field = User_Search_Field.replace(/\s/g, '').split(',');
 	} else {
-		LDAP_Domain_Search_User_ID = [];
+		User_Search_Field = [];
 	}
 
-	Unique_Identifier_Field = Unique_Identifier_Field.concat(LDAP_Domain_Search_User_ID);
+	Unique_Identifier_Field = Unique_Identifier_Field.concat(User_Search_Field);
 
 	if (Unique_Identifier_Field.length > 0) {
 		Unique_Identifier_Field = Unique_Identifier_Field.find((field) => {
@@ -55,10 +57,9 @@ getLdapUserUniqueID = function getLdapUserUniqueID(ldapUser) {
 		}
 		return Unique_Identifier_Field;
 	}
-};
-
+}
 
-getDataToSyncUserData = function getDataToSyncUserData(ldapUser, user) {
+export function getDataToSyncUserData(ldapUser, user) {
 	const syncUserData = RocketChat.settings.get('LDAP_Sync_User_Data');
 	const syncUserDataFieldMap = RocketChat.settings.get('LDAP_Sync_User_Data_FieldMap').trim();
 
@@ -122,13 +123,13 @@ getDataToSyncUserData = function getDataToSyncUserData(ldapUser, user) {
 	if (_.size(userData)) {
 		return userData;
 	}
-};
+}
 
 
-syncUserData = function syncUserData(user, ldapUser) {
+export function syncUserData(user, ldapUser) {
 	logger.info('Syncing user data');
 	logger.debug('user', {'email': user.email, '_id': user._id});
-	logger.debug('ldapUser', ldapUser);
+	logger.debug('ldapUser', ldapUser.object);
 
 	const userData = getDataToSyncUserData(ldapUser, user);
 	if (user && user._id && userData) {
@@ -173,21 +174,29 @@ syncUserData = function syncUserData(user, ldapUser) {
 			});
 		}
 	}
-};
+}
 
-addLdapUser = function addLdapUser(ldapUser, username, password) {
-	const userObject = {
-		username
-	};
+export function addLdapUser(ldapUser, username, password) {
+	const uniqueId = getLdapUserUniqueID(ldapUser);
+
+	const userObject = {};
+
+	if (username) {
+		userObject.username = username;
+	}
 
 	const userData = getDataToSyncUserData(ldapUser, {});
 
-	if (userData && userData.emails) {
-		userObject.email = userData.emails[0].address;
+	if (userData && userData.emails && userData.emails[0] && userData.emails[0].address) {
+		if (Array.isArray(userData.emails[0].address)) {
+			userObject.email = userData.emails[0].address[0];
+		} else {
+			userObject.email = userData.emails[0].address;
+		}
 	} else if (ldapUser.object.mail && ldapUser.object.mail.indexOf('@') > -1) {
 		userObject.email = ldapUser.object.mail;
 	} else if (RocketChat.settings.get('LDAP_Default_Domain') !== '') {
-		userObject.email = `${ username }@${ RocketChat.settings.get('LDAP_Default_Domain') }`;
+		userObject.email = `${ username || uniqueId.value }@${ RocketChat.settings.get('LDAP_Default_Domain') }`;
 	} else {
 		const error = new Meteor.Error('LDAP-login-error', 'LDAP Authentication succeded, there is no email to create an account. Have you tried setting your Default Domain in LDAP Settings?');
 		logger.error(error);
@@ -212,79 +221,139 @@ addLdapUser = function addLdapUser(ldapUser, username, password) {
 	return {
 		userId: userObject._id
 	};
-};
+}
 
-sync = function sync() {
+export function importNewUsers(ldap) {
 	if (RocketChat.settings.get('LDAP_Enable') !== true) {
+		logger.error('Can\'t run LDAP Import, LDAP is disabled');
 		return;
 	}
 
-	const ldap = new LDAP();
-
-	try {
+	if (!ldap) {
+		ldap = new LDAP();
 		ldap.connectSync();
+	}
+
+	let count = 0;
+	ldap.searchUsersSync('*', Meteor.bindEnvironment((error, ldapUsers, {next} = {}) => {
+		if (error) {
+			throw error;
+		}
 
-		const users = RocketChat.models.Users.findLDAPUsers();
+		ldapUsers.forEach((ldapUser) => {
+			count++;
 
-		if (RocketChat.settings.get('LDAP_Import_Users') === true && RocketChat.settings.get('LDAP_Username_Field') !== '') {
-			const ldapUsers = ldap.searchUsersSync('*');
-			ldapUsers.forEach(function(ldapUser) {
-				const username = slug(getLdapUsername(ldapUser));
-				// Look to see if user already exists
+			const uniqueId = getLdapUserUniqueID(ldapUser);
+			// Look to see if user already exists
+			const userQuery = {
+				'services.ldap.id': uniqueId.value
+			};
+
+			logger.debug('userQuery', userQuery);
+
+			let username;
+			if (RocketChat.settings.get('LDAP_Username_Field') !== '') {
+				username = slug(getLdapUsername(ldapUser));
+			}
+
+			// Add user if it was not added before
+			const user = Meteor.users.findOne(userQuery);
+			if (!user) {
+				addLdapUser(ldapUser, username);
+			}
+
+			if (!user && username && RocketChat.settings.get('LDAP_Merge_Existing_Users') === true) {
 				const userQuery = {
 					username
 				};
 
-				logger.debug('userQuery', userQuery);
+				logger.debug('userQuery merge', userQuery);
 
 				const user = Meteor.users.findOne(userQuery);
-
-				if (!user) {
-					addLdapUser(ldapUser, username);
-				} else if (user.ldap !== true && RocketChat.settings.get('LDAP_Merge_Existing_Users') === true) {
+				if (user) {
 					syncUserData(user, ldapUser);
 				}
-			});
-		}
-
-		users.forEach(function(user) {
-			let ldapUser;
-
-			if (user.services && user.services.ldap && user.services.ldap.id) {
-				ldapUser = ldap.getUserByIdSync(user.services.ldap.id, user.services.ldap.idAttribute);
-			} else {
-				ldapUser = ldap.getUserByUsernameSync(user.username);
 			}
 
-			if (ldapUser) {
-				syncUserData(user, ldapUser);
-			} else {
-				logger.info('Can\'t sync user', user.username);
+			if (count % 1000 === 0) {
+				logger.info('Imported:', count);
 			}
 		});
+		next && next();
+	}));
+
+	logger.info('Imported:', count);
+}
+
+function sync() {
+	if (RocketChat.settings.get('LDAP_Enable') !== true) {
+		return;
+	}
+
+	const ldap = new LDAP();
+
+	try {
+		ldap.connectSync();
+
+		let users;
+		if (RocketChat.settings.get('LDAP_Background_Sync_Keep_Existant_Users_Updated') === true) {
+			users = RocketChat.models.Users.findLDAPUsers();
+		}
+
+		if (RocketChat.settings.get('LDAP_Background_Sync_Import_New_Users') === true) {
+			importNewUsers(ldap);
+		}
+
+		if (RocketChat.settings.get('LDAP_Background_Sync_Keep_Existant_Users_Updated') === true) {
+			users.forEach(function(user) {
+				let ldapUser;
+
+				if (user.services && user.services.ldap && user.services.ldap.id) {
+					ldapUser = ldap.getUserByIdSync(user.services.ldap.id, user.services.ldap.idAttribute);
+				} else {
+					ldapUser = ldap.getUserByUsernameSync(user.username);
+				}
+
+				if (ldapUser) {
+					syncUserData(user, ldapUser);
+				} else {
+					logger.info('Can\'t sync user', user.username);
+				}
+			});
+		}
 	} catch (error) {
 		logger.error(error);
 		return error;
 	}
-
-	ldap.disconnect();
 	return true;
-};
+}
 
-let interval;
-let timeout;
+const jobName = 'LDAP_Sync';
 
-RocketChat.settings.get('LDAP_Sync_User_Data', function(key, value) {
-	Meteor.clearInterval(interval);
-	Meteor.clearTimeout(timeout);
+const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounced() {
+	if (RocketChat.settings.get('LDAP_Background_Sync') !== true) {
+		logger.info('Disabling LDAP Background Sync');
+		if (SyncedCron.nextScheduledAtDate(jobName)) {
+			SyncedCron.remove(jobName);
+		}
+		return;
+	}
 
-	if (value === true) {
-		logger.info('Enabling LDAP user sync');
-		interval = Meteor.setInterval(sync, 1000 * 60 * 60);
-		timeout = Meteor.setTimeout(function() {
-			sync();
-		}, 1000 * 60 * 10);
-	} else {
-		logger.info('Disabling LDAP user sync');
+	if (RocketChat.settings.get('LDAP_Sync_Interval')) {
+		logger.info('Enabling LDAP Background Sync');
+		SyncedCron.add({
+			name: jobName,
+			schedule: (parser) => parser.text(RocketChat.settings.get('LDAP_Sync_Interval')),
+			job() {
+				sync();
+			}
+		});
 	}
+}), 500);
+
+Meteor.startup(() => {
+	Meteor.defer(() => {
+		RocketChat.settings.get('LDAP_Background_Sync', addCronJob);
+		RocketChat.settings.get('LDAP_Background_Sync_Interval', addCronJob);
+	});
 });
diff --git a/packages/rocketchat-ldap/server/syncUsers.js b/packages/rocketchat-ldap/server/syncUsers.js
index 2c26f2cf095..3af0887e5ae 100644
--- a/packages/rocketchat-ldap/server/syncUsers.js
+++ b/packages/rocketchat-ldap/server/syncUsers.js
@@ -1,7 +1,7 @@
-/* globals sync */
+import {importNewUsers} from './sync';
 
 Meteor.methods({
-	ldap_sync_users() {
+	ldap_sync_now() {
 		const user = Meteor.user();
 		if (!user) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'ldap_sync_users' });
@@ -15,15 +15,13 @@ Meteor.methods({
 			throw new Meteor.Error('LDAP_disabled');
 		}
 
-		const result = sync();
+		this.unblock();
 
-		if (result === true) {
-			return {
-				message: 'Sync_success',
-				params: []
-			};
-		}
+		importNewUsers();
 
-		throw result;
+		return {
+			message: 'Sync_in_progress',
+			params: []
+		};
 	}
 });
diff --git a/packages/rocketchat-ldap/server/testConnection.js b/packages/rocketchat-ldap/server/testConnection.js
index 679d934af56..08916190f93 100644
--- a/packages/rocketchat-ldap/server/testConnection.js
+++ b/packages/rocketchat-ldap/server/testConnection.js
@@ -1,4 +1,4 @@
-/* globals LDAP */
+import LDAP from './ldap';
 
 Meteor.methods({
 	ldap_test_connection() {
@@ -26,7 +26,6 @@ Meteor.methods({
 
 		try {
 			ldap.bindIfNecessary();
-			ldap.disconnect();
 		} catch (error) {
 			throw new Meteor.Error(error.name || error.message);
 		}
diff --git a/packages/rocketchat-markdown/markdown.js b/packages/rocketchat-markdown/markdown.js
index facb01fa343..77d690ddf92 100644
--- a/packages/rocketchat-markdown/markdown.js
+++ b/packages/rocketchat-markdown/markdown.js
@@ -19,14 +19,14 @@ class MarkdownClass {
 		const message = {
 			html: _.escapeHTML(text)
 		};
-		return this.parseMessageNotEscaped(message).html;
+		return this.mountTokensBack(this.parseMessageNotEscaped(message)).html;
 	}
 
 	parseNotEscaped(text) {
 		const message = {
 			html: text
 		};
-		return this.parseMessageNotEscaped(message).html;
+		return this.mountTokensBack(this.parseMessageNotEscaped(message)).html;
 	}
 
 	parseMessageNotEscaped(message) {
@@ -36,6 +36,16 @@ class MarkdownClass {
 		}
 		return parsers['original'](message);
 	}
+
+	mountTokensBack(message) {
+		if (message.tokens && message.tokens.length > 0) {
+			for (const {token, text} of message.tokens) {
+				message.html = message.html.replace(token, () => text); // Uses lambda so doesn't need to escape $
+			}
+		}
+
+		return message;
+	}
 }
 
 const Markdown = new MarkdownClass;
diff --git a/packages/rocketchat-markdown/parser/marked/marked.js b/packages/rocketchat-markdown/parser/marked/marked.js
index 5b8dbb200f3..9480ec1cc89 100644
--- a/packages/rocketchat-markdown/parser/marked/marked.js
+++ b/packages/rocketchat-markdown/parser/marked/marked.js
@@ -99,6 +99,7 @@ export const marked = (message) => {
 		smartLists,
 		smartypants,
 		renderer,
+		sanitize: true,
 		highlight
 	});
 
diff --git a/packages/rocketchat-ui-admin/client/admin.html b/packages/rocketchat-ui-admin/client/admin.html
index 725b6405b34..b47e6e83cf5 100644
--- a/packages/rocketchat-ui-admin/client/admin.html
+++ b/packages/rocketchat-ui-admin/client/admin.html
@@ -48,7 +48,7 @@
 									{{/if}}
 									{{#each settings}}
 										<div class="input-line double-col {{#if isSettingChanged _id}}setting-changed{{/if}}" {{isDisabled}}>
-											<label class="setting-label">{{label}}</label>
+											<label class="setting-label" title="{{_id}}">{{label}}</label>
 											<div class="setting-field">
 												{{#if $eq type 'string'}}
 													{{#if multiline}}
diff --git a/server/startup/migrations/v102.js b/server/startup/migrations/v102.js
new file mode 100644
index 00000000000..af588dc5cbb
--- /dev/null
+++ b/server/startup/migrations/v102.js
@@ -0,0 +1,136 @@
+RocketChat.Migrations.add({
+	version: 102,
+	up() {
+		if (!RocketChat || !RocketChat.models || !RocketChat.models.Settings) {
+			return;
+		}
+
+		RocketChat.models.Settings.update(
+			{ _id: 'LDAP_Connect_Timeout', value: 600000 },
+			{ $set: { value: 1000 } }
+		);
+
+		RocketChat.models.Settings.update(
+			{ _id: 'LDAP_Idle_Timeout', value: 600000 },
+			{ $set: { value: 1000 } }
+		);
+
+		const LDAP_Domain_Base = RocketChat.models.Settings.findOne({ _id: 'LDAP_Domain_Base' });
+		if (LDAP_Domain_Base) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_BaseDN' },
+				{ $set: { value: LDAP_Domain_Base.value } }
+			);
+		}
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Domain_Base' });
+
+		const LDAP_Domain_Search_User_ID = RocketChat.models.Settings.findOne({ _id: 'LDAP_Domain_Search_User_ID' });
+		if (LDAP_Domain_Search_User_ID) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_User_Search_Field' },
+				{ $set: { value: LDAP_Domain_Search_User_ID.value } }
+			);
+		}
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Domain_Search_User_ID' });
+
+		const LDAP_Use_Custom_Domain_Search = RocketChat.models.Settings.findOne({ _id: 'LDAP_Use_Custom_Domain_Search' });
+		const LDAP_Custom_Domain_Search = RocketChat.models.Settings.findOne({ _id: 'LDAP_Custom_Domain_Search' });
+
+		const LDAP_Domain_Search_User = RocketChat.models.Settings.findOne({ _id: 'LDAP_Domain_Search_User' });
+		const LDAP_Domain_Search_Password = RocketChat.models.Settings.findOne({ _id: 'LDAP_Domain_Search_Password' });
+		const LDAP_Domain_Search_Filter = RocketChat.models.Settings.findOne({ _id: 'LDAP_Domain_Search_Filter' });
+
+		const LDAP_Domain_Search_Object_Class = RocketChat.models.Settings.findOne({ _id: 'LDAP_Domain_Search_Object_Class' });
+		const LDAP_Domain_Search_Object_Category = RocketChat.models.Settings.findOne({ _id: 'LDAP_Domain_Search_Object_Category' });
+
+		if (LDAP_Use_Custom_Domain_Search) {
+			if (LDAP_Use_Custom_Domain_Search.value === true) {
+				let Custom_Domain_Search;
+				try {
+					Custom_Domain_Search = JSON.parse(LDAP_Custom_Domain_Search.value);
+				} catch (error) {
+					throw new Error('Invalid Custom Domain Search JSON');
+				}
+
+				LDAP_Domain_Search_User.value = Custom_Domain_Search.userDN || '';
+				LDAP_Domain_Search_Password.value = Custom_Domain_Search.password || '';
+				LDAP_Domain_Search_Filter.value = Custom_Domain_Search.filter;
+			} else {
+				const filter = [];
+
+				if (LDAP_Domain_Search_Object_Category.value !== '') {
+					filter.push(`(objectCategory=${ LDAP_Domain_Search_Object_Category.value })`);
+				}
+
+				if (LDAP_Domain_Search_Object_Class.value !== '') {
+					filter.push(`(objectclass=${ LDAP_Domain_Search_Object_Class.value })`);
+				}
+
+				if (LDAP_Domain_Search_Filter.value !== '') {
+					filter.push(`(${ LDAP_Domain_Search_Filter.value })`);
+				}
+
+				if (filter.length === 1) {
+					LDAP_Domain_Search_Filter.value = filter[0];
+				} else if (filter.length > 1) {
+					LDAP_Domain_Search_Filter.value = `(&${ filter.join('') })`;
+				}
+			}
+		}
+
+		if (LDAP_Domain_Search_Filter && LDAP_Domain_Search_Filter.value) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_User_Search_Filter' },
+				{ $set: { value: LDAP_Domain_Search_Filter.value } }
+			);
+		}
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Domain_Search_Filter' });
+
+		if (LDAP_Domain_Search_User && LDAP_Domain_Search_User.value) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_Authentication_UserDN' },
+				{ $set: { value: LDAP_Domain_Search_User.value } }
+			);
+		}
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Domain_Search_User' });
+
+
+		if (LDAP_Domain_Search_Password && LDAP_Domain_Search_Password.value) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_Authentication_Password' },
+				{ $set: { value: LDAP_Domain_Search_Password.value } }
+			);
+		}
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Domain_Search_Password' });
+
+		if (LDAP_Domain_Search_User && LDAP_Domain_Search_User.value && LDAP_Domain_Search_Password && LDAP_Domain_Search_Password.value) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_Authentication' },
+				{ $set: { value: true } }
+			);
+		}
+
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Use_Custom_Domain_Search' });
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Custom_Domain_Search' });
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Domain_Search_Object_Class' });
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Domain_Search_Object_Category' });
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Sync_Users' }); //Button
+
+		const LDAP_Sync_User_Data = RocketChat.models.Settings.findOne({ _id: 'LDAP_Sync_User_Data' });
+		if (LDAP_Sync_User_Data && LDAP_Sync_User_Data.value) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_Background_Sync' },
+				{ $set: { value: true } }
+			);
+		}
+
+		const LDAP_Import_Users = RocketChat.models.Settings.findOne({ _id: 'LDAP_Import_Users' });
+		if (LDAP_Import_Users && LDAP_Import_Users.value === false) {
+			RocketChat.models.Settings.update(
+				{ _id: 'LDAP_Background_Sync_Import_New_Users' },
+				{ $set: { value: false } }
+			);
+		}
+		RocketChat.models.Settings.remove({ _id: 'LDAP_Import_Users' });
+	}
+});

From f12b732e0599301201545d11a6ca8aff9b23ef82 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 2 Oct 2017 23:08:12 -0300
Subject: [PATCH 125/244] Merge pull request #8375 from
 RocketChat/lingohub_based_on_develop

LingoHub based on develop
---
 packages/rocketchat-i18n/i18n/ar.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/ca.i18n.json    | 24 +++--------------
 packages/rocketchat-i18n/i18n/cs.i18n.json    | 26 +++++--------------
 packages/rocketchat-i18n/i18n/de-AT.i18n.json | 23 +++-------------
 packages/rocketchat-i18n/i18n/de.i18n.json    | 26 +++++--------------
 packages/rocketchat-i18n/i18n/el.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/en.i18n.json    |  3 ++-
 packages/rocketchat-i18n/i18n/es.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/fa.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/fi.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/fr.i18n.json    | 24 +++--------------
 packages/rocketchat-i18n/i18n/he.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/hr.i18n.json    | 24 +++--------------
 packages/rocketchat-i18n/i18n/hu.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/id.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/it.i18n.json    | 24 +++--------------
 packages/rocketchat-i18n/i18n/ja.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/km.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/ko.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/ku.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/lo.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/ms-MY.i18n.json | 23 +++-------------
 packages/rocketchat-i18n/i18n/nl.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/pl.i18n.json    | 24 +++--------------
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 23 +++-------------
 packages/rocketchat-i18n/i18n/pt.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/ro.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/ru.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/sq.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/sr.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/sv.i18n.json    | 24 +++--------------
 packages/rocketchat-i18n/i18n/ta-IN.i18n.json | 23 +++-------------
 packages/rocketchat-i18n/i18n/tr.i18n.json    | 24 +++--------------
 packages/rocketchat-i18n/i18n/ug.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/uk.i18n.json    | 23 +++-------------
 packages/rocketchat-i18n/i18n/zh-TW.i18n.json | 23 +++-------------
 packages/rocketchat-i18n/i18n/zh.i18n.json    | 24 +++--------------
 37 files changed, 150 insertions(+), 695 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/ar.i18n.json b/packages/rocketchat-i18n/i18n/ar.i18n.json
index eff7f45c7d9..ff03126a58a 100644
--- a/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -806,24 +806,12 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA سيرت",
   "LDAP_Connect_Timeout": "انتهاء مدة الاتصال (بالملي ثانية)",
-  "LDAP_Custom_Domain_Search": "البحث المجال مخصص",
-  "LDAP_Custom_Domain_Search_Description": "قطعة من JSON الذي يحكم ربط واتصال من المعلومات وهو النموذج: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "المجال الافتراضي",
   "LDAP_Description": "LDAP هي قاعدة بيانات هرمية التي تستخدم العديد من الشركات لتقديم إشارة واحدة على - مرفق لتقاسم كلمة مرور واحدة بين المواقع وخدمات متعددة. للحصول على معلومات التكوين المتقدمة والأمثلة، يرجى الرجوع لدينا ويكي: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "قاعدة المجال",
-  "LDAP_Domain_Base_Description": "اسم المؤهل بالكامل المميز (DN) من الشجرة الفرعية LDAP تريد البحث للمستخدمين والمجموعات. يمكنك إضافة ما تريد. ومع ذلك، يجب أن تحدد كل مجموعة في قاعدة نطاق نفس المستخدمين التي تنتمي إليها. إذا قمت بتحديد مجموعات المستخدمين المحظورة، وفقط للمستخدمين الذين ينتمون لتلك الجماعات أن يكون في نطاق. نوصي تحديد المستوى الخاص بك شجرة دليل LDAP كقاعدة المجال الخاص بك واستخدام فلتر البحث للتحكم في الوصول.",
-  "LDAP_Domain_Search_Filter": "نطاق البحث تصفية",
-  "LDAP_Domain_Search_Filter_Description": "إذا كان سيتم السماح محددة، فقط للمستخدمين تطابق هذا المرشح لتسجيل الدخول. إذا لم يتم تحديد مرشح، جميع المستخدمين ضمن نطاق قاعدة المجال المحدد سوف تكون قادرة على تسجيل الدخول. <br/> على سبيل المثال ل Active Directory `memberOf = CN = ROCKET_CHAT، أوو = العام Groups`. <br/> على سبيل المثال لب OpenLDAP (للمد بحث مباراة) `أوو: DN: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "المجال كائن البحث التصنيف",
-  "LDAP_Domain_Search_Object_Category_Description": "و* objectCategory * أن تحديد المستخدمين. <br/> اتركه فارغا ل* ب OpenLDAP *. <br/> على سبيل المثال `person`، الخ",
-  "LDAP_Domain_Search_Object_Class": "نطاق فئة كائن البحث",
-  "LDAP_Domain_Search_Object_Class_Description": "و* objectclass * أن تحديد المستخدمين. <br/> على سبيل المثال `organizationalPerson`،` user`، `inetOrgPerson`، الخ",
-  "LDAP_Domain_Search_Password": "بحث نطاق كلمة المرور",
-  "LDAP_Domain_Search_Password_Description": "كلمة السر للمستخدم البحث المجال.",
-  "LDAP_Domain_Search_User": "نطاق البحث العضو",
-  "LDAP_Domain_Search_User_Description": "المستخدم LDAP التي تنفذ عمليات البحث المستخدم لمصادقة المستخدمين الآخرين عند تسجيل الدخول. <br/> هذا هو عادة حساب خدمة أنشئت خصيصا لالتكامل طرف ثالث. استخدام اسم مؤهل بشكل كامل، مثل `CN = مسؤول، CN = المستخدمين، DC = المثال، DC = com`.",
-  "LDAP_Domain_Search_User_ID": "بحث نطاق هوية المستخدم",
-  "LDAP_Domain_Search_User_ID_Description": "السمة LDAP أن يحدد المستخدم LDAP الذي يحاول المصادقة. وينبغي أن يكون هذا المجال `sAMAccountName` للمنشآت الأكثر نشاطا دليل، ولكنه قد يكون` uid` عن حلول LDAP الأخرى، مثل ب OpenLDAP. يمكنك استخدام `mail` لتعريف المستخدمين عن طريق البريد الإلكتروني أو أيا كان السمة التي تريد. <br> يمكنك استخدام قيم متعددة مفصولة بفواصل للسماح للمستخدمين تسجيل الدخول باستخدام معرفات متعددة مثل اسم المستخدم أو البريد الإلكتروني.",
+  "LDAP_BaseDN_Description": "اسم المؤهل بالكامل المميز (DN) من الشجرة الفرعية LDAP تريد البحث للمستخدمين والمجموعات. يمكنك إضافة ما تريد. ومع ذلك، يجب أن تحدد كل مجموعة في قاعدة نطاق نفس المستخدمين التي تنتمي إليها. إذا قمت بتحديد مجموعات المستخدمين المحظورة، وفقط للمستخدمين الذين ينتمون لتلك الجماعات أن يكون في نطاق. نوصي تحديد المستوى الخاص بك شجرة دليل LDAP كقاعدة المجال الخاص بك واستخدام فلتر البحث للتحكم في الوصول.",
+  "LDAP_User_Search_Field_Description": "السمة LDAP أن يحدد المستخدم LDAP الذي يحاول المصادقة. وينبغي أن يكون هذا المجال `sAMAccountName` للمنشآت الأكثر نشاطا دليل، ولكنه قد يكون` uid` عن حلول LDAP الأخرى، مثل ب OpenLDAP. يمكنك استخدام `mail` لتعريف المستخدمين عن طريق البريد الإلكتروني أو أيا كان السمة التي تريد. <br> يمكنك استخدام قيم متعددة مفصولة بفواصل للسماح للمستخدمين تسجيل الدخول باستخدام معرفات متعددة مثل اسم المستخدم أو البريد الإلكتروني.",
+  "LDAP_User_Search_Filter_Description": "إذا كان سيتم السماح محددة، فقط للمستخدمين تطابق هذا المرشح لتسجيل الدخول. إذا لم يتم تحديد مرشح، جميع المستخدمين ضمن نطاق قاعدة المجال المحدد سوف تكون قادرة على تسجيل الدخول. <br/> على سبيل المثال ل Active Directory `memberOf = CN = ROCKET_CHAT، أوو = العام Groups`. <br/> على سبيل المثال لب OpenLDAP (للمد بحث مباراة) `أوو: DN: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "المستخدم LDAP التي تنفذ عمليات البحث المستخدم لمصادقة المستخدمين الآخرين عند تسجيل الدخول. <br/> هذا هو عادة حساب خدمة أنشئت خصيصا لالتكامل طرف ثالث. استخدام اسم مؤهل بشكل كامل، مثل `CN = مسؤول، CN = المستخدمين، DC = المثال، DC = com`.",
   "LDAP_Enable": "تفعيل",
   "LDAP_Enable_Description": "محاولة استخدام LDAP للمصادقة.",
   "LDAP_Encryption": "التشفير",
@@ -843,12 +831,9 @@
   "LDAP_Sync_User_Data_Description": "حافظ على بيانات المستخدم في تزامن مع الخادم على تسجيل الدخول (على سبيل المثال: الاسم، البريد الإلكتروني).",
   "LDAP_Sync_User_Data_FieldMap": "العضو بيانات خريطة الميدان",
   "LDAP_Sync_User_Data_FieldMap_Description": "تكوين كيف يتم ملؤها الحقول حساب المستخدم (مثل البريد الإلكتروني) من مستوى قياسي في LDAP (وجدت مرة واحدة). <br/> وكمثال على ذلك، `{\" CN \":\" اسم \"،\" البريد الإلكتروني \":\" البريد الإلكتروني \"}` سيختار اسم الشخص البشري للقراءة من سمة CN، وبريدهم الإلكتروني من السمة البريد. <br/> وتشمل المجالات المتاحة `name`، و` email`.",
-  "LDAP_Sync_Users": "المستخدمين مزامنة",
   "LDAP_Test_Connection": "اختبار الاتصال",
   "LDAP_Unique_Identifier_Field": "معرف الميدان وفريدة من نوعها",
   "LDAP_Unique_Identifier_Field_Description": "التي الحقل سيتم استخدامها لربط المستخدم LDAP والمستخدم Rocket.Chat. يمكنك إبلاغ قيم متعددة مفصولة بفواصل في محاولة للحصول على قيمة من سجل LDAP. <br/> القيمة الافتراضية هي `objectGUID يتم، آي بي إم، entryUUID، GUID، dominoUNID، nsuniqueId، uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "استخدام البحث المجال مخصص",
-  "LDAP_Use_Custom_Domain_Search_Description": "إرسال الفلتر الخاص للمستخدمين البحث في خادم LDAP.",
   "LDAP_Username_Field": "اسم المستخدم الميدان",
   "LDAP_Username_Field_Description": "التي المجال سوف تستخدم * اسم المستخدم * للمستخدمين الجدد. اتركه فارغا لاستخدام اسم المستخدم على علم صفحة تسجيل الدخول. <br/> يمكنك استخدام العلامات قالب جدا، مثل `#{givenName}.#{sn}`. <br/> القيمة الافتراضية هي `sAMAccountName`.",
   "Least_Amount": "المقدار الأقل",
diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json
index f5e21b382dd..ba196b96933 100644
--- a/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -971,24 +971,12 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
   "LDAP_Connect_Timeout": "Temps d'espera connexió (ms)",
-  "LDAP_Custom_Domain_Search": "Domini de cerca personalitzat",
-  "LDAP_Custom_Domain_Search_Description": "Objecte JSON per definir el bind i la informació de connexió, segons el format:<br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domini predeterminat",
   "LDAP_Description": "LDAP és una base de dades jeràrquica que moltes empreses utilitzen per proporcionar un inici de sessió únic –una eina per tenir una sola contrasenya a múltiples llocs web i serveis. Per a exemples i informació sobre configuracions més avançades, consulteu la nostra wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Domini base",
-  "LDAP_Domain_Base_Description": "Nom distingit (Distinguished Name, DN), complet i qualificat d'una branca LDAP on voleu cercar usuaris i grups. Se'n poden afegir tants com es vulgui, però cada grup s'ha de definir al mateix domini base que els usuaris que hi pertanyen. Si especifica grups d'usuaris restringits, només els usuaris que pertanyen a aquests grups seran considerats. Recomanem que s'especifici el nivell superior de l'arbre de directoris LDAP com a domini base i que s'utilitzi el filtre de cerca per controlar l'accés.",
-  "LDAP_Domain_Search_Filter": "Filtre de cerca al domini",
-  "LDAP_Domain_Search_Filter_Description": "Si s'especifica, només els usuaris que compleixin aquest filtre podran iniciar sessió. Si no s'especifica cap filtre, tots els usuaris del domini base podran fer-ho.<br/>Exemple per Active Directory `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Exemple per OpenLDAP (cerca de patró extensible) `ou:dn:=ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Categoria d'objecte del domini de cerca",
-  "LDAP_Domain_Search_Object_Category_Description": "L'*objectCategory* que identifica als teus usuaris.<br/>Deixar buit per *OpenLDAP*.<br/>Exemple: `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Classe d'objecte del domini de cerca",
-  "LDAP_Domain_Search_Object_Class_Description": "La classe d'objecte (*Object Class*) que identifica els usuaris. <br />Per exemple, `organizationalPerson`,`user`,`inetOrgPerson`, etcètera.",
-  "LDAP_Domain_Search_Password": "Contrasenya del domini de cerca",
-  "LDAP_Domain_Search_Password_Description": "Contrasenya de l'usuari del domini de cerca.",
-  "LDAP_Domain_Search_User": "Usuari del domini de cerca",
-  "LDAP_Domain_Search_User_Description": "Usuari LDAP que fa cerques d'usuari per identificar altres usuaris quan inicien sessió.<br/>Aquest és un compte que s'acostuma a crear específicament per a fer les integracions de tercers. Utilitza un nom complet i qualificat, com `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "ID d'usuari del domini de cerca",
-  "LDAP_Domain_Search_User_ID_Description": "L'atribut LDAP que identifica a l'usuari quan intenta l'inici de sessió. Aquest camp ha de ser `sAMAccountName` per a la majoria de les instal·lacions d'Active Directory, però pot ser `uid` per altres solucions LDAP, com OpenLDAP. Podeu fer servir `mail` per identificar els usuaris per correu electrònic o qualsevol altre atribut que vulgueu.<br>Es poden utilitzar diversos valors separats per comes per permetre als usuaris accedir utilitzant diversos identificadors com nom d'usuari o adreça de correu-e.",
+  "LDAP_BaseDN_Description": "Nom distingit (Distinguished Name, DN), complet i qualificat d'una branca LDAP on voleu cercar usuaris i grups. Se'n poden afegir tants com es vulgui, però cada grup s'ha de definir al mateix domini base que els usuaris que hi pertanyen. Si especifica grups d'usuaris restringits, només els usuaris que pertanyen a aquests grups seran considerats. Recomanem que s'especifici el nivell superior de l'arbre de directoris LDAP com a domini base i que s'utilitzi el filtre de cerca per controlar l'accés.",
+  "LDAP_User_Search_Field_Description": "L'atribut LDAP que identifica a l'usuari quan intenta l'inici de sessió. Aquest camp ha de ser `sAMAccountName` per a la majoria de les instal·lacions d'Active Directory, però pot ser `uid` per altres solucions LDAP, com OpenLDAP. Podeu fer servir `mail` per identificar els usuaris per correu electrònic o qualsevol altre atribut que vulgueu.<br>Es poden utilitzar diversos valors separats per comes per permetre als usuaris accedir utilitzant diversos identificadors com nom d'usuari o adreça de correu-e.",
+  "LDAP_User_Search_Filter_Description": "Si s'especifica, només els usuaris que compleixin aquest filtre podran iniciar sessió. Si no s'especifica cap filtre, tots els usuaris del domini base podran fer-ho.<br/>Exemple per Active Directory `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Exemple per OpenLDAP (cerca de patró extensible) `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Usuari LDAP que fa cerques d'usuari per identificar altres usuaris quan inicien sessió.<br/>Aquest és un compte que s'acostuma a crear específicament per a fer les integracions de tercers. Utilitza un nom complet i qualificat, com `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "Activa",
   "LDAP_Enable_Description": "Intentar utilitzar LDAP com a mètode d'autenticació",
   "LDAP_Encryption": "Xifrat",
@@ -1008,7 +996,6 @@
   "LDAP_Host": "Amfitrió (host) ",
   "LDAP_Host_Description": "Amfitrió (host) LDAP, exemple: `ldap.exemple.com` o `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Temps d'espera inactiu (ms)",
-  "LDAP_Import_Users": "Importa usuaris LDAP",
   "LDAP_Import_Users_Description": "Si s'activa, el procés de sincronització importarà tots els usuaris LDAP<br/> *Compte!* Cal especificar un filtre de cerca per no importar més usuaris del compte.",
   "LDAP_Login_Fallback": "Inici de sessió alternativa (fallback)",
   "LDAP_Login_Fallback_Description": "Si l'inici de sessió LDAP no funciona, intenta iniciar-la amb el sistema de comptes per defecte/local. Útil si el servei LDAP no està disponible per algun motiu.",
@@ -1022,12 +1009,9 @@
   "LDAP_Sync_User_Data_Description": "Mantenir les dades de l'usuari sincronitzades amb el servidor quan s'identifiqui (ex: nom, adreça de correu, etcètera).",
   "LDAP_Sync_User_Data_FieldMap": "Mapatge de camps de dades d'usuari",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configura com els camps del compte d'usuari (com el de correu-e) s'omplen des del registre LDAP (un cop trobat).<br/>A tall d'exemple, `{\"cn\":\"name\", \"mail\":\"email\"}` triarà el nom des de l'atribut `cn`, i l'adreça-e des de l'atribut `mail`. Addicionalment, és possible utilitzar variables, per exemple: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` utilitza una combinació del nom de pila i del cognom per al camp `name` de l'usuari de rocket chat. <br/>Camps disponibles a Rocket.Chat: `name`, `email` i `customFields`.",
-  "LDAP_Sync_Users": "Sincronització d'usuaris",
   "LDAP_Test_Connection": "Prova la connexió",
   "LDAP_Unique_Identifier_Field": "Camp d'identificador únic",
   "LDAP_Unique_Identifier_Field_Description": "Aquest camp s'utilitzarà per vincular l'usuari LDAP amb l'usuari Rocket.Chat. Pot proporcionar diversos valors separats per coma per intentar obtenir el valor del registre LDAP.<br/>El valor per defecte és `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Utilitza el domini de cerca personalitzat",
-  "LDAP_Use_Custom_Domain_Search_Description": "Escriviu el vostre propi filtre per cercar usuaris al servidor LDAP.",
   "LDAP_Username_Field": "Camp del nom d'usuari",
   "LDAP_Username_Field_Description": "El camp que s'utilitzarà com a nom d'usuari (*username*) per als nous usuaris. Deixar en blanc per a utilitzar el nom d'usuari proporcionat durant l'inici de sessió.<br/>També es poden utilitzar plantilles d'etiqueta, com `#{givenName}.#{sn}`.<br/>El valor per defecte és `sAMAccountName`.",
   "Least_Amount": "Quantitat mínima",
diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json
index bbf07e9aec7..6b01b17785e 100644
--- a/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -374,6 +374,7 @@
   "clear_history": "Smazat historii",
   "Click_here": "Klikněte zde",
   "Click_here_for_more_info": "Klikněte pro více infomací",
+  "Click_to_join": "Klikněte pro připojení!",
   "Client_ID": "ID klienta",
   "Client_Secret": "Secret klienta",
   "Clients_will_refresh_in_a_few_seconds": "Klienti se obnoví během několika sekund",
@@ -986,24 +987,12 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Certifikát",
   "LDAP_Connect_Timeout": "Prodleva připojení (ms)",
-  "LDAP_Custom_Domain_Search": "Vyhledávání ve vlastní doméně",
-  "LDAP_Custom_Domain_Search_Description": "JSON, který řídí vazby a informací o připojení a je ve tvaru: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Výchozí doména",
   "LDAP_Description": "LDAP je hierarchická databáze, kterou mnohé společnosti používají pro jednotné přihlášení - systém pro sdílení jednoho hesla mezi více webů a služeb. Pro pokročilé informace a příklady konfigurace se podívejte na naši wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "Základní doména",
-  "LDAP_Domain_Base_Description": "Plně kvalifikovaný rozlišující název (DN) z podstromu LDAP, ve kterém chcete vyhledávat uživatele a skupiny. Můžete jich přidat tolik, kolik chcete; Nicméně, každá skupina musí být definována pod stejnou základní doménou jako uživatele, kteří do ní patří. Zadáte-li omezené skupiny uživatelů, budou použiti pouze uživatelé, kteří do těchto skupin patří. Doporučujeme použít nejvyšší úroveň vaší LDAP adresářové struktury jako svou základní doménu a použít vyhledávací filtr pro řízení přístupu.",
-  "LDAP_Domain_Search_Filter": "Vyhledávací filtr domény",
-  "LDAP_Domain_Search_Filter_Description": "Pokud je vyplněno, pouze uživatelé, kteří odpovídají tomuto filtru se budou moci přihlásit. Pokud není zadán žádný filtr, všichni uživatelé v rozsahu základní domény se budou moci přihlásit. <br/> Např Active Directory `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/> Nebo pro OpenLDAP (rozšiřitelné vyhledávání) `ou:dn:=ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Kategorie vyhledávaného objektu domény",
-  "LDAP_Domain_Search_Object_Category_Description": "*objectCategory* která identifikuje Vaše uživatele. <br/> Nechte prázdné pro *OpenLDAP*. <br/> Např `Person, atd.",
-  "LDAP_Domain_Search_Object_Class": "Třída vyhledávaného objektu domény",
-  "LDAP_Domain_Search_Object_Class_Description": "*objectClass* která identifikuje Vaše uživatele. <br/> Např `organizationalPerson`,` user`, `inetOrgPerson`, atd.",
-  "LDAP_Domain_Search_Password": "Heslo do domény",
-  "LDAP_Domain_Search_Password_Description": "Heslo pro uživatele domény vyhledávání.",
-  "LDAP_Domain_Search_User": "Uživatel pro doménu vyhledávání",
-  "LDAP_Domain_Search_User_Description": "Uživatel LDAP, přes kterého se provádí vyhledávání a ověřují ostatní uživatelé při přihlášení. <br/> Obvykle je to účet služby vytvořené speciálně pro integraci do třetích stran. Použijte plně kvalifikovaný název, jako například `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "ID uživatele domény",
-  "LDAP_Domain_Search_User_ID_Description": "Atribut LDAP, který identifikuje uživatele LDAP, který se přihlašuje. Toto pole by mělo být `sAMAccountName` pro většinu instancí Active Directory, ale může být` uid` v jiných LDAP řešeních (například OpenLDAP). Můžete použít `mail` k identifikaci uživatele pomocí e-mailu nebo jakýkoliv jiný atribut, který chcete.<br>Můžete použít více hodnot oddělených čárkou, která uživatelům umožňuje přihlášení pomocí více identifikátorů, jako jsou uživatelské jméno nebo e-mail.",
+  "LDAP_BaseDN_Description": "Plně kvalifikovaný rozlišující název (DN) z podstromu LDAP, ve kterém chcete vyhledávat uživatele a skupiny. Můžete jich přidat tolik, kolik chcete; Nicméně, každá skupina musí být definována pod stejnou základní doménou jako uživatele, kteří do ní patří. Zadáte-li omezené skupiny uživatelů, budou použiti pouze uživatelé, kteří do těchto skupin patří. Doporučujeme použít nejvyšší úroveň vaší LDAP adresářové struktury jako svou základní doménu a použít vyhledávací filtr pro řízení přístupu.",
+  "LDAP_User_Search_Field_Description": "Atribut LDAP, který identifikuje uživatele LDAP, který se přihlašuje. Toto pole by mělo být `sAMAccountName` pro většinu instancí Active Directory, ale může být` uid` v jiných LDAP řešeních (například OpenLDAP). Můžete použít `mail` k identifikaci uživatele pomocí e-mailu nebo jakýkoliv jiný atribut, který chcete.<br>Můžete použít více hodnot oddělených čárkou, která uživatelům umožňuje přihlášení pomocí více identifikátorů, jako jsou uživatelské jméno nebo e-mail.",
+  "LDAP_User_Search_Filter_Description": "Pokud je vyplněno, pouze uživatelé, kteří odpovídají tomuto filtru se budou moci přihlásit. Pokud není zadán žádný filtr, všichni uživatelé v rozsahu základní domény se budou moci přihlásit. <br/> Např Active Directory `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/> Nebo pro OpenLDAP (rozšiřitelné vyhledávání) `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Uživatel LDAP, přes kterého se provádí vyhledávání a ověřují ostatní uživatelé při přihlášení. <br/> Obvykle je to účet služby vytvořené speciálně pro integraci do třetích stran. Použijte plně kvalifikovaný název, jako například `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "Povolit",
   "LDAP_Enable_Description": "Pokusit se použít LDAP pro autentizaci.",
   "LDAP_Encryption": "Šifrování",
@@ -1023,7 +1012,6 @@
   "LDAP_Host": "Hostitel",
   "LDAP_Host_Description": "Hostitel LDAP, například `ldap.example.com` nebo 10.0.0.30`.",
   "LDAP_Idle_Timeout": "Prodleva nečinnosti (ms)",
-  "LDAP_Import_Users": "Importovat LDAP uživatele",
   "LDAP_Import_Users_Description": "Pokud povoleno, všichni LDAP uživatelé budou naimportováni<br /> *POZOR* Nastavte filtr pokud chcete omezit počet uživatelů.",
   "LDAP_Login_Fallback": "Alternativní login",
   "LDAP_Login_Fallback_Description": "Pokud se přihlášení přes LDAP nepodaří použít místní/výchozí login. Může se hodit pokud je LDAP offline.",
@@ -1037,12 +1025,9 @@
   "LDAP_Sync_User_Data_Description": "Udržujte uživatelská data synchronizovaná se serverem po přihlášení (např: jméno, e-mail).",
   "LDAP_Sync_User_Data_FieldMap": "Mapa polí uživatelských dat",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfiguruje pole uživatelských dat (například e-mailu) v záznamu v LDAP. <br/> Například `{\"cn\":\"name\", \"mail\":\"email\"}` vybere jméno osoby z atributu `cn`, a jeho e-mail z atributu `mail`. Lze používat proměnné například: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` použije kombinaci křestínho jména a příjmení pro pole `name` v Rocket.Chat.<br/>Dostupná pole Rocket.Chatu jsou `name`, a `email`.",
-  "LDAP_Sync_Users": "Synchronizovat Uživatele",
   "LDAP_Test_Connection": "Test připojení",
   "LDAP_Unique_Identifier_Field": "Jedinečný identifikátor",
   "LDAP_Unique_Identifier_Field_Description": "Která pole bude použita k propojení uživatelů LDAP a uživatelů Rocket.Chat. Můžete specifikovat více hodnot oddělených čárkou pro získání z LDAP záznamu. <br/> Výchozí hodnota je `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Použít vlastní doménové vyhledávání",
-  "LDAP_Use_Custom_Domain_Search_Description": "Napište svůj vlastní filtr pro vyhledávání uživatelů v LDAP serveru.",
   "LDAP_Username_Field": "Pole Uživatelského jména",
   "LDAP_Username_Field_Description": "Které pole budou použity jako *Jméno* pro nové uživatele. Ponechte prázdné pro použítí jména z přihlašovací stránky. <br/> Můžete použít šablony a tagy jako například `#{givenName}.#{sn}`.<br/>Výchozí hodnota je `sAMAccountName`.",
   "Least_Amount": "Nejmenším počet",
@@ -1663,6 +1648,7 @@
   "Start_video_call": "Začít videohovor",
   "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Napište <code class=\"inline\">%s</code> pro uživatele nebo <code class=\"inline\">%s</code> pro místnost. Např.: <code class=\"inline\">%s</code> nebo <code class=\"inline\">%s</code>",
   "Started_At": "Zahájena v",
+  "Started_a_video_call": "Zahájil videohovor",
   "Statistics": "Statistiky",
   "Statistics_reporting": "Posílat statistiky do Rocket.Chat",
   "Statistics_reporting_Description": "Zasláním svých statistik, nám pomáháte mít přehled o tom, kolik instancí se používá, zda se systém chová správně, takže jej můžeme dále vylepšovat. Nebojte, žádné důvěrné informace o uživatelích neodesíláme a všechny informace, které obdržíme, udržujeme v tajnosti.",
diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index 0156a822440..507fb07a83c 100644
--- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -598,24 +598,12 @@
   "Layout_Terms_of_Service": "Nutzungsbedingungen",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA-Cert",
-  "LDAP_Custom_Domain_Search": "Benutzerdefinierte Domainsuche",
-  "LDAP_Custom_Domain_Search_Description": "Ein Teil aus JSON, welches Bindungs- und Verbindungsinformationen regelt und folgende Struktur besitzt: <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Standard-Domain",
   "LDAP_Description": "LDAP ist ein  Frontend zu hierarchischen Datenbanken, die viele Unternehmen nutzen, um eine eine Einmalanmeldung (SSO) zu ermöglichen. Über SSO kann \"ein Benutzer nach einer einmaligen Authentifizierung an einem Arbeitsplatz auf alle Rechner und Dienste, für die er lokal berechtigt ist, am selben Arbeitsplatz zugreifen kann, ohne sich jedes Mal neu anmelden zu müssen\". Genauere Informationen zur Konfiguration von LDAP mit Konfigurationsbeispielen erhalten Sie unter folgendem Link: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "Domainbasis",
-  "LDAP_Domain_Base_Description": "Der volle Distinguished Name (DN) von einem LDAP-Unterverzeichnis, den Sie nach Benutzern und Gruppen durchsuchen möchten. SIe können so viele hinzufügen wie sie möchten. Jede Gruppe muss aber der selben Domainbasis angehören, in der sich die Benutzer befindet. Wenn Sie beschränkte Nutzergruppen angeben, werden nur Benutzer, die diesen Gruppen angehören, im Anwendungsbereich liegen. Wir empfehlen, die oberste Ebene des LDAP-Verzeichnisbaums als Domainbasis anzugeben und Suchfilter zu verwenden, um den Zugriff zu kontrollieren.",
-  "LDAP_Domain_Search_Filter": "Filter der Domainsuche",
-  "LDAP_Domain_Search_Filter_Description": "Wenn angegeben, wird nur Benutzern, die dem Filter entsprechen, erlaubt, sich anzumelden. Wenn kein Filter angegeben ist, werden sich alle Benutzer in dem Bereich der angegebenen Domainbasis anmelden können.<br/>Ein Beispiel für Active-Directory: `memberOf=cn=ROCKET_CHAT,ou=General Groups`<br/>Ein Beispiel für OpenLDAP (erweiterbare Übereinstimmungssuche): `ou:dn:=ROCKET_CHAT`",
-  "LDAP_Domain_Search_Object_Category": "Objektkategorie der Domainsuche",
-  "LDAP_Domain_Search_Object_Category_Description": "Die *objectCategory*, die Ihre Nutzer identifizert. Lassen Sie das Feld leer, um *OpenLDAP* zu aktivieren. <br/> Beispiel: `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Objektklasse der Domainsuche",
-  "LDAP_Domain_Search_Object_Class_Description": "Die *objectclass*, die Ihre Nutzer identifizert. <br/> Beispiel: `organizationalPerson`, `user`, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Passwort der Domainsuche",
-  "LDAP_Domain_Search_Password_Description": "Das Passwort für die Benuzer der Domainsuche",
-  "LDAP_Domain_Search_User": "Domain Search User",
-  "LDAP_Domain_Search_User_Description": "Der LDAP-Benutzer, der eine Benutzersuche durchführt, um andere Nutzer bei der Anmeldung zu authentifizieren. <br/>Dies ist in der Regel ein Servicekonto, welches für Drittintegrationen erstellt worden ist. Verwenden Sie einen vollen Namen, wie zum Beispiel `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search User ID",
-  "LDAP_Domain_Search_User_ID_Description": "Das LDAP-Attribut, welches den LDAP-Benutzer identifiziert, der sich zu authentifizieren versucht. Das Feld ist für die meisten Active-Directory-Installationen `sAMAccountName`, für andere LDAP-Lösungen wie OpenLDAP kann dieses jedoch auch `uid` sein. Sie können aber auch `mail` verwenden, um Benutzer mit Ihrer E-Mail-Adresse zu identifizieren oder jedes Attribut, das Sie möchten. <br>Sie können mehrere Werte, getrennt mit Kommata, verwenden, um es Benutzern zu erlauben, sich mit mehreren Kennungen anzumelden, wie zum Beispiel einem Benutzernamen und der E-Mail-Adresse.",
+  "LDAP_BaseDN_Description": "Der volle Distinguished Name (DN) von einem LDAP-Unterverzeichnis, den Sie nach Benutzern und Gruppen durchsuchen möchten. SIe können so viele hinzufügen wie sie möchten. Jede Gruppe muss aber der selben Domainbasis angehören, in der sich die Benutzer befindet. Wenn Sie beschränkte Nutzergruppen angeben, werden nur Benutzer, die diesen Gruppen angehören, im Anwendungsbereich liegen. Wir empfehlen, die oberste Ebene des LDAP-Verzeichnisbaums als Domainbasis anzugeben und Suchfilter zu verwenden, um den Zugriff zu kontrollieren.",
+  "LDAP_User_Search_Field_Description": "Das LDAP-Attribut, welches den LDAP-Benutzer identifiziert, der sich zu authentifizieren versucht. Das Feld ist für die meisten Active-Directory-Installationen `sAMAccountName`, für andere LDAP-Lösungen wie OpenLDAP kann dieses jedoch auch `uid` sein. Sie können aber auch `mail` verwenden, um Benutzer mit Ihrer E-Mail-Adresse zu identifizieren oder jedes Attribut, das Sie möchten. <br>Sie können mehrere Werte, getrennt mit Kommata, verwenden, um es Benutzern zu erlauben, sich mit mehreren Kennungen anzumelden, wie zum Beispiel einem Benutzernamen und der E-Mail-Adresse.",
+  "LDAP_User_Search_Filter_Description": "Wenn angegeben, wird nur Benutzern, die dem Filter entsprechen, erlaubt, sich anzumelden. Wenn kein Filter angegeben ist, werden sich alle Benutzer in dem Bereich der angegebenen Domainbasis anmelden können.<br/>Ein Beispiel für Active-Directory: `memberOf=cn=ROCKET_CHAT,ou=General Groups`<br/>Ein Beispiel für OpenLDAP (erweiterbare Übereinstimmungssuche): `ou:dn:=ROCKET_CHAT`",
+  "LDAP_Authentication_UserDN_Description": "Der LDAP-Benutzer, der eine Benutzersuche durchführt, um andere Nutzer bei der Anmeldung zu authentifizieren. <br/>Dies ist in der Regel ein Servicekonto, welches für Drittintegrationen erstellt worden ist. Verwenden Sie einen vollen Namen, wie zum Beispiel `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "LDAP aktivieren",
   "LDAP_Enable_Description": "LDAP für die Authentifizierung verwenden.",
   "LDAP_Encryption": "Verschlüsselung",
@@ -630,12 +618,9 @@
   "LDAP_Sync_User_Data_Description": "Bei der Anmeldung die Benutzerdaten mit dem Server synchronisieren (Beispiel: Name, E-Mail).",
   "LDAP_Sync_User_Data_FieldMap": "Nutzerdaten-Feldkarte",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurieren Sie, wie Benutzer-Account-Felder (wie die E-Mail-Adresse) aus einem LDAP-Datensatz (falls gefunden) geladen werden.<br/>Beispiel: {\"cn\":\"name\", \"mail\":\"email\"} nimmt einen von Menschen lesbaren Namen von dem cn-Attribut und die E-Mail-Adresse vom Mail-Attribut.<br/>Verfügbare Felder beinhalten den Namen und die E-Mail-Adresse.",
-  "LDAP_Sync_Users": "Benutzer synchronisieren",
   "LDAP_Test_Connection": "Testverbindung",
   "LDAP_Unique_Identifier_Field": "Eindeutige Kennung des Felds",
   "LDAP_Unique_Identifier_Field_Description": "Dieses Feld wird verwendet, um LDAP-Nutzer und Rocket.Chat-Nutzer zu verbinden. Sie können mehrere Kommata-getrennte Werte angeben, um die Werte vom LDAP-Eintrag zu erhalten.<br/>Der Standardwert ist `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`.",
-  "LDAP_Use_Custom_Domain_Search": "Benutzerdefinierte Domainsuche verwenden",
-  "LDAP_Use_Custom_Domain_Search_Description": "Schreiben Sie Ihren eigenen Filter, um Benutzer auf dem LDAP-Server zu suchen.",
   "LDAP_Username_Field": "Nutzernamenfeld",
   "LDAP_Username_Field_Description": "Geben Sie an, welches Feld als *Nutzername* für neue Benutzer verwendet werden soll. Lassen Sie das Feld leer, um den Nutzernamen zu verwenden, der auf der Anmeldeseite verwendet wird.<br/>Es können auch Template-Tags wie `#{givenNamen}.#{sn}` verwendet werden.<br/>Der Standardwert ist `sAMAccountName`.",
   "Least_Amount": "Geringste Anzahl",
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index 3e11c2c7296..a5f91d7bfdd 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -374,6 +374,7 @@
   "clear_history": "Verlauf löschen",
   "Click_here": "Hier klicken",
   "Click_here_for_more_info": "Für weitere Informationen hier klicken",
+  "Click_to_join": "Hier klicken um teilzunehmen!",
   "Client_ID": "Client-ID",
   "Client_Secret": "Client-Geheimnis",
   "Clients_will_refresh_in_a_few_seconds": "Clients werden in wenigen Sekunden aktualisiert",
@@ -986,24 +987,12 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA-Cert",
   "LDAP_Connect_Timeout": "Verbindungs-Timeout (ms)",
-  "LDAP_Custom_Domain_Search": "Benutzerdefinierte Domainsuche",
-  "LDAP_Custom_Domain_Search_Description": "Ein Teil aus JSON, welches Verbindungsinformationen defiiniert und folgende Struktur besitzt: <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Standard-Domain",
   "LDAP_Description": "LDAP ist eine hierarchische Datenbank, die viele Unternehmen nutzen, um eine eine Einmalanmeldung (SSO) zu ermöglichen. Über SSO kann \"ein Benutzer nach einer einmaligen Authentifizierung an einem Arbeitsplatz auf alle Rechner und Dienste, für die er lokal berechtigt ist, am selben Arbeitsplatz zugreifen kann, ohne sich jedes Mal neu anmelden zu müssen\". Genauere Informationen zur Konfiguration von LDAP mit Konfigurationsbeispielen erhalten Sie unter folgendem Link: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "Domain-Basis",
-  "LDAP_Domain_Base_Description": "Der volle Distinguished Name (DN) von einem LDAP-Unterverzeichnis, den Sie nach Benutzern und Gruppen durchsuchen möchten. Sie können so viele hinzufügen wie sie möchten. Jede Gruppe muss aber der selben Domainbasis angehören, in der sich die Benutzer befindet. Wenn Sie beschränkte Nutzergruppen angeben, werden nur Benutzer, die diesen Gruppen angehören, berücksichtig. Wir empfehlen, die oberste Ebene des LDAP-Verzeichnisbaums als Domainbasis anzugeben und Suchfilter zu verwenden, um Einschränkungen vorzunehmen.",
-  "LDAP_Domain_Search_Filter": "Filter der Domain-Suche",
-  "LDAP_Domain_Search_Filter_Description": "Wenn angegeben, wird nur Benutzern, die dem Filter entsprechen, erlaubt, sich anzumelden. Wenn kein Filter angegeben ist, werden sich alle Benutzer in dem Bereich der angegebenen Domainbasis anmelden können.<br/>Ein Beispiel für Active-Directory: `memberOf=cn=ROCKET_CHAT,ou=General Groups`<br/>Ein Beispiel für OpenLDAP (erweiterbare Übereinstimmungssuche): `ou:dn:=ROCKET_CHAT`",
-  "LDAP_Domain_Search_Object_Category": "Objektkategorie der Domain-Suche",
-  "LDAP_Domain_Search_Object_Category_Description": "Die *objectCategory*, die Ihre Nutzer identifizert. Lassen Sie das Feld bei der Nutzung von *OpenLDAP* leer. <br/> Beispiel: `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Objektklasse der Domain-Suche",
-  "LDAP_Domain_Search_Object_Class_Description": "Die *objectclass*, die Ihre Nutzer identifizert. <br/> Beispiel: `organizationalPerson`, `user`, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Passwort der Domain-Suche",
-  "LDAP_Domain_Search_Password_Description": "Das Passwort für die Benuzer der Domainsuche",
-  "LDAP_Domain_Search_User": "Benutzer der Domain-Suche",
-  "LDAP_Domain_Search_User_Description": "Der LDAP-Benutzer, der eine Benutzersuche durchführt, um andere Nutzer bei der Anmeldung zu authentifizieren. <br/>Dies ist in der Regel ein Servicekonto, welches für Drittintegrationen erstellt worden ist. Verwenden Sie einen vollen Namen, wie zum Beispiel `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "User ID der Domain-Suche",
-  "LDAP_Domain_Search_User_ID_Description": "Das LDAP-Attribut, welches den LDAP-Benutzer identifiziert, der sich zu authentifizieren versucht. Das Feld ist für die meisten Active-Directory-Installationen `sAMAccountName`, für andere LDAP-Lösungen wie OpenLDAP kann dieses jedoch auch `uid` sein. Sie können aber auch `mail` verwenden, um Benutzer mit Ihrer E-Mail-Adresse zu identifizieren - oder jedes Attribut, das Sie möchten. <br/>Sie können mehrere Werte, getrennt mit Kommata, verwenden, um es Benutzern zu erlauben, sich mit mehreren Kennungen anzumelden, wie zum Beispiel einem Benutzernamen und der E-Mail-Adresse.",
+  "LDAP_BaseDN_Description": "Der volle Distinguished Name (DN) von einem LDAP-Unterverzeichnis, den Sie nach Benutzern und Gruppen durchsuchen möchten. Sie können so viele hinzufügen wie sie möchten. Jede Gruppe muss aber der selben Domainbasis angehören, in der sich die Benutzer befindet. Wenn Sie beschränkte Nutzergruppen angeben, werden nur Benutzer, die diesen Gruppen angehören, berücksichtig. Wir empfehlen, die oberste Ebene des LDAP-Verzeichnisbaums als Domainbasis anzugeben und Suchfilter zu verwenden, um Einschränkungen vorzunehmen.",
+  "LDAP_User_Search_Field_Description": "Das LDAP-Attribut, welches den LDAP-Benutzer identifiziert, der sich zu authentifizieren versucht. Das Feld ist für die meisten Active-Directory-Installationen `sAMAccountName`, für andere LDAP-Lösungen wie OpenLDAP kann dieses jedoch auch `uid` sein. Sie können aber auch `mail` verwenden, um Benutzer mit Ihrer E-Mail-Adresse zu identifizieren - oder jedes Attribut, das Sie möchten. <br/>Sie können mehrere Werte, getrennt mit Kommata, verwenden, um es Benutzern zu erlauben, sich mit mehreren Kennungen anzumelden, wie zum Beispiel einem Benutzernamen und der E-Mail-Adresse.",
+  "LDAP_User_Search_Filter_Description": "Wenn angegeben, wird nur Benutzern, die dem Filter entsprechen, erlaubt, sich anzumelden. Wenn kein Filter angegeben ist, werden sich alle Benutzer in dem Bereich der angegebenen Domainbasis anmelden können.<br/>Ein Beispiel für Active-Directory: `memberOf=cn=ROCKET_CHAT,ou=General Groups`<br/>Ein Beispiel für OpenLDAP (erweiterbare Übereinstimmungssuche): `ou:dn:=ROCKET_CHAT`",
+  "LDAP_Authentication_UserDN_Description": "Der LDAP-Benutzer, der eine Benutzersuche durchführt, um andere Nutzer bei der Anmeldung zu authentifizieren. <br/>Dies ist in der Regel ein Servicekonto, welches für Drittintegrationen erstellt worden ist. Verwenden Sie einen vollen Namen, wie zum Beispiel `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "LDAP",
   "LDAP_Enable_Description": "LDAP zur Authentifizierung verwenden",
   "LDAP_Encryption": "Verschlüsselung",
@@ -1023,7 +1012,6 @@
   "LDAP_Host": "LDAP-Host",
   "LDAP_Host_Description": "Der LDAP-Host, bspw. `ldap.example.com` oder `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Idle Timeout (ms)",
-  "LDAP_Import_Users": "Importiere LDAP-Benutzer",
   "LDAP_Import_Users_Description": "Importiert alle gefundenen LDAP-Benutzer.<br/>*Achtung!* Filteroption angeben , um nicht zu viele Benutzer zu importieren",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "Wenn der Login mit Hilfe von LDAP nicht erfolgreich war versuchen, mit dem lokalen Konto anzumelden. Das kann hilfreich sein, falls LDAP nicht verfügbar war.",
@@ -1037,12 +1025,9 @@
   "LDAP_Sync_User_Data_Description": "Bei der Anmeldung die Benutzerdaten mit dem Server synchronisieren (Bspw. Name, E-Mail-Adresse).",
   "LDAP_Sync_User_Data_FieldMap": "Zuordnung der Benutzer-Attribute",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurieren Sie, wie Benutzer-Account-Eigenschaften (wie die E-Mail-Adresse) aus einem LDAP-Datensatz (falls gefunden) geladen werden.<br/>Beispiel: {\"cn\":\"name\", \"mail\":\"email\"} nimmt einen von Menschen lesbaren Namen aus dem cn-Attribut und die E-Mail-Adresse aus dem Mail-Attribut. Zusätzlich ist die Verwendung von Variablen möglich, wie z.B.: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }`. Hierbei wird eine Kombination des Vor- und Nachnamens verwendet.<br/>Verfügbare Felder in Rocket.Chat sind `name` und `email`.",
-  "LDAP_Sync_Users": "Benutzer synchronisieren",
   "LDAP_Test_Connection": "Verbindung prüfen",
   "LDAP_Unique_Identifier_Field": "Feld für eindeutige Identifizierung",
   "LDAP_Unique_Identifier_Field_Description": "Dieses Feld wird verwendet, um LDAP-Nutzer und Rocket.Chat-Nutzer zu verbinden. Sie können mehrere Kommata-getrennte Werte angeben, um die Werte vom LDAP-Eintrag zu erhalten.<br/>Der Standardwert ist `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`.",
-  "LDAP_Use_Custom_Domain_Search": "Benutzerdefinierte Domain-Suche verwenden",
-  "LDAP_Use_Custom_Domain_Search_Description": "Schreiben Sie Ihren eigenen Filter, um Benutzer auf dem LDAP-Server zu suchen.",
   "LDAP_Username_Field": "Feld für den Benutzernamen",
   "LDAP_Username_Field_Description": "Geben Sie an, welches Feld als *Benutzername* für neue Benutzer verwendet werden soll. Lassen Sie das Feld leer, um den Nutzernamen zu verwenden, der auf der Anmeldeseite verwendet wird.<br/>Es können auch Template-Tags wie `#{givenNamen}.#{sn}` verwendet werden.<br/>Der Standardwert ist `sAMAccountName`.",
   "Least_Amount": "Geringste Anzahl",
@@ -1663,6 +1648,7 @@
   "Start_video_call": "Videoanruf starten",
   "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Starten Sie mit <code class=\"inline\">%s</code> für Nutzer oder <code class=\"inline\">%s</code> für Kanäle. Beispiel: <code class=\"inline\">%s</code> oder <code class=\"inline\">%s</code>",
   "Started_At": "Gestartet um",
+  "Started_a_video_call": "Ein Video-Anruf wurde gestartet",
   "Statistics": "Statistiken",
   "Statistics_reporting": "Sende Statistiken an Rocket.Chat",
   "Statistics_reporting_Description": "Mit dem Senden Ihrer Statistiken helfen Sie uns herauszufinden, wie viele Instanzen von Rocket.Chat eingesetzt werden und wie gut sich das System verhält. So können wir es weiter verbessern. Es werden keine Benutzerinformationen übertragen und die erhaltenen Daten werden vertraulich behandelt.",
diff --git a/packages/rocketchat-i18n/i18n/el.i18n.json b/packages/rocketchat-i18n/i18n/el.i18n.json
index bdebece374b..41268edd90a 100644
--- a/packages/rocketchat-i18n/i18n/el.i18n.json
+++ b/packages/rocketchat-i18n/i18n/el.i18n.json
@@ -570,24 +570,12 @@
   "Layout_Terms_of_Service": "Όροι χρήσης",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Αναζήτηση προσαρμοσμένο τομέα",
-  "LDAP_Custom_Domain_Search_Description": "Ένα κομμάτι του JSON που διέπει δεσμεύουν και σύνδεση πληροφορίες και είναι της μορφής: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "default Domain",
   "LDAP_Description": "LDAP είναι μια ιεραρχική βάση δεδομένων που πολλές εταιρείες χρησιμοποιούν για να παρέχουν Single Sign On - μια εγκατάσταση για την κοινή χρήση ενός κωδικού πρόσβασης από πολλαπλές τοποθεσίες και υπηρεσίες. Για προχωρημένους πληροφορίες διαμόρφωσης και παραδείγματα, συμβουλευτείτε wiki μας: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "τομέα Βάσης",
-  "LDAP_Domain_Base_Description": "Το πλήρως αναγνωρισμένο αποκλειστικό όνομα (DN) του υποδένδρο LDAP που θέλετε να αναζητήσετε χρήστες και ομάδες. Μπορείτε να προσθέσετε όσες θέλετε? Ωστόσο, κάθε ομάδα πρέπει να ορίζεται στην ίδια βάση τομέα με τους χρήστες που ανήκουν σε αυτήν. Εάν καθορίσετε κλειστές ομάδες χρηστών, μόνο οι χρήστες που ανήκουν σε αυτές τις ομάδες θα είναι στο πεδίο. Σας συνιστούμε να καθορίσετε το ανώτερο επίπεδο του δέντρου καταλόγου LDAP σας ως βάση το domain σας και να χρησιμοποιήσετε το φίλτρο αναζήτησης για να ελέγξετε την πρόσβαση.",
-  "LDAP_Domain_Search_Filter": "Αναζήτηση Domain Φίλτρο",
-  "LDAP_Domain_Search_Filter_Description": "Αν καθοριστεί, μόνο οι χρήστες που ταιριάζουν με αυτό το φίλτρο θα επιτραπεί να συνδεθείτε. Εάν δεν έχει καθοριστεί φίλτρου, όλοι οι χρήστες εντός του πεδίου εφαρμογής της συγκεκριμένης βάσης τομέα θα είναι σε θέση να συνδεθείτε. <br/> Π.χ. για Active Directory `MemberOf = cn = ROCKET_CHAT, ou = Γενική Groups`. <br/> Π.χ. για OpenLDAP (αναζήτηση επεκτάσιμη αγώνα) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Αναζήτηση Domain Object Κατηγορία",
-  "LDAP_Domain_Search_Object_Category_Description": "Ο * objectCategory * που αναγνωρίζουν τους χρήστες σας. <br/> Αφήστε το κενό για * OpenLDAP *. <br/> Π.χ. `person`, κ.λπ.",
-  "LDAP_Domain_Search_Object_Class": "Τομέα Class Αναζήτηση Αντικείμενο",
-  "LDAP_Domain_Search_Object_Class_Description": "Ο * objectclass * που αναγνωρίζουν τους χρήστες σας. <br/> Π.χ. `organizationalPerson`,` Χρήστης των, `inetOrgPerson`, κ.λπ.",
-  "LDAP_Domain_Search_Password": "Αναζήτηση Domain Κωδικός",
-  "LDAP_Domain_Search_Password_Description": "Ο κωδικός πρόσβασης για το χρήστη αναζήτησης τομέα.",
-  "LDAP_Domain_Search_User": "Αναζήτηση Domain User",
-  "LDAP_Domain_Search_User_Description": "Ο χρήστης LDAP που εκτελεί αναζητήσεις του χρήστη για τον έλεγχο ταυτότητας σε άλλους χρήστες, όταν συνδεθείτε. <br/> Αυτό είναι συνήθως ένα λογαριασμό υπηρεσίας που δημιουργήθηκε ειδικά για την ενσωμάτωση τρίτων κατασκευαστών. Χρησιμοποιήστε ένα πλήρως αναγνωρισμένο όνομα, όπως `cn = διαχειριστή, CN = Users, dc = Παράδειγμα, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Αναζήτηση Domain Αναγνωριστικό χρήστη",
-  "LDAP_Domain_Search_User_ID_Description": "Το χαρακτηριστικό LDAP που προσδιορίζει το χρήστη LDAP ο οποίος επιχειρεί έλεγχο ταυτότητας. Αυτό το πεδίο πρέπει να είναι `sAMAccountName` για τις εγκαταστάσεις πιο Active Directory, αλλά μπορεί να είναι` uid` για άλλες λύσεις LDAP, όπως OpenLDAP. Μπορείτε να χρησιμοποιήσετε το `mail` για την αναγνώριση των χρηστών μέσω e-mail ή οτιδήποτε άλλο χαρακτηριστικό που θέλετε. <br> Μπορείτε να χρησιμοποιήσετε πολλές τιμές διαχωρισμένες με κόμμα για να επιτρέπει στους χρήστες να συνδεθείτε χρησιμοποιώντας πολλαπλές αναγνωριστικά, όπως το όνομα χρήστη ή e-mail.",
+  "LDAP_BaseDN_Description": "Το πλήρως αναγνωρισμένο αποκλειστικό όνομα (DN) του υποδένδρο LDAP που θέλετε να αναζητήσετε χρήστες και ομάδες. Μπορείτε να προσθέσετε όσες θέλετε? Ωστόσο, κάθε ομάδα πρέπει να ορίζεται στην ίδια βάση τομέα με τους χρήστες που ανήκουν σε αυτήν. Εάν καθορίσετε κλειστές ομάδες χρηστών, μόνο οι χρήστες που ανήκουν σε αυτές τις ομάδες θα είναι στο πεδίο. Σας συνιστούμε να καθορίσετε το ανώτερο επίπεδο του δέντρου καταλόγου LDAP σας ως βάση το domain σας και να χρησιμοποιήσετε το φίλτρο αναζήτησης για να ελέγξετε την πρόσβαση.",
+  "LDAP_User_Search_Field_Description": "Το χαρακτηριστικό LDAP που προσδιορίζει το χρήστη LDAP ο οποίος επιχειρεί έλεγχο ταυτότητας. Αυτό το πεδίο πρέπει να είναι `sAMAccountName` για τις εγκαταστάσεις πιο Active Directory, αλλά μπορεί να είναι` uid` για άλλες λύσεις LDAP, όπως OpenLDAP. Μπορείτε να χρησιμοποιήσετε το `mail` για την αναγνώριση των χρηστών μέσω e-mail ή οτιδήποτε άλλο χαρακτηριστικό που θέλετε. <br> Μπορείτε να χρησιμοποιήσετε πολλές τιμές διαχωρισμένες με κόμμα για να επιτρέπει στους χρήστες να συνδεθείτε χρησιμοποιώντας πολλαπλές αναγνωριστικά, όπως το όνομα χρήστη ή e-mail.",
+  "LDAP_User_Search_Filter_Description": "Αν καθοριστεί, μόνο οι χρήστες που ταιριάζουν με αυτό το φίλτρο θα επιτραπεί να συνδεθείτε. Εάν δεν έχει καθοριστεί φίλτρου, όλοι οι χρήστες εντός του πεδίου εφαρμογής της συγκεκριμένης βάσης τομέα θα είναι σε θέση να συνδεθείτε. <br/> Π.χ. για Active Directory `MemberOf = cn = ROCKET_CHAT, ou = Γενική Groups`. <br/> Π.χ. για OpenLDAP (αναζήτηση επεκτάσιμη αγώνα) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Ο χρήστης LDAP που εκτελεί αναζητήσεις του χρήστη για τον έλεγχο ταυτότητας σε άλλους χρήστες, όταν συνδεθείτε. <br/> Αυτό είναι συνήθως ένα λογαριασμό υπηρεσίας που δημιουργήθηκε ειδικά για την ενσωμάτωση τρίτων κατασκευαστών. Χρησιμοποιήστε ένα πλήρως αναγνωρισμένο όνομα, όπως `cn = διαχειριστή, CN = Users, dc = Παράδειγμα, dc = com`.",
   "LDAP_Enable": "Καθιστώ ικανό",
   "LDAP_Enable_Description": "Προσπάθεια να χρησιμοποιούν το LDAP για έλεγχο ταυτότητας.",
   "LDAP_Encryption": "κρυπτογράφηση",
@@ -602,12 +590,9 @@
   "LDAP_Sync_User_Data_Description": "Κρατήστε τα δεδομένα των χρηστών σε συγχρονισμό με το διακομιστή για την είσοδο (π.χ. όνομα, διεύθυνση ηλεκτρονικού ταχυδρομείου).",
   "LDAP_Sync_User_Data_FieldMap": "Πεδίου δεδομένων χρήστη Χάρτης",
   "LDAP_Sync_User_Data_FieldMap_Description": "Διαμορφώστε το πώς τα πεδία λογαριασμού χρήστη (όπως το ηλεκτρονικό ταχυδρομείο) κατοικείται από τα επίπεδα ρεκόρ στα LDAP (αφού διαπίστωσε). <br/> Ως παράδειγμα, `{\" ΣΟ \":\" όνομα \",\" mail \":\" e-mail \"}` θα επιλέξουν τα ανθρώπινα αναγνώσιμο όνομα ενός ατόμου από το χαρακτηριστικό cn, και το ηλεκτρονικό ταχυδρομείο τους από το χαρακτηριστικό αλληλογραφίας. <br/> Διαθέσιμα πεδία περιλαμβάνουν `name`, και` email`.",
-  "LDAP_Sync_Users": "Συγχρονισμός χρήστες",
   "LDAP_Test_Connection": "δοκιμή σύνδεσης",
   "LDAP_Unique_Identifier_Field": "Μοναδικό αναγνωριστικό πεδίο",
   "LDAP_Unique_Identifier_Field_Description": "Ποιο πεδίο θα χρησιμοποιηθεί για να συνδέσει το χρήστη LDAP και του χρήστη Rocket.Chat. Μπορείτε να ενημερώσετε πολλαπλές τιμές διαχωρισμένες με κόμμα για να προσπαθήσει να πάρει την τιμή από LDAP ρεκόρ. <br/> Προεπιλεγμένη τιμή είναι `objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Χρησιμοποιήστε Αναζήτηση Προσαρμοσμένο Τομέα",
-  "LDAP_Use_Custom_Domain_Search_Description": "Γράψτε τη δική σας φίλτρο για να αναζητήσετε χρήστες στο διακομιστή LDAP.",
   "LDAP_Username_Field": "Όνομα Χρήστη πεδίο",
   "LDAP_Username_Field_Description": "Ποιο πεδίο θα πρέπει να χρησιμοποιηθεί ως * όνομα * για τους νέους χρήστες. Αφήστε το κενό για να χρησιμοποιήσετε το όνομα χρήστη ενήμερο για login σελίδα. <br/> Μπορείτε να χρησιμοποιήσετε ετικέτες πρότυπο πάρα πολύ, όπως το `#{givenName}.#{sn}`. <br/> Προεπιλεγμένη τιμή είναι `sAMAccountName`.",
   "Leave_Group_Warning": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από την ομάδα \" %s\";",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index cecea32625a..367b6a5ee78 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1043,7 +1043,8 @@
   "LDAP_Sync_User_Data": "Sync User Data",
   "LDAP_Sync_User_Data_Description": "Keep user data in sync with server on **login** or on **background sync** (eg: name, email).",
   "LDAP_Sync_User_Data_FieldMap": "User Data Field Map",
-  "LDAP_Sync_User_Data_FieldMap_Description": "Configure how user account fields (like email) are populated from a record in LDAP (once found). <br/>As an example, `{\"cn\":\"name\", \"mail\":\"email\"}` will choose a person's human readable name from the cn attribute, and their email from the mail attribute. Additionally it is possible to use variables, for example: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` uses a combination of the user's first name and last name for the rocket chat `name` field.<br/>Available fields in Rocket.Chat: `name`, `email` and `customFields`.",  "LDAP_Test_Connection": "Test Connection",
+  "LDAP_Sync_User_Data_FieldMap_Description": "Configure how user account fields (like email) are populated from a record in LDAP (once found). <br/>As an example, `{\"cn\":\"name\", \"mail\":\"email\"}` will choose a person's human readable name from the cn attribute, and their email from the mail attribute. Additionally it is possible to use variables, for example: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` uses a combination of the user's first name and last name for the rocket chat `name` field.<br/>Available fields in Rocket.Chat: `name`, `email` and `customFields`.",
+  "LDAP_Test_Connection": "Test Connection",
   "LDAP_Timeout": "Timeout (ms)",
   "LDAP_Timeout_Description": "How many mileseconds wait for a search result before return an error",
   "LDAP_Unique_Identifier_Field": "Unique Identifier Field",
diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index 0feb4497c4f..1cd533f1ff2 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -671,24 +671,12 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
   "LDAP_Connect_Timeout": "Tiempo de espera de conexión(ms)",
-  "LDAP_Custom_Domain_Search": "Dominio Personalizado de Busqueda",
-  "LDAP_Custom_Domain_Search_Description": "Un pedazo de JSON que gobierna se unen y la conexión y la información es de la forma: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Dominio Predeterminado",
   "LDAP_Description": "LDAP es una base de datos jerárquica que muchas empresas utilizan para proporcionar inicio de sesión único - una instalación para compartir una contraseña entre múltiples sitios y servicios. Para obtener información avanzada de configuración y ejemplos, consulte nuestra wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Dominio Base",
-  "LDAP_Domain_Base_Description": "El nombre completo (DN) de un sub-árbol LDAP que desea buscar usuarios y grupos. Se pueden añadir tantos como quiera; sin embargo, cada grupo se debe definir en la misma base de dominio que los usuarios que pertenecen a la misma. Si especifica los grupos de usuarios restringidos, sólo los usuarios que pertenecen a esos grupos serán de alcance. Recomendamos que se especifica el nivel superior del árbol de directorios LDAP como su base de dominio y utiliza filtro de búsqueda para controlar el acceso.",
-  "LDAP_Domain_Search_Filter": "Filtro del Dominio de Busqueda",
-  "LDAP_Domain_Search_Filter_Description": "Si se les permitirá especificados, sólo los usuarios que coincidan con este filtro para iniciar sesión. Si no se especifica ningún filtro, todos los usuarios dentro del alcance de la base de dominio especificado serán capaces de iniciar sesión. <br/> Por ejemplo, para Active Directory `memberOf = cn = ROCKET_CHAT, ou = Groups` general. <br/> Por ejemplo, para OpenLDAP (búsqueda de coincidencia de extensible) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Contraseña del Dominio de Busqueda",
-  "LDAP_Domain_Search_Object_Category_Description": "El objectCategory * * que identifican a los usuarios. <br/> Dejar en blanco para OpenLDAP * *. <br/> Por ejemplo, `Person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Clase de dominio de búsqueda de objetos",
-  "LDAP_Domain_Search_Object_Class_Description": "La clase de objeto * * que identifican a los usuarios. <br/> Por ejemplo, `organizationalPerson`,` usuario de la red, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Búsqueda de dominio contraseña",
-  "LDAP_Domain_Search_Password_Description": "La contraseña para el usuario de búsqueda de dominios.",
-  "LDAP_Domain_Search_User": "Búsqueda de dominio del usuario",
-  "LDAP_Domain_Search_User_Description": "El usuario LDAP que realiza búsquedas de usuario para autenticar a otros usuarios cuando inician sesión en. <br/> Esta es normalmente una cuenta de servicio creado específicamente para integraciones de terceros. Utilizar un nombre completo, como `cn = Administrador, cn = Users, dc = ejemplo, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Dominio de búsqueda ID de usuario",
-  "LDAP_Domain_Search_User_ID_Description": "El atributo LDAP que identifica al usuario que intente LDAP autenticación. Este campo debe ser `sAMAccountName` para la mayoría de las instalaciones de Active Directory, pero puede ser` uid` para otras soluciones LDAP, como OpenLDAP. Puede utilizar `mail` para identificar a los usuarios por correo electrónico o cualquier atributo que desee. <br> Se pueden utilizar varios valores separados por comas para permitir a los usuarios acceder usando múltiples identificadores como nombre de usuario o correo electrónico.",
+  "LDAP_BaseDN_Description": "El nombre completo (DN) de un sub-árbol LDAP que desea buscar usuarios y grupos. Se pueden añadir tantos como quiera; sin embargo, cada grupo se debe definir en la misma base de dominio que los usuarios que pertenecen a la misma. Si especifica los grupos de usuarios restringidos, sólo los usuarios que pertenecen a esos grupos serán de alcance. Recomendamos que se especifica el nivel superior del árbol de directorios LDAP como su base de dominio y utiliza filtro de búsqueda para controlar el acceso.",
+  "LDAP_User_Search_Field_Description": "El atributo LDAP que identifica al usuario que intente LDAP autenticación. Este campo debe ser `sAMAccountName` para la mayoría de las instalaciones de Active Directory, pero puede ser` uid` para otras soluciones LDAP, como OpenLDAP. Puede utilizar `mail` para identificar a los usuarios por correo electrónico o cualquier atributo que desee. <br> Se pueden utilizar varios valores separados por comas para permitir a los usuarios acceder usando múltiples identificadores como nombre de usuario o correo electrónico.",
+  "LDAP_User_Search_Filter_Description": "Si se les permitirá especificados, sólo los usuarios que coincidan con este filtro para iniciar sesión. Si no se especifica ningún filtro, todos los usuarios dentro del alcance de la base de dominio especificado serán capaces de iniciar sesión. <br/> Por ejemplo, para Active Directory `memberOf = cn = ROCKET_CHAT, ou = Groups` general. <br/> Por ejemplo, para OpenLDAP (búsqueda de coincidencia de extensible) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "El usuario LDAP que realiza búsquedas de usuario para autenticar a otros usuarios cuando inician sesión en. <br/> Esta es normalmente una cuenta de servicio creado específicamente para integraciones de terceros. Utilizar un nombre completo, como `cn = Administrador, cn = Users, dc = ejemplo, dc = com`.",
   "LDAP_Enable": "Habilitado",
   "LDAP_Enable_Description": "Intentar utilizar LDAP como método de autenticación ",
   "LDAP_Encryption": "Cifrado",
@@ -703,12 +691,9 @@
   "LDAP_Sync_User_Data_Description": "Mantener los datos del usuario en sincronía con el servidor al iniciar sesión (ej: nombre, correo electrónico). ",
   "LDAP_Sync_User_Data_FieldMap": "Mapa de campos de datos de usuario",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configurar como los campos de cuenta de usuario ( como el correo electrónico) son llenados desde un registro en LDAP (una vez encontrados). <br/>A modo de ejemplo, `{\"cn\":\"name\", \"mail\":\"email\"}` elegira el nombre legible de una persona desde el atributo cn, y su correo electrónico desde el atributo de correo electrónico.</br/> Campos disponibles `nombre` y `correo electrónico`.",
-  "LDAP_Sync_Users": "Sincronizar Usuarios",
   "LDAP_Test_Connection": "Probar Conexión ",
   "LDAP_Unique_Identifier_Field": "Campo de Identificador Único ",
   "LDAP_Unique_Identifier_Field_Description": "Qué campo se utilizará para vincular al usuario LDAP y el usuario Rocket.Chat. Puede informar a varios valores separados por una coma para tratar de obtener el valor del registro de LDAP. <br/> El valor por defecto es `objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueid, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Usar la búsqueda de dominio personalizado",
-  "LDAP_Use_Custom_Domain_Search_Description": "Escribir su propio filtro para buscar a los usuarios en el servidor LDAP.",
   "LDAP_Username_Field": "Campo de Nombre de Usuario",
   "LDAP_Username_Field_Description": "Qué campo se utilizará como nombre de usuario * * para los nuevos usuarios. Dejar en blanco para usar el nombre de usuario informado en la página de inicio de sesión. <br/> Puede utilizar etiquetas de plantilla también, como `#{givenName}.#{sn}`. <br/> El valor por defecto es `sAMAccountName`.",
   "Least_Amount": "Menor cantidad",
diff --git a/packages/rocketchat-i18n/i18n/fa.i18n.json b/packages/rocketchat-i18n/i18n/fa.i18n.json
index 3ca1c87ff18..5411735b52a 100644
--- a/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -570,24 +570,12 @@
   "Layout_Terms_of_Service": "شرایط استفاده از خدمات",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA بزنید",
-  "LDAP_Custom_Domain_Search": "جستجو سفارشی دامنه",
-  "LDAP_Custom_Domain_Search_Description": "قطعه ای از JSON که بر اتصال و اتصال اطلاعات و فرم: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "به طور پیش فرض دامنه",
   "LDAP_Description": "یک مرکز برای به اشتراک گذاری یک رمز عبور بین سایت و خدمات مختلف - LDAP یک پایگاه داده سلسله مراتبی است که بسیاری از شرکت ها برای ارائه یکبار ورود به سیستم است. https://rocket.chat/docs/administrator-guides/authentication/ldap/: برای کسب اطلاعات پیکربندی پیشرفته و نمونه، لطفا ویکی ما مشورت کنید.",
-  "LDAP_Domain_Base": "پایه دامنه",
-  "LDAP_Domain_Base_Description": "نام کامل برجسته (DN) از یک زیر درخت LDAP شما می خواهید به جستجو برای کاربران و گروه. شما می توانید به عنوان بسیاری از شما می خواهم اضافه کنید. با این حال، هر گروه باید در پایه دامنه به عنوان کاربران که متعلق به آن تعریف شود. اگر شما گروه های کاربری محدود مشخص، تنها کاربران که متعلق به آن گروه در دامنه باشد. ما توصیه می کنیم که شما در سطح بالا از LDAP درخت دایرکتوری خود را مشخص کنید به عنوان پایه دامنه خود و استفاده از فیلتر جستجو برای کنترل دسترسی.",
-  "LDAP_Domain_Search_Filter": "دامنه جستجو فیلتر",
-  "LDAP_Domain_Search_Filter_Description": "اگر مشخص، تنها کاربران که مطابقت دارند این فیلتر اجازه خواهد داشت به سیستم وارد شوید. اگر هیچ فیلتر مشخص است، تمام کاربران در محدوده پایه دامنه مشخص قادر خواهد بود به سیستم وارد شوید. <br/> به عنوان مثال برای اکتیو دایرکتوری `memberOf = CN = ROCKET_CHAT، OU = عمومی Groups`. <br/> به عنوان مثال برای اوپنالدپ (جستجو بازی های درب) `OU: DN: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "دامنه جستجو شی رده",
-  "LDAP_Domain_Search_Object_Category_Description": "* به objectCategory * که شناسایی کاربران خود را. <br/> خالی به * اوپنالدپ *. <br/> به عنوان مثال `person`، و غیره",
-  "LDAP_Domain_Search_Object_Class": "دامنه کلاس جستجو شی",
-  "LDAP_Domain_Search_Object_Class_Description": "* به objectclass * که شناسایی کاربران خود را. <br/> به عنوان مثال `organizationalPerson`،` user`، `inetOrgPerson`، و غیره",
-  "LDAP_Domain_Search_Password": "دامنه جستجو رمز عبور",
-  "LDAP_Domain_Search_Password_Description": "رمز عبور برای کاربر جستجوی دامنه.",
-  "LDAP_Domain_Search_User": "دامنه جستجو کاربر",
-  "LDAP_Domain_Search_User_Description": "کاربر LDAP که انجام جستجوها کاربران برای تأیید هویت کاربران دیگر زمانی که آنها وارد شوید. <br/> این یک حساب خدمات به طور خاص برای یکپارچگی شخص ثالث ایجاد شده است به طور معمول. استفاده از یک نام کاملا مناسب، مانند `CN = مدیر، CN = کاربران، DC = به عنوان مثال، DC = com`.",
-  "LDAP_Domain_Search_User_ID": "دامنه جستجو ID کاربر",
-  "LDAP_Domain_Search_User_ID_Description": "ویژگی LDAP LDAP که شناسایی کاربران که تلاش احراز هویت. در این زمینه باید `شود sAMAccountName` برای نصب فعال ترین دایرکتوری، اما ممکن است` uid` برای راه حل های دیگر LDAP، مانند OpenLDAP. شما می توانید `mail` برای شناسایی کاربران از طریق ایمیل و یا هر ویژگی شما می خواهید استفاده کنید. <br> شما می توانید چندین مقدار را جدا شده توسط کاما به کاربران اجازه ورود با استفاده از شناسههای متعدد مانند نام کاربری یا ایمیل استفاده کنید.",
+  "LDAP_BaseDN_Description": "نام کامل برجسته (DN) از یک زیر درخت LDAP شما می خواهید به جستجو برای کاربران و گروه. شما می توانید به عنوان بسیاری از شما می خواهم اضافه کنید. با این حال، هر گروه باید در پایه دامنه به عنوان کاربران که متعلق به آن تعریف شود. اگر شما گروه های کاربری محدود مشخص، تنها کاربران که متعلق به آن گروه در دامنه باشد. ما توصیه می کنیم که شما در سطح بالا از LDAP درخت دایرکتوری خود را مشخص کنید به عنوان پایه دامنه خود و استفاده از فیلتر جستجو برای کنترل دسترسی.",
+  "LDAP_User_Search_Field_Description": "ویژگی LDAP LDAP که شناسایی کاربران که تلاش احراز هویت. در این زمینه باید `شود sAMAccountName` برای نصب فعال ترین دایرکتوری، اما ممکن است` uid` برای راه حل های دیگر LDAP، مانند OpenLDAP. شما می توانید `mail` برای شناسایی کاربران از طریق ایمیل و یا هر ویژگی شما می خواهید استفاده کنید. <br> شما می توانید چندین مقدار را جدا شده توسط کاما به کاربران اجازه ورود با استفاده از شناسههای متعدد مانند نام کاربری یا ایمیل استفاده کنید.",
+  "LDAP_User_Search_Filter_Description": "اگر مشخص، تنها کاربران که مطابقت دارند این فیلتر اجازه خواهد داشت به سیستم وارد شوید. اگر هیچ فیلتر مشخص است، تمام کاربران در محدوده پایه دامنه مشخص قادر خواهد بود به سیستم وارد شوید. <br/> به عنوان مثال برای اکتیو دایرکتوری `memberOf = CN = ROCKET_CHAT، OU = عمومی Groups`. <br/> به عنوان مثال برای اوپنالدپ (جستجو بازی های درب) `OU: DN: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "کاربر LDAP که انجام جستجوها کاربران برای تأیید هویت کاربران دیگر زمانی که آنها وارد شوید. <br/> این یک حساب خدمات به طور خاص برای یکپارچگی شخص ثالث ایجاد شده است به طور معمول. استفاده از یک نام کاملا مناسب، مانند `CN = مدیر، CN = کاربران، DC = به عنوان مثال، DC = com`.",
   "LDAP_Enable": "قادر ساختن",
   "LDAP_Enable_Description": "تلاش برای استفاده از LDAP برای احراز هویت.",
   "LDAP_Encryption": "رمزگذاری",
@@ -602,12 +590,9 @@
   "LDAP_Sync_User_Data_Description": "حفظ اطلاعات کاربران در همگام سازی با سرور در ورود (به عنوان مثال: نام، ایمیل).",
   "LDAP_Sync_User_Data_FieldMap": "کاربر داده نقشه درست",
   "LDAP_Sync_User_Data_FieldMap_Description": "پیکربندی زمینه حساب کاربری (مانند ایمیل) از یک رکورد در LDAP جمعیت (یک بار). <br/> به عنوان مثال، `{\" CN \":\" نام \"،\" ایمیل \":\" ایمیل \"}` خواهد نام یک شخص قابل خواندن توسط انسان از ویژگی CN، و ایمیل خود را از ویژگی های ایمیل را انتخاب نمایید. <br/> زمینه های موجود عبارتند از `name` و` email`.",
-  "LDAP_Sync_Users": "کاربران همگام سازی",
   "LDAP_Test_Connection": "اتصال تست",
   "LDAP_Unique_Identifier_Field": "شناسه منحصر به فرد درست",
   "LDAP_Unique_Identifier_Field_Description": "که درست استفاده خواهد شد به لینک کاربران LDAP و کاربر Rocket.Chat است. شما می توانید چندین مقدار را جدا شده توسط کاما اطلاع به تلاش برای بدست آوردن مقدار از رکورد LDAP. <br/> مقدار پیش فرض است `objectGUID، آی بی ام-entryUUID، GUID، dominoUNID، nsuniqueId، uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "استفاده از جستجو سفارشی دامنه",
-  "LDAP_Use_Custom_Domain_Search_Description": "ارسال فیلتر خود را به کاربران جستجو در سرور LDAP.",
   "LDAP_Username_Field": "نام کاربری درست",
   "LDAP_Username_Field_Description": "که درست خواهد شد به عنوان * نام کاربری * برای کاربران جدید استفاده می شود. خالی بگذارید به استفاده از نام کاربری آگاهانه در صفحه ورود. <br/> شما می توانید تگ های قالب بیش از حد استفاده کنید، مانند `#{givenName}.#{sn}`. <br/> مقدار پیش فرض است `sAMAccountName`.",
   "Leave_Group_Warning": "آیا مطمئن هستید که می خواهید گروه \" %s\" را ترک کنند؟",
diff --git a/packages/rocketchat-i18n/i18n/fi.i18n.json b/packages/rocketchat-i18n/i18n/fi.i18n.json
index 1a26dfa0995..188d27f8dab 100644
--- a/packages/rocketchat-i18n/i18n/fi.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -591,24 +591,12 @@
   "Layout_Terms_of_Service": "Käyttöehdot",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Mukautettu domain-haku",
-  "LDAP_Custom_Domain_Search_Description": "JSONin palanen, joka säätelee bindin ja yhteyden tietoja ja on muotoa: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Oletusverkkotunnus",
   "LDAP_Description": "LDAP on laajasti käytössä oleva hierarkinen tietokantapalvelu, jolla organisaatioiden palveluille mahdollistetaan kertakirjautuminen (SSO).\nMääritystiedot ja esimerkit, katso wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "Domain Base",
-  "LDAP_Domain_Base_Description": "The fully qualified Distinguished Name (DN) of an LDAP subtree you want to search for users and groups. You can add as many as you like; however, each group must be defined in the same domain base as the users that belong to it. If you specify restricted user groups, only users that belong to those groups will be in scope. We recommend that you specify the top level of your LDAP directory tree as your domain base and use search filter to control access.",
-  "LDAP_Domain_Search_Filter": "Verkkotunnusten hakusuodatin",
-  "LDAP_Domain_Search_Filter_Description": "Mikäli määritelty, vain tätä suodatinta vastaavat käyttäjät voivat kirjautua sisään. Jos suodatinta ei ole määritetty, kaikki käyttäjät määritetyn toimialueen puitteissa voivat kirjautua sisään. <br/> Esim. Active Directorylle `MEMBEROF = cn = ROCKET_CHAT, ou = General Groups`. <br/> Esim. OpenLDAP:lle (extensible match search) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Verkkotunnushaun olion kategoria",
-  "LDAP_Domain_Search_Object_Category_Description": "*olion kategoria* käyttäjien tunnistamiseksi.<br/>Jätä tyhjäksi *OpenLDAPille*.<br/>Esim. `person` tms.",
-  "LDAP_Domain_Search_Object_Class": "Verkkotunnushaun olion luokka",
-  "LDAP_Domain_Search_Object_Class_Description": "*olion luokka* käyttäjien tunnistamiseksi. <br/>Esim. `organizationalPerson`, `user`, `inetOrgPerson` tms.",
-  "LDAP_Domain_Search_Password": "Verkkotunnushaun salasana",
-  "LDAP_Domain_Search_Password_Description": "Salasana verkkotunnushaun käyttäjälle.",
-  "LDAP_Domain_Search_User": "Verkkotunnushaun käyttäjä",
-  "LDAP_Domain_Search_User_Description": "LDAP käyttäjä, joka suorittaa käyttäjähaut muiden käyttäjien varmentamiseksi, kun he kirjautuvat sisään. <br/> Tämä on tyypillisesti nimenomaan kolmannen osapuolen integraatioita varten luotu tili. Käytä täysin varmistettua nimeä, kuten `cn = Ylläpitäjä, cn = Users, dc = Esimerkki, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Verkkotunnushaun käyttäjän tunniste",
-  "LDAP_Domain_Search_User_ID_Description": "LDAP-määrite, joka yksilöi LDAP- käyttäjän, joka yrittää todennusta. Tämän kentän tulisi olla `sAMAccountName` useimmille Active Directory- asennuksille, mutta se voi olla` uid` muille LDAP ratkaisuille, kuten OpenLDAP:lle. Voit käyttää `mail`- tunnistusta käyttäjät tunnistukseen sähköpostitse tai mitä tahansa muuta attribuuttia. <br/> Voit käyttää useita arvoja, pilkuilla eroteltuna, jotta käyttäjät voivat kirjautua käyttämällä useita tunnisteita, kuten käyttäjätunnusta tai sähköpostiosoitetta.",
+  "LDAP_BaseDN_Description": "The fully qualified Distinguished Name (DN) of an LDAP subtree you want to search for users and groups. You can add as many as you like; however, each group must be defined in the same domain base as the users that belong to it. If you specify restricted user groups, only users that belong to those groups will be in scope. We recommend that you specify the top level of your LDAP directory tree as your domain base and use search filter to control access.",
+  "LDAP_User_Search_Field_Description": "LDAP-määrite, joka yksilöi LDAP- käyttäjän, joka yrittää todennusta. Tämän kentän tulisi olla `sAMAccountName` useimmille Active Directory- asennuksille, mutta se voi olla` uid` muille LDAP ratkaisuille, kuten OpenLDAP:lle. Voit käyttää `mail`- tunnistusta käyttäjät tunnistukseen sähköpostitse tai mitä tahansa muuta attribuuttia. <br/> Voit käyttää useita arvoja, pilkuilla eroteltuna, jotta käyttäjät voivat kirjautua käyttämällä useita tunnisteita, kuten käyttäjätunnusta tai sähköpostiosoitetta.",
+  "LDAP_User_Search_Filter_Description": "Mikäli määritelty, vain tätä suodatinta vastaavat käyttäjät voivat kirjautua sisään. Jos suodatinta ei ole määritetty, kaikki käyttäjät määritetyn toimialueen puitteissa voivat kirjautua sisään. <br/> Esim. Active Directorylle `MEMBEROF = cn = ROCKET_CHAT, ou = General Groups`. <br/> Esim. OpenLDAP:lle (extensible match search) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "LDAP käyttäjä, joka suorittaa käyttäjähaut muiden käyttäjien varmentamiseksi, kun he kirjautuvat sisään. <br/> Tämä on tyypillisesti nimenomaan kolmannen osapuolen integraatioita varten luotu tili. Käytä täysin varmistettua nimeä, kuten `cn = Ylläpitäjä, cn = Users, dc = Esimerkki, dc = com`.",
   "LDAP_Enable": "Kytke LDAP päälle",
   "LDAP_Enable_Description": "Käytä LDAPia autentikointiin",
   "LDAP_Encryption": "Salaus",
@@ -623,12 +611,9 @@
   "LDAP_Sync_User_Data_Description": "Pidä käyttäjädata synkronoituna palvelimelta kirjautumishetkellä (esim nimi, sähköposti)",
   "LDAP_Sync_User_Data_FieldMap": "Käyttäjätietojen kohdistus",
   "LDAP_Sync_User_Data_FieldMap_Description": "Määrittää, miten käyttäjätietojen kentät tuodaan LDAP-palvelimelta.\nEsimerkiksi, {\"cn\":\"name\", \"mail\":\"email\"} -määritys tuo käyttäjän nimen cn-tiedosta ja sähköpostin email-tiedosta. Käytettävissä olevat kentät ovat \"name\" ja \"email\".",
-  "LDAP_Sync_Users": "Synkronoi käyttäjät",
   "LDAP_Test_Connection": "Testaa yhteys",
   "LDAP_Unique_Identifier_Field": "Uniikin tunnisteen kenttä",
   "LDAP_Unique_Identifier_Field_Description": "Kenttä, jota käytetään liittämään LDAP käyttäjä ja Rocket.Chat käyttäjä. Voit ilmoittaa useita arvoja pilkuilla erotettuna yrittääksesi saada arvon LDAP-tiedoista. <br/> Oletusarvo on `objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Käytä mukautettua verkkotunnushakua",
-  "LDAP_Use_Custom_Domain_Search_Description": "Kirjoita oma suodatin etsiäksesi käyttäjiä LDAP-palvelimelta.",
   "LDAP_Username_Field": "Käyttäjänimikenttä",
   "LDAP_Username_Field_Description": "Uusille käyttäjille *käyttäjätunnuksena* käytetty kenttä. Jätä tyhjäksi käyttääksesi kirjautumissivulla näytettyä käyttäjätunnusta. <br/> Voit myös käyttää template-tageja myös kuten `#{givenName}.#{sn}`. <br/> Oletusarvo on `sAMAccountName`.",
   "Least_Amount": "Pienin määrä",
diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json
index 02ce7c002b5..f50ece8d6af 100644
--- a/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -778,24 +778,12 @@
   "Layout_Terms_of_Service": "Conditions de service",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "Certificat CA (Autorité de certification)",
-  "LDAP_Custom_Domain_Search": "Domaine de recherche personnalisé",
-  "LDAP_Custom_Domain_Search_Description": "Un bout de JSON qui contrôle la liaison et la connexion et qui a le format :<br/><code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domaine par défaut",
   "LDAP_Description": "Un LDAP est une base de données hiérarchique que de nombreuses entreprises utilisent pour fournir une authentification unique à travers leurs services - l'utilisateur partage un mot de passe entre plusieurs sites et services. Pour avoir plus d'informations sur la configuration avancée et voir des exemples, consulter notre wiki : https://rocket.chat/docs/administrator-guides/authentication/ldap/ .",
-  "LDAP_Domain_Base": "Domaine de base",
-  "LDAP_Domain_Base_Description": "Le chemin complet du Distinguished Name (DN) d'un sous arbre LDAP dans lequel vous souhaitez chercher les utilisateurs et les groupes. Vous pouvez en ajouter autant que vous voulez ; cependant, chaque groupe doit être défini dans le même domaine de base que les utilisateurs qui le composent. Si vous spécifiez des restrictions sur des groupes d'utilisateurs, seuls les utilisateurs appartenant à ces groupes seront dans le périmètre de la recherche. Nous recommandons de spécifier le top level de votre arbre LDAP en tant que domaine de base et d'utiliser le filtre de recherche pour contrôler l'accès.",
-  "LDAP_Domain_Search_Filter": "Filtre pour la recherche dans le domaine",
-  "LDAP_Domain_Search_Filter_Description": "Si renseigné, seuls les utilisateurs qui correspondent à ce filtre seront autorisés à se connecter. Si aucun filtre n'est spécifié, tous les utilisateurs dans le spectre du domaine de base spécifié seront capable de se connecter.<br/>Exemple pour ActiveDirectory : `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Exemple pour OpenLDAP (recherche étendue de correspondance) : `ou:dn:=ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Catégorie d'objet pour la recherche dans le domaine",
-  "LDAP_Domain_Search_Object_Category_Description": "L'*objectCategory* qui identifie vos utilisateurs.<br/>Laisser vide pour *OpenLDAP*.<br/>Par exemple : `personne`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Classe d'objet pour la recherche dans le domaine",
-  "LDAP_Domain_Search_Object_Class_Description": "L'*objectClass* qui identifie vos utilisateurs.<br/>Par exemple : `organizationalPerson`, `user`, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Mot de passe pour la recherche dans le domaine",
-  "LDAP_Domain_Search_Password_Description": "Le mot de passe pour l'utilisateur utilisé pour la recherche dans le domaine.",
-  "LDAP_Domain_Search_User": "Utilisateur pour la recherche dans le domaine",
-  "LDAP_Domain_Search_User_Description": "L'utilisateur LDAP qui réalise les recherches d'utilisateur pour authentifier les autres utilisateurs quand ils se connectent.<br/>Il s'agit typiquement d'un compte de service créé spécialement pour l'intégration de tierces parties. Utilisez un nom complet, tel que `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "ID de l'utilisateur pour la recherche dans le domaine",
-  "LDAP_Domain_Search_User_ID_Description": "L'attribut LDAP qui identifie l'utilisateur LDAP qui essaye de s'authentifier. Ce champ est `sAMAccountName` pour la plupart des installations Active Directory, mais cela peut être `uid` pour d'autres solutions de LDAP, comme OpenLDAP. Vous pouvez utiliser `mail` pour identifier les utilisateurs par leur adresse e-mail ou n'importe quel autre attribut que vous souhaitez.<br>Vous pouvez utiliser plusieurs valeurs séparées par des virgules pour permettre aux utilisateur de s'identifier en utilisant plusieurs identifiants comme le nom d'utilisateur ou l'adresse e-mail.",
+  "LDAP_BaseDN_Description": "Le chemin complet du Distinguished Name (DN) d'un sous arbre LDAP dans lequel vous souhaitez chercher les utilisateurs et les groupes. Vous pouvez en ajouter autant que vous voulez ; cependant, chaque groupe doit être défini dans le même domaine de base que les utilisateurs qui le composent. Si vous spécifiez des restrictions sur des groupes d'utilisateurs, seuls les utilisateurs appartenant à ces groupes seront dans le périmètre de la recherche. Nous recommandons de spécifier le top level de votre arbre LDAP en tant que domaine de base et d'utiliser le filtre de recherche pour contrôler l'accès.",
+  "LDAP_User_Search_Field_Description": "L'attribut LDAP qui identifie l'utilisateur LDAP qui essaye de s'authentifier. Ce champ est `sAMAccountName` pour la plupart des installations Active Directory, mais cela peut être `uid` pour d'autres solutions de LDAP, comme OpenLDAP. Vous pouvez utiliser `mail` pour identifier les utilisateurs par leur adresse e-mail ou n'importe quel autre attribut que vous souhaitez.<br>Vous pouvez utiliser plusieurs valeurs séparées par des virgules pour permettre aux utilisateur de s'identifier en utilisant plusieurs identifiants comme le nom d'utilisateur ou l'adresse e-mail.",
+  "LDAP_User_Search_Filter_Description": "Si renseigné, seuls les utilisateurs qui correspondent à ce filtre seront autorisés à se connecter. Si aucun filtre n'est spécifié, tous les utilisateurs dans le spectre du domaine de base spécifié seront capable de se connecter.<br/>Exemple pour ActiveDirectory : `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Exemple pour OpenLDAP (recherche étendue de correspondance) : `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "L'utilisateur LDAP qui réalise les recherches d'utilisateur pour authentifier les autres utilisateurs quand ils se connectent.<br/>Il s'agit typiquement d'un compte de service créé spécialement pour l'intégration de tierces parties. Utilisez un nom complet, tel que `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "Activer",
   "LDAP_Enable_Description": "Essayer d'utiliser LDAP pour l'authentification.",
   "LDAP_Encryption": "Chiffrement",
@@ -806,7 +794,6 @@
   "LDAP_Group_Filter_Group_Name_Description": "Groupe auquel appartient l'utilisateur",
   "LDAP_Host": "Hôte",
   "LDAP_Host_Description": "L'hôte LDAP, par exemple `ldap.exemple.com` ou `10.0.0.30`.",
-  "LDAP_Import_Users": "Importer les utilisateurs LDAP",
   "LDAP_Import_Users_Description": "Si OUI les processus de synchronisation importeront l'ensemble des utilisateurs LDAP <br/>\n*Attention !* Spécifiez les filtres de recherche pour ne pas importer trop d'utilisateurs.",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "Si l'authentification LDAP échoue, essaye de se connecter avec un compte local. Aide quand le LDAP est inaccessible.",
@@ -820,12 +807,9 @@
   "LDAP_Sync_User_Data_Description": "Garder les données de l'utilisateur synchronisées avec celles du serveur lors de la connexion (par exemple : nom, adresse e-mail).",
   "LDAP_Sync_User_Data_FieldMap": "Liste des champs utilisateur",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configurer la façon dont les champs de compte utilisateur (comme l'adresse e-mail) sont remplis à partir d'un enregistrement dans l'annuaire LDAP (une fois trouvé). À titre d'exemple, {\"cn\": \"nom\", \"mail\": \"email\"} choisira le nom lisible d'une personne à partir de l'attribut cn, et son adresse e-mail à partir de l'attribut mail.<br/> Les champs disponibles comprennent `name`et `email`.",
-  "LDAP_Sync_Users": "Synchronisation des utilisateurs",
   "LDAP_Test_Connection": "Tester la connexion",
   "LDAP_Unique_Identifier_Field": "Champ de l'identifiant unique",
   "LDAP_Unique_Identifier_Field_Description": "Le champ utilisé pour lier l'utilisateur LDAP à l'utilisateur Rocket.Chat. Vous pouvez renseigner plusieurs valeurs séparées par des virgules pour obtenir la valeur depuis l'enregistrement LDAP.<br/>La valeur par défaut est `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Utiliser la recherche personnalisée dans le domaine",
-  "LDAP_Use_Custom_Domain_Search_Description": "Écrivez vos propres filtres pour rechercher les utilisateurs dans le serveur LDAP.",
   "LDAP_Username_Field": "Champs du nom d'utilisateur",
   "LDAP_Username_Field_Description": "Champ utilisé en tant que *nom d'utilisateur* pour les nouveaux utilisateurs. Laisser vide pour utiliser le nom d'utilisateur renseigné sur la page de connexion.<br/>Vous pouvez aussi utiliser un modèle à base de tags, comme `#{givenName}.#{sn}`. La valeur par défaut est `sAMAccountName`.",
   "Least_Amount": "Le minimum",
diff --git a/packages/rocketchat-i18n/i18n/he.i18n.json b/packages/rocketchat-i18n/i18n/he.i18n.json
index d7000fbffc3..6188f79ab18 100644
--- a/packages/rocketchat-i18n/i18n/he.i18n.json
+++ b/packages/rocketchat-i18n/i18n/he.i18n.json
@@ -565,24 +565,12 @@
   "Layout_Terms_of_Service": "תנאי השירות",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "Cert CA",
-  "LDAP_Custom_Domain_Search": "חיפוש הדומיין המותאם אישית",
-  "LDAP_Custom_Domain_Search_Description": "חתיכת JSON, השולטת מידע לאגד וחיבור והוא מהצורה: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "ברירת המחדל של תחום",
   "LDAP_Description": "LDAP הוא מסד נתונים היררכיים כי חברות רבות להשתמש בו כדי לספק כניסה יחידה - מתקן לשיתוף סיסמא אחת בין אתרים ושירותים רבים. לקבלת מידע תצורה מתקדמת ודוגמאות, היועץ wiki שלנו: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "מאגר דומיין",
-  "LDAP_Domain_Base_Description": "השם הייחודי מלא (DN) של עץ משנה LDAP אתה רוצה לחפש משתמשים וקבוצות. אתה יכול להוסיף כמה שאתה רוצה; עם זאת, כל קבוצה חייבת להיות מוגדרת באותו הבסיס מושלם בתור המשתמשים ששייכים אליו. אם תציין קבוצות משתמש מוגבלות, רק משתמשים השייכים לקבוצות אלו יהיו בהיקפה. אנו ממליצים לציין את הרמה העליונה של ספריית עץ LDAP שלך כבסיס התחום שלך ולהשתמש במסנן חיפוש כדי לשלוט בגישה.",
-  "LDAP_Domain_Search_Filter": "סנן חיפוש דומיין",
-  "LDAP_Domain_Search_Filter_Description": "אם צויין, רק משתמשים התואמים מסנן זה יורשו להיכנס. אם אין מסנן מצוין, כל המשתמשים בתחולת בבסיס התחום שצוין יוכלו להיכנס. <br/> למשל עבור Active Directory `memberOf = cn = ROCKET_CHAT, ou = כללי Groups`. <br/> לדוגמא עבור OpenLDAP (חיפוש בהתאמה להרחבה) `ou: DN: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "קטגורית אובייקט חיפוש דומיין",
-  "LDAP_Domain_Search_Object_Category_Description": "הסימן * * objectCategory שמזהים המשתמשים שלך. <br/> השאר ריק עבור OpenLDAP * *. <br/> לדוגמא `person`, וכו '",
-  "LDAP_Domain_Search_Object_Class": "כיתת אובייקט חיפוש דומיין",
-  "LDAP_Domain_Search_Object_Class_Description": "הסימן * * objectClass שמזהים המשתמשים שלך. <br/> לדוגמא `organizationalPerson`,` user`, `inetOrgPerson`, וכו '",
-  "LDAP_Domain_Search_Password": "סיסמא חיפוש דומיין",
-  "LDAP_Domain_Search_Password_Description": "הסיסמה עבור משתמש תחום החיפוש.",
-  "LDAP_Domain_Search_User": "משתמש חיפוש דומיין",
-  "LDAP_Domain_Search_User_Description": "משתמש LDAP שמבצע חיפושי משתמש כדי לאמת משתמשים אחרים כאשר הם נכנסים. <br/> זה בדרך כלל חשבון שירות שנוצרו במיוחד עבור ואינטגרציות צד שלישי. השתמש בשם מלא, כגון `cn = מנהל, cn = Users, dc = דוגמא, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "זיהוי משתמש חיפוש דומיין",
-  "LDAP_Domain_Search_User_ID_Description": "התכונה של LDAP המזהה את המשתמש LDAP שמנסה אימות. שדה זה צריך להיות `sAMAccountName` להתקנות של Active Directory ביותר, אבל זה עשוי להיות` uid` לפתרונות LDAP אחרים, כגון OpenLDAP. אתה יכול להשתמש `mail` לזהות משתמשים בדוא\"ל או כל תכונה שאתה רוצה. <br> תוכל להשתמש בערכים מרובים המופרדים בפסיק כדי לאפשר למשתמשים להתחבר באמצעות מזהים מרובים כמו שם משתמש או דוא\"ל.",
+  "LDAP_BaseDN_Description": "השם הייחודי מלא (DN) של עץ משנה LDAP אתה רוצה לחפש משתמשים וקבוצות. אתה יכול להוסיף כמה שאתה רוצה; עם זאת, כל קבוצה חייבת להיות מוגדרת באותו הבסיס מושלם בתור המשתמשים ששייכים אליו. אם תציין קבוצות משתמש מוגבלות, רק משתמשים השייכים לקבוצות אלו יהיו בהיקפה. אנו ממליצים לציין את הרמה העליונה של ספריית עץ LDAP שלך כבסיס התחום שלך ולהשתמש במסנן חיפוש כדי לשלוט בגישה.",
+  "LDAP_User_Search_Field_Description": "התכונה של LDAP המזהה את המשתמש LDAP שמנסה אימות. שדה זה צריך להיות `sAMAccountName` להתקנות של Active Directory ביותר, אבל זה עשוי להיות` uid` לפתרונות LDAP אחרים, כגון OpenLDAP. אתה יכול להשתמש `mail` לזהות משתמשים בדוא\"ל או כל תכונה שאתה רוצה. <br> תוכל להשתמש בערכים מרובים המופרדים בפסיק כדי לאפשר למשתמשים להתחבר באמצעות מזהים מרובים כמו שם משתמש או דוא\"ל.",
+  "LDAP_User_Search_Filter_Description": "אם צויין, רק משתמשים התואמים מסנן זה יורשו להיכנס. אם אין מסנן מצוין, כל המשתמשים בתחולת בבסיס התחום שצוין יוכלו להיכנס. <br/> למשל עבור Active Directory `memberOf = cn = ROCKET_CHAT, ou = כללי Groups`. <br/> לדוגמא עבור OpenLDAP (חיפוש בהתאמה להרחבה) `ou: DN: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "משתמש LDAP שמבצע חיפושי משתמש כדי לאמת משתמשים אחרים כאשר הם נכנסים. <br/> זה בדרך כלל חשבון שירות שנוצרו במיוחד עבור ואינטגרציות צד שלישי. השתמש בשם מלא, כגון `cn = מנהל, cn = Users, dc = דוגמא, dc = com`.",
   "LDAP_Enable": "אפשר",
   "LDAP_Enable_Description": "מנסה לאתחל LDAP עבור הזדהות.",
   "LDAP_Encryption": "הצף",
@@ -597,12 +585,9 @@
   "LDAP_Sync_User_Data_Description": "דאג למידע מסונכרן על המשתמש בהתחברות לשרת (שם, אימייל).",
   "LDAP_Sync_User_Data_FieldMap": "מיפוי שדה User Data",
   "LDAP_Sync_User_Data_FieldMap_Description": "הגדר כיצד שדות חשבון המשתמש (כגון אימייל) ישלפו מרשומת ה-LDAP (כאשר נמצאה).<br/> לדוגמה, `{\"cn\":\"name\", \"mail\":\"email\"}` יבחרו את השם הקריא של המשתמש מהשדה cn והאימייל שלהם מהשדה mail.<br/> השדות האפשריים כוללים  `name`, ו-`email`.",
-  "LDAP_Sync_Users": "משתמשים Sync",
   "LDAP_Test_Connection": "בדיקת חיבור",
   "LDAP_Unique_Identifier_Field": "ייחודיות מזהים שדה",
   "LDAP_Unique_Identifier_Field_Description": "איזה שדה ישמש לקשר משתמש LDAP ומשתמש Rocket.Chat. אתה יכול להודיע ​​ערכים המופרדים באמצעות פסיק כדי לנסות להשיג את הערך מרשום LDAP. <br/> ערך ברירת המחדל הוא `objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "השתמש חיפוש דומיין מותאם אישית",
-  "LDAP_Use_Custom_Domain_Search_Description": "כתוב מסנן משלך לחפש משתמשים בשרת LDAP.",
   "LDAP_Username_Field": "שדה שם המשתמש",
   "LDAP_Username_Field_Description": "איזה שדה ישמש * שם משתמש * עבור משתמשים חדשים. השאר ריק להשתמש בשם המשתמש הודיע ​​על דף הכניסה. <br/> אתה יכול להשתמש בתגי תבנית מדי, כמו `#{givenName}.#{sn}`. <br/> ערך ברירת המחדל הוא `sAMAccountName`.",
   "Leave_Group_Warning": "האם אתה בטוח שאתה רוצה לעזוב את הקבוצה \" %s\"?",
diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json
index f4d2b496f38..1c80698260f 100644
--- a/packages/rocketchat-i18n/i18n/hr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hr.i18n.json
@@ -667,24 +667,12 @@
   "Layout_Terms_of_Service": "Uvjeti pružanja usluge",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Custom Domain Search",
-  "LDAP_Custom_Domain_Search_Description": "Komad JSONa koji upravlja vezama je u obliku: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Zadana domena",
   "LDAP_Description": "LDAP je hijerarhijska baza podataka koja mnoge tvrtke koriste za pružanje jedinstvene prijave - usluge za dijeljenje jedne lozinke između više web-mjesta i usluga. Za napredne podatke o konfiguraciji i primjere, obratite se našem wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Osnova domene",
-  "LDAP_Domain_Base_Description": "Potpuno kvalificirana Distinguished Name (DN) u LDAP podstablo koje želite pretražiti za korisnike i grupe. Možete dodati koliko god želite; Međutim, svaka grupa mora biti definirana u istoj bazi domeni kao korisnici koji pripadaju njemu. Ako navedete ograničene grupe korisnika, samo korisnici koji pripadaju tim skupinama će biti u opsegu. Preporučujemo da odredite gornju razinu svoje LDAP direktorija stablo kao svoju bazu domene i korištenje filtra za pretraživanje za kontrolu pristupa.",
-  "LDAP_Domain_Search_Filter": "Domain Search Filter",
-  "LDAP_Domain_Search_Filter_Description": "Ako je navedeno, samo korisnicima koji odgovaraju filteru će biti dopušteno da se prijavite. Ako nijedan filtar nije naveden, svi korisnici u okviru zadane osnovne domene moći će se prijaviti. <br/> Npr za Active Directory`memberOf=cn=ROCKET_CHAT,ou=General Groups`.. <br/> Npr za OpenLDAP `ou:dn:=ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search Object Kategorija",
-  "LDAP_Domain_Search_Object_Category_Description": "*objectCategory* koji identificira svoje korisnike. <br/> Ostavite prazno za *OpenLDAP*. <br/> Npr. `person` itd",
-  "LDAP_Domain_Search_Object_Class": "Domain Search Object Klasa",
-  "LDAP_Domain_Search_Object_Class_Description": "*objectclass* koji identificira svoje korisnike. <br/> Npr `organizationalPerson`, `user`, `inetOrgPerson`, itd",
-  "LDAP_Domain_Search_Password": "Domena Search Lozinka",
-  "LDAP_Domain_Search_Password_Description": "Lozinka za korisnika za pretraživanje domene.",
-  "LDAP_Domain_Search_User": "Domain Search Korisnik",
-  "LDAP_Domain_Search_User_Description": "LDAP korisnik koja obavlja korisničke dohvate za autentifikaciju drugih korisnika prilikom prijave. <br/> To je obično račun za uslugu izrađen posebno za treće integracijama. Koristite potpuno kvalificirani naziv, kao što je `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search ID korisnika",
-  "LDAP_Domain_Search_User_ID_Description": "LDAP atribut koji identificira LDAP korisnika koji pokušava provjeru autentičnosti. Ovo polje mora biti `sAMAccountName` za većinu Active Directory instalacija, ali to može biti` uid` za druge LDAP rješenjima, kao što su OpenLDAP. Možete koristiti `mail` identificiraju korisnike putem e-maila ili bilo atribut želite. <br/> Možete koristiti više vrijednosti odvojene zarezom kako bi se omogućilo korisnicima da se prijavite koristeći višestruke identifikatore kao što su korisničko ime ili e-mail.",
+  "LDAP_BaseDN_Description": "Potpuno kvalificirana Distinguished Name (DN) u LDAP podstablo koje želite pretražiti za korisnike i grupe. Možete dodati koliko god želite; Međutim, svaka grupa mora biti definirana u istoj bazi domeni kao korisnici koji pripadaju njemu. Ako navedete ograničene grupe korisnika, samo korisnici koji pripadaju tim skupinama će biti u opsegu. Preporučujemo da odredite gornju razinu svoje LDAP direktorija stablo kao svoju bazu domene i korištenje filtra za pretraživanje za kontrolu pristupa.",
+  "LDAP_User_Search_Field_Description": "LDAP atribut koji identificira LDAP korisnika koji pokušava provjeru autentičnosti. Ovo polje mora biti `sAMAccountName` za većinu Active Directory instalacija, ali to može biti` uid` za druge LDAP rješenjima, kao što su OpenLDAP. Možete koristiti `mail` identificiraju korisnike putem e-maila ili bilo atribut želite. <br/> Možete koristiti više vrijednosti odvojene zarezom kako bi se omogućilo korisnicima da se prijavite koristeći višestruke identifikatore kao što su korisničko ime ili e-mail.",
+  "LDAP_User_Search_Filter_Description": "Ako je navedeno, samo korisnicima koji odgovaraju filteru će biti dopušteno da se prijavite. Ako nijedan filtar nije naveden, svi korisnici u okviru zadane osnovne domene moći će se prijaviti. <br/> Npr za Active Directory`memberOf=cn=ROCKET_CHAT,ou=General Groups`.. <br/> Npr za OpenLDAP `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "LDAP korisnik koja obavlja korisničke dohvate za autentifikaciju drugih korisnika prilikom prijave. <br/> To je obično račun za uslugu izrađen posebno za treće integracijama. Koristite potpuno kvalificirani naziv, kao što je `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "Omogući",
   "LDAP_Enable_Description": "Pokušaj koristiti LDAP za provjeru autentičnosti.",
   "LDAP_Encryption": "Šifriranje",
@@ -692,7 +680,6 @@
   "LDAP_Group_Filter_Group_Name": "Ime grupe",
   "LDAP_Host": "Domaćin",
   "LDAP_Host_Description": "LDAP domaćin, npr `ldap.example.com` ili` 10.0.0.30`.",
-  "LDAP_Import_Users": "Uvezi LDAP korisnike",
   "LDAP_Merge_Existing_Users": "Spoji postojeće korisnike",
   "LDAP_Merge_Existing_Users_Description": "*Oprez!* Pri uvozu korisnika s LDAPa i ako već postoji korisnik s istim korisničkim imenom, LDAP podaci i lozinka će biti postavljeni na postojećeg korisnika.",
   "LDAP_Port": "Port",
@@ -703,12 +690,9 @@
   "LDAP_Sync_User_Data_Description": "Održavajte korisničke podatke sinkronizirane sa serverom pri prijavi (npr: ime i prezime, e-mail).",
   "LDAP_Sync_User_Data_FieldMap": "Mapa korisničkih podataka",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurirajte kako će korisnička polja (poput emaila) biti popunje iz zapisa na LDAPu (nakon što ih nađemo). <br/> Na primjer, `{\"cn\":\"name\", \"mail\":\"email\"}` će odabrati čitljivo ime iz cn atributa i njihov email i mail atributa. <br/> Dostupna polja uključuju `name`i `email`.",
-  "LDAP_Sync_Users": "Sinkronizacija korisnika",
   "LDAP_Test_Connection": "Testiraj vezu",
   "LDAP_Unique_Identifier_Field": "Jedinstveni identifikator polja",
   "LDAP_Unique_Identifier_Field_Description": "Koje polje će se koristiti za povezivanje LDAP korisnika i korisnika Rocket.Chat. Možete koristiti višestruke vrijednosti odvojene zarezom kako bi dobili vrijednost iz LDAP zapisa. <br/> Zadana vrijednost je `objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Koristite Custom Domain Search",
-  "LDAP_Use_Custom_Domain_Search_Description": "Napišite vlastiti filter za pretraživanje korisnika u LDAP poslužitelju.",
   "LDAP_Username_Field": "Polje za Korisničko ime",
   "LDAP_Username_Field_Description": "Koje polje će se koristiti kao *username* za nove korisnike. Ostavite prazno za korištenje korisničkog imena s prijave. <br/> Možete koristiti oznake poput `#{givenName}.#{sn}`. <br/> Zadana vrijednost je `sAMAccountName`.",
   "Least_Amount": "Najmanja količina",
diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json
index 830c1c44a3a..09192f521e3 100644
--- a/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -631,24 +631,12 @@
   "Layout_Terms_of_Service": "Szolgáltatás feltételei",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Egyéni Domain Search",
-  "LDAP_Custom_Domain_Search_Description": "Egy darab JSON, amely szabályozza kötődnek és a kapcsolat adatainak és a forma: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Default Domain",
   "LDAP_Description": "Az LDAP hierarchikus adatbázis sok cég használja, hogy single sign on - a létesítmény megosztása egy jelszót a több oldalak és szolgáltatások. Speciális konfigurációs információkat és példákat, kérjük forduljon a wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Domain Base",
-  "LDAP_Domain_Base_Description": "A teljesen minősített elkülönítő neve (DN) LDAP részfa szeretne keresni felhasználókat és csoportokat. Akkor adjunk hozzá annyi, amennyit akar; azonban minden csoport kell meghatározni ugyanabban a tartományban bázis a felhasználók számára, hogy tartozik hozzá. Ha megadod korlátozott felhasználói csoportok, csak azok a felhasználók, hogy tartoznak azok a csoportok lesznek hatálya alá. Javasoljuk, hogy adja meg a felső szint a LDAP fa, mint a domain bázis és használja keresési szűrő a hozzáférés szabályozására.",
-  "LDAP_Domain_Search_Filter": "Domain Search Filter",
-  "LDAP_Domain_Search_Filter_Description": "Ha meg van adva, csak azok a felhasználók, amelyek megfelelnek a szűrőt tenni, hogy jelentkezzen be. Ha nincs szűrő megadva, az összes felhasználó körén belül a megadott tartomány bázis lesz képes bejelentkezni. <br/> Pl Active Directory `MemberOf = cn = ROCKET_CHAT, ou = Általános Groups`. <br/> Pl OpenLDAP (bővíthető találat keresés) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search Object Kategória",
-  "LDAP_Domain_Search_Object_Category_Description": "A * objectCategory * hogy azonosítsa a felhasználókat. <br/> Hagyja üresen * OpenLDAP *. <br/> Pl: `Person, stb",
-  "LDAP_Domain_Search_Object_Class": "Domain Search Objektumosztály",
-  "LDAP_Domain_Search_Object_Class_Description": "A * objectlass * hogy azonosítsa a felhasználókat. <br/> Pl: `organizationalPerson`,`-használó, `inetOrgPerson` stb",
-  "LDAP_Domain_Search_Password": "Domain Search jelszó",
-  "LDAP_Domain_Search_Password_Description": "A jelszó a domain kereső felhasználó.",
-  "LDAP_Domain_Search_User": "Domain Felhasználó keresése",
-  "LDAP_Domain_Search_User_Description": "Az LDAP felhasználó, amely végrehajtja a felhasználó kereséseket hitelesítésére felhasználók, amikor bejelentkeznek. <br/> Ez általában egy szolgáltatási fiókot létre kifejezetten a harmadik fél integrációk. Használjon teljes nevét, például `cn = Administrator, cn = Users, dc = példa, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search felhasználói azonosító",
-  "LDAP_Domain_Search_User_ID_Description": "Az LDAP-attribútum, amely azonosítja az LDAP felhasználó, aki megkísérel hitelesítést. Ezt a mezőt kell `sAMAccountName` legtöbb Active Directory telepítés, de lehet, hogy` uid` más LDAP megoldások, mint például az OpenLDAP. A `mail` azonosítani felhasználókat e-mailben, vagy bármi kívánt attribútum. <br> A többszörös értékeket vesszővel elválasztva, hogy a felhasználó bejelentkezési segítségével több azonosítók, mint a felhasználónév vagy e-mailben.",
+  "LDAP_BaseDN_Description": "A teljesen minősített elkülönítő neve (DN) LDAP részfa szeretne keresni felhasználókat és csoportokat. Akkor adjunk hozzá annyi, amennyit akar; azonban minden csoport kell meghatározni ugyanabban a tartományban bázis a felhasználók számára, hogy tartozik hozzá. Ha megadod korlátozott felhasználói csoportok, csak azok a felhasználók, hogy tartoznak azok a csoportok lesznek hatálya alá. Javasoljuk, hogy adja meg a felső szint a LDAP fa, mint a domain bázis és használja keresési szűrő a hozzáférés szabályozására.",
+  "LDAP_User_Search_Field_Description": "Az LDAP-attribútum, amely azonosítja az LDAP felhasználó, aki megkísérel hitelesítést. Ezt a mezőt kell `sAMAccountName` legtöbb Active Directory telepítés, de lehet, hogy` uid` más LDAP megoldások, mint például az OpenLDAP. A `mail` azonosítani felhasználókat e-mailben, vagy bármi kívánt attribútum. <br> A többszörös értékeket vesszővel elválasztva, hogy a felhasználó bejelentkezési segítségével több azonosítók, mint a felhasználónév vagy e-mailben.",
+  "LDAP_User_Search_Filter_Description": "Ha meg van adva, csak azok a felhasználók, amelyek megfelelnek a szűrőt tenni, hogy jelentkezzen be. Ha nincs szűrő megadva, az összes felhasználó körén belül a megadott tartomány bázis lesz képes bejelentkezni. <br/> Pl Active Directory `MemberOf = cn = ROCKET_CHAT, ou = Általános Groups`. <br/> Pl OpenLDAP (bővíthető találat keresés) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Az LDAP felhasználó, amely végrehajtja a felhasználó kereséseket hitelesítésére felhasználók, amikor bejelentkeznek. <br/> Ez általában egy szolgáltatási fiókot létre kifejezetten a harmadik fél integrációk. Használjon teljes nevét, például `cn = Administrator, cn = Users, dc = példa, dc = com`.",
   "LDAP_Enable": "Engedélyezze",
   "LDAP_Enable_Description": "Kísérlet, hogy kihasználja az LDAP hitelesítés.",
   "LDAP_Encryption": "Titkosítás",
@@ -663,12 +651,9 @@
   "LDAP_Sync_User_Data_Description": "Tartsa a felhasználói adatok szinkronban szerver login (pl: név, e-mail).",
   "LDAP_Sync_User_Data_FieldMap": "Felhasználói adatok Field Térkép",
   "LDAP_Sync_User_Data_FieldMap_Description": "Állítsd be, hogyan felhasználói fiók területeken (például e-mail) lakott egy rekordot LDAP (egyszer találtak). <br/> Példaként `{\" cn \":\" name \",\" mail \":\" email \"}` fog választani egy személy olvasható név a cn attribútumot, és az e-mail a mail attribútumot. <br/> Elérhető mezők közé `name` és` email`.",
-  "LDAP_Sync_Users": "Szinkronizálás felhasználók",
   "LDAP_Test_Connection": "kapcsolat tesztelése",
   "LDAP_Unique_Identifier_Field": "Egyedi azonosító mező",
   "LDAP_Unique_Identifier_Field_Description": "Mely területen fogják használni, hogy összekapcsolja a LDAP felhasználó és a felhasználói Rocket.Chat. Közölhetitek több értéket vesszővel elválasztva meg kell kérni az érték LDAP rekordot. <br/> Az alapértelmezett érték a `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Használja Egyéni Domain Search",
-  "LDAP_Use_Custom_Domain_Search_Description": "Írja meg saját szűrő keresni a felhasználókat az LDAP kiszolgálón.",
   "LDAP_Username_Field": "felhasználónév mező",
   "LDAP_Username_Field_Description": "Mely területen kerül felhasználásra * felhasználónév * az új felhasználók számára. Hagyja üresen használni a felhasználónevét tájékoztatni bejelentkezési oldalon. <br/> Használhatja sablon címkéket is, mint a `#{givenName}.#{sn}`. <br/> Az alapértelmezett érték `sAMAccountName`.",
   "Leave_Group_Warning": "Biztos benne, hogy szeretné elhagyni a csoportot \" %s\"?",
diff --git a/packages/rocketchat-i18n/i18n/id.i18n.json b/packages/rocketchat-i18n/i18n/id.i18n.json
index b06f650fbd5..1f51b993089 100644
--- a/packages/rocketchat-i18n/i18n/id.i18n.json
+++ b/packages/rocketchat-i18n/i18n/id.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "Kebijakan Layanan",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Cari Domain",
-  "LDAP_Custom_Domain_Search_Description": "Sepotong JSON yang mengatur mengikat dan koneksi info dan adalah dalam bentuk: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "default Domain",
   "LDAP_Description": "LDAP adalah basis data hirarki yang banyak digunakan perusahaan untuk menyediakan fasilitas single sing on untuk berbagi satu kata sandi diantara beberapa situs dan services. Untuk informasi dan contoh konfigurasi lebih lanjut, silahkan berkonsultasi di wiki kami:\nhttps://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "domain Basis",
-  "LDAP_Domain_Base_Description": "Nama yang memenuhi syarat Distinguished (DN) dari subtree LDAP Anda ingin mencari pengguna dan kelompok. Anda dapat menambahkan sebanyak yang Anda inginkan; Namun, masing-masing kelompok harus didefinisikan dalam basis domain sama dengan pengguna milik itu. Jika Anda menentukan kelompok pengguna terbatas, hanya pengguna yang termasuk kelompok-kelompok akan di lingkup. Kami menyarankan Anda menentukan tingkat atas pohon direktori LDAP sebagai basis domain Anda dan gunakan filter pencarian untuk mengontrol akses.",
-  "LDAP_Domain_Search_Filter": "Domain Cari Filter",
-  "LDAP_Domain_Search_Filter_Description": "Jika ditentukan, hanya pengguna yang cocok dengan filter ini akan diizinkan untuk masuk. Jika tidak ada filter yang ditentukan, semua pengguna dalam lingkup dasar domain yang ditentukan akan dapat masuk. <br/> Misalnya untuk Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> Misalnya untuk OpenLDAP (extensible penelusuran pencocokan) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Cari Obyek Kategori",
-  "LDAP_Domain_Search_Object_Category_Description": "The * objectCategory * yang mengidentifikasi pengguna Anda. <br/> Biarkan kosong untuk * OpenLDAP *. <br/> Misalnya `person`, dll",
-  "LDAP_Domain_Search_Object_Class": "Domain Cari Obyek Kelas",
-  "LDAP_Domain_Search_Object_Class_Description": "The * objectclass * yang mengidentifikasi pengguna Anda. <br/> Misalnya `organizationalPerson`,` user`, `inetOrgPerson`, dll",
-  "LDAP_Domain_Search_Password": "Domain Cari Kata",
-  "LDAP_Domain_Search_Password_Description": "Password untuk pengguna pencarian domain.",
-  "LDAP_Domain_Search_User": "Domain Cari Pengguna",
-  "LDAP_Domain_Search_User_Description": "LDAP pengguna yang melakukan pencarian pengguna untuk otentikasi pengguna lain ketika mereka masuk. <br/> Ini biasanya account layanan dibuat khusus untuk integrasi pihak ketiga. Gunakan nama yang memenuhi syarat, seperti `cn = Administrator, cn = Users, dc = Contoh, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Cari ID Pengguna",
-  "LDAP_Domain_Search_User_ID_Description": "Atribut LDAP yang mengidentifikasi pengguna LDAP yang mencoba otentikasi. Bidang ini harus `sAMAccountName` untuk instalasi yang paling Active Directory, tapi mungkin` uid` untuk solusi LDAP lain, seperti OpenLDAP. Anda dapat menggunakan `mail` untuk mengidentifikasi pengguna melalui email atau atribut apa pun yang Anda inginkan. <br> Anda dapat menggunakan beberapa nilai dipisahkan dengan koma untuk memungkinkan pengguna untuk login menggunakan beberapa pengenal seperti username atau email.",
+  "LDAP_BaseDN_Description": "Nama yang memenuhi syarat Distinguished (DN) dari subtree LDAP Anda ingin mencari pengguna dan kelompok. Anda dapat menambahkan sebanyak yang Anda inginkan; Namun, masing-masing kelompok harus didefinisikan dalam basis domain sama dengan pengguna milik itu. Jika Anda menentukan kelompok pengguna terbatas, hanya pengguna yang termasuk kelompok-kelompok akan di lingkup. Kami menyarankan Anda menentukan tingkat atas pohon direktori LDAP sebagai basis domain Anda dan gunakan filter pencarian untuk mengontrol akses.",
+  "LDAP_User_Search_Field_Description": "Atribut LDAP yang mengidentifikasi pengguna LDAP yang mencoba otentikasi. Bidang ini harus `sAMAccountName` untuk instalasi yang paling Active Directory, tapi mungkin` uid` untuk solusi LDAP lain, seperti OpenLDAP. Anda dapat menggunakan `mail` untuk mengidentifikasi pengguna melalui email atau atribut apa pun yang Anda inginkan. <br> Anda dapat menggunakan beberapa nilai dipisahkan dengan koma untuk memungkinkan pengguna untuk login menggunakan beberapa pengenal seperti username atau email.",
+  "LDAP_User_Search_Filter_Description": "Jika ditentukan, hanya pengguna yang cocok dengan filter ini akan diizinkan untuk masuk. Jika tidak ada filter yang ditentukan, semua pengguna dalam lingkup dasar domain yang ditentukan akan dapat masuk. <br/> Misalnya untuk Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> Misalnya untuk OpenLDAP (extensible penelusuran pencocokan) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "LDAP pengguna yang melakukan pencarian pengguna untuk otentikasi pengguna lain ketika mereka masuk. <br/> Ini biasanya account layanan dibuat khusus untuk integrasi pihak ketiga. Gunakan nama yang memenuhi syarat, seperti `cn = Administrator, cn = Users, dc = Contoh, dc = com`.",
   "LDAP_Enable": "Hidupkan",
   "LDAP_Enable_Description": "Mencoba untuk memanfaatkan LDAP sebagai otentikasi.",
   "LDAP_Encryption": "enkripsi",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "Menjaga data pengguna tetap tersinkronasi dengan server saat login(seperti: nama, email).",
   "LDAP_Sync_User_Data_FieldMap": "Peta Kolom Data User",
   "LDAP_Sync_User_Data_FieldMap_Description": "Mengkonfigurasi bagaimana kolom akun pengguna(seperti email) yang akan diisi dari record dalam LDAP(sekali ditemukan). <br/>Sebagai contoh, `{\"cn\":\"name\", \"mail\":\"email\"}` akan memilih nama yang dapat dibaca oleh manusia dari atribut cn, dan email mereka dari atribut mail. <br/> Kolom yang tersedia meliputi `name`, and `email`.",
-  "LDAP_Sync_Users": "Pengguna sinkronisasi",
   "LDAP_Test_Connection": "Tes koneksi",
   "LDAP_Unique_Identifier_Field": "Unique Identifier Bidang",
   "LDAP_Unique_Identifier_Field_Description": "bidang yang akan digunakan untuk menghubungkan pengguna LDAP dan pengguna Rocket.Chat. Anda dapat menginformasikan beberapa nilai dipisahkan dengan koma untuk mencoba untuk mendapatkan nilai dari catatan LDAP. <br/> Nilai default adalah `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Gunakan Pencarian Domain",
-  "LDAP_Use_Custom_Domain_Search_Description": "Menulis filter Anda sendiri untuk mencari pengguna di server LDAP.",
   "LDAP_Username_Field": "nama pengguna Lapangan",
   "LDAP_Username_Field_Description": "bidang yang akan digunakan sebagai * nama * bagi pengguna baru. Biarkan kosong untuk menggunakan nama pengguna informasi pada halaman login. <br/> Anda dapat menggunakan tag template juga, seperti `#{givenName}.#{sn}`. <br/> Nilai default adalah `sAMAccountName`.",
   "Leave_Group_Warning": "Apakah Anda yakin ingin meninggalkan kelompok \"% s\"?",
diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json
index cf072551c8b..3af3d63505e 100644
--- a/packages/rocketchat-i18n/i18n/it.i18n.json
+++ b/packages/rocketchat-i18n/i18n/it.i18n.json
@@ -842,24 +842,12 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
   "LDAP_Connect_Timeout": "Timeout Connessione (ms)",
-  "LDAP_Custom_Domain_Search": "Ricerca dominio personalizzato",
-  "LDAP_Custom_Domain_Search_Description": "Un pezzo di JSON che lega e collega informazioni di questo tipo: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Dominio Predefinito",
   "LDAP_Description": "LDAP è un database gerarchico che molte aziende utilizzano per fornire single sign on - per la condivisione di una sola password tra più siti e servizi. Per informazioni sulla configurazione avanzata ed esempi, consulta il nostro wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Dominio Base",
-  "LDAP_Domain_Base_Description": "Il nome Distinguished Name (DN) di una sottostruttura LDAP in cui vuoi cercare utenti e gruppi. È possibile aggiungere quanti ne vuoi; Tuttavia, ogni gruppo deve essere definito nella stessa base dominio degli utenti che ne fanno parte. Se specifichi gruppi di utenti con restrizioni, solo gli utenti che appartengono a questi gruppi saranno raggiungibili. Si consiglia di specificare il livello superiore nell'albero della directory LDAP come base di dominio e utilizzare il filtro di ricerca per controllare l'accesso.",
-  "LDAP_Domain_Search_Filter": "Filtro di ricerca del dominio ",
-  "LDAP_Domain_Search_Filter_Description": "Se specificato, solo gli utenti che corrispondono a questo filtro sarà consentito effettuare il login. Se non viene specificato alcun filtro, tutti gli utenti che rientrano nel campo della base di dominio specificato saranno in grado di accedere. <br/> Ad esempio, per Active Directory `memberOf = CN = ROCKET_CHAT, ou = Generale Groups`. <br/> Ad esempio per OpenLDAP (extensible ricerca match) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Ricerca nel dominio Categoria Oggetto",
-  "LDAP_Domain_Search_Object_Category_Description": "I * * objectCategory che identificano gli utenti. <br/> Lascia vuoto per * * OpenLDAP. <br/> Ad esempio `Person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Ricerca di Object Class nel dominio",
-  "LDAP_Domain_Search_Object_Class_Description": "I * * objectclass che identificano gli utenti. <br/> Ad esempio `organizationalPerson`,` user`, `inetOrgPerson`, ecc.",
-  "LDAP_Domain_Search_Password": "Ricerca password nel dominio ",
-  "LDAP_Domain_Search_Password_Description": "La password per l'utente del dominio di ricerca.",
-  "LDAP_Domain_Search_User": "Ricerca utente nel dominio",
-  "LDAP_Domain_Search_User_Description": "L'utente che esegue ricerche LDAP per l'autenticazione degli utenti quando accedono. <br/> Solitamente é un account di servizio creato appositamente per le integrazioni di terze parti. Utilizzare un nome completo, come `cn=Administrator, CN=Users, dc=example, dc=com`.",
-  "LDAP_Domain_Search_User_ID": "Ricerca User ID nel dominio",
-  "LDAP_Domain_Search_User_ID_Description": "L'attributo LDAP che identifica l'utente LDAP che tenta l'autenticazione. Questo campo deve essere `sAMAccountName` per la maggior parte di installazioni Active Directory, ma può essere `uid` per altre soluzioni LDAP, come OpenLDAP. È possibile utilizzare `mail` per identificare gli utenti via e-mail o tramite attributo.<br>È possibile utilizzare più valori separati da virgola per consentire agli utenti di accedere con più identificatori, come nome utente o e-mail.",
+  "LDAP_BaseDN_Description": "Il nome Distinguished Name (DN) di una sottostruttura LDAP in cui vuoi cercare utenti e gruppi. È possibile aggiungere quanti ne vuoi; Tuttavia, ogni gruppo deve essere definito nella stessa base dominio degli utenti che ne fanno parte. Se specifichi gruppi di utenti con restrizioni, solo gli utenti che appartengono a questi gruppi saranno raggiungibili. Si consiglia di specificare il livello superiore nell'albero della directory LDAP come base di dominio e utilizzare il filtro di ricerca per controllare l'accesso.",
+  "LDAP_User_Search_Field_Description": "L'attributo LDAP che identifica l'utente LDAP che tenta l'autenticazione. Questo campo deve essere `sAMAccountName` per la maggior parte di installazioni Active Directory, ma può essere `uid` per altre soluzioni LDAP, come OpenLDAP. È possibile utilizzare `mail` per identificare gli utenti via e-mail o tramite attributo.<br>È possibile utilizzare più valori separati da virgola per consentire agli utenti di accedere con più identificatori, come nome utente o e-mail.",
+  "LDAP_User_Search_Filter_Description": "Se specificato, solo gli utenti che corrispondono a questo filtro sarà consentito effettuare il login. Se non viene specificato alcun filtro, tutti gli utenti che rientrano nel campo della base di dominio specificato saranno in grado di accedere. <br/> Ad esempio, per Active Directory `memberOf = CN = ROCKET_CHAT, ou = Generale Groups`. <br/> Ad esempio per OpenLDAP (extensible ricerca match) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "L'utente che esegue ricerche LDAP per l'autenticazione degli utenti quando accedono. <br/> Solitamente é un account di servizio creato appositamente per le integrazioni di terze parti. Utilizzare un nome completo, come `cn=Administrator, CN=Users, dc=example, dc=com`.",
   "LDAP_Enable": "Attivo",
   "LDAP_Enable_Description": "Tenta di utilizzare LDAP per l'autenticazione.",
   "LDAP_Encryption": "Crittografia",
@@ -879,7 +867,6 @@
   "LDAP_Host": "Host",
   "LDAP_Host_Description": "Host LDAP, ad esempio `ldap.example.com` o` 10.0.0.30`.",
   "LDAP_Idle_Timeout": "Timeout attesa (ms)",
-  "LDAP_Import_Users": "Importa utenti LDAP",
   "LDAP_Import_Users_Description": "Il processo true sync importerà tutti gli utenti LDAP<br/> *Attenzione!* Specificare il filtro di ricerca per non importare gli utenti in eccesso.",
   "LDAP_Login_Fallback": "Login di Fallback",
   "LDAP_Login_Fallback_Description": "Se il login su LDAP non ha successo, prova ad effettuarlo sul sistema di account locale. E' utile quando il server LDAP è down per qualche ragione.",
@@ -893,12 +880,9 @@
   "LDAP_Sync_User_Data_Description": "Conserva i dati degli utenti in sincro con il server di login (ad esempio: nome, email).",
   "LDAP_Sync_User_Data_FieldMap": "Campo Utente Dati Mappa",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configura come i campi dell'account utente (come l'email) sono popolate da un record LDAP (una volta trovato). <br/>A titolo di esempio, `{\" cn \":\" nome \",\" mail \":\" email \"}` sceglierà il nome di una persona umana dall'attributo cn, e la loro email dall'attributo mail. In aggiunta è possibile usare le variabili, per esempio:  { \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` usa una combinazione di nome e cognome dell'utente per il campo `name` di rocket chat.<br/>I campi disponibili in Rocket.Chat includono: `name` e `email`.",
-  "LDAP_Sync_Users": "Sincronizza utenti",
   "LDAP_Test_Connection": "Connessione di prova",
   "LDAP_Unique_Identifier_Field": "Campo Identificativo Univoco",
   "LDAP_Unique_Identifier_Field_Description": "Quale campo verrà utilizzato per collegare l'utente LDAP e l'utente Rocket.Chat. È possibile comunicare più valori separati da virgola per cercare di ottenere il valore dal record di LDAP. <br/> Il valore predefinito è `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Utilizza la Ricerca del dominio personalizzato",
-  "LDAP_Use_Custom_Domain_Search_Description": "Scrive il tuo filtro per cercare gli utenti nel server LDAP.",
   "LDAP_Username_Field": "Nome utente campo",
   "LDAP_Username_Field_Description": "Quale campo verrà utilizzato come *username* per i nuovi utenti. Lascia vuoto per usare il nome utente informato sulla pagina di login. <br/> È possibile utilizzare i tag modello di troppo, come `#{givenName}.#{sn}`. <br/> Il valore predefinito è `sAMAccountName`.",
   "Least_Amount": "Importo Minimo",
diff --git a/packages/rocketchat-i18n/i18n/ja.i18n.json b/packages/rocketchat-i18n/i18n/ja.i18n.json
index f0cc047ab9c..c092fd60676 100644
--- a/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -568,24 +568,12 @@
   "Layout_Terms_of_Service": "サービス利用規約",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA 証明書",
-  "LDAP_Custom_Domain_Search": "カスタムドメイン検索",
-  "LDAP_Custom_Domain_Search_Description": "バインドと接続情報を管理し、フォームのあるJSONの作品： <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "既定ドメイン",
   "LDAP_Description": "LDAP は、多くの企業でシングルサインオンを提供する為に使用している階層構造データベースで、 1 つのパスワードを複数サイトやサービスで共有できる手法です。高度な設定情報や例示は、私達の wiki で相談してください: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "ドメインベース",
-  "LDAP_Domain_Base_Description": "検索したいユーザーやグループが LDAP サブツリーとして属す完全修飾の Distinguished Name (DN) 。 それぞれのグループは、そこに属すユーザーと同じドメインベースに定義されていなければなりません。特定のユーザーグループを制限した場合、そのグループに属したユーザーのみ対象になります。LDAP ディレクトリーのトップレベルドメインをドメインベースとし、アクセス制御には検索フィルターを使用することを推奨します。",
-  "LDAP_Domain_Search_Filter": "ドメイン検索フィルター",
-  "LDAP_Domain_Search_Filter_Description": "指定すると、このフィルターにマッチしたユーザーのみログインできます。何も指定しないと、指定したドメインベースの範囲にいるすべてのユーザーログインできるようになります。<br/>例えば Active Directory では `memberOf=cn=ROCKET_CHAT,ou=General Groups` など。<br/>例えば OpenLDAP ( 拡張可能な検索 ) では `ou:dn:=ROCKET_CHAT` など。",
-  "LDAP_Domain_Search_Object_Category": "ドメイン検索の objectCategory",
-  "LDAP_Domain_Search_Object_Category_Description": "ユーザーを識別する *objectCategory* 。<br/>空値は *OpenLDAP* のために、除いてください。<br/>例えば、 `person` など。",
-  "LDAP_Domain_Search_Object_Class": "ドメイン検索の objectclass",
-  "LDAP_Domain_Search_Object_Class_Description": "ユーザーを識別する *objectclass* 。<br/>例えば、 `organizationalPerson` 、 `user` 、 `inetOrgPerson` など。",
-  "LDAP_Domain_Search_Password": "ドメイン検索のパスワード",
-  "LDAP_Domain_Search_Password_Description": "ドメイン検索ユーザーのパスワード。",
-  "LDAP_Domain_Search_User": "ドメイン検索ユーザー",
-  "LDAP_Domain_Search_User_Description": "ユーザーがログインするためにユーザーを検索する時に使用する LDAP ユーザー。<br/>これは多くの場合、 3rd パーティー連携の為に特別に作成されたサービスアカウントです。 `cn=Administrator,cn=Users,dc=Example,dc=com` といった完全修飾名を使用してください。",
-  "LDAP_Domain_Search_User_ID": "ドメイン検索ユーザー ID",
-  "LDAP_Domain_Search_User_ID_Description": "認証を試みるユーザーの LDAP 属性。 このフィールドは、ほとんどの Active Directory インストールで `sAMAccountName` とすることを推奨されていますが、ほかの OpenLDAP などの LDAP システムでは `uid` かもしれません。 `mail` をメールアドレスとしてユーザーを識別であれば使用できますし、この他にも識別できればどんな属性でも構いません。<br>複数の値をカンマ区切りで指定すれば、メールアドレスとユーザー名といったように複数のIDでログインできるようになります。",
+  "LDAP_BaseDN_Description": "検索したいユーザーやグループが LDAP サブツリーとして属す完全修飾の Distinguished Name (DN) 。 それぞれのグループは、そこに属すユーザーと同じドメインベースに定義されていなければなりません。特定のユーザーグループを制限した場合、そのグループに属したユーザーのみ対象になります。LDAP ディレクトリーのトップレベルドメインをドメインベースとし、アクセス制御には検索フィルターを使用することを推奨します。",
+  "LDAP_User_Search_Field_Description": "認証を試みるユーザーの LDAP 属性。 このフィールドは、ほとんどの Active Directory インストールで `sAMAccountName` とすることを推奨されていますが、ほかの OpenLDAP などの LDAP システムでは `uid` かもしれません。 `mail` をメールアドレスとしてユーザーを識別であれば使用できますし、この他にも識別できればどんな属性でも構いません。<br>複数の値をカンマ区切りで指定すれば、メールアドレスとユーザー名といったように複数のIDでログインできるようになります。",
+  "LDAP_User_Search_Filter_Description": "指定すると、このフィルターにマッチしたユーザーのみログインできます。何も指定しないと、指定したドメインベースの範囲にいるすべてのユーザーログインできるようになります。<br/>例えば Active Directory では `memberOf=cn=ROCKET_CHAT,ou=General Groups` など。<br/>例えば OpenLDAP ( 拡張可能な検索 ) では `ou:dn:=ROCKET_CHAT` など。",
+  "LDAP_Authentication_UserDN_Description": "ユーザーがログインするためにユーザーを検索する時に使用する LDAP ユーザー。<br/>これは多くの場合、 3rd パーティー連携の為に特別に作成されたサービスアカウントです。 `cn=Administrator,cn=Users,dc=Example,dc=com` といった完全修飾名を使用してください。",
   "LDAP_Enable": "有効にする",
   "LDAP_Enable_Description": "LDAP による認証を試行するようになります。",
   "LDAP_Encryption": "暗号化",
@@ -600,12 +588,9 @@
   "LDAP_Sync_User_Data_Description": "ログインする時に、ユーザーデータを同期します (例: 名前, メールアドレス)",
   "LDAP_Sync_User_Data_FieldMap": "ユーザーデータのフィールドマップ",
   "LDAP_Sync_User_Data_FieldMap_Description": "どのようにユーザーアカウントのフィールド (メールアドレスなど) を LDAP にあるレコードから調整するか。 <br/>例えば、 `{\"cn\":\"name\", \"mail\":\"email\"}` では、人間が読める名前を cn 属性とし、メールアドレスを mail 属性から取得します。<br/> 使用できるは、 `名前` と `メールアドレス` を含むものです。",
-  "LDAP_Sync_Users": "ユーザーを同期する",
   "LDAP_Test_Connection": "接続テスト",
   "LDAP_Unique_Identifier_Field": "一意性を識別するフィールド",
   "LDAP_Unique_Identifier_Field_Description": "どのフィールドで LDAP ユーザーと Rocket.Chat ユーザーをリンクするか。複数の値をカンマ区切りで指定すると LDAP レコードからそれぞれ取得することを試みます。<br/>既定値は、 `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber` です",
-  "LDAP_Use_Custom_Domain_Search": "カスタムドメイン検索を使用する",
-  "LDAP_Use_Custom_Domain_Search_Description": "LDAP サーバー上で検索する際の独自フィルターを記述する場合に指定します。",
   "LDAP_Username_Field": "ユーザー名フィールド",
   "LDAP_Username_Field_Description": "どのフィールドを新しいユーザーの *ユーザー名* として使用するのか。ログインページのユーザー名を利用する場合は、空にしてください。<br/>テンプレートタグとして `#{givenName}.#{sn}` といった記述も使用できます。<br/>既定値は、 `sAMAccountName` です",
   "Leave_Group_Warning": "本当にグループ \"%s\" から退出しますか?",
diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json
index be3d59aa11d..20c1746dc6d 100644
--- a/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "ល័ក្ខខ័ណ្ឌ​នៃ​សេវាកម្ម",
   "LDAP": "ប្រើ LDAP",
   "LDAP_CA_Cert": "CA បានវិញ្ញាបនបត្រ",
-  "LDAP_Custom_Domain_Search": "ស្វែងរកដែនផ្ទាល់ខ្លួន",
-  "LDAP_Custom_Domain_Search_Description": "បំណែកមួយនៃ JSON ប៉ុណ្ណោះដែលគ្រប់គ្រង info ចងនិងការតភ្ជាប់និងជានៃសំណុំបែបបទនេះ: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "ដែនលំនាំដើម",
   "LDAP_Description": "LDAP គឺជាលំដាប់ក្នុងទូផ្ទុកទិន្នន័យដែលផ្ទុកព័ត៌មានក្រុមហ៊ុនជាច្រើនដែលប្រើប្រាស់ដើម្បីធ្វើការ Authentication ដោយប្រើប្រាស់ Username និង Password រវាង Site ជាច្រើន និងសេវាកម្មផ្សេងៗ។ ព័ត៌មានអំពីការកំណត់កម្រិតខ្ពស់ និងឧទាហរណ៍សូមចូលទៅកាន់វីគី https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "មូលដ្ឋានដែន",
-  "LDAP_Domain_Base_Description": "ឈ្មោះដែលមានសមត្ថភាពយ៉ាងពេញលេញកិត្តិយស (DN) នៃមែកធាងរបស់ LDAP មួយដែលអ្នកចង់បានដើម្បីស្វែងរកអ្នកប្រើនិងក្រុម។ អ្នកអាចបន្ថែមជាច្រើនដូចជាអ្នកចង់; ទោះជាយ៉ាងណា, ក្រុមនីមួយត្រូវតែត្រូវបានកំណត់នៅក្នុងមូលដ្ឋានដែនដូចគ្នាជាអ្នកប្រើប្រាស់ដែលជាកម្មសិទ្ធិរបស់វា។ ប្រសិនបើអ្នកបញ្ជាក់ក្រុមអ្នកប្រើបានដាក់មានតែអ្នកប្រើដែលជារបស់ក្រុមទាំងនោះនឹងមាននៅក្នុងវិសាលភាព។ យើងផ្ដល់អនុសាសន៍ថាអ្នកបញ្ជាក់ក្នុងកម្រិតកំពូលរបស់ថត LDAP របស់អ្នកដើមឈើជាមូលដ្ឋានដែនរបស់អ្នកហើយប្រើតម្រងស្វែងរកដើម្បីគ្រប់គ្រងការចូលប្រើ។",
-  "LDAP_Domain_Search_Filter": "តម្រងស្វែងរកដែន",
-  "LDAP_Domain_Search_Filter_Description": "ប្រសិនបើបានបញ្ជាក់នោះមានតែអ្នកប្រើដែលផ្គូផ្គងនឹងតម្រងនេះនឹងត្រូវបានអនុញ្ញាតឱ្យចូល។ ប្រសិនបើមិនមានតម្រងត្រូវបានបញ្ជាក់, អ្នកប្រើប្រាស់ទាំងអស់នៅក្នុងវិសាលភាពនៃមូលដ្ឋានដែនដែលបានបញ្ជាក់នឹងអាចចូល។ <br/> ឧសម្រាប់ថតសកម្ម `memberOf = CN = ROCKET_CHAT, ou = ទូទៅ Groups` ។ <br/> ឧសម្រាប់ OpenLDAP (ស្វែងរកការប្រកួតពង្រីក) `OU: DN: = ROCKET_CHAT` ។",
-  "LDAP_Domain_Search_Object_Category": "ដែនស្វែងរកវត្ថុ",
-  "LDAP_Domain_Search_Object_Category_Description": "នេះ * objectCategory * ដែលសម្គាល់អ្នកប្រើរបស់អ្នក។ <br/> ទុកឱ្យនៅទទេចំពោះ * របស់ OpenLDAP * ។ <br/> ឧ `person` ល",
-  "LDAP_Domain_Search_Object_Class": "ស្វែងរកវត្ថុដែនថ្នាក់",
-  "LDAP_Domain_Search_Object_Class_Description": "នេះ * objectClass * ដែលសម្គាល់អ្នកប្រើរបស់អ្នក។ <br/> ឧ `organizationalPerson`: user`: inetOrgPerson` ល",
-  "LDAP_Domain_Search_Password": "ស្វែងរកពាក្យសម្ងាត់ដែន",
-  "LDAP_Domain_Search_Password_Description": "ពាក្យសម្ងាត់សម្រាប់អ្នកប្រើស្វែងរកដែន។",
-  "LDAP_Domain_Search_User": "ដែនស្វែងរករបស់អ្នកប្រើ",
-  "LDAP_Domain_Search_User_Description": "អ្នកប្រើ LDAP ដែលដំណើរការរកមើលអ្នកប្រើដើម្បីផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវអ្នកប្រើផ្សេងទៀតនៅពេលពួកគេចូល។ <br/> នេះគឺជាការជាធម្មតាគណនីសេវាកម្មមួយដែលបានបង្កើតឡើងជាពិសេសសម្រាប់ការធ្វើសមាហរណកម្មភាគីទីបី។ ប្រើឈ្មោះដែលមានសមត្ថភាពយ៉ាងពេញលេញជាមួយដូចជា `CN = គ្រប់គ្រង CN = អ្នកប្រើ, DC = ឧទាហរណ៍ dc = com` ។",
-  "LDAP_Domain_Search_User_ID": "លេខសម្គាល់អ្នកដែនស្វែងរក",
-  "LDAP_Domain_Search_User_ID_Description": "គុណលក្ខណៈ LDAP ដែលបានកំណត់អ្នកប្រើ LDAP ដែលប៉ុនប៉ងផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ។ វាលនេះគួរតែជា `sAMAccountName` សម្រាប់ការដំឡើងថតសកម្មច្រើនបំផុតប៉ុន្តែវាអាចជាដំណោះស្រាយ` uid` ផ្សេងទៀតរបស់ LDAP ដូចជារបស់ OpenLDAP ។ អ្នកអាចប្រើ `mail` អត្តសញ្ញាណអ្នកប្រើដោយអ៊ីម៉ែលឬគុណលក្ខណៈដែលអ្នកចង់បាន។ <br> អ្នកអាចប្រើតម្លៃជាច្រើនត្រូវបានបំបែកដោយសញ្ញាក្បៀសដើម្បីអនុញ្ញាតឱ្យអ្នកប្រើដើម្បីចូលទៅប្រើប្រាស់ជាច្រើនដូចឈ្មោះអ្នកប្រើអត្តសញ្ញាឬអ៊ីម៉ែល។",
+  "LDAP_BaseDN_Description": "ឈ្មោះដែលមានសមត្ថភាពយ៉ាងពេញលេញកិត្តិយស (DN) នៃមែកធាងរបស់ LDAP មួយដែលអ្នកចង់បានដើម្បីស្វែងរកអ្នកប្រើនិងក្រុម។ អ្នកអាចបន្ថែមជាច្រើនដូចជាអ្នកចង់; ទោះជាយ៉ាងណា, ក្រុមនីមួយត្រូវតែត្រូវបានកំណត់នៅក្នុងមូលដ្ឋានដែនដូចគ្នាជាអ្នកប្រើប្រាស់ដែលជាកម្មសិទ្ធិរបស់វា។ ប្រសិនបើអ្នកបញ្ជាក់ក្រុមអ្នកប្រើបានដាក់មានតែអ្នកប្រើដែលជារបស់ក្រុមទាំងនោះនឹងមាននៅក្នុងវិសាលភាព។ យើងផ្ដល់អនុសាសន៍ថាអ្នកបញ្ជាក់ក្នុងកម្រិតកំពូលរបស់ថត LDAP របស់អ្នកដើមឈើជាមូលដ្ឋានដែនរបស់អ្នកហើយប្រើតម្រងស្វែងរកដើម្បីគ្រប់គ្រងការចូលប្រើ។",
+  "LDAP_User_Search_Field_Description": "គុណលក្ខណៈ LDAP ដែលបានកំណត់អ្នកប្រើ LDAP ដែលប៉ុនប៉ងផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ។ វាលនេះគួរតែជា `sAMAccountName` សម្រាប់ការដំឡើងថតសកម្មច្រើនបំផុតប៉ុន្តែវាអាចជាដំណោះស្រាយ` uid` ផ្សេងទៀតរបស់ LDAP ដូចជារបស់ OpenLDAP ។ អ្នកអាចប្រើ `mail` អត្តសញ្ញាណអ្នកប្រើដោយអ៊ីម៉ែលឬគុណលក្ខណៈដែលអ្នកចង់បាន។ <br> អ្នកអាចប្រើតម្លៃជាច្រើនត្រូវបានបំបែកដោយសញ្ញាក្បៀសដើម្បីអនុញ្ញាតឱ្យអ្នកប្រើដើម្បីចូលទៅប្រើប្រាស់ជាច្រើនដូចឈ្មោះអ្នកប្រើអត្តសញ្ញាឬអ៊ីម៉ែល។",
+  "LDAP_User_Search_Filter_Description": "ប្រសិនបើបានបញ្ជាក់នោះមានតែអ្នកប្រើដែលផ្គូផ្គងនឹងតម្រងនេះនឹងត្រូវបានអនុញ្ញាតឱ្យចូល។ ប្រសិនបើមិនមានតម្រងត្រូវបានបញ្ជាក់, អ្នកប្រើប្រាស់ទាំងអស់នៅក្នុងវិសាលភាពនៃមូលដ្ឋានដែនដែលបានបញ្ជាក់នឹងអាចចូល។ <br/> ឧសម្រាប់ថតសកម្ម `memberOf = CN = ROCKET_CHAT, ou = ទូទៅ Groups` ។ <br/> ឧសម្រាប់ OpenLDAP (ស្វែងរកការប្រកួតពង្រីក) `OU: DN: = ROCKET_CHAT` ។",
+  "LDAP_Authentication_UserDN_Description": "អ្នកប្រើ LDAP ដែលដំណើរការរកមើលអ្នកប្រើដើម្បីផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវអ្នកប្រើផ្សេងទៀតនៅពេលពួកគេចូល។ <br/> នេះគឺជាការជាធម្មតាគណនីសេវាកម្មមួយដែលបានបង្កើតឡើងជាពិសេសសម្រាប់ការធ្វើសមាហរណកម្មភាគីទីបី។ ប្រើឈ្មោះដែលមានសមត្ថភាពយ៉ាងពេញលេញជាមួយដូចជា `CN = គ្រប់គ្រង CN = អ្នកប្រើ, DC = ឧទាហរណ៍ dc = com` ។",
   "LDAP_Enable": "អនុញ្ញាតិ LDAP",
   "LDAP_Enable_Description": "ព្យាយាមប្រើប្រាស់ LDAP ក្នុងការផ្ទៀងផ្ទាត់គណនី",
   "LDAP_Encryption": "ការអ៊ីនគ្រីប",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "រក្សាទិន្នន័យអ្នកប្រើប្រាស់ក្នុងការ Sync ជាមួយម៉ាស៊ីនមេក្នុងការ Login (eg: name, email)។",
   "LDAP_Sync_User_Data_FieldMap": "ចំណុចចងភ្ជាប់ទិន្នន័យអ្នកប្រើប្រាស់",
   "LDAP_Sync_User_Data_FieldMap_Description": "ការកំណត់ចន្លោះគណនីអ្នកប្រើប្រាស់ (ដូចជាអ៊ីមែល) គឺត្រូវបានទាញទិន្នន័យចេញពី LDAP (ពេលដែលរកឃើញ)។ <br/> ឧទាហរណ៍៖ `{\"cn\":\"ឈ្មោះ\", \"mail\":\"អ៊ីមែល\"}` នឹងត្រូវបានជ្រើសយកឈ្មោះមនុស្សពីធាតុ cn ហើយអ៊ីមែលរបស់ពួកគេទាញចេញពីធាតុ email។<br/> ចន្លោះទំនេររាប់បញ្ចូលទាំង `ឈ្មោះ` និង `អ៊ីមែល`។",
-  "LDAP_Sync_Users": "អ្នកប្រើសមកាលកម្ម",
   "LDAP_Test_Connection": "សាកល្បងការតភ្ជាប់",
   "LDAP_Unique_Identifier_Field": "មានតែមួយគត់សម្គាល់វាល",
   "LDAP_Unique_Identifier_Field_Description": "វាលនេះដែលនឹងត្រូវបានប្រើដើម្បីភ្ជាប់អ្នកប្រើ LDAP និងអ្នកប្រើ Rocket.Chat នេះ។ អ្នកអាចជូនដំណឹងដល់តម្លៃជាច្រើនត្រូវបានបំបែកដោយសញ្ញាក្បៀសដើម្បីព្យាយាមដើម្បីទទួលបានតម្លៃពីកំណត់ត្រា LDAP ។ <br/> តម្លៃលំនាំដើមគឺ `objectGUID, ក្រុមហ៊ុន IBM-entryUUID, ណែនាំ, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "ប្រើ Search ដែនផ្ទាល់ខ្លួន",
-  "LDAP_Use_Custom_Domain_Search_Description": "ការសរសេរតម្រងផ្ទាល់ខ្លួនរបស់អ្នកដើម្បីស្វែងរកអ្នកប្រើនៅក្នុងម៉ាស៊ីនបម្រើ LDAP ។",
   "LDAP_Username_Field": "ឈ្មោះអ្នកប្រើវាល",
   "LDAP_Username_Field_Description": "វាលនេះដែលនឹងត្រូវបានប្រើជា * សម្រាប់អ្នកប្រើឈ្មោះអ្នកប្រើ * ថ្មី។ ទុកឱ្យទទេដើម្បីប្រើឈ្មោះអ្នកប្រើដែលបានជូនដំណឹងនៅលើទំព័រចូល។ <br/> អ្នកអាចប្រើស្លាកពុម្ពផងដែរ, ដូចជា `#{givenName}.#{sn}` ។ <br/> តម្លៃលំនាំដើមគឺ `sAMAccountName` ។",
   "Leave_Group_Warning": "តើអ្នកពិតជាចង់ចាកចេញពីក្រុម \" %s\" ទេ?",
diff --git a/packages/rocketchat-i18n/i18n/ko.i18n.json b/packages/rocketchat-i18n/i18n/ko.i18n.json
index 4355f2eaa22..bd24ed7152a 100644
--- a/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -671,24 +671,12 @@
   "Layout_Terms_of_Service": "이용약관",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA 쿠폰",
-  "LDAP_Custom_Domain_Search": "맞춤 도메인 검색",
-  "LDAP_Custom_Domain_Search_Description": "바인딩 및 연결 정보를 지배하고 양식입니다 JSON의 조각 : <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "기본 도메인",
   "LDAP_Description": "LDAP는 많은 기업들이 통합 인증을 제공하기 위해 사용하는 계층적인 데이터베이스입니다. 여러 사이트와 서비스 간에 하나의 암호를 공유하기 위한 기능으로, 자세한 정보는 위키를 참고하세요: https://github.com/RocketChat/Rocket.Chat/wiki/LDAP",
-  "LDAP_Domain_Base": "도메인 자료",
-  "LDAP_Domain_Base_Description": "사용자와 그룹을 검색하려는 LDAP 하위 트리의 완전한 고유 이름 (DN). 당신은 당신이 원하는만큼 추가 할 수 있습니다; 그러나, 각각의 그룹은 그것이 속하는 사용자와 동일한 도메인베이스에 정의되어야한다. 당신이 제한된 사용자 그룹을 지정하면 해당 그룹에 속한 사용자 만 범위에있을 것입니다. 우리는 당신이 도메인베이스로 LDAP 디렉토리 트리의 최상위 레벨을 지정하고 액세스를 제어하는​​ 검색 필터를 사용하는 것이 좋습니다.",
-  "LDAP_Domain_Search_Filter": "도메인 검색 필터",
-  "LDAP_Domain_Search_Filter_Description": "이 필터와 일치하는 지정된 사용자 만이 로그인 할 수 할 경우에는 필터가 지정되지 않은 경우. 지정된 도메인베이스의 범위 내에서 모든 사용자가 로그인 할 수 있습니다. <br/> Active Directory에 대한 예`의 memberOf = CN = ROCKET_CHAT, OU = 일반 Groups`. <br/> OpenLDAP를위한 예 (확장 일치 검색)`OU : DN = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "도메인 검색 개체 카테고리",
-  "LDAP_Domain_Search_Object_Category_Description": "사용자를 식별 *의 수 objectcategory의 *. <br/> *의 OpenLDAP를 * 빈 둡니다. <br/> 예를 들어`person` 등",
-  "LDAP_Domain_Search_Object_Class": "도메인 검색 객체 클래스",
-  "LDAP_Domain_Search_Object_Class_Description": "사용자를 식별 * 객체 클래스의 *. <br/> 예를 들어`organizationalPerson`,`user`,`inetOrgPerson` 등",
-  "LDAP_Domain_Search_Password": "도메인 검색 비밀",
-  "LDAP_Domain_Search_Password_Description": "도메인 검색 사용자의 암호입니다.",
-  "LDAP_Domain_Search_User": "도메인 검색 사용",
-  "LDAP_Domain_Search_User_Description": "가 로그인 할 때 다른 사용자를 인증하는 사용자 조회를 수행하는 LDAP 사용자입니다. <br/> 이것은 일반적으로 타사 통합을 위해 특별히 만든 서비스 계정입니다. 정규화 된 이름을 사용, 같은 CN = 관리자 '로, CN 사용자, DC = 예, DC = com`을 =.",
-  "LDAP_Domain_Search_User_ID": "도메인 검색 사용자 ID",
-  "LDAP_Domain_Search_User_ID_Description": "인증을 시도하는 LDAP 사용자를 식별하는 LDAP 속성입니다. 이 필드는`대부분의 Active Directory 설치를위한 sAMAccountName`해야하지만, 그러한 OpenLDAP를 다른 LDAP 솔루션에 대한`uid` 수있다. 당신은 이메일이나 어떤 속성 당신이 원하는하여 사용자를 식별하기 위해`mail`를 사용할 수 있습니다. <br> 당신은 사용자가 사용자 이름 또는 이메일 등 여러 ID를 사용하여 로그인 할 수 있도록 쉼표로 구분하여 여러 값을 사용할 수 있습니다.",
+  "LDAP_BaseDN_Description": "사용자와 그룹을 검색하려는 LDAP 하위 트리의 완전한 고유 이름 (DN). 당신은 당신이 원하는만큼 추가 할 수 있습니다; 그러나, 각각의 그룹은 그것이 속하는 사용자와 동일한 도메인베이스에 정의되어야한다. 당신이 제한된 사용자 그룹을 지정하면 해당 그룹에 속한 사용자 만 범위에있을 것입니다. 우리는 당신이 도메인베이스로 LDAP 디렉토리 트리의 최상위 레벨을 지정하고 액세스를 제어하는​​ 검색 필터를 사용하는 것이 좋습니다.",
+  "LDAP_User_Search_Field_Description": "인증을 시도하는 LDAP 사용자를 식별하는 LDAP 속성입니다. 이 필드는`대부분의 Active Directory 설치를위한 sAMAccountName`해야하지만, 그러한 OpenLDAP를 다른 LDAP 솔루션에 대한`uid` 수있다. 당신은 이메일이나 어떤 속성 당신이 원하는하여 사용자를 식별하기 위해`mail`를 사용할 수 있습니다. <br> 당신은 사용자가 사용자 이름 또는 이메일 등 여러 ID를 사용하여 로그인 할 수 있도록 쉼표로 구분하여 여러 값을 사용할 수 있습니다.",
+  "LDAP_User_Search_Filter_Description": "이 필터와 일치하는 지정된 사용자 만이 로그인 할 수 할 경우에는 필터가 지정되지 않은 경우. 지정된 도메인베이스의 범위 내에서 모든 사용자가 로그인 할 수 있습니다. <br/> Active Directory에 대한 예`의 memberOf = CN = ROCKET_CHAT, OU = 일반 Groups`. <br/> OpenLDAP를위한 예 (확장 일치 검색)`OU : DN = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "가 로그인 할 때 다른 사용자를 인증하는 사용자 조회를 수행하는 LDAP 사용자입니다. <br/> 이것은 일반적으로 타사 통합을 위해 특별히 만든 서비스 계정입니다. 정규화 된 이름을 사용, 같은 CN = 관리자 '로, CN 사용자, DC = 예, DC = com`을 =.",
   "LDAP_Enable": "LDAP 사용",
   "LDAP_Enable_Description": "인증을 위해 LDAP를 사용하려고합니다.",
   "LDAP_Encryption": "암호화",
@@ -703,12 +691,9 @@
   "LDAP_Sync_User_Data_Description": "서버에 로그인할 때 사용자 데이터의 동기화를 유지하세요(예: 이름, 이메일).",
   "LDAP_Sync_User_Data_FieldMap": "사용자 데이터 필드 맵",
   "LDAP_Sync_User_Data_FieldMap_Description": "사용자 계정 필드 (이메일 등) LDAP의 레코드에서 채워집니다 방법을 구성 (한 번 발견). <br/> 예를 들어,`{ \"CN은\": \"이름\", \"메일\": \"이메일\"}`cn 속성에서 사람의 사람이 읽을 수있는 이름, 메일 속성에서 이메일을 선택합니다. <br/> 사용 가능한 필드는 name`, 그리고`email``등이 있습니다.",
-  "LDAP_Sync_Users": "동기화 사용자",
   "LDAP_Test_Connection": "연결 테스트",
   "LDAP_Unique_Identifier_Field": "고유 식별자 필드",
   "LDAP_Unique_Identifier_Field_Description": "어떤 필드는 LDAP 사용자와 Rocket.Chat 사용자를 연결하는 데 사용됩니다. 당신은 LDAP 레코드에서 값을 얻기 위해 시도하는 쉼표로 구분하여 여러 값을 알릴 수 있습니다. <br/> 기본값은 '의 objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueid도, uidNumber`입니다",
-  "LDAP_Use_Custom_Domain_Search": "맞춤 도메인 검색을 사용하여",
-  "LDAP_Use_Custom_Domain_Search_Description": "LDAP 서버에서 사용자를 검색 할 자신의 필터를 작성합니다.",
   "LDAP_Username_Field": "사용자 이름 필드",
   "LDAP_Username_Field_Description": "어떤 분야는 새로운 사용자를위한 * 사용자 이름 *으로 사용됩니다. 로그인 페이지에서 정보를 사용자 이름을 사용하는 빈 둡니다. <br/> 당신은 # {givenName으로}`처럼, 너무 템플릿 태그를 사용할 수 있습니다. # {SN}`. <br/> 기본값은`sAMAccountName`입니다.",
   "Leave_Group_Warning": "당신은 당신이 그룹 \" %s을 (를)\"에서 탈퇴 하시겠습니까?",
diff --git a/packages/rocketchat-i18n/i18n/ku.i18n.json b/packages/rocketchat-i18n/i18n/ku.i18n.json
index bd485ce1a3b..971b80c1b12 100644
--- a/packages/rocketchat-i18n/i18n/ku.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ku.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "Terms of Service",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Search Custom Domain",
-  "LDAP_Custom_Domain_Search_Description": "A perçek ji JSON ku rê bind û girêdana info e û yên ku forma: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Default Domain",
   "LDAP_Description": "hesanîyekî ji bo parvekirina yek nasnavê di navbera sites û xizmetên piralî - LDAP a nav HTMLê da heye hiyerarşîk ku gelek kompaniyên bi kar ji bo ne yek nîşanek li ser e. https://rocket.chat/docs/administrator-guides/authentication/ldap/: Ji bo agahiyên Mîhengên pêşketî û wergerandî, ji kerema xwe ve wiki me bişêwirin.",
-  "LDAP_Domain_Base": "Base Domain",
-  "LDAP_Domain_Base_Description": "The Name bi temamî bi kalîte Hêja (DN) ya subtree LDAP hûn jî dixwazin ku ji bo lêgerîna bikarhênerên û komên. Hûn dikarin wek gelek wek ku hûn dixwazin lê zêde bike; Lê belê, her kom, divê li ser bingeha domain eynî wek ku bikarhênerên ku ji bo ev were terîf kirin. Ger tu komên user dibî diyar bike, tenê bikarhênerên ku endamên wan koman dê di çarçoveya be. Em tewsiye dikin ku tu di asta herî bilind de ji LDAP dara pêristeke xwe diyar bike, wek bingeha Domaina xwe û bi kar tînin Parzûna lêgerîn ji bo kontrolkirina access.",
-  "LDAP_Domain_Search_Filter": "Domain Search Filter",
-  "LDAP_Domain_Search_Filter_Description": "Ger diyarkirin, tenê bikarhênerên ku lihevhatina bi vî Parzûna bê destûr dê têkevim. Heke tu Parzûna dîyarkirin, hemû bikarhêneran di çarçoveya bingeha domain xwe bişinî dê karibin bi îmza li bin. <br/> Mînak: ji bo Active Directory `memberOf = cn = ROCKET_CHAT, ou = Giştî Groups`. <br/> Mînak: ji bo OpenLDAP (search match Extensible) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search Object Kategorî",
-  "LDAP_Domain_Search_Object_Category_Description": "The * objectCategory * ku bikarhênerên xwe. <br/> Vala bihêlin ji bo * OpenLDAP *. <br/> Eg `person`, û hwd.",
-  "LDAP_Domain_Search_Object_Class": "Domain Class Search Object",
-  "LDAP_Domain_Search_Object_Class_Description": "The * objectclass * ku bikarhênerên xwe. <br/> Eg `organizationalPerson`,` user`, `inetOrgPerson`, û hwd.",
-  "LDAP_Domain_Search_Password": "Domain Search Password",
-  "LDAP_Domain_Search_Password_Description": "The şîfreya bikarhêner ji bo search domain.",
-  "LDAP_Domain_Search_User": "Domain Search Bikarhêner",
-  "LDAP_Domain_Search_User_Description": "The user LDAP ku performs Lookups user piştrastkirin bikarhênerên din, gava ku ew sign in. <br/> Ev account xizmeta bi taybetî ji bo integrations third-party tên afirandin e, bêhtirê. Bi kar tînin a name bi temamî bi kalîte, wek `cn = Administrator, cn = Bikarhêner, dc = mînak, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search ID'ya bikarhêner",
-  "LDAP_Domain_Search_User_ID_Description": "Çawaniya LDAP ku tê nasîn user LDAP ku hewldanên di naskirinê. Vî warî de divê `be sAMAccountName` ji bo avahîyên herî çalak Directory, lê dibe ku` uid` bo din çareseriyên LDAP, wek OpenLDAP. Tu dikarî `mail` ji bo diyarkirina by email an jî her tiştê ku wesf û tu dixwazî ​​bi kar tînin. <br> Tu dikarî nirxên multiple ji hev veqetîne de bêhnok bête bi rê bikarhênerên têkevim bikaranîna identifiers multiple wek bikarhêner an jî email bi kar tînin.",
+  "LDAP_BaseDN_Description": "The Name bi temamî bi kalîte Hêja (DN) ya subtree LDAP hûn jî dixwazin ku ji bo lêgerîna bikarhênerên û komên. Hûn dikarin wek gelek wek ku hûn dixwazin lê zêde bike; Lê belê, her kom, divê li ser bingeha domain eynî wek ku bikarhênerên ku ji bo ev were terîf kirin. Ger tu komên user dibî diyar bike, tenê bikarhênerên ku endamên wan koman dê di çarçoveya be. Em tewsiye dikin ku tu di asta herî bilind de ji LDAP dara pêristeke xwe diyar bike, wek bingeha Domaina xwe û bi kar tînin Parzûna lêgerîn ji bo kontrolkirina access.",
+  "LDAP_User_Search_Field_Description": "Çawaniya LDAP ku tê nasîn user LDAP ku hewldanên di naskirinê. Vî warî de divê `be sAMAccountName` ji bo avahîyên herî çalak Directory, lê dibe ku` uid` bo din çareseriyên LDAP, wek OpenLDAP. Tu dikarî `mail` ji bo diyarkirina by email an jî her tiştê ku wesf û tu dixwazî ​​bi kar tînin. <br> Tu dikarî nirxên multiple ji hev veqetîne de bêhnok bête bi rê bikarhênerên têkevim bikaranîna identifiers multiple wek bikarhêner an jî email bi kar tînin.",
+  "LDAP_User_Search_Filter_Description": "Ger diyarkirin, tenê bikarhênerên ku lihevhatina bi vî Parzûna bê destûr dê têkevim. Heke tu Parzûna dîyarkirin, hemû bikarhêneran di çarçoveya bingeha domain xwe bişinî dê karibin bi îmza li bin. <br/> Mînak: ji bo Active Directory `memberOf = cn = ROCKET_CHAT, ou = Giştî Groups`. <br/> Mînak: ji bo OpenLDAP (search match Extensible) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "The user LDAP ku performs Lookups user piştrastkirin bikarhênerên din, gava ku ew sign in. <br/> Ev account xizmeta bi taybetî ji bo integrations third-party tên afirandin e, bêhtirê. Bi kar tînin a name bi temamî bi kalîte, wek `cn = Administrator, cn = Bikarhêner, dc = mînak, dc = com`.",
   "LDAP_Enable": "Bikêrkirin",
   "LDAP_Enable_Description": "Hewldana ji bo dozeke LDAP bo piştrastkirinê.",
   "LDAP_Encryption": "Şîfrekirin,",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "Keep welat user di synchê bi server li ser login (wek nimûne: name, email).",
   "LDAP_Sync_User_Data_FieldMap": "Bikarhêner Data Map Field",
   "LDAP_Sync_User_Data_FieldMap_Description": "Mîheng bikî ka zeviyên Hesabê bikarhêner (wek email) bi ji qeyda li LDAP dijîn (cih). <br/> Wek nimûne, `{\" cn \":\" name \",\" mail \":\" email \"}` ê bi navê mirovekî mirovan xwendin ji bikarbar cn, û email xwe ji taybetiyê mail hilbijêre. <br/> zeviyên Available de `name`, û` email`.",
-  "LDAP_Sync_Users": "Bikarhêner li ser Syncê",
   "LDAP_Test_Connection": "Connection test",
   "LDAP_Unique_Identifier_Field": "Krom Field",
   "LDAP_Unique_Identifier_Field_Description": "Ku qada wê were bikaranîn berve bikarhênerê LDAP û user Rocket.Chat de. Tu dikarî nirxên multiple ji hev veqetîne de bêhnok agahdar to try to get nirxa ku ji qeyda LDAP. <br/> nirxa standard e `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Bi kar tînin Custom Search Domain",
-  "LDAP_Use_Custom_Domain_Search_Description": "Hewe Parzûna xwe bi xwe ji bo bikarhênerên lêgerîn li server LDAP de.",
   "LDAP_Username_Field": "Username Field",
   "LDAP_Username_Field_Description": "Ku qada wê bên * username * ji bo bikarhênerên nû de tê bikaranîn. Dev ji vala bi kar username agahdar li ser rûpela têketinê. <br/> Tu dikarî tags şablonê pêk hatiye jî bi kar tînin, wek `#{givenName}.#{sn}`. <br/> nirxa standard e `sAMAccountName`.",
   "Leave_Group_Warning": "Ma tu dizanî, tu dixwazî ​​ji koma \" %s\" ku herin?",
diff --git a/packages/rocketchat-i18n/i18n/lo.i18n.json b/packages/rocketchat-i18n/i18n/lo.i18n.json
index 713ae363a8f..2e73877dac0 100644
--- a/packages/rocketchat-i18n/i18n/lo.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lo.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "ເງື່ອນໄຂການໃຫ້ບໍລິການ",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "ຄົ້ນຫາ Domain Custom",
-  "LDAP_Custom_Domain_Search_Description": "A ສິ້ນຂອງ JSON ທີ່ຄວບຄຸມຂໍ້ມູນຕິດແລະການເຊື່ອມຕໍ່ແລະເປັນຮູບແບບ: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domain ມາດຕະຖານ",
   "LDAP_Description": "LDAP ເປັນຖານຂໍ້ມູນລໍາດັບຊັ້ນທີ່ຫຼາຍບໍລິສັດນໍາໃຊ້ເພື່ອສະຫນອງການເຂົ້າສູ່ລະບົບໃນ - ສະຖານທີ່ສໍາລັບການແລກປ່ຽນລະຫັດຜ່ານຫນຶ່ງລະຫວ່າງສະຖານທີ່ແລະບໍລິການທີ່ຫຼາກຫຼາຍ. ສໍາລັບຂໍ້ມູນການຕັ້ງຄ່າຂັ້ນສູງແລະຕົວຢ່າງ, ກະລຸນາປືກສາຫາລື wiki ຂອງພວກເຮົາ: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Base ໂດເມນ",
-  "LDAP_Domain_Base_Description": "ຄຸນສົມບັດຢ່າງເຕັມສ່ວນຊື່ເພາະ (DN) ຂອງຍ່ອຍ LDAP ທ່ານຕ້ອງການຄົ້ນຫາສໍາລັບຜູ້ໃຊ້ແລະກຸ່ມ. ທ່ານສາມາດເພີ່ມເປັນຈໍານວນຫຼາຍຕາມທີ່ທ່ານຕ້ອງການ; ຢ່າງໃດກໍຕາມ, ໃນແຕ່ລະກຸ່ມຈະຕ້ອງໄດ້ຮັບການກໍານົດໄວ້ໃນຖານໂດເມນດຽວກັນຜູ້ຊົມໃຊ້ທີ່ເປັນຂອງມັນ. ຖ້າຫາກວ່າທ່ານລະບຸກຸ່ມຜູ້ໃຊ້ຈໍາກັດ, ມີພຽງແຕ່ຜູ້ໃຊ້ທີ່ຂຶ້ນກັບກຸ່ມຄົນເຫຼົ່ານັ້ນຈະຢູ່ໃນຂອບເຂດ. ພວກເຮົາແນະນໍາໃຫ້ທ່ານກໍານົດລະດັບເທິງຂອງຕົ້ນໄມ້ directory LDAP ຂອງທ່ານເປັນພື້ນຖານໂດເມນຂອງທ່ານແລະການນໍາໃຊ້ການກັ່ນຕອງການຊອກຫາທີ່ຈະຄວບຄຸມການເຂົ້າເຖິງ.",
-  "LDAP_Domain_Search_Filter": "ໂດເມນຜົນການຄົ້ນຫາ",
-  "LDAP_Domain_Search_Filter_Description": "ຖ້າກໍານົດໄວ້, ຜູ້ໃຊ້ພຽງແຕ່ຄໍາວ່າການກັ່ນຕອງນີ້ຈະໄດ້ຮັບການອະນຸຍາດໃຫ້ເຂົ້າສູ່ລະບົບ. ຖ້າຫາກວ່າບໍ່ມີການກັ່ນຕອງແມ່ນກໍານົດໄວ້, ຜູ້ຊົມໃຊ້ທັງຫມົດພາຍໃນຂອບເຂດຂອງພື້ນຖານໂດເມນທີ່ລະບຸຈະສາມາດເຂົ້າສູ່ລະບົບ. <br/> ຕົວຢ່າງ: ສໍາລັບການ Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> ຕົວຢ່າງ: ສໍາລັບການ OpenLDAP (ການຊອກຫາຄໍາວ່າຂະຫຍາຍ) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "ໂດເມນຄົ້ນຫາວັດຖຸປະເພດ",
-  "LDAP_Domain_Search_Object_Category_Description": "The * * objectCategory ທີ່ລະບຸຜູ້ໃຊ້ຂອງທ່ານ. <br/> ອອກຈາກເປົ່າຫວ່າງສໍາລັບ OpenLDAP * *. <br/> ຕົວຢ່າງ: `person`, ແລະອື່ນໆ",
-  "LDAP_Domain_Search_Object_Class": "ໂດເມນ Class ຄົ້ນຫາວັດຖຸ",
-  "LDAP_Domain_Search_Object_Class_Description": "The * * objectClass ທີ່ລະບຸຜູ້ໃຊ້ຂອງທ່ານ. <br/> ຕົວຢ່າງ: `organizationalPerson`,` user`, `inetOrgPerson`, ແລະອື່ນໆ",
-  "LDAP_Domain_Search_Password": "ຄົ້ນຫາໂດເມນລະຫັດຜ່ານ",
-  "LDAP_Domain_Search_Password_Description": "ລະຫັດຜ່ານສໍາລັບຜູ້ໃຊ້ຄົ້ນຫາໂດເມນທີ່.",
-  "LDAP_Domain_Search_User": "ໂດເມນຄົ້ນຫາຜູ້ໃຊ້",
-  "LDAP_Domain_Search_User_Description": "ຜູ້ໃຊ້ LDAP ທີ່ດໍາເນີນການຄົ້ນຫາຜູ້ໃຊ້ໃນການກວດສອບຜູ້ຊົມໃຊ້ອື່ນໆໃນເວລາທີ່ພວກເຂົາເຈົ້າເຂົ້າສູ່ລະບົບ. <br/> ນີ້ແມ່ນປົກກະຕິບັນຊີການບໍລິການສ້າງໂດຍສະເພາະສໍາລັບການເຊື່ອມໂຍງພາກສ່ວນທີສາມ. ການນໍາໃຊ້ຊື່ຄົບຖ້ວນ, ເຊັ່ນດຽວກັນ, cn = Administrator, cn = ຜູ້ໃຊ້ dc = ຕົວຢ່າງ, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "ຄົ້ນຫາ Domain User ID",
-  "LDAP_Domain_Search_User_ID_Description": "ການໃຫ້ເຫດຜົນ LDAP ທີ່ລະບຸຜູ້ໃຊ້ LDAP ຜູ້ທີ່ພະຍາຍາມກວດສອບ. ພາກສະຫນາມນີ້ຄວນຈະເປັນ `sAMAccountName` ສໍາລັບການຕິດຕັ້ງໃຊ້ວຽກຫຼາຍທີ່ສຸດລະບົບ, ແຕ່ວ່າມັນອາດຈະ` uid` ສໍາລັບການແກ້ໄຂບັນຫາ LDAP ອື່ນໆ, ເຊັ່ນ: OpenLDAP. ທ່ານສາມາດນໍາໃຊ້ `mail` ເພື່ອກໍານົດຜູ້ໃຊ້ອີເມລຫຼືໃດກໍ່ຕາມເຫດຜົນທີ່ທ່ານຕ້ອງການ. <br> ທ່ານສາມາດນໍາໃຊ້ຄຸນຄ່າຫລາຍຂັ້ນດ້ວຍຈໍ້າຈຸດທີ່ຈະອະນຸຍາດໃຫ້ຜູ້ໃຊ້ສາມາດເຂົ້າສູ່ລະບົບໂດຍໃຊ້ຕົວລະບຸຫຼາຍເຊັ່ນຊື່ຜູ້ໃຊ້ຫລືອີເມລ໌.",
+  "LDAP_BaseDN_Description": "ຄຸນສົມບັດຢ່າງເຕັມສ່ວນຊື່ເພາະ (DN) ຂອງຍ່ອຍ LDAP ທ່ານຕ້ອງການຄົ້ນຫາສໍາລັບຜູ້ໃຊ້ແລະກຸ່ມ. ທ່ານສາມາດເພີ່ມເປັນຈໍານວນຫຼາຍຕາມທີ່ທ່ານຕ້ອງການ; ຢ່າງໃດກໍຕາມ, ໃນແຕ່ລະກຸ່ມຈະຕ້ອງໄດ້ຮັບການກໍານົດໄວ້ໃນຖານໂດເມນດຽວກັນຜູ້ຊົມໃຊ້ທີ່ເປັນຂອງມັນ. ຖ້າຫາກວ່າທ່ານລະບຸກຸ່ມຜູ້ໃຊ້ຈໍາກັດ, ມີພຽງແຕ່ຜູ້ໃຊ້ທີ່ຂຶ້ນກັບກຸ່ມຄົນເຫຼົ່ານັ້ນຈະຢູ່ໃນຂອບເຂດ. ພວກເຮົາແນະນໍາໃຫ້ທ່ານກໍານົດລະດັບເທິງຂອງຕົ້ນໄມ້ directory LDAP ຂອງທ່ານເປັນພື້ນຖານໂດເມນຂອງທ່ານແລະການນໍາໃຊ້ການກັ່ນຕອງການຊອກຫາທີ່ຈະຄວບຄຸມການເຂົ້າເຖິງ.",
+  "LDAP_User_Search_Field_Description": "ການໃຫ້ເຫດຜົນ LDAP ທີ່ລະບຸຜູ້ໃຊ້ LDAP ຜູ້ທີ່ພະຍາຍາມກວດສອບ. ພາກສະຫນາມນີ້ຄວນຈະເປັນ `sAMAccountName` ສໍາລັບການຕິດຕັ້ງໃຊ້ວຽກຫຼາຍທີ່ສຸດລະບົບ, ແຕ່ວ່າມັນອາດຈະ` uid` ສໍາລັບການແກ້ໄຂບັນຫາ LDAP ອື່ນໆ, ເຊັ່ນ: OpenLDAP. ທ່ານສາມາດນໍາໃຊ້ `mail` ເພື່ອກໍານົດຜູ້ໃຊ້ອີເມລຫຼືໃດກໍ່ຕາມເຫດຜົນທີ່ທ່ານຕ້ອງການ. <br> ທ່ານສາມາດນໍາໃຊ້ຄຸນຄ່າຫລາຍຂັ້ນດ້ວຍຈໍ້າຈຸດທີ່ຈະອະນຸຍາດໃຫ້ຜູ້ໃຊ້ສາມາດເຂົ້າສູ່ລະບົບໂດຍໃຊ້ຕົວລະບຸຫຼາຍເຊັ່ນຊື່ຜູ້ໃຊ້ຫລືອີເມລ໌.",
+  "LDAP_User_Search_Filter_Description": "ຖ້າກໍານົດໄວ້, ຜູ້ໃຊ້ພຽງແຕ່ຄໍາວ່າການກັ່ນຕອງນີ້ຈະໄດ້ຮັບການອະນຸຍາດໃຫ້ເຂົ້າສູ່ລະບົບ. ຖ້າຫາກວ່າບໍ່ມີການກັ່ນຕອງແມ່ນກໍານົດໄວ້, ຜູ້ຊົມໃຊ້ທັງຫມົດພາຍໃນຂອບເຂດຂອງພື້ນຖານໂດເມນທີ່ລະບຸຈະສາມາດເຂົ້າສູ່ລະບົບ. <br/> ຕົວຢ່າງ: ສໍາລັບການ Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> ຕົວຢ່າງ: ສໍາລັບການ OpenLDAP (ການຊອກຫາຄໍາວ່າຂະຫຍາຍ) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "ຜູ້ໃຊ້ LDAP ທີ່ດໍາເນີນການຄົ້ນຫາຜູ້ໃຊ້ໃນການກວດສອບຜູ້ຊົມໃຊ້ອື່ນໆໃນເວລາທີ່ພວກເຂົາເຈົ້າເຂົ້າສູ່ລະບົບ. <br/> ນີ້ແມ່ນປົກກະຕິບັນຊີການບໍລິການສ້າງໂດຍສະເພາະສໍາລັບການເຊື່ອມໂຍງພາກສ່ວນທີສາມ. ການນໍາໃຊ້ຊື່ຄົບຖ້ວນ, ເຊັ່ນດຽວກັນ, cn = Administrator, cn = ຜູ້ໃຊ້ dc = ຕົວຢ່າງ, dc = com`.",
   "LDAP_Enable": "ເຮັດໃຫ້ສາມາດ",
   "LDAP_Enable_Description": "ພະຍາຍາມທີ່ຈະນໍາໃຊ້ LDAP ສໍາລັບການກວດສອບ.",
   "LDAP_Encryption": "ການເຂົ້າລະຫັດ",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "ໃຫ້ເກັບຮັກສາຂໍ້ມູນຜູ້ໃຊ້ໃນ sync ກັບເຄື່ອງແມ່ຂ່າຍຂອງກ່ຽວກັບການເຂົ້າສູ່ລະບົບ (ເຊັ່ນ: ຊື່, ອີເມວ).",
   "LDAP_Sync_User_Data_FieldMap": "ຜູ້ໃຊ້ຂໍ້ມູນພາກສະຫນາມແຜນທີ່",
   "LDAP_Sync_User_Data_FieldMap_Description": "ກໍາຫນົດຄ່າວິທີຂົງເຂດບັນຊີຜູ້ໃຊ້ (ເຊັ່ນ: ອີ) ມີປະຊາກອນຈາກການບັນທຶກໃນ LDAP ເປັນ (ພົບເທື່ອດຽວ). <br/> ໃນຖານະເປັນຕົວຢ່າງ, `{\" cn \":\" ຊື່ \",\" ຈົດຫມາຍ \":\" ອີເມລ໌ \"}` ຈະເລືອກເອົາຊື່ຂອງບຸກຄົນມະນຸດສາມາດອ່ານໄດ້ຈາກ cn ເຫດຜົນ, ແລະອີເມລຂອງເຂົາເຈົ້າຈາກເຫດຜົນ mail ໄດ້. <br/> ທົ່ງນາທີ່ມີປະກອບມີ `name`, ແລະ` email`.",
-  "LDAP_Sync_Users": "ຜູ້ໃຊ້ Sync",
   "LDAP_Test_Connection": "ການເຊື່ອມຕໍ່ການທົດສອບ",
   "LDAP_Unique_Identifier_Field": "ເປັນເອກະລັກ Identifier ພາກສະຫນາມ",
   "LDAP_Unique_Identifier_Field_Description": "ພາກສະຫນາມທີ່ຈະໄດ້ຮັບການນໍາໃຊ້ເພື່ອເຊື່ອມຕໍ່ຜູ້ໃຊ້ LDAP ແລະຜູ້ໃຊ້ Rocket.Chat ໄດ້. ທ່ານສາມາດແຈ້ງຄ່າຫລາຍຂັ້ນດ້ວຍຈໍ້າຈຸດທີ່ຈະພະຍາຍາມເພື່ອໃຫ້ໄດ້ຮັບມູນຄ່າຈາກການບັນທຶກຂອງ LDAP. <br/> ຄ່າເລີ່ມຕົ້ນຄື `objectGUID, IBM, entryUUID, ຄູ່ມື, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "ການນໍາໃຊ້ຄົ້ນຫາ Domain Custom",
-  "LDAP_Use_Custom_Domain_Search_Description": "ຂຽນກັ່ນຕອງຂອງທ່ານເອງເພື່ອຄົ້ນຫາຜູ້ໃຊ້ໃນເຄື່ອງແມ່ຂ່າຍຂອງ LDAP.",
   "LDAP_Username_Field": "ຊື່ຜູ້ໃຊ້ພາກສະຫນາມ",
   "LDAP_Username_Field_Description": "ພາກສະຫນາມທີ່ຈະໄດ້ຮັບການນໍາໃຊ້ເປັນຊື່ຜູ້ໃຊ້ * ສໍາລັບຜູ້ໃຊ້ໃຫມ່ *. ປ່ອຍໃຫ້ເປົ່າການນໍາໃຊ້ຊື່ຜູ້ໃຊ້ຂໍ້ມູນໃນຫນ້າເຂົ້າສູ່ລະບົບ. <br/> ທ່ານສາມາດນໍາໃຊ້ tags ແມ່ແບບເກີນໄປເຊັ່ນ: `#{givenName}.#{sn}`. <br/> ຄ່າເລີ່ມຕົ້ນຄື `sAMAccountName`.",
   "Leave_Group_Warning": "ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການທີ່ຈະອອກຈາກກຸ່ມ \" %s\"?",
diff --git a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
index 3787041ffe9..0b51dbbc479 100644
--- a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "Terma Perkhidmatan",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Custom Domain Search",
-  "LDAP_Custom_Domain_Search_Description": "Sekeping JSON yang mentadbir maklumat mengikat dan sambungan dan dalam bentuk: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domain lalai",
   "LDAP_Description": "LDAP adalah pangkalan data hierarki bahawa banyak syarikat gunakan untuk menyediakan single sign on - kemudahan untuk berkongsi satu kata laluan antara beberapa tapak dan perkhidmatan. Untuk maklumat konfigurasi lanjutan dan contoh, sila rujuk wiki kami: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Base domain",
-  "LDAP_Domain_Base_Description": "Nama pertama layak sepenuhnya Cemerlang (DN) seorang anak pohon LDAP anda ingin mencari pengguna-pengguna dan kumpulan. Anda boleh menambah seberapa banyak yang anda suka; Walau bagaimanapun, setiap kumpulan mesti ditakrifkan dalam asas domain yang sama dengan pengguna yang menjadi miliknya. Jika anda menentukan kumpulan pengguna terhad, hanya pengguna yang di dalam kumpulan-kumpulan akan berada dalam skop. Kami mengesyorkan bahawa anda menentukan tahap bahagian atas pokok direktori LDAP anda sebagai asas domain anda dan menggunakan penapis carian untuk mengawal akses.",
-  "LDAP_Domain_Search_Filter": "Domain Search Filter",
-  "LDAP_Domain_Search_Filter_Description": "Jika dinyatakan, hanya pengguna yang sepadan dengan penapis ini akan dibenarkan untuk log masuk. Jika tiada penapis yang dinyatakan, semua pengguna dalam skop asas domain yang dinyatakan akan dapat untuk mendaftar masuk. <br/> Contohnya untuk Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> Contohnya untuk OpenLDAP (search Perlawanan extensible) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Cari Objek Kategori",
-  "LDAP_Domain_Search_Object_Category_Description": "The * objectCategory * yang mengenal pasti pengguna anda. <br/> Tinggalkan kosong untuk * OpenLDAP *. <br/> Eg `person`, dan lain-lain",
-  "LDAP_Domain_Search_Object_Class": "Domain Kelas Cari Objek",
-  "LDAP_Domain_Search_Object_Class_Description": "The * kelas objek * yang mengenal pasti pengguna anda. <br/> Eg `organizationalPerson`,` user`, `inetOrgPerson`, dan lain-lain",
-  "LDAP_Domain_Search_Password": "Domain Cari Kata laluan",
-  "LDAP_Domain_Search_Password_Description": "Kata laluan untuk pengguna carian domain.",
-  "LDAP_Domain_Search_User": "Domain Search Pengguna",
-  "LDAP_Domain_Search_User_Description": "The LDAP pengguna yang melaksanakan pencarian pengguna untuk mengesahkan pengguna lain apabila mereka log masuk. <br/> Ini biasanya satu akaun perkhidmatan dicipta khusus untuk integrasi pihak ketiga. Gunakan nama yang memenuhi syarat, seperti `cn = Administrator, cn = Pengguna, dc = Contoh, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search ID Pengguna",
-  "LDAP_Domain_Search_User_ID_Description": "The LDAP atribut yang mengenal pasti pengguna LDAP yang cuba pengesahan. medan ini sepatutnya menjadi `sAMAccountName` untuk pemasangan paling Active Directory, tetapi ia boleh menjadi` uid` penyelesaian LDAP yang lain, seperti OpenLDAP. Anda boleh menggunakan `mail` untuk mengenal pasti pengguna melalui e-mel atau apa sahaja atribut yang anda mahu. <br> Anda boleh menggunakan pelbagai nilai dipisahkan oleh koma untuk membolehkan pengguna untuk log masuk menggunakan berbilang pengecam seperti nama pengguna atau e-mel.",
+  "LDAP_BaseDN_Description": "Nama pertama layak sepenuhnya Cemerlang (DN) seorang anak pohon LDAP anda ingin mencari pengguna-pengguna dan kumpulan. Anda boleh menambah seberapa banyak yang anda suka; Walau bagaimanapun, setiap kumpulan mesti ditakrifkan dalam asas domain yang sama dengan pengguna yang menjadi miliknya. Jika anda menentukan kumpulan pengguna terhad, hanya pengguna yang di dalam kumpulan-kumpulan akan berada dalam skop. Kami mengesyorkan bahawa anda menentukan tahap bahagian atas pokok direktori LDAP anda sebagai asas domain anda dan menggunakan penapis carian untuk mengawal akses.",
+  "LDAP_User_Search_Field_Description": "The LDAP atribut yang mengenal pasti pengguna LDAP yang cuba pengesahan. medan ini sepatutnya menjadi `sAMAccountName` untuk pemasangan paling Active Directory, tetapi ia boleh menjadi` uid` penyelesaian LDAP yang lain, seperti OpenLDAP. Anda boleh menggunakan `mail` untuk mengenal pasti pengguna melalui e-mel atau apa sahaja atribut yang anda mahu. <br> Anda boleh menggunakan pelbagai nilai dipisahkan oleh koma untuk membolehkan pengguna untuk log masuk menggunakan berbilang pengecam seperti nama pengguna atau e-mel.",
+  "LDAP_User_Search_Filter_Description": "Jika dinyatakan, hanya pengguna yang sepadan dengan penapis ini akan dibenarkan untuk log masuk. Jika tiada penapis yang dinyatakan, semua pengguna dalam skop asas domain yang dinyatakan akan dapat untuk mendaftar masuk. <br/> Contohnya untuk Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> Contohnya untuk OpenLDAP (search Perlawanan extensible) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "The LDAP pengguna yang melaksanakan pencarian pengguna untuk mengesahkan pengguna lain apabila mereka log masuk. <br/> Ini biasanya satu akaun perkhidmatan dicipta khusus untuk integrasi pihak ketiga. Gunakan nama yang memenuhi syarat, seperti `cn = Administrator, cn = Pengguna, dc = Contoh, dc = com`.",
   "LDAP_Enable": "membolehkan",
   "LDAP_Enable_Description": "Cuba untuk menggunakan LDAP untuk pengesahan.",
   "LDAP_Encryption": "penyulitan",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "Menyimpan data pengguna dalam penyegerakan dengan pelayan pada login (contohnya: nama, e-mel).",
   "LDAP_Sync_User_Data_FieldMap": "Pengguna Data Field Peta",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfigur berapa bidang akaun pengguna (seperti e-mel) adalah penduduk dari satu rekod dalam LDAP (sekali dijumpai). <br/> Sebagai contoh, `{\" cn \":\" nama \",\" mel \":\" e-mel \"}` akan memilih nama seseorang manusia boleh dibaca dari atribut cn, dan e-mel mereka dari sifat mel. <br/> bidang termasuk `name`, dan` email`.",
-  "LDAP_Sync_Users": "Pengguna Sync",
   "LDAP_Test_Connection": "Test Connection",
   "LDAP_Unique_Identifier_Field": "Pengecam Unik Field",
   "LDAP_Unique_Identifier_Field_Description": "Yang bidang akan digunakan untuk menghubungkan pengguna LDAP dan pengguna Rocket.Chat itu. Anda boleh memaklumkan pelbagai nilai dipisahkan oleh koma untuk cuba untuk mendapatkan nilai daripada rekod LDAP. <br/> Nilai lalai adalah `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Gunakan Custom Domain Search",
-  "LDAP_Use_Custom_Domain_Search_Description": "Tulis penapis anda sendiri untuk mencari pengguna dalam pelayan LDAP.",
   "LDAP_Username_Field": "Nama pengguna Field",
   "LDAP_Username_Field_Description": "Yang bidang akan digunakan sebagai * nama pengguna * bagi pengguna baru. Biarkan kosong untuk menggunakan nama pengguna yang dimaklumkan pada halaman login. <br/> Anda boleh menggunakan tag template juga, seperti `#{givenName}.#{sn}`. <br/> Nilai lalai adalah `sAMAccountName`.",
   "Leave_Group_Warning": "Adakah anda pasti anda mahu meninggalkan kumpulan \" %s\"?",
diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json
index 7c95bdf6d5b..8689fa5eb36 100644
--- a/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "Algemene Voorwaarden",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Custom Domain Search",
-  "LDAP_Custom_Domain_Search_Description": "Een stuk van JSON die regeert binden en de aansluiting info en is van de vorm: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Default Domain",
   "LDAP_Description": "LDAP is a hierarchical database that many companies use to provide single sign on - a facility for sharing one password between multiple sites and services. For advanced configuration information and examples, please consult our wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Domain Base",
-  "LDAP_Domain_Base_Description": "De volledig gekwalificeerde Distinguished Name (DN) van een LDAP subtree u wilt zoeken voor gebruikers en groepen. U kunt zoveel als je wilt toevoegen; echter, moet elke groep worden gedefinieerd in hetzelfde domein basis als de gebruikers die behoren. Als u beperkte gebruikersgroepen geven, zullen alleen gebruikers die behoren tot die groepen in scope. Wij raden u aan het hoogste niveau van de LDAP-directory tree opgeven als uw domein basis en gebruiken zoekfilter om toegang te controleren.",
-  "LDAP_Domain_Search_Filter": "Domain Zoek Filter",
-  "LDAP_Domain_Search_Filter_Description": "Indien gespecificeerd, alleen gebruikers die overeenkomen met dit filter zal worden toegestaan ​​om in te loggen. Als er geen filter is aangegeven, zijn alle gebruikers in het kader van het opgegeven domein basis zal in staat zijn om in te loggen. <br/> Bijvoorbeeld voor Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> Bijvoorbeeld voor OpenLDAP (extensible match zoeken) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search Object Categorie",
-  "LDAP_Domain_Search_Object_Category_Description": "De * objectCategory * dat uw gebruikers te identificeren. <br/> Laat leeg voor OpenLDAP * *. <br/> Bijvoorbeeld `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Domain Search Object Class",
-  "LDAP_Domain_Search_Object_Class_Description": "De * objectclass * dat uw gebruikers te identificeren. <br/> Bijvoorbeeld `organizationalPerson`,` netgebruiker, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Domain Search Password",
-  "LDAP_Domain_Search_Password_Description": "Het wachtwoord voor het domein zoeken gebruiker.",
-  "LDAP_Domain_Search_User": "Domain Search Gebruiker",
-  "LDAP_Domain_Search_User_Description": "De LDAP-gebruiker die gebruiker lookups uitvoert om andere gebruikers te verifiëren wanneer ze zich aanmelden. <br/> Dit is typisch een service-account speciaal gemaakt voor derden integraties. Gebruik een volledig gekwalificeerde naam, zoals `cn = Administrator, cn = Users, dc = voorbeeld, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search User ID",
-  "LDAP_Domain_Search_User_ID_Description": "De LDAP-kenmerk dat de LDAP-gebruiker die verificatie probeert identificeert. Dit veld moet `sAMAccountName` voor de meeste Active Directory-installaties, maar het kan` uid` andere LDAP-oplossingen, zoals OpenLDAP zijn. U kunt `mail` gebruiken om gebruikers te identificeren via e-mail of wat kenmerk dat u wilt. <br> U kunt meerdere waarden gescheiden door een komma te gebruiken om gebruikers in staat om in te loggen met behulp van meerdere identifiers zoals gebruikersnaam of e-mail.",
+  "LDAP_BaseDN_Description": "De volledig gekwalificeerde Distinguished Name (DN) van een LDAP subtree u wilt zoeken voor gebruikers en groepen. U kunt zoveel als je wilt toevoegen; echter, moet elke groep worden gedefinieerd in hetzelfde domein basis als de gebruikers die behoren. Als u beperkte gebruikersgroepen geven, zullen alleen gebruikers die behoren tot die groepen in scope. Wij raden u aan het hoogste niveau van de LDAP-directory tree opgeven als uw domein basis en gebruiken zoekfilter om toegang te controleren.",
+  "LDAP_User_Search_Field_Description": "De LDAP-kenmerk dat de LDAP-gebruiker die verificatie probeert identificeert. Dit veld moet `sAMAccountName` voor de meeste Active Directory-installaties, maar het kan` uid` andere LDAP-oplossingen, zoals OpenLDAP zijn. U kunt `mail` gebruiken om gebruikers te identificeren via e-mail of wat kenmerk dat u wilt. <br> U kunt meerdere waarden gescheiden door een komma te gebruiken om gebruikers in staat om in te loggen met behulp van meerdere identifiers zoals gebruikersnaam of e-mail.",
+  "LDAP_User_Search_Filter_Description": "Indien gespecificeerd, alleen gebruikers die overeenkomen met dit filter zal worden toegestaan ​​om in te loggen. Als er geen filter is aangegeven, zijn alle gebruikers in het kader van het opgegeven domein basis zal in staat zijn om in te loggen. <br/> Bijvoorbeeld voor Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> Bijvoorbeeld voor OpenLDAP (extensible match zoeken) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "De LDAP-gebruiker die gebruiker lookups uitvoert om andere gebruikers te verifiëren wanneer ze zich aanmelden. <br/> Dit is typisch een service-account speciaal gemaakt voor derden integraties. Gebruik een volledig gekwalificeerde naam, zoals `cn = Administrator, cn = Users, dc = voorbeeld, dc = com`.",
   "LDAP_Enable": "Aanzetten",
   "LDAP_Enable_Description": "Probeer LDAP te gebruiken voor authenticatie.",
   "LDAP_Encryption": "encryptie",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "Houd gebruikersdata synchroon met de server tijdens login (bijv. naam en email).",
   "LDAP_Sync_User_Data_FieldMap": "User Data Field Map",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configure how user account fields (like email) are populated from a record in LDAP (once found). As an example, {\"cn\":\"name\", \"mail\":\"email\"} will choose a person's human readable name from the cn attribute, and their email from the mail attribute. Available fields include name, and email.",
-  "LDAP_Sync_Users": "Sync Gebruikers",
   "LDAP_Test_Connection": "Test verbinding",
   "LDAP_Unique_Identifier_Field": "Unique Identifier Field",
   "LDAP_Unique_Identifier_Field_Description": "Welk veld zal worden gebruikt om de LDAP-gebruiker en de Rocket.Chat gebruiker te koppelen. U kunt meerdere waarden gescheiden door een komma te informeren om te proberen om de waarde van LDAP plaat te krijgen. <br/> Standaard waarde is `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Gebruik Custom Domain Search",
-  "LDAP_Use_Custom_Domain_Search_Description": "Schrijf uw eigen filter te zoeken gebruikers in de LDAP-server.",
   "LDAP_Username_Field": "gebruikersnaam Field",
   "LDAP_Username_Field_Description": "Welk veld zal gebruikt worden als gebruikersnaam * * voor nieuwe gebruikers. Laat leeg om de gebruikersnaam op de hoogte inlogpagina te gebruiken. <br/> U kunt template-tags te gebruiken, zoals `#{givenName}.#{sn}`. <br/> Standaard waarde is `sAMAccountName`.",
   "Leave_Group_Warning": "Weet je zeker dat je groep \"%s\" wil verlaten?",
diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json
index a6788570c0d..bc86b12135c 100644
--- a/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -711,31 +711,18 @@
   "Layout_Terms_of_Service": "Regulamin",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Szukaj Domena niestandardowa",
-  "LDAP_Custom_Domain_Search_Description": "Kawałek JSON, który reguluje powiązania i połączenia informacji i ma postać: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domyślna domena",
   "LDAP_Description": "LDAP to hierarchiczna baza danych wykorzystywana przez wiele firm w celu udostępniania pojedynczej usługi autoryzacji użytkowników pomiędzy wieloma serwisami. Aby uzyskać dodatkowe informacje i przykłady konfiguracji, odwiedź nasze wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Baza domeny",
-  "LDAP_Domain_Base_Description": "W pełni kwalifikowana nazwa wyróżniająca (DN) w poddrzewie LDAP chcesz wyszukać użytkowników i grup. Możesz dodać tyle, ile zechcesz; Jednakże, każda grupa musi być określona w ten sam bazie domeny jako użytkowników należących do niego. Jeśli podasz niewielkich grup użytkowników, tylko użytkownicy należący do tych grup będzie w zasięgu. Zaleca się, aby określić górny poziom drzewa katalogów LDAP jako baza domeny i użyć filtru wyszukiwania w celu kontroli dostępu.",
-  "LDAP_Domain_Search_Filter": "Domeny Filtr wyszukiwania",
-  "LDAP_Domain_Search_Filter_Description": "Jeśli określony, tylko użytkownicy pasujących ten filtr będzie mógł zalogować. Jeśli filtr nie jest określony, wszyscy użytkownicy w zakresie określonym bazie domeny będą mogli się zalogować. <br/> Np Active Directory `memberOf = cn = ROCKET_CHAT, ou = Ogólne Groups`. <br/> Np OpenLDAP (rozszerzalny wyszukiwania match) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search Object Kategoria",
-  "LDAP_Domain_Search_Object_Category_Description": "* Przy objectCategory *, które identyfikują użytkowników. <br/> Zostaw pusty * OpenLDAP *. <br/> Np `osoba prowadząca, etc.",
-  "LDAP_Domain_Search_Object_Class": "Domain Search Object Class",
-  "LDAP_Domain_Search_Object_Class_Description": "Gwiazdka * * objectclass które identyfikują użytkowników. <br/> Np `organizationalPerson`,` użytkownik portu, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Domain Search Hasło",
-  "LDAP_Domain_Search_Password_Description": "Hasło dla użytkownika wyszukiwarki domeny.",
-  "LDAP_Domain_Search_User": "Domeny Szukaj użytkownika",
-  "LDAP_Domain_Search_User_Description": "Użytkownik LDAP, który wykonuje wyszukiwań użytkowników do uwierzytelnienia innych użytkowników podczas logowania się. <br/> Jest to zazwyczaj konto usługi stworzony specjalnie dla integracji osób trzecich. Użyj pełnej nazwy, takie jak `cn = Administrator, CN = Users, DC = example, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search ID użytkownika",
-  "LDAP_Domain_Search_User_ID_Description": "Atrybut LDAP, która identyfikuje użytkownika LDAP, który próbuje uwierzytelnienia. To pole powinno być `sAMAccountName` dla instalacji najbardziej Active Directory, ale może to być` uid` innych rozwiązań, takich jak LDAP OpenLDAP. Można użyć `mail` celu identyfikacji użytkowników przez e-mail lub cokolwiek atrybut chcesz. <br> Można użyć wielu wartości oddzielonych przecinkiem, aby umożliwić użytkownikom, aby zalogować się za pomocą wielu identyfikatorów, takich jak nazwa użytkownika lub adres e-mail.",
+  "LDAP_BaseDN_Description": "W pełni kwalifikowana nazwa wyróżniająca (DN) w poddrzewie LDAP chcesz wyszukać użytkowników i grup. Możesz dodać tyle, ile zechcesz; Jednakże, każda grupa musi być określona w ten sam bazie domeny jako użytkowników należących do niego. Jeśli podasz niewielkich grup użytkowników, tylko użytkownicy należący do tych grup będzie w zasięgu. Zaleca się, aby określić górny poziom drzewa katalogów LDAP jako baza domeny i użyć filtru wyszukiwania w celu kontroli dostępu.",
+  "LDAP_User_Search_Field_Description": "Atrybut LDAP, która identyfikuje użytkownika LDAP, który próbuje uwierzytelnienia. To pole powinno być `sAMAccountName` dla instalacji najbardziej Active Directory, ale może to być` uid` innych rozwiązań, takich jak LDAP OpenLDAP. Można użyć `mail` celu identyfikacji użytkowników przez e-mail lub cokolwiek atrybut chcesz. <br> Można użyć wielu wartości oddzielonych przecinkiem, aby umożliwić użytkownikom, aby zalogować się za pomocą wielu identyfikatorów, takich jak nazwa użytkownika lub adres e-mail.",
+  "LDAP_User_Search_Filter_Description": "Jeśli określony, tylko użytkownicy pasujących ten filtr będzie mógł zalogować. Jeśli filtr nie jest określony, wszyscy użytkownicy w zakresie określonym bazie domeny będą mogli się zalogować. <br/> Np Active Directory `memberOf = cn = ROCKET_CHAT, ou = Ogólne Groups`. <br/> Np OpenLDAP (rozszerzalny wyszukiwania match) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Użytkownik LDAP, który wykonuje wyszukiwań użytkowników do uwierzytelnienia innych użytkowników podczas logowania się. <br/> Jest to zazwyczaj konto usługi stworzony specjalnie dla integracji osób trzecich. Użyj pełnej nazwy, takie jak `cn = Administrator, CN = Users, DC = example, dc = com`.",
   "LDAP_Enable": "Włącz LDAP",
   "LDAP_Enable_Description": "Włącza LDAP podczas uwierzytelniania.",
   "LDAP_Encryption": "Szyfrowanie",
   "LDAP_Encryption_Description": "Metoda szyfrowania wykorzystywany do zabezpieczenia komunikacji z serwerem LDAP. Przykłady obejmują `plain` (bez szyfrowania),` SSL / LDAPS` (zaszyfrowany od początku) i `StartTLS` (upgrade do szyfrowanej komunikacji po podłączeniu).",
   "LDAP_Host": "Host",
   "LDAP_Host_Description": "Gospodarz LDAP, np `ldap.example.com` lub` 10.0.0.30`.",
-  "LDAP_Import_Users": "Importuj użytkowników LDAP",
   "LDAP_Login_Fallback_Description": "Jeżeli logowanie LDAP zakończy się niepowodzeniem, spróbuj zalogować lokalnie. Pomocne w przypadku gdy LDAP jest nieosiągalny.",
   "LDAP_Merge_Existing_Users": "Połącz istniejących użytkowników",
   "LDAP_Port": "Port LDAP",
@@ -746,12 +733,9 @@
   "LDAP_Sync_User_Data_Description": "Utrzymuj dane (np: nazwa, email) w synchronizacji z serwerem podczas logowania",
   "LDAP_Sync_User_Data_FieldMap": "Mapa pól użytkownika",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurowanie sposobu w jaki pola kont (np. email) są uzupełniane z rekordów LDAP (gdy takowe zostaną znalezione). Na przykład podając `{\"cn\":\"name\", \"mail\":\"email\"}` system wybierze wyświetlaną nazwę użytkownika z pola cn i jego adres email z pola email. <br/>Dostępne pola to: `name`, `email`.",
-  "LDAP_Sync_Users": "Użytkownicy Sync",
   "LDAP_Test_Connection": "Testuj połączenie",
   "LDAP_Unique_Identifier_Field": "Unikalny Identyfikator Pole",
   "LDAP_Unique_Identifier_Field_Description": "To które będą stosowane do łączenia użytkownika LDAP i użytkownika Rocket.Chat. Możesz poinformować wiele wartości oddzielonych przecinkiem, aby postarać się o wartość z rejestru LDAP. <br/> Domyślną wartością jest `objectGUID IBM-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Użyj wyszukiwarki Domena niestandardowa",
-  "LDAP_Use_Custom_Domain_Search_Description": "Wpisz swój własny filtr do wyszukiwania użytkowników na serwerze LDAP.",
   "LDAP_Username_Field": "Nazwa pola",
   "LDAP_Username_Field_Description": "Które pole będzie używany jako nazwa użytkownika * * Dla nowych użytkowników. Zostaw puste, aby użyć nazwy użytkownika informować na stronie logowania. <br/> Można używać znaczników szablonów też, podobnie jak `#{givenName}.#{sn}`. <br/> Domyślną wartością jest `sAMAccountName`.",
   "Least_Amount": "Ostatnia ilość",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 70dbf7049cd..f87e98ddbf8 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -624,24 +624,12 @@
   "Layout_Terms_of_Service": "Termos de Serviço",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "Certificado CA",
-  "LDAP_Custom_Domain_Search": "Pesquisa de Domínio Personalizado",
-  "LDAP_Custom_Domain_Search_Description": "Um pedaço de JSON que governa informações de conexão e ligação e é da forma: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domínio Padrão",
   "LDAP_Description": "LDAP é um banco de dados hierárquico que muitas empresas usam para fornecer single sign on - uma facilidade para compartilhar uma senha entre múltiplos sites e serviços. Para exemplos e informações de configurações avançadas, por favor consulte nosso wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "Base de Domínio",
-  "LDAP_Domain_Base_Description": "O nome distinto (DN) de uma sub-árvore LDAP em que você deseja procurar por usuários e grupos. Você pode adicionar tantos quantos quiser; no entanto, cada grupo deve ser definido na mesma base de domínio que os usuários que pertencem a ele. Se você especificar grupos de usuários restritos, somente os usuários que pertencem a esses grupos estarão no escopo. Recomendamos que você especifique o nível mais alto de seu diretório LDAP como a sua base de domínio e use o filtro de pesquisa para controlar o acesso.",
-  "LDAP_Domain_Search_Filter": "Filtro da Pesquisa de Domínio",
-  "LDAP_Domain_Search_Filter_Description": "Se especificado, somente os usuários que correspondem a este filtro serão autorizados a entrar. Se nenhum filtro for especificado, todos os usuários dentro do âmbito da base de domínio especificado serão capazes de entrar. <br/> Por exemplo, para Active Directory `memberOf = cn = ROCKET_CHAT, ou = Geral Groups`. <br/> Por exemplo, para OpenLDAP (extensible match search) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Categoria de Objeto de Pesquisa de Domínio",
-  "LDAP_Domain_Search_Object_Category_Description": "O *objectCategory* que identifica seus usuários. <br/> Deixe em branco para *OpenLDAP*. <br/> Por exemplo, `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Classe de Objeto de Pesquisa de Domínio",
-  "LDAP_Domain_Search_Object_Class_Description": "O *objectclass* que identifica seus usuários. <br/> Por exemplo, `organizationalPerson`, `user`, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Senha da Pesquisa de Domínio",
-  "LDAP_Domain_Search_Password_Description": "A senha para o usuário de pesquisa de domínio.",
-  "LDAP_Domain_Search_User": "Usuário da Pesquisa de Domínio",
-  "LDAP_Domain_Search_User_Description": "O usuário LDAP que realiza pesquisas de usuário para autenticar outros usuários quando eles entram. <br/> Isto é tipicamente uma conta de serviço criado especificamente para integrações de terceiros. Usar um nome qualificado, como `cn = administrador, cn = usuários, dc = exemplo, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "ID de Usuário de Pesquisa de Domínio",
-  "LDAP_Domain_Search_User_ID_Description": "O atributo LDAP que identifica o usuário LDAP que tenta autenticar. Este campo deve ser `sAMAccountName` para a maioria das instalações de Active Directory, mas pode ser` uid` para outras soluções LDAP, como o OpenLDAP. Você pode usar `mail` para identificar usuários por e-mail ou qualquer atributo que você desejar. <br> Você pode usar vários valores separados por vírgula para permitir que os usuários façam login usando vários identificadores, como nome de usuário ou e-mail.",
+  "LDAP_BaseDN_Description": "O nome distinto (DN) de uma sub-árvore LDAP em que você deseja procurar por usuários e grupos. Você pode adicionar tantos quantos quiser; no entanto, cada grupo deve ser definido na mesma base de domínio que os usuários que pertencem a ele. Se você especificar grupos de usuários restritos, somente os usuários que pertencem a esses grupos estarão no escopo. Recomendamos que você especifique o nível mais alto de seu diretório LDAP como a sua base de domínio e use o filtro de pesquisa para controlar o acesso.",
+  "LDAP_User_Search_Field_Description": "O atributo LDAP que identifica o usuário LDAP que tenta autenticar. Este campo deve ser `sAMAccountName` para a maioria das instalações de Active Directory, mas pode ser` uid` para outras soluções LDAP, como o OpenLDAP. Você pode usar `mail` para identificar usuários por e-mail ou qualquer atributo que você desejar. <br> Você pode usar vários valores separados por vírgula para permitir que os usuários façam login usando vários identificadores, como nome de usuário ou e-mail.",
+  "LDAP_User_Search_Filter_Description": "Se especificado, somente os usuários que correspondem a este filtro serão autorizados a entrar. Se nenhum filtro for especificado, todos os usuários dentro do âmbito da base de domínio especificado serão capazes de entrar. <br/> Por exemplo, para Active Directory `memberOf = cn = ROCKET_CHAT, ou = Geral Groups`. <br/> Por exemplo, para OpenLDAP (extensible match search) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "O usuário LDAP que realiza pesquisas de usuário para autenticar outros usuários quando eles entram. <br/> Isto é tipicamente uma conta de serviço criado especificamente para integrações de terceiros. Usar um nome qualificado, como `cn = administrador, cn = usuários, dc = exemplo, dc = com`.",
   "LDAP_Enable": "Ativar",
   "LDAP_Enable_Description": "Tente utilizar LDAP para autenticação",
   "LDAP_Encryption": "Criptografia",
@@ -657,12 +645,9 @@
   "LDAP_Sync_User_Data_Description": "Mantenha seus dados de usuário em sincronia logando no servidor (ex.: nome, email).",
   "LDAP_Sync_User_Data_FieldMap": "Mapeamento de campos do usuário",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configure como os campos da conta de usuário (tipo email) serão populados no LDAP (quando encontrados). <br />Por exemplo, `{\"cn\":\"name\", \"mail\":\"email\"}` irá selecionar o nome do usuário do atributo cn, e o seu e-mail do atributo mail. <br/>Os campos disponíveis incluem `name`, `email` e `customFields`.",
-  "LDAP_Sync_Users": "Sincronizar Usuários",
   "LDAP_Test_Connection": "Testar Conexão",
   "LDAP_Unique_Identifier_Field": "Campo Identificador Único",
   "LDAP_Unique_Identifier_Field_Description": "O campo que será usado para vincular o usuário LDAP ao usuário Rocket.Chat. Você pode informar vários valores separados por vírgula para tentar obter o valor do registro LDAP. <br/> O valor padrão é `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueid, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Use Pesquisa de Domínio Personalizado",
-  "LDAP_Use_Custom_Domain_Search_Description": "Escreva seu próprio filtro para procurar usuários no servidor LDAP.",
   "LDAP_Username_Field": "Campo do Nome de Usuário",
   "LDAP_Username_Field_Description": "O campo que será usado como nome de usuário ( *username* ) para novos usuários. Deixe em branco para usar o nome de usuário informado na página de login. <br/> Você pode usar tags de template também, como `#{givenName}.#{sn}`. <br/> O valor padrão é `sAMAccountName`.",
   "Leave_Group_Warning": "Tem certeza de que quer sair do grupo \"%s\"?",
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index cfad9f35e2e..d0d507ee96c 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -663,24 +663,12 @@
   "Layout_Terms_of_Service": "Termos de Serviço",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "Certificado CA",
-  "LDAP_Custom_Domain_Search": "Pesquisa de Domínio Personalizado",
-  "LDAP_Custom_Domain_Search_Description": "Um pedaço de JSON que governa informações de conexão e ligação e é da forma: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domínio Padrão",
   "LDAP_Description": "LDAP é um banco de dados hierárquico que muitas empresas usam para fornecer single sign on - uma facilidade para compartilhar uma senha entre múltiplos sites e serviços. Para exemplos e informações de configurações avançadas, por favor consulte nosso wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "Base de Domínio",
-  "LDAP_Domain_Base_Description": "O nome distinto (DN) de uma sub-árvore LDAP em que você deseja procurar por usuários e grupos. Você pode adicionar tantos quantos quiser; no entanto, cada grupo deve ser definido na mesma base de domínio que os usuários que pertencem a ele. Se você especificar grupos de usuários restritos, somente os usuários que pertencem a esses grupos estarão no escopo. Recomendamos que você especifique o nível mais alto de seu diretório LDAP como a sua base de domínio e use o filtro de pesquisa para controlar o acesso.",
-  "LDAP_Domain_Search_Filter": "Filtro da Pesquisa de Domínio",
-  "LDAP_Domain_Search_Filter_Description": "Se especificado, somente os usuários que correspondem a este filtro serão autorizados a entrar. Se nenhum filtro for especificado, todos os usuários dentro do âmbito da base de domínio especificado serão capazes de entrar. <br/> Por exemplo, para Active Directory `memberOf = cn = ROCKET_CHAT, ou = Geral Groups`. <br/> Por exemplo, para OpenLDAP (extensible match search) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Categoria de Objeto de Pesquisa de Domínio",
-  "LDAP_Domain_Search_Object_Category_Description": "O *objectCategory* que identifica seus usuários. <br/> Deixe em branco para *OpenLDAP*. <br/> Por exemplo, `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Classe de Objeto de Pesquisa de Domínio",
-  "LDAP_Domain_Search_Object_Class_Description": "O *objectclass* que identifica seus usuários. <br/> Por exemplo, `organizationalPerson`, `user`, `inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Senha da Pesquisa de Domínio",
-  "LDAP_Domain_Search_Password_Description": "A senha para o usuário de pesquisa de domínio.",
-  "LDAP_Domain_Search_User": "Usuário da Pesquisa de Domínio",
-  "LDAP_Domain_Search_User_Description": "O usuário LDAP que realiza pesquisas de usuário para autenticar outros usuários quando eles entram. <br/> Isto é tipicamente uma conta de serviço criado especificamente para integrações de terceiros. Usar um nome qualificado, como `cn = administrador, cn = usuários, dc = exemplo, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "ID de Usuário de Pesquisa de Domínio",
-  "LDAP_Domain_Search_User_ID_Description": "O atributo LDAP que identifica o usuário LDAP que tenta autenticar. Este campo deve ser `sAMAccountName` para a maioria das instalações de Active Directory, mas pode ser` uid` para outras soluções LDAP, como o OpenLDAP. Você pode usar `mail` para identificar usuários por e-mail ou qualquer atributo que você desejar. <br> Você pode usar vários valores separados por vírgula para permitir que os usuários façam login usando vários identificadores, como nome de usuário ou e-mail.",
+  "LDAP_BaseDN_Description": "O nome distinto (DN) de uma sub-árvore LDAP em que você deseja procurar por usuários e grupos. Você pode adicionar tantos quantos quiser; no entanto, cada grupo deve ser definido na mesma base de domínio que os usuários que pertencem a ele. Se você especificar grupos de usuários restritos, somente os usuários que pertencem a esses grupos estarão no escopo. Recomendamos que você especifique o nível mais alto de seu diretório LDAP como a sua base de domínio e use o filtro de pesquisa para controlar o acesso.",
+  "LDAP_User_Search_Field_Description": "O atributo LDAP que identifica o usuário LDAP que tenta autenticar. Este campo deve ser `sAMAccountName` para a maioria das instalações de Active Directory, mas pode ser` uid` para outras soluções LDAP, como o OpenLDAP. Você pode usar `mail` para identificar usuários por e-mail ou qualquer atributo que você desejar. <br> Você pode usar vários valores separados por vírgula para permitir que os usuários façam login usando vários identificadores, como nome de usuário ou e-mail.",
+  "LDAP_User_Search_Filter_Description": "Se especificado, somente os usuários que correspondem a este filtro serão autorizados a entrar. Se nenhum filtro for especificado, todos os usuários dentro do âmbito da base de domínio especificado serão capazes de entrar. <br/> Por exemplo, para Active Directory `memberOf = cn = ROCKET_CHAT, ou = Geral Groups`. <br/> Por exemplo, para OpenLDAP (extensible match search) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "O usuário LDAP que realiza pesquisas de usuário para autenticar outros usuários quando eles entram. <br/> Isto é tipicamente uma conta de serviço criado especificamente para integrações de terceiros. Usar um nome qualificado, como `cn = administrador, cn = usuários, dc = exemplo, dc = com`.",
   "LDAP_Enable": "Ativar",
   "LDAP_Enable_Description": "Tente utilizar LDAP para autenticação",
   "LDAP_Encryption": "Criptografia",
@@ -696,12 +684,9 @@
   "LDAP_Sync_User_Data_Description": "Mantenha seus dados de usuário em sincronia logando no servidor (ex.: nome, email).",
   "LDAP_Sync_User_Data_FieldMap": "Mapeamento de campos do usuário",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configure como os campos da conta de usuário (tipo email) serão populados no LDAP (quando encontrados). <br />Por exemplo, `{\"cn\":\"name\", \"mail\":\"email\"}` irá selecionar o nome do usuário do atributo cn, e o seu e-mail do atributo mail. <br/>Os campos disponíveis incluem `name`, `email` e `customFields`.",
-  "LDAP_Sync_Users": "Sincronizar Usuários",
   "LDAP_Test_Connection": "Testar Conexão",
   "LDAP_Unique_Identifier_Field": "Campo Identificador Único",
   "LDAP_Unique_Identifier_Field_Description": "O campo que será usado para vincular o usuário LDAP ao usuário Rocket.Chat. Você pode informar vários valores separados por vírgula para tentar obter o valor do registro LDAP. <br/> O valor padrão é `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueid, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Use Pesquisa de Domínio Personalizado",
-  "LDAP_Use_Custom_Domain_Search_Description": "Escreva seu próprio filtro para procurar usuários no servidor LDAP.",
   "LDAP_Username_Field": "Campo do Nome de Usuário",
   "LDAP_Username_Field_Description": "O campo que será usado como nome de usuário ( *username* ) para novos usuários. Deixe em branco para usar o nome de usuário informado na página de login. <br/> Você pode usar tags de template também, como `#{givenName}.#{sn}`. <br/> O valor padrão é `sAMAccountName`.",
   "Leave_Group_Warning": "Tem certeza de que quer sair do grupo \"%s\"?",
diff --git a/packages/rocketchat-i18n/i18n/ro.i18n.json b/packages/rocketchat-i18n/i18n/ro.i18n.json
index 42292a09012..1503681ab23 100644
--- a/packages/rocketchat-i18n/i18n/ro.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ro.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "Condții de utilizare",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "Certificat CA",
-  "LDAP_Custom_Domain_Search": "Căutare în domeniu personalizat",
-  "LDAP_Custom_Domain_Search_Description": "O bucată de JSON care guvernează leagă și conexiunea info și este de forma: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domeniu implicit",
   "LDAP_Description": "LDAP este o bază de date ierarhică pe care multe companii o folosesc pentru a oferi osingură  parolă pe mai multe site-uri și servicii. Pentru informații și exemple de configurare avansate, vă rugăm să consultați wiki nostru: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Baza domeniului",
-  "LDAP_Domain_Base_Description": "Numele complet calificat distinctiv (DN) al unui subramificație LDAP pe care doriți să căutați utilizatori și grupuri. Puteți adăuga oricât de multe doriți; cu toate acestea, fiecare grup trebuie să fie definite în același domeniu de bază ca și utilizatorii care îi aparțin. Dacă precizați grupurile de utilizatori sunt restricționate, numai utilizatorii care fac parte din aceste grupuri vor fi în domeniul de aplicare. Vă recomandăm să specificați nivelul superior al arborelui dvs. de director LDAP ca baza domeniului dvs. și utilizați filtrul de căutare pentru a controla accesul.",
-  "LDAP_Domain_Search_Filter": "Filtru Căutare Domeniu",
-  "LDAP_Domain_Search_Filter_Description": "Dacă se specifică, numai utilizatorii care se potrivesc cu acest filtru va fi permis să te loghezi. Dacă nu este specificat nici un filtru, toți utilizatorii din domeniul de aplicare al bazei domeniului specificat va fi capabil să se conecteze. <br/> De exemplu, pentru Active Directory `memberOf = cn = ROCKET_CHAT, ou = generalul Groups`. <br/> De exemplu, pentru OpenLDAP (căutare meci extensibil) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domeniul Cautare Obiect Categorie",
-  "LDAP_Domain_Search_Object_Category_Description": "* De * objectCategory care identifica utilizatorii. <br/> Lasă un gol pentru * OpenLDAP *. <br/> De exemplu, `person` etc.",
-  "LDAP_Domain_Search_Object_Class": "Domeniul de clasă căutare Obiect",
-  "LDAP_Domain_Search_Object_Class_Description": "* De * objectclass care identifica utilizatorii. <br/> De exemplu, `organizationalPerson`,` utilizator al, `inetOrgPerson` etc.",
-  "LDAP_Domain_Search_Password": "Parolă căutare domeniu",
-  "LDAP_Domain_Search_Password_Description": "Parola pentru utilizatorul căutării domeniu",
-  "LDAP_Domain_Search_User": "Utilizator căutare domeniu",
-  "LDAP_Domain_Search_User_Description": "Utilizatorul LDAP care efectuează căutări de utilizator pentru autentificarea altor utilizatori atunci când se conectează. <br/> Aceasta este de obicei un cont de serviciu special creat pentru integrările terțe părți. Utilizați un nume complet calificat, cum ar fi `cn = Administrator, cn = Users, dc = Exemplu, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domeniul de căutare ID utilizator",
-  "LDAP_Domain_Search_User_ID_Description": "Acest atribut LDAP care identifică utilizatorul LDAP care încearcă autentificarea. Acest câmp ar trebui să fie `sAMAccountName` pentru instalații de cele mai multe Active Directory, dar poate fi` uid` pentru alte soluții LDAP, cum ar fi OpenLDAP. Aveți posibilitatea să utilizați `mail` pentru a identifica utilizatorii prin e-mail sau orice atribut pe care doriți. <br> Puteți utiliza valori multiple, separate prin virgula pentru a permite utilizatorilor să te autentifici folosind mai mulți identificatori, cum ar fi numele de utilizator sau e-mail.",
+  "LDAP_BaseDN_Description": "Numele complet calificat distinctiv (DN) al unui subramificație LDAP pe care doriți să căutați utilizatori și grupuri. Puteți adăuga oricât de multe doriți; cu toate acestea, fiecare grup trebuie să fie definite în același domeniu de bază ca și utilizatorii care îi aparțin. Dacă precizați grupurile de utilizatori sunt restricționate, numai utilizatorii care fac parte din aceste grupuri vor fi în domeniul de aplicare. Vă recomandăm să specificați nivelul superior al arborelui dvs. de director LDAP ca baza domeniului dvs. și utilizați filtrul de căutare pentru a controla accesul.",
+  "LDAP_User_Search_Field_Description": "Acest atribut LDAP care identifică utilizatorul LDAP care încearcă autentificarea. Acest câmp ar trebui să fie `sAMAccountName` pentru instalații de cele mai multe Active Directory, dar poate fi` uid` pentru alte soluții LDAP, cum ar fi OpenLDAP. Aveți posibilitatea să utilizați `mail` pentru a identifica utilizatorii prin e-mail sau orice atribut pe care doriți. <br> Puteți utiliza valori multiple, separate prin virgula pentru a permite utilizatorilor să te autentifici folosind mai mulți identificatori, cum ar fi numele de utilizator sau e-mail.",
+  "LDAP_User_Search_Filter_Description": "Dacă se specifică, numai utilizatorii care se potrivesc cu acest filtru va fi permis să te loghezi. Dacă nu este specificat nici un filtru, toți utilizatorii din domeniul de aplicare al bazei domeniului specificat va fi capabil să se conecteze. <br/> De exemplu, pentru Active Directory `memberOf = cn = ROCKET_CHAT, ou = generalul Groups`. <br/> De exemplu, pentru OpenLDAP (căutare meci extensibil) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Utilizatorul LDAP care efectuează căutări de utilizator pentru autentificarea altor utilizatori atunci când se conectează. <br/> Aceasta este de obicei un cont de serviciu special creat pentru integrările terțe părți. Utilizați un nume complet calificat, cum ar fi `cn = Administrator, cn = Users, dc = Exemplu, dc = com`.",
   "LDAP_Enable": "Activați",
   "LDAP_Enable_Description": "Încearcă să utilizezi LDAP pentru autentificare.",
   "LDAP_Encryption": "Encriptare",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "Păstrați datele utilizatorului în sincron cu serverul de autentificare (de exemplu: nume, e-mail).",
   "LDAP_Sync_User_Data_FieldMap": "User Data Field Map",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configurați modul în care detalii ale contului de utilizator (cum ar fi e-mail-ul) sunt populate de o înregistrare LDAP (odată găsită).<br/> De exemplu, {\"cn\": \"Numele\", \"e-mail\": \"e-mail\"} va alege numele unei persoane ce poate fi citit de la atributul cn, și e-mail lor de atributul e-mail. <br/>Detaliile disponibile includ numele și e-mail.",
-  "LDAP_Sync_Users": "Sincronizează utilizatori",
   "LDAP_Test_Connection": "Test conexiune",
   "LDAP_Unique_Identifier_Field": "Identificator unic câmp",
   "LDAP_Unique_Identifier_Field_Description": "Care câmp va fi folosit pentru a lega utilizatorul LDAP și utilizatorul Rocket.Chat. Vă poate informa cu valori multiple, separate prin virgula pentru a încerca pentru a obține valoarea de înregistrare LDAP. <br/> Valoarea implicită este `objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Folosește Căutare Domeniu Specific",
-  "LDAP_Use_Custom_Domain_Search_Description": "Scrie propriul filtru pentru utilizatorii caută în serverul LDAP.",
   "LDAP_Username_Field": "Câmp utilizator",
   "LDAP_Username_Field_Description": "Care câmp va fi folosit ca nume de utilizator * * pentru noii utilizatori. Lasă un gol pentru a utiliza numele de utilizator informat pe pagina de conectare. <br/> Aveți posibilitatea să utilizați etichete șablon prea, cum ar fi `#{givenName}.#{sn}`. <br/> Valoarea implicită este `sAMAccountName`.",
   "Leave_Group_Warning": "Sunteți sigur că vreți să părăsiți grupul?",
diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json
index 3ae1bd813c1..30d683def51 100644
--- a/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -846,24 +846,12 @@
   "LDAP": "Протокол LDAP",
   "LDAP_CA_Cert": "Сертификат CA",
   "LDAP_Connect_Timeout": "Таймаут соединения (мсек)",
-  "LDAP_Custom_Domain_Search": "Пользовательский домен поиска",
-  "LDAP_Custom_Domain_Search_Description": "JSON, который содержит информацию привязки и подключения, имеет форму: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Домен по умолчанию",
   "LDAP_Description": "Протокол LDAP - это иерархическая база данных, которую используют многие компании для обеспечения единой регистрации - средство для совместного использования одного пароля для разных сайтов и сервисов. Для подробной информации по конфигурации читайте нашу wiki-страницу: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "Доменная база",
-  "LDAP_Domain_Base_Description": "Полностью соответствующее Отличительное Имя (ОМ) поддерева протокола LDAP, которое вы хотите найти для пользователей и групп. Вы можете добавлять столько, сколько желаете; однако, каждая группа должна быть определена в одной и той же доменной базе, как и пользователи, относящиеся к ней. Если вы укажете ограниченные группы пользователей, в пределах этих групп будут лишь те пользователи, относящиеся к ним. Вы рекомендуем вам указать верхний уровень дерева каталогов LDAP в качестве доменной базы и использовать фильтр поиска для контроля доступа.",
-  "LDAP_Domain_Search_Filter": "Фильтр доменного поиска",
-  "LDAP_Domain_Search_Filter_Description": "Если определено, только пользователям, которые соответствуют этому фильтру, разрешат авторизоваться. Если никакой фильтр не будет определен, то все пользователи в рамках указанной доменной базы будут в состоянии регистрироваться. <br/>Например для Активной Директории `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Например для OpenLDAP (расширяемый соответствующий поиск) `ou:dn:=ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Категория объекта доменного поиска",
-  "LDAP_Domain_Search_Object_Category_Description": "*objectCategory* определяет ваших пользователей.<br/>Оставить пустым для *OpenLDAP*.<br/>Например `person`, и так далее.",
-  "LDAP_Domain_Search_Object_Class": "Класс объекта доменного поиска",
-  "LDAP_Domain_Search_Object_Class_Description": "*objectclass* определяет ваших пользователей. <br/>Например `organizationalPerson`, `user`, `inetOrgPerson`, и так далее.",
-  "LDAP_Domain_Search_Password": "Пароль к доменному поиску",
-  "LDAP_Domain_Search_Password_Description": "Пароль для пользователя доменного поиска",
-  "LDAP_Domain_Search_User": "Пользователь доменного поиска",
-  "LDAP_Domain_Search_User_Description": "Пользователь LDAP, который выполняет пользовательские поиски, чтобы подтвердить подлинность других пользователей, когда они регистрируются. <br/>Это, как правило - сервисный аккаунт, созданный определенно для сторонней интеграции. Используйте полностью составное имя, например `cn=Administrator,cn=Users,dc=Example,dc=com`.",
-  "LDAP_Domain_Search_User_ID": "Идентификатор пользователя доменного поиска",
-  "LDAP_Domain_Search_User_ID_Description": "Атрибут LDAP, который идентифицирует пользователя LDAP, делающего попытку аутентификации. Это поле должно иметь значение `sAMAccountName` для большинства установок Active Directory, но она может иметь значение `uid` для других LDAP решений, таких как OpenLDAP. Вы можете использовать `mail` для указания пользователей по электронной почте или любой атрибут, какой пожелаете. <br>Вы можете использовать несколько значений, разделенных запятой, чтобы разрешить пользователям войти, используя множественные идентификаторы, такие как имя пользователя или электронная почта.",
+  "LDAP_BaseDN_Description": "Полностью соответствующее Отличительное Имя (ОМ) поддерева протокола LDAP, которое вы хотите найти для пользователей и групп. Вы можете добавлять столько, сколько желаете; однако, каждая группа должна быть определена в одной и той же доменной базе, как и пользователи, относящиеся к ней. Если вы укажете ограниченные группы пользователей, в пределах этих групп будут лишь те пользователи, относящиеся к ним. Вы рекомендуем вам указать верхний уровень дерева каталогов LDAP в качестве доменной базы и использовать фильтр поиска для контроля доступа.",
+  "LDAP_User_Search_Field_Description": "Атрибут LDAP, который идентифицирует пользователя LDAP, делающего попытку аутентификации. Это поле должно иметь значение `sAMAccountName` для большинства установок Active Directory, но она может иметь значение `uid` для других LDAP решений, таких как OpenLDAP. Вы можете использовать `mail` для указания пользователей по электронной почте или любой атрибут, какой пожелаете. <br>Вы можете использовать несколько значений, разделенных запятой, чтобы разрешить пользователям войти, используя множественные идентификаторы, такие как имя пользователя или электронная почта.",
+  "LDAP_User_Search_Filter_Description": "Если определено, только пользователям, которые соответствуют этому фильтру, разрешат авторизоваться. Если никакой фильтр не будет определен, то все пользователи в рамках указанной доменной базы будут в состоянии регистрироваться. <br/>Например для Активной Директории `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Например для OpenLDAP (расширяемый соответствующий поиск) `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Пользователь LDAP, который выполняет пользовательские поиски, чтобы подтвердить подлинность других пользователей, когда они регистрируются. <br/>Это, как правило - сервисный аккаунт, созданный определенно для сторонней интеграции. Используйте полностью составное имя, например `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "Включить LDAP",
   "LDAP_Enable_Description": "Попытка использовать LDAP для аутентификации.",
   "LDAP_Encryption": "Шифрование",
@@ -882,12 +870,9 @@
   "LDAP_Sync_User_Data_Description": "Синхронизировать пользовательские данные с сервером при входе (например: имя, адрес электронной почты).",
   "LDAP_Sync_User_Data_FieldMap": "Карта пользовательских данных",
   "LDAP_Sync_User_Data_FieldMap_Description": "Настраивайте то, как будут заполняться поля аккаунта пользователя (такие как адрес электронной почты) из записи в LDAP (как только будет найден). <br/>Например `{\"cn\":\"name\", \"mail\":\"email\"}` выберет человекочитаемое имя человека из атрибута \"cn\", и его адрес электронной почты – из атрибута \"mail\". Дополнительно возможно использовать переменные, например: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` использует комбинацию имени и фамилии пользователя для поля `name` в Rocket.Chat. <br/> В Rocket.Chat доступны поля `name` и `email`.",
-  "LDAP_Sync_Users": "Синхронизация пользователей",
   "LDAP_Test_Connection": "Протестировать соединение",
   "LDAP_Unique_Identifier_Field": "Поле уникального идентификатора",
   "LDAP_Unique_Identifier_Field_Description": "Какая область будет использоваться, чтобы связать пользователя LDAP и Rocket.Chat. Вы можете сообщать многократные значения, отделенные запятой, чтобы попытаться получить значение из отчета LDAP.<br/>Значение по умолчанию `objectGUID, ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Использовать пользовательский домен поиска",
-  "LDAP_Use_Custom_Domain_Search_Description": "Напишите свой собственный фильтр, чтобы искать пользователей в сервере LDAP.",
   "LDAP_Username_Field": "Поле \"Логин\"",
   "LDAP_Username_Field_Description": "Какое поле будет устанавливаться в качестве логина для новых пользователей. Оставьте поле пустым, чтобы использовать логин, введенный на странице входа.<br/>Вы также можете использовать теги шаблонов, например `#{givenName}.#{sn}`.<br/>Значение по умолчанию - `sAMAccountName`.",
   "Leave_Group_Warning": "Вы уверены, что хотите покинуть группу \"%s\"?",
diff --git a/packages/rocketchat-i18n/i18n/sq.i18n.json b/packages/rocketchat-i18n/i18n/sq.i18n.json
index 485504219b0..b06613773c5 100644
--- a/packages/rocketchat-i18n/i18n/sq.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sq.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "Kushtet e Shërbimit",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Custom Domain Kërko",
-  "LDAP_Custom_Domain_Search_Description": "Një pjesë e JSON që rregullon lidh dhe lidhje info dhe është i formës: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Domain Default",
   "LDAP_Description": "LDAP është një bazë të dhënash hierarkike se shumë kompani përdorin për të dhënë shenjë të vetme në - një strukturë për të ndarë një fjalëkalim në mes të vendeve të shumta dhe të shërbimeve. Për informacion të avancuara konfigurimi dhe shembuj, ju lutem konsultoni wiki tonë: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "domain Base",
-  "LDAP_Domain_Base_Description": "Plotësisht të kualifikuar nderuar Emri (DN) e një subtree LDAP që ju doni të kërkoni për përdoruesit dhe grupet. Ju mund të shtoni sa më shumë që ju pëlqen; Megjithatë, secili grup duhet të përcaktohen në të njëjtën bazë domain si përdoruesit që i përket. Nëse ju specifikoni grupet e kufizuara të përdoruesve, vetëm përdoruesit që i përkasin këtyre grupeve do të jetë në fushë. Ne ju rekomandojmë që të përcaktojë nivelin e lartë të LDAP pemë tuaj directory si bazë domain dhe përdorimin e kërkimit filtër për të kontrolluar hyrje.",
-  "LDAP_Domain_Search_Filter": "Domain Kërko Filter",
-  "LDAP_Domain_Search_Filter_Description": "Nëse specifikuara, vetëm përdoruesit që përputhen me këtë filtër do të lejohet të hyni. Nëse nuk është specifikuar filter, të gjithë përdoruesit brenda objektit të bazës së të caktuar domain do të jetë në gjendje të nënshkruajë në. <br/> P.sh. për Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> P.sh. për t'OpenLdap (zgjeruar Kërkimi ndeshje) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search Object Category",
-  "LDAP_Domain_Search_Object_Category_Description": "* I * objectCategory që identifikojnë përdoruesit tuaj. <br/> Lini bosh për * t'OpenLdap *. <br/> P.sh. `person`, etj",
-  "LDAP_Domain_Search_Object_Class": "Domain Class kerko objekti",
-  "LDAP_Domain_Search_Object_Class_Description": "* I * objectclass që identifikojnë përdoruesit tuaj. <br/> P.sh. `organizationalPerson`,` user`, `inetOrgPerson`, etj",
-  "LDAP_Domain_Search_Password": "Domain Kërko Password",
-  "LDAP_Domain_Search_Password_Description": "Fjalëkalimi për përdoruesin e kërkimit domain.",
-  "LDAP_Domain_Search_User": "Domain Kërko User",
-  "LDAP_Domain_Search_User_Description": "Përdoruesi LDAP që kryen Lookups përdoruesit për të vërtetuar përdoruesit e tjerë, kur ata nënshkruajnë në. <br/> Kjo është zakonisht një llogari të shërbimit krijuar posaçërisht për integrime palë të treta. Përdorni një emër plotësisht të kualifikuar, të tilla si 'cn = Administrator, cn = Përdoruesit, dc = Shembull, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Kërko ID User",
-  "LDAP_Domain_Search_User_ID_Description": "LDAP atribut që identifikon përdoruesit LDAP që tenton të legalizuara. Kjo fushë duhet të jetë `sAMAccountName` për instalime më të Active Directory, por ajo mund të jetë` uid` për zgjidhje të tjera LDAP, të tilla si t'OpenLdap. Ju mund të përdorni `mail` për të identifikuar përdoruesit me email ose çfarëdo atribut që ju dëshironi. <br> Ju mund të përdorni vlerat e shumta të ndara me presje për të lejuar përdoruesit të identifikoheni duke përdorur identifikuesit të shumta si emrin e përdoruesit ose e-mail.",
+  "LDAP_BaseDN_Description": "Plotësisht të kualifikuar nderuar Emri (DN) e një subtree LDAP që ju doni të kërkoni për përdoruesit dhe grupet. Ju mund të shtoni sa më shumë që ju pëlqen; Megjithatë, secili grup duhet të përcaktohen në të njëjtën bazë domain si përdoruesit që i përket. Nëse ju specifikoni grupet e kufizuara të përdoruesve, vetëm përdoruesit që i përkasin këtyre grupeve do të jetë në fushë. Ne ju rekomandojmë që të përcaktojë nivelin e lartë të LDAP pemë tuaj directory si bazë domain dhe përdorimin e kërkimit filtër për të kontrolluar hyrje.",
+  "LDAP_User_Search_Field_Description": "LDAP atribut që identifikon përdoruesit LDAP që tenton të legalizuara. Kjo fushë duhet të jetë `sAMAccountName` për instalime më të Active Directory, por ajo mund të jetë` uid` për zgjidhje të tjera LDAP, të tilla si t'OpenLdap. Ju mund të përdorni `mail` për të identifikuar përdoruesit me email ose çfarëdo atribut që ju dëshironi. <br> Ju mund të përdorni vlerat e shumta të ndara me presje për të lejuar përdoruesit të identifikoheni duke përdorur identifikuesit të shumta si emrin e përdoruesit ose e-mail.",
+  "LDAP_User_Search_Filter_Description": "Nëse specifikuara, vetëm përdoruesit që përputhen me këtë filtër do të lejohet të hyni. Nëse nuk është specifikuar filter, të gjithë përdoruesit brenda objektit të bazës së të caktuar domain do të jetë në gjendje të nënshkruajë në. <br/> P.sh. për Active Directory `memberOf = cn = ROCKET_CHAT, ou = General Groups`. <br/> P.sh. për t'OpenLdap (zgjeruar Kërkimi ndeshje) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Përdoruesi LDAP që kryen Lookups përdoruesit për të vërtetuar përdoruesit e tjerë, kur ata nënshkruajnë në. <br/> Kjo është zakonisht një llogari të shërbimit krijuar posaçërisht për integrime palë të treta. Përdorni një emër plotësisht të kualifikuar, të tilla si 'cn = Administrator, cn = Përdoruesit, dc = Shembull, dc = com`.",
   "LDAP_Enable": "mundësoj",
   "LDAP_Enable_Description": "Përpjekje për të shfrytëzuar LDAP për autentikim.",
   "LDAP_Encryption": "encryption",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "Të mbajtur të dhënat e përdoruesit në sync me server në hyrje (p.sh: emri, email).",
   "LDAP_Sync_User_Data_FieldMap": "User Data Map Field",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfiguro si fusha e llogarisë përdoruesit (si email) janë të populluar nga një rekord në LDAP (sapo gjetur). <br/> Si një shembull, `{\" cn \":\" Emri \",\" postë \":\" email \"} 'do të zgjedhë emrin e një personi njerëzor lexueshëm nga atribut cn dhe adresën e tyre nga postës atribut. <br/> Fushat e vlefshme përfshijnë `name`, dhe` email`.",
-  "LDAP_Sync_Users": "Përdoruesit Sync",
   "LDAP_Test_Connection": "Test Connection",
   "LDAP_Unique_Identifier_Field": "Unique Identifier Field",
   "LDAP_Unique_Identifier_Field_Description": "Cilën fushë do të përdoret për të lidhur përdoruesit LDAP dhe përdoruesit Rocket.Chat. Ju mund të informojë vlerat e shumta të ndara me presje për të përpiqen për të marrë vlerën prej rekord LDAP. <br/> Vlera e parazgjedhur është 'objectGUID, ibm-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Përdorni Custom Domain Kërko",
-  "LDAP_Use_Custom_Domain_Search_Description": "Shkruar vetë filtrin tuaj për të kërkuar përdoruesit në server LDAP.",
   "LDAP_Username_Field": "Username Field",
   "LDAP_Username_Field_Description": "Cilën fushë do të përdoret si * emrin e përdoruesit * për përdoruesit e rinj. Lini bosh për të përdorur emrin e përdoruesit të informuar në faqen e identifikimit. <br/> Ju mund të përdorni tags template shumë, si `#{givenName}.#{sn}`. <br/> Vlera e parazgjedhur është `sAMAccountName`.",
   "Leave_Group_Warning": "Jeni te sigurte qe doni te largohet nga grupi \" %s\"?",
diff --git a/packages/rocketchat-i18n/i18n/sr.i18n.json b/packages/rocketchat-i18n/i18n/sr.i18n.json
index e0b4ef692ce..4f3a2b79222 100644
--- a/packages/rocketchat-i18n/i18n/sr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sr.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "Услови коришћења",
   "LDAP": "ЛДАП",
   "LDAP_CA_Cert": "ЦА Церт",
-  "LDAP_Custom_Domain_Search": "Цустом Претрага домена",
-  "LDAP_Custom_Domain_Search_Description": "Парче ЈСОН који управља везују и повезивање информација и има облик: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Уобичајено Домен",
   "LDAP_Description": "ЛДАП је хијерархијска база података која многе компаније користе да би обезбедили јединствени знак на - објекат за размену једну лозинку између више локација и услуга. За напредне информације о конфигурацији и примере, погледајте наш вики: хттпс://гитхуб.цом/РоцкетЦхат/Роцкет.Цхат/вики/ЛДАП-Аутхентицатион.",
-  "LDAP_Domain_Base": "domen База",
-  "LDAP_Domain_Base_Description": "Потпуно квалификовани препознатљивог имена (ДН) ЛДАП подстабла желите да тражите кориснике и групе. Можете додати колико год желите; Међутим, свака група мора бити дефинисана у истој бази домена као и корисницима који јој припадају. Ако наведете ограничене групе корисника, само корисници који припадају тим групама ће бити у обиму. Препоручујемо да наведете највиши ниво вашег ЛДАП стабла именика као домена базу и користите филтер за претрагу за контролу приступа.",
-  "LDAP_Domain_Search_Filter": "Домен Тражи филтер",
-  "LDAP_Domain_Search_Filter_Description": "Ако наведено, само корисници који одговарају овог филтера ће бити дозвољено да се пријавите. Ако није наведен филтера, сви корисници у оквиру наведеног домена базе ће моћи да се пријавите. <br/> Нпр за Ацтиве Дирецтори `мемберОф = ЦН = РОЦКЕТ_ЦХАТ, или = генерал Гроупс`. <br/> Нпр за ОпенЛДАП (прошириви меч претрага) 'или: ДН: = РОЦКЕТ_ЦХАТ`.",
-  "LDAP_Domain_Search_Object_Category": "Домен Претрага Предмет Категорија",
-  "LDAP_Domain_Search_Object_Category_Description": "Тхе * објецтЦатегори * да идентификују своје кориснике. <br/> Оставите празно за * ОпенЛДАП *. <br/> Нпр `персон`, итд",
-  "LDAP_Domain_Search_Object_Class": "Домен Класа Претрага Предмет",
-  "LDAP_Domain_Search_Object_Class_Description": "Тхе * објецтЦласс * да идентификују своје кориснике. <br/> Нпр `организатионалПерсон`,` усер`, `инетОргПерсон`, итд",
-  "LDAP_Domain_Search_Password": "Домен Тражи Лозинка",
-  "LDAP_Domain_Search_Password_Description": "Лозинка за корисника претраживање домена.",
-  "LDAP_Domain_Search_User": "Домен Тражи Корисник",
-  "LDAP_Domain_Search_User_Description": "ЛДАП корисник који обавља корисника лоокупс за проверу идентитета друге кориснике када се пријавите. <br/> Ово је типично рачун сервис специјално направљена за треће стране интеграције. Користите пуно име, као што су `цн = Администратор, ЦН = Усерс, ДЦ = пример, ДЦ = цом`.",
-  "LDAP_Domain_Search_User_ID": "Домен Тражи кориснику ИД",
-  "LDAP_Domain_Search_User_ID_Description": "ЛДАП атрибут који идентификује корисника ЛДАП који покушавају проверу идентитета. Ово поље треба да буде `сАМАццоунтНаме` за већину Ацтиве Дирецтори инсталацијама, али може бити` уид` за друге ЛДАП решења, као што је ОпенЛДАП. Можете користити `маил` идентификују кориснике путем е-маила или како атрибут хоћеш. <br> Можете користити више вредности одвојене зарезом да омогући корисницима да се пријавите користећи више идентификаторе као што су корисничко име или е-маилом.",
+  "LDAP_BaseDN_Description": "Потпуно квалификовани препознатљивог имена (ДН) ЛДАП подстабла желите да тражите кориснике и групе. Можете додати колико год желите; Међутим, свака група мора бити дефинисана у истој бази домена као и корисницима који јој припадају. Ако наведете ограничене групе корисника, само корисници који припадају тим групама ће бити у обиму. Препоручујемо да наведете највиши ниво вашег ЛДАП стабла именика као домена базу и користите филтер за претрагу за контролу приступа.",
+  "LDAP_User_Search_Field_Description": "ЛДАП атрибут који идентификује корисника ЛДАП који покушавају проверу идентитета. Ово поље треба да буде `сАМАццоунтНаме` за већину Ацтиве Дирецтори инсталацијама, али може бити` уид` за друге ЛДАП решења, као што је ОпенЛДАП. Можете користити `маил` идентификују кориснике путем е-маила или како атрибут хоћеш. <br> Можете користити више вредности одвојене зарезом да омогући корисницима да се пријавите користећи више идентификаторе као што су корисничко име или е-маилом.",
+  "LDAP_User_Search_Filter_Description": "Ако наведено, само корисници који одговарају овог филтера ће бити дозвољено да се пријавите. Ако није наведен филтера, сви корисници у оквиру наведеног домена базе ће моћи да се пријавите. <br/> Нпр за Ацтиве Дирецтори `мемберОф = ЦН = РОЦКЕТ_ЦХАТ, или = генерал Гроупс`. <br/> Нпр за ОпенЛДАП (прошириви меч претрага) 'или: ДН: = РОЦКЕТ_ЦХАТ`.",
+  "LDAP_Authentication_UserDN_Description": "ЛДАП корисник који обавља корисника лоокупс за проверу идентитета друге кориснике када се пријавите. <br/> Ово је типично рачун сервис специјално направљена за треће стране интеграције. Користите пуно име, као што су `цн = Администратор, ЦН = Усерс, ДЦ = пример, ДЦ = цом`.",
   "LDAP_Enable": "омогућити",
   "LDAP_Enable_Description": "Покушај да се користе ЛДАП за потврду идентитета.",
   "LDAP_Encryption": "шифровање",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "Имајте корисничких података у синхронизацију са сервером на логин (нпр: име, емаил).",
   "LDAP_Sync_User_Data_FieldMap": "Корисник поља података Карта",
   "LDAP_Sync_User_Data_FieldMap_Description": "Конфигуришете како се поља кориснички налог (као поште) насељено од рекордних у ЛДАП (једном фоунд). <br/> Као пример, `{\" ЦН \":\" Име \",\" пошта \":\" е \"}` ће изабрати човеку читљиву име особе из цн атрибута, и њихово емаил од атрибута поште. <br/> Поља која укључују `наме`, и` емаил`.",
-  "LDAP_Sync_Users": "Синц корисника",
   "LDAP_Test_Connection": "тест везе",
   "LDAP_Unique_Identifier_Field": "Јединствени идентификатор Поље",
   "LDAP_Unique_Identifier_Field_Description": "Који поље ће се користити за повезивање корисника ЛДАП и корисника Роцкет.Цхат. Можете обавестити више вредности одвојене зарезом у покушају да добије вредност од ЛДАП записа. <br/> Дефаулт вредност је `објецтГУИД, ИБМ-ентриУУИД, ГУИД, доминоУНИД, нсуникуеИд, уидНумбер`",
-  "LDAP_Use_Custom_Domain_Search": "Користити прилагођени домен Сеарцх",
-  "LDAP_Use_Custom_Domain_Search_Description": "Напиши свој филтер за претрагу корисника у ЛДАП серверу.",
   "LDAP_Username_Field": "корисничко име polje",
   "LDAP_Username_Field_Description": "Који поље ће се користити као * корисничко име * за нове кориснике. Оставите празно да користи име информисани на пријаву. <br/> Можете користити темплате ознаке такође, као `#{givenName}.#{sn}`. <br/> Дефаулт вредност је `сАМАццоунтНаме`.",
   "Leave_Group_Warning": "Да ли сте сигурни да желите да напустите групу \"% с\"?",
diff --git a/packages/rocketchat-i18n/i18n/sv.i18n.json b/packages/rocketchat-i18n/i18n/sv.i18n.json
index 727d444d6c8..807ea0f6eba 100644
--- a/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -653,24 +653,12 @@
   "Layout_Terms_of_Service": "Användarvillkor",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Anpassad Domain Search",
-  "LDAP_Custom_Domain_Search_Description": "En bit av JSON som styr binder och anslutningsinfo och har formen: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Standarddomän",
   "LDAP_Description": "LDAP är en hierarkisk databas som många företag använder för att tillhandahålla enkel inloggning - en anläggning för att dela ett lösenord mellan flera webbplatser och tjänster. För avancerad konfiguration. information och exempel, kontakta vår wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "domän Base",
-  "LDAP_Domain_Base_Description": "Den fullständiga unika namn (DN) på en LDAP träd som du vill söka efter användare och grupper. Du kan lägga till så många som du vill, emellertid måste definieras varje grupp i samma domän basen som de användare som hör till den. Om du anger begränsade användargrupper, kommer endast användare som tillhör dessa grupper vara i omfattning. Vi rekommenderar att du anger den översta nivån i LDAP-katalogträd som domänen bas och använda sökfunktionen filter för att kontrollera åtkomsten.",
-  "LDAP_Domain_Search_Filter": "Domän Filter",
-  "LDAP_Domain_Search_Filter_Description": "Om angivna endast användare som matchar detta filter kommer att tillåtas att logga in. Om inget filter anges kommer alla användare inom ramen för den angivna domänen bas kunna logga in. <br/> T.ex. för Active Directory `MEMBEROF = cn = ROCKET_CHAT, ou = General Groups`. <br/> T.ex. för OpenLDAP (extensible match ökning) `ou: DN: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Search kvalitetsklass",
-  "LDAP_Domain_Search_Object_Category_Description": "Den * objectcategory * som identifierar användarna. <br/> Lämna tomt för * OpenLDAP *. <br/> T.ex. `person`, etc.",
-  "LDAP_Domain_Search_Object_Class": "Domain Search Objektklass",
-  "LDAP_Domain_Search_Object_Class_Description": "Den * object * som identifierar användarna. <br/> T.ex. `organizationalPerson`, 'användare:,' inetOrgPerson`, etc.",
-  "LDAP_Domain_Search_Password": "Domän Sök Lösenord",
-  "LDAP_Domain_Search_Password_Description": "Lösenordet för domänen sökanvänd.",
-  "LDAP_Domain_Search_User": "Domän Sök användare",
-  "LDAP_Domain_Search_User_Description": "LDAP användare som utför användaruppslag att autentisera andra användare när de loggar in. <br/> Detta är typiskt ett servicekonto som skapats speciellt för tredjeparts integrationer. Använd ett fullständigt namn, såsom `cn = Administratör, cn = användare, dc = example, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "Domain Search användar-ID",
-  "LDAP_Domain_Search_User_ID_Description": "LDAP-attribut som identifierar LDAP användare som försöker autentisering. Detta område bör vara `sAMAccountName` för de flesta Active Directory installationer, men det kan vara` uid` för andra LDAP lösningar, såsom OpenLDAP. Du kan använda `mail` att identifiera användare via e-post eller vad attribut du vill. <br> Du kan använda flera värden separerade med kommatecken för att tillåta användare att logga in med flera identifierare som användarnamn eller e-postadress.",
+  "LDAP_BaseDN_Description": "Den fullständiga unika namn (DN) på en LDAP träd som du vill söka efter användare och grupper. Du kan lägga till så många som du vill, emellertid måste definieras varje grupp i samma domän basen som de användare som hör till den. Om du anger begränsade användargrupper, kommer endast användare som tillhör dessa grupper vara i omfattning. Vi rekommenderar att du anger den översta nivån i LDAP-katalogträd som domänen bas och använda sökfunktionen filter för att kontrollera åtkomsten.",
+  "LDAP_User_Search_Field_Description": "LDAP-attribut som identifierar LDAP användare som försöker autentisering. Detta område bör vara `sAMAccountName` för de flesta Active Directory installationer, men det kan vara` uid` för andra LDAP lösningar, såsom OpenLDAP. Du kan använda `mail` att identifiera användare via e-post eller vad attribut du vill. <br> Du kan använda flera värden separerade med kommatecken för att tillåta användare att logga in med flera identifierare som användarnamn eller e-postadress.",
+  "LDAP_User_Search_Filter_Description": "Om angivna endast användare som matchar detta filter kommer att tillåtas att logga in. Om inget filter anges kommer alla användare inom ramen för den angivna domänen bas kunna logga in. <br/> T.ex. för Active Directory `MEMBEROF = cn = ROCKET_CHAT, ou = General Groups`. <br/> T.ex. för OpenLDAP (extensible match ökning) `ou: DN: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "LDAP användare som utför användaruppslag att autentisera andra användare när de loggar in. <br/> Detta är typiskt ett servicekonto som skapats speciellt för tredjeparts integrationer. Använd ett fullständigt namn, såsom `cn = Administratör, cn = användare, dc = example, dc = com`.",
   "LDAP_Enable": "Aktivera",
   "LDAP_Enable_Description": "Försök att använda LDAP för autentisering.",
   "LDAP_Encryption": "kryptering",
@@ -679,7 +667,6 @@
   "LDAP_Host": "Värd",
   "LDAP_Host_Description": "LDAP värd, t.ex. `ldap.example.com` eller` 10.0.0.30`.",
   "LDAP_Idle_Timeout": "Timeout för inaktivitet (ms)",
-  "LDAP_Import_Users": "Importera LDAP användare",
   "LDAP_Merge_Existing_Users": "Slå samman existerande användare",
   "LDAP_Port": "Port",
   "LDAP_Port_Description": "Port för att få tillgång till LDAP. t.ex. `389` eller` 636` för LDAPS",
@@ -689,12 +676,9 @@
   "LDAP_Sync_User_Data_Description": "Håll användardata i synk med servern vid inloggning ( t.ex. namn, e-post ).",
   "LDAP_Sync_User_Data_FieldMap": "Användardatafält Karta",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurera hur användarkonto fält (som e-post) fylls från en post i LDAP (en gång hittade). <br/> Som ett exempel, `{\" cn \":\" namn \",\" post \":\" email \"} 'kommer att välja en persons mänskligt läsbar namn från cn attribut och deras e-post från e-postattribut. <br/> Tillgängliga fält inkluderar `name` och` email`.",
-  "LDAP_Sync_Users": "Synkronisera Användare",
   "LDAP_Test_Connection": "Testa anslutning",
   "LDAP_Unique_Identifier_Field": "Unique Identifier Field",
   "LDAP_Unique_Identifier_Field_Description": "Vilket fält kommer att användas för att länka LDAP användare och Rocket.Chat användaren. Du kan informera flera värden separerade med kommatecken för att försöka få värdet från LDAP register. <br/> Standardvärdet är 'objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Använd egen domän Sök",
-  "LDAP_Use_Custom_Domain_Search_Description": "Skriv ditt eget filter för att söka användare i LDAP-servern.",
   "LDAP_Username_Field": "Användarnamn Field",
   "LDAP_Username_Field_Description": "Vilket fält kommer att användas som * användarnamn * för nya användare. Lämna tomt för att använda användarnamn informerad om inloggningssidan. <br/> Du kan använda malltaggar också, som `#{givenName}.#{sn}`. <br/> Standardvärdet är 'sAMAccountName`.",
   "Leave_Group_Warning": "Är du säker att du vill lämna gruppen \"%s\"?",
diff --git a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
index 4456691c482..694596cbe8d 100644
--- a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "சேவை விதிமுறைகள்",
   "LDAP": "LDAP,",
   "LDAP_CA_Cert": "கலிபோர்னியா சான்றிதழ்",
-  "LDAP_Custom_Domain_Search": "விருப்ப இணைய தேடல்",
-  "LDAP_Custom_Domain_Search_Description": "ஜெர்மானிய மற்றும் இணைப்பு தகவல் நிர்வகிக்கிறது மற்றும் அந்த வடிவம் JSON ஒரு துண்டு: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "இயல்புநிலை களப்",
   "LDAP_Description": "பல தளங்கள் மற்றும் சேவைகள் இடையே ஒரு கடவுச்சொல்லை பகிர்ந்து ஒரு வசதி - LDAP, பல நிறுவனங்கள் ஒற்றை அடையாளம் வழங்க பயன்படுத்த என்று ஒரு படிநிலை தரவுத்தள உள்ளது. https://rocket.chat/docs/administrator-guides/authentication/ldap/: மேம்பட்ட கட்டமைப்பு தகவல் மற்றும் உதாரணங்கள், எங்கள் விக்கி கலந்தாலோசிக்கவும்.",
-  "LDAP_Domain_Base": "இணைய தளம்",
-  "LDAP_Domain_Base_Description": "பயனர்கள் மற்றும் குழுக்களுக்கு தேட வேண்டும் ஒரு LDAP உபபடிநிலை முழுவதும் தகுதியான டிஸ்டிங்கஷ்ட் நேம் (DN). நீங்கள் போன்ற பல சேர்க்க முடியும்; எனினும், ஒவ்வொரு குழு சேர்ந்தவை என்று பயனர்கள் அதே டொமைன் அடிப்படை வரையறுக்கப்பட்டிருக்க வேண்டும். நீங்கள் கட்டுப்படுத்தப்பட்ட பயனர் குழுக்கள் குறிப்பிட்டால், அந்த குழுக்கள் சேர்ந்தவை என்று பயனர்கள் மட்டுமே நோக்கம் இருக்கும். நாங்கள் உங்கள் டொமைன் தளமாக LDAP அடைவு கிளையின் மேல் நிலை குறிப்பிட மற்றும் அணுகல் கட்டுப்படுத்த தேடல் வடிகட்டி பயன்படுத்த பரிந்துரைக்கிறோம்.",
-  "LDAP_Domain_Search_Filter": "இணைய தேடல் வடிகட்டி",
-  "LDAP_Domain_Search_Filter_Description": "குறிப்பிட்ட, இந்த வடிகட்டி பொருந்தும் என்று பயனர்கள் மட்டுமே நுழைய அனுமதி வேண்டும் என்றால். எந்த வடிகட்டி குறிப்பிடப்பட்டால், குறிப்பிட்ட களப் அடிப்படை எல்லைக்குள் அனைத்து பயனர்கள் உள்நுழைய முடியும். <br/> ஆக்டிவ் டைரக்டரி எ.கா.: memberOf = CN = ROCKET_CHAT, OU = பொது Groups`. <br/> OpenLDAP ஆனது எ.கா (நீடிக்கவும் போட்டியில் தேடல்): OU: DN: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "இணைய தேடல் பொருள் வகை",
-  "LDAP_Domain_Search_Object_Category_Description": "உங்கள் பயனர் அடையாளம் என்று * objectCategory *. <br/> * OpenLDAP ஆனது * காலியாக விடவும். <br/> எ.கா: person`, முதலியன",
-  "LDAP_Domain_Search_Object_Class": "இணைய தேடல் பொருள் வகுப்பு",
-  "LDAP_Domain_Search_Object_Class_Description": "உங்கள் பயனர் அடையாளம் என்று * objectClass *. <br/> எ.கா: organizationalPerson`, `user`,` inetOrgPerson`, முதலியன",
-  "LDAP_Domain_Search_Password": "இணைய தேடல் கடவுச்சொல்",
-  "LDAP_Domain_Search_Password_Description": "டொமைன் தேடல் பயனர் கடவுச்சொல்லை.",
-  "LDAP_Domain_Search_User": "இணைய தேடல் பயனர்",
-  "LDAP_Domain_Search_User_Description": "அவர்கள் உள்நுழையும் போது மற்ற பயனாளிகள் அங்கீகரிக்க பயனர் தேடுதல்களும் செய்கிறது என்று, LDAP பயனர். <br/> இது பொதுவாக மூன்றாம் தரப்பு ஒருங்கிணைவு குறிப்பாக உருவாக்கப்பட்ட ஒரு சேவை கணக்கு உள்ளது. ஒரு முழு தகுதி பெயரை பயன்படுத்த, அத்தகைய CN = நிர்வாகி `என, cn = பயனர்கள், DC = example, dc = com`.",
-  "LDAP_Domain_Search_User_ID": "இணைய தேடல் பயனர் ஐடி",
-  "LDAP_Domain_Search_User_ID_Description": "அங்கீகார முயலும், LDAP பயனர் அடையாளம் என்று ஒரு LDAP பண்பு. இந்த துறையில் `மிக ஆக்டிவ் டைரக்டரி நிறுவலுக்கு sAMAccountName` இருக்க வேண்டும், ஆனால் இது போன்ற OpenLDAP ஆனது போல் மற்ற LDAP, தீர்வுகள், ரூபாய் uid` இருக்கலாம். நீங்கள் மின்னஞ்சல் அல்லது என்ன பண்பு நீங்கள் விரும்பும் மூலம் பயனர் அடையாளம்: mail` பயன்படுத்த முடியும். <br> நீங்கள் செய்த பயனர் பெயர் அல்லது மின்னஞ்சல் போன்ற பல அடையாளங்காட்டிகளானது பயன்படுத்தி உள்நுழைய அனுமதிக்க கமா பிரிக்கப்பட்ட பல மதிப்புகள் பயன்படுத்த முடியும்.",
+  "LDAP_BaseDN_Description": "பயனர்கள் மற்றும் குழுக்களுக்கு தேட வேண்டும் ஒரு LDAP உபபடிநிலை முழுவதும் தகுதியான டிஸ்டிங்கஷ்ட் நேம் (DN). நீங்கள் போன்ற பல சேர்க்க முடியும்; எனினும், ஒவ்வொரு குழு சேர்ந்தவை என்று பயனர்கள் அதே டொமைன் அடிப்படை வரையறுக்கப்பட்டிருக்க வேண்டும். நீங்கள் கட்டுப்படுத்தப்பட்ட பயனர் குழுக்கள் குறிப்பிட்டால், அந்த குழுக்கள் சேர்ந்தவை என்று பயனர்கள் மட்டுமே நோக்கம் இருக்கும். நாங்கள் உங்கள் டொமைன் தளமாக LDAP அடைவு கிளையின் மேல் நிலை குறிப்பிட மற்றும் அணுகல் கட்டுப்படுத்த தேடல் வடிகட்டி பயன்படுத்த பரிந்துரைக்கிறோம்.",
+  "LDAP_User_Search_Field_Description": "அங்கீகார முயலும், LDAP பயனர் அடையாளம் என்று ஒரு LDAP பண்பு. இந்த துறையில் `மிக ஆக்டிவ் டைரக்டரி நிறுவலுக்கு sAMAccountName` இருக்க வேண்டும், ஆனால் இது போன்ற OpenLDAP ஆனது போல் மற்ற LDAP, தீர்வுகள், ரூபாய் uid` இருக்கலாம். நீங்கள் மின்னஞ்சல் அல்லது என்ன பண்பு நீங்கள் விரும்பும் மூலம் பயனர் அடையாளம்: mail` பயன்படுத்த முடியும். <br> நீங்கள் செய்த பயனர் பெயர் அல்லது மின்னஞ்சல் போன்ற பல அடையாளங்காட்டிகளானது பயன்படுத்தி உள்நுழைய அனுமதிக்க கமா பிரிக்கப்பட்ட பல மதிப்புகள் பயன்படுத்த முடியும்.",
+  "LDAP_User_Search_Filter_Description": "குறிப்பிட்ட, இந்த வடிகட்டி பொருந்தும் என்று பயனர்கள் மட்டுமே நுழைய அனுமதி வேண்டும் என்றால். எந்த வடிகட்டி குறிப்பிடப்பட்டால், குறிப்பிட்ட களப் அடிப்படை எல்லைக்குள் அனைத்து பயனர்கள் உள்நுழைய முடியும். <br/> ஆக்டிவ் டைரக்டரி எ.கா.: memberOf = CN = ROCKET_CHAT, OU = பொது Groups`. <br/> OpenLDAP ஆனது எ.கா (நீடிக்கவும் போட்டியில் தேடல்): OU: DN: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "அவர்கள் உள்நுழையும் போது மற்ற பயனாளிகள் அங்கீகரிக்க பயனர் தேடுதல்களும் செய்கிறது என்று, LDAP பயனர். <br/> இது பொதுவாக மூன்றாம் தரப்பு ஒருங்கிணைவு குறிப்பாக உருவாக்கப்பட்ட ஒரு சேவை கணக்கு உள்ளது. ஒரு முழு தகுதி பெயரை பயன்படுத்த, அத்தகைய CN = நிர்வாகி `என, cn = பயனர்கள், DC = example, dc = com`.",
   "LDAP_Enable": "இயக்கு",
   "LDAP_Enable_Description": "அங்கீகார க்கான LDAP பயன்படுத்த முயற்சிக்கும்.",
   "LDAP_Encryption": "குறியாக்க",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "உள்நுழைவு சர்வர் ஒத்திசைந்து பயனர் தரவை வைத்திருக்கவும் (எ.கா.: பெயர், மின்னஞ்சல்).",
   "LDAP_Sync_User_Data_FieldMap": "பயனர் தகவல்கள் களம் வரைபடம்",
   "LDAP_Sync_User_Data_FieldMap_Description": "பயனர் கணக்கு துறைகள் (மின்னஞ்சல் போன்ற) LDAP இல் ஒரு சாதனை இருந்து மக்கள் எப்படி கட்டமைக்க (ஒரு முறை காணப்படுகிறது). <br/> உதாரணமாக, `{\" cn \"என்பது:\" பெயர் \",\" மெயில் \":\" மின்னஞ்சல் \"}: CN பண்பு இருந்து ஒரு நபரின் மனித வாசிக்கக்கூடிய பெயர், மற்றும் மெயில் பண்பு தங்கள் மின்னஞ்சல் தேர்வு செய்யும். <br/> கிடைக்க துறைகள் name`, மற்றும் `email` அடங்கும்:.",
-  "LDAP_Sync_Users": "ஒத்திசைவு பயனர்கள்",
   "LDAP_Test_Connection": "சோதனை இணைப்பு",
   "LDAP_Unique_Identifier_Field": "தனித்துவ அடையாளங்காட்டி களம்",
   "LDAP_Unique_Identifier_Field_Description": "எந்த துறையில், LDAP பயனர் மற்றும் Rocket.Chat பயனர் இணைக்க பயன்படுத்தப்படும். நீங்கள் ஒரு LDAP சாதனை இருந்து மதிப்பு பெற முயற்சி செய்ய கமா பிரிக்கப்பட்ட பல மதிப்புகள் தெரிவிக்க முடியும். <br/> இயல்புநிலை மதிப்பு `objectGUID, IBM-என்ட்ரி UUID, GUID அகம், dominoUNID, nsuniqueId, uidNumber` ஆகும்",
-  "LDAP_Use_Custom_Domain_Search": "விருப்ப இணைய தேடல் பயன்படுத்தவும்",
-  "LDAP_Use_Custom_Domain_Search_Description": "LDAP சர்வர் உள்ள பயனர்கள் தேட உங்கள் சொந்த வடிகட்டி எழுது.",
   "LDAP_Username_Field": "பயனர்பெயர் துறையில்",
   "LDAP_Username_Field_Description": "எந்த துறையில் * பயனர் பெயர் * புதிய பயனர்கள் பயன்படுத்தப்படும். உள்நுழைவு பக்கத்தில் தகவல் பயனர் பெயர் பயன்படுத்த காலியாக விடவும். <br/> நீங்கள் `# {givenName} போல், மிக டெம்ப்ளேட் குறிச்சொற்களை பயன்படுத்த முடியும். # {SN}:. <br/> இயல்புநிலை மதிப்பு `sAMAccountName` உள்ளது.",
   "Leave_Group_Warning": "குழு \" %s\" பதில் விட்டு வெளியேற வேண்டும் என்பதில் உறுதியாக இருக்கிறீர்களா?",
diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json
index d156b44703a..5627914a5dd 100644
--- a/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -661,31 +661,18 @@
   "Layout_Terms_of_Service": "Kullanım Koşulları",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Sertifika",
-  "LDAP_Custom_Domain_Search": "Özel Alan Arama",
-  "LDAP_Custom_Domain_Search_Description": "bağlama ve bağlantı bilgileri yönetir ve form olan JSON bir parça: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "varsayılan Etki Alanı",
   "LDAP_Description": "Birden çok site ve hizmetler arasında bir parola paylaşımı için bir tesis - LDAP birçok şirket üzerinde tek oturum sağlamak için kullanmak hiyerarşik veritabanı. https://rocket.chat/docs/administrator-guides/authentication/ldap/: gelişmiş yapılandırma bilgi ve örnekler için, bizim wiki danışın.",
-  "LDAP_Domain_Base": "Alan Bankası",
-  "LDAP_Domain_Base_Description": "Eğer kullanıcılar ve gruplar için aramak istediğiniz bir LDAP alt ağacının tam ayırt edici ad (DN). İstediğiniz kadar ekleyebilirsiniz; Ancak, her grup kendisine ait kullanıcılarıyla aynı etki tabanı tanımlanmış olmalıdır. Eğer kısıtlı kullanıcı grupları belirtirseniz, bu gruplara ait sadece kullanıcıların kapsamında olacak. Size etki temel olarak LDAP dizin ağacının üst düzeyini belirlemek ve erişim kontrolü için arama filtresi kullanmanızı öneririz.",
-  "LDAP_Domain_Search_Filter": "Domain Arama Filtresi",
-  "LDAP_Domain_Search_Filter_Description": "Bu filtreyle eşleşen belirtilen, sadece kullanıcıların oturum izin verilecek olursa filtre belirtilirse., belirtilen etki alanı tabanının kapsamındaki tüm kullanıcılar oturum mümkün olacak. <br/> Active Directory örneğin `memberOf = cn = ROCKET_CHAT, ou = Genel gruplarının iş. <br/> OpenLDAP için (örn genişletilebilir maç arama) `ou: dn: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Domain Arama Nesne Kategori",
-  "LDAP_Domain_Search_Object_Category_Description": "senin kullanıcıları tanımlamak * objectCategory *. <br/> * OpenLDAP * için boş bırakın. <br/> Örneğin, 'person` vs.",
-  "LDAP_Domain_Search_Object_Class": "Domain Arama nesne sınıfı",
-  "LDAP_Domain_Search_Object_Class_Description": "senin kullanıcıları tanımlamak * objectclass *. <br/> Örneğin, 'organizationalPerson`,' user`, 'inetOrgPerson` vs.",
-  "LDAP_Domain_Search_Password": "Domain Arama Şifre",
-  "LDAP_Domain_Search_Password_Description": "etki alanı arama kullanıcının parolası.",
-  "LDAP_Domain_Search_User": "Domain Arama Kullanıcı",
-  "LDAP_Domain_Search_User_Description": "oturum açtıklarında diğer kullanıcıların kimliğini doğrulamak için kullanıcı aramaları gerçekleştiren LDAP kullanıcı. <br/> Bu genellikle üçüncü parti entegrasyonları için özel olarak oluşturulan bir hizmet hesabıdır. Bir tam adını kullanın, örneğin cn = Yönetici 'olarak, cn Kullanıcıları, dc = Örnek, dc = com` =.",
-  "LDAP_Domain_Search_User_ID": "Domain Arama Kullanıcı Kimliği",
-  "LDAP_Domain_Search_User_ID_Description": "kimlik girişimleri LDAP kullanıcı tanımlayan LDAP özelliği. Bu alan `en Active Directory yüklemeleri için sAMAccountName` olmalı, ama böyle OpenLDAP gibi diğer LDAP çözümleri için` uid` olabilir. E-posta ya da her türlü özellik istediğiniz kullanıcıları tanımlamak için `mail` kullanabilirsiniz. <br> Kullanıcıların kullanıcı adı veya e-posta gibi çoklu tanımlayıcıları kullanarak giriş için izin virgülle ayrılmış birden fazla değer kullanabilirsiniz.",
+  "LDAP_BaseDN_Description": "Eğer kullanıcılar ve gruplar için aramak istediğiniz bir LDAP alt ağacının tam ayırt edici ad (DN). İstediğiniz kadar ekleyebilirsiniz; Ancak, her grup kendisine ait kullanıcılarıyla aynı etki tabanı tanımlanmış olmalıdır. Eğer kısıtlı kullanıcı grupları belirtirseniz, bu gruplara ait sadece kullanıcıların kapsamında olacak. Size etki temel olarak LDAP dizin ağacının üst düzeyini belirlemek ve erişim kontrolü için arama filtresi kullanmanızı öneririz.",
+  "LDAP_User_Search_Field_Description": "kimlik girişimleri LDAP kullanıcı tanımlayan LDAP özelliği. Bu alan `en Active Directory yüklemeleri için sAMAccountName` olmalı, ama böyle OpenLDAP gibi diğer LDAP çözümleri için` uid` olabilir. E-posta ya da her türlü özellik istediğiniz kullanıcıları tanımlamak için `mail` kullanabilirsiniz. <br> Kullanıcıların kullanıcı adı veya e-posta gibi çoklu tanımlayıcıları kullanarak giriş için izin virgülle ayrılmış birden fazla değer kullanabilirsiniz.",
+  "LDAP_User_Search_Filter_Description": "Bu filtreyle eşleşen belirtilen, sadece kullanıcıların oturum izin verilecek olursa filtre belirtilirse., belirtilen etki alanı tabanının kapsamındaki tüm kullanıcılar oturum mümkün olacak. <br/> Active Directory örneğin `memberOf = cn = ROCKET_CHAT, ou = Genel gruplarının iş. <br/> OpenLDAP için (örn genişletilebilir maç arama) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "oturum açtıklarında diğer kullanıcıların kimliğini doğrulamak için kullanıcı aramaları gerçekleştiren LDAP kullanıcı. <br/> Bu genellikle üçüncü parti entegrasyonları için özel olarak oluşturulan bir hizmet hesabıdır. Bir tam adını kullanın, örneğin cn = Yönetici 'olarak, cn Kullanıcıları, dc = Örnek, dc = com` =.",
   "LDAP_Enable": "Etkinleştir",
   "LDAP_Enable_Description": "Kimlik doğrulama için LDAP kullanmak için deneyin.",
   "LDAP_Encryption": "Şifreleme",
   "LDAP_Encryption_Description": "LDAP sunucusuna iletişim güvenliğini sağlamak için kullanılan şifreleme yöntemi. Örnekler `plain` (hiçbir şifreleme), (baştan şifreli)` SSL / LDAPS` ve `StartTLS` (şifreli iletişim için bir kez bağlı yükseltme) içerir.",
   "LDAP_Host": "evsahibi",
   "LDAP_Host_Description": "LDAP ana örneğin 'ldap.example.com` ya da' 10.0.0.30`.",
-  "LDAP_Import_Users": "LDAP Kullanıcılarını İçe Aktar",
   "LDAP_Merge_Existing_Users": "Varolan Kullanıcıları Birleştir",
   "LDAP_Port": "LDAP Port",
   "LDAP_Port_Description": "Liman LDAP erişmek için. LDAPS için `389` ya da '636`: örneğin",
@@ -695,12 +682,9 @@
   "LDAP_Sync_User_Data_Description": "girişte sunucu ile senkronize kullanıcı verilerini tutmak (örneğin: isim, e-posta).",
   "LDAP_Sync_User_Data_FieldMap": "Kullanıcı Veri Alanı Haritası",
   "LDAP_Sync_User_Data_FieldMap_Description": "Kullanıcı hesabı alanları (e-posta gibi) LDAP rekor doldurulur nasıl yapılandırma (bir kez bulundu). <br/> Bir örnek olarak, `{\" cn \":\" ad \",\" posta \":\" e-posta \"}` cn özniteliği bir kişinin insan okunabilir adı ve posta özniteliği kendi e-posta seçecektir. <br/> Mevcut alanları name` ve 'email`' içerir.",
-  "LDAP_Sync_Users": "Senkronizasyon Kullanıcılar",
   "LDAP_Test_Connection": "Test bağlantısı",
   "LDAP_Unique_Identifier_Field": "Benzersiz Tanımlayıcı Alan",
   "LDAP_Unique_Identifier_Field_Description": "Hangi alan LDAP kullanıcı ve Rocket.Chat kullanıcıyı bağlamak için kullanılacaktır. LDAP kaydından değerini almak için denemek için virgülle ayrılmış birden fazla değer bilgilendirebilir. <br/> Varsayılan değer `Objectguıd, IBM-entryUUID, GUID, dominoUNID, nsuniqueId, uidNumber` olduğunu",
-  "LDAP_Use_Custom_Domain_Search": "Özel Alan Arama kullanın",
-  "LDAP_Use_Custom_Domain_Search_Description": "LDAP sunucusunda kullanıcıları aramak için kendi filtresini yazın.",
   "LDAP_Username_Field": "Adı Alan",
   "LDAP_Username_Field_Description": "Hangi alan yeni kullanıcılar için * kullanıcı adı * olarak kullanılacaktır. giriş sayfasında haberdar adını kullanmak için boş bırakın. <br/> Sen # {givenName} `gibi, çok şablon etiketlerini kullanabilirsiniz. # {Sn}`. <br/> Varsayılan değer `sAMAccountName` olduğunu.",
   "Leave_Group_Warning": "Eğer grup \" %s\" ayrılmak istediğinize emin misiniz?",
diff --git a/packages/rocketchat-i18n/i18n/ug.i18n.json b/packages/rocketchat-i18n/i18n/ug.i18n.json
index f0bc7998c97..c87d127725a 100644
--- a/packages/rocketchat-i18n/i18n/ug.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ug.i18n.json
@@ -563,24 +563,12 @@
   "Layout_Terms_of_Service": "مۇلازىمەت تارمىقى",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA گۇۋاھنامىسى",
-  "LDAP_Custom_Domain_Search": "ئۆزى بېكىتكەن تورنامى ئىزدەش شەرتى",
-  "LDAP_Custom_Domain_Search_Description": "<br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>:سانلىق مەلۇماتنى مۇنداق باشقۇرىمىزJSONئۇچۇر باغلانغان ۋە ئۇلانغان",
   "LDAP_Default_Domain": "بەلگىلەنگەن تور نامى",
   "LDAP_Description": "ئادەتتە شىركەتلەر تەرىپىدىن ئاددىي نۇقتا كىرىش مېخانىزىمى قىلىپ قوللىنىدۇ .بۇ خىلمېخانىزىم بىر ئەزانى ئوخشاش بىر يۈرۈش ھېسابات نومۇرى ۋە مەخپىي نومۇر ئارقىلىق كۆپلىگەن تور بەت ۋەمۇلازىمەتكە كىرگىلى بولىدۇ.كۆپلىگەن LDAPگۇۋاھنامىسىنى تەڭشەش ۋە مىساللىرىنى ئىچكىرى چۈشەنمەكچى بولسىڭىز بىزنىڭ wikiتور بېتىمىزدىن پايدىلانسىڭىز بولىدۇ https://rocket.chat/docs/administrator-guides/authentication/ldap/ (ېنىك مۇندەرىجىنى زىيارەت قىلىش كېلىشىمى)LDAP",
-  "LDAP_Domain_Base": "ئاساس تور بەت نامى",
-  "LDAP_Domain_Base_Description": ".تىكى يۇقىرى دەرىجىلىك مۇندەرىجىنى ئاساسىي تورنامى قىلىپ ئىشلىتىشنى تەكلىپ قىلىمىز .تۆۋەنكى 'بەلگىلەنگەن تورنامى ئىزدەش'تاللاش شەرتىگە ئاساسەن ئەزا چەكلەش ئېلىپ بېرىڭ. .LDAP .ئاستىدىكى ئەزانىلا ئىزدىيەلەيدۇ.DNنىڭ ئاساسىي تور نامى بولىشىنى ئەگەر سىز چەكلىگەن بولسىڭىز بۇ ۋاقىتتا پەقەت بۇ DN.نى سىز كۆپرەپ قاتسىڭىز بولىدۇ لېكىن گۇرۇپپا ۋە گۇرۇپپا ئىچىدە ئەزا نامى چوقۇم بىر تورنامى ئاستىدا بولىشى كېرەك DN .نىڭ تارماق دەرىخى ئىچىدىن ئەزا ۋە گۇرۇپ ئىزدىشىگە قولايلىق بولىدۇ .LDAP نىڭ DNبۇنداق بولغاندا （Domain Base）نى تولدۇرۇپ ئۇنى ئاساسى توربەت نامىد قىددلىڭ ،DNئىناۋەتلىك",
-  "LDAP_Domain_Search_Filter": "تاللاش شەرتى",
-  "LDAP_Domain_Search_Filter_Description": "`memberOf=cn=ROCKET_CHAT,ou=General Groups`。<br/>OpenLDAP (extensible match search) `ou:dn:=ROCKET_CHAT`تورنامىWindows AD<br/>مەسلەن <br/> تىكى ھەممە ئەزا كىرەلەيدۇ domain base ئەگەر بۇ يەردە تاللاش شەرتىنى بېكىتسىڭىز ،پەقەت شەرتكە توشقان ئەزالا كىرەلەيدۇ. ئەگەر بەلگىلەنگەن تاللاش شەرتى بولسا",
-  "LDAP_Domain_Search_Object_Category": "نى ئىزدەشobjectCategoryئەزا ئىشلەتكەن",
-  "LDAP_Domain_Search_Object_Category_Description": "دەپ ئايرىيمىز.`person`غا كۆپ ۋاقىتتا Windows AD مەسلەن:<br/> ئىشلىتىلسە بۇ ئورۇن قۇرۇق قالىدۇ. *OpenLDAP*ئەگەر <br/>نى كىرگۈزۈڭ *objectCategory*ئىچىدە ئەزا تونۇشقا ئىشلىتىلىدىغان LDAP",
-  "LDAP_Domain_Search_Object_Class": "نى ئىزدەشobjectCategory",
-  "LDAP_Domain_Search_Object_Class_Description": "لاردەك.`user`،`organizationalPerson`，`inetOrgPerson`مەسىلەن:<br/>نى كىرگۈزۈڭ .*objectclass* دە ئەزا تونۇشقا ئىشلىتىلىدىغان LDAP",
-  "LDAP_Domain_Search_Password": "تورنامى باشقۇرغۇچىنىڭ مەخپىي نومۇرى",
-  "LDAP_Domain_Search_Password_Description": "نىڭ مەخپىي نومۇرىLDAPتورنامى باشقۇرغۇچى",
-  "LDAP_Domain_Search_User": "تورنامى باشقۇرغۇچى",
-  "LDAP_Domain_Search_User_Description": "`cn=Administrator,cn=Users,dc=Example,dc=com`دە ئۈچىنچى تەرەپنىڭ توپلىشىشى ئۈچۈن قۇرۇلغان ھېسابات نومۇرى. ئىناۋەتلىك بولغان پۈتۈن ئىسىم ئىشلىتىڭ مەسىلەن: . LDAP كۆپ ئەھۋالدا ، ئۇ ئەزا <br/>نىڭ ئىچىدە ئىزدەش ۋە دەلىللەش رولىنى ئۆتەيدۇ.LDAP ئەزا باشقا ئەزالار كىرگەن چاغدا LDAP بۇ",
-  "LDAP_Domain_Search_User_ID": "ھېسابات نومۇرى دەلىللەش خەت بۆلىكى",
-  "LDAP_Domain_Search_User_ID_Description": "نى ئىشلەتسە بولىدۇ .`sAMAccountName,mail` مەسلەن بىر ۋاقىتتا ئوخشاش ئەزا نامى ۋە ئىلخەت ئادرېسىنى دەللىلەش ھېسابات نومۇرى قىلسا، <br>ئەگەر بىر ۋاقىتتا كۆپ خىل دەلىللەش ئىشلىتىلسە ، پەش ئارقىلىق خەت بۆلەك ئىسمىنى ئايرىپ تۇرسا بولىدۇ .<br>خەت بۆلىكىنى ئىشلىتىشى مۇمكىن .`uid` بولسا OpenLDAP ھەل قىلىش پىلانلىرى مەسلەن LDAPخەت بۆلىكى ئىشلىتىدۇ .لېكىن باشقا `sAMAccountName` نى ئېلىپ ئېيتقاندا ، كۆپ ئەھۋالدا Windows AD خۇسۇسىيتى كىرگۈچىنىڭ خەت بۆلىكىنى تونۇشقا ئىشلىتىلىدۇ.LDAPبۇ",
+  "LDAP_BaseDN_Description": ".تىكى يۇقىرى دەرىجىلىك مۇندەرىجىنى ئاساسىي تورنامى قىلىپ ئىشلىتىشنى تەكلىپ قىلىمىز .تۆۋەنكى 'بەلگىلەنگەن تورنامى ئىزدەش'تاللاش شەرتىگە ئاساسەن ئەزا چەكلەش ئېلىپ بېرىڭ. .LDAP .ئاستىدىكى ئەزانىلا ئىزدىيەلەيدۇ.DNنىڭ ئاساسىي تور نامى بولىشىنى ئەگەر سىز چەكلىگەن بولسىڭىز بۇ ۋاقىتتا پەقەت بۇ DN.نى سىز كۆپرەپ قاتسىڭىز بولىدۇ لېكىن گۇرۇپپا ۋە گۇرۇپپا ئىچىدە ئەزا نامى چوقۇم بىر تورنامى ئاستىدا بولىشى كېرەك DN .نىڭ تارماق دەرىخى ئىچىدىن ئەزا ۋە گۇرۇپ ئىزدىشىگە قولايلىق بولىدۇ .LDAP نىڭ DNبۇنداق بولغاندا （Domain Base）نى تولدۇرۇپ ئۇنى ئاساسى توربەت نامىد قىددلىڭ ،DNئىناۋەتلىك",
+  "LDAP_User_Search_Field_Description": "نى ئىشلەتسە بولىدۇ .`sAMAccountName,mail` مەسلەن بىر ۋاقىتتا ئوخشاش ئەزا نامى ۋە ئىلخەت ئادرېسىنى دەللىلەش ھېسابات نومۇرى قىلسا، <br>ئەگەر بىر ۋاقىتتا كۆپ خىل دەلىللەش ئىشلىتىلسە ، پەش ئارقىلىق خەت بۆلەك ئىسمىنى ئايرىپ تۇرسا بولىدۇ .<br>خەت بۆلىكىنى ئىشلىتىشى مۇمكىن .`uid` بولسا OpenLDAP ھەل قىلىش پىلانلىرى مەسلەن LDAPخەت بۆلىكى ئىشلىتىدۇ .لېكىن باشقا `sAMAccountName` نى ئېلىپ ئېيتقاندا ، كۆپ ئەھۋالدا Windows AD خۇسۇسىيتى كىرگۈچىنىڭ خەت بۆلىكىنى تونۇشقا ئىشلىتىلىدۇ.LDAPبۇ",
+  "LDAP_User_Search_Filter_Description": "`memberOf=cn=ROCKET_CHAT,ou=General Groups`。<br/>OpenLDAP (extensible match search) `ou:dn:=ROCKET_CHAT`تورنامىWindows AD<br/>مەسلەن <br/> تىكى ھەممە ئەزا كىرەلەيدۇ domain base ئەگەر بۇ يەردە تاللاش شەرتىنى بېكىتسىڭىز ،پەقەت شەرتكە توشقان ئەزالا كىرەلەيدۇ. ئەگەر بەلگىلەنگەن تاللاش شەرتى بولسا",
+  "LDAP_Authentication_UserDN_Description": "`cn=Administrator,cn=Users,dc=Example,dc=com`دە ئۈچىنچى تەرەپنىڭ توپلىشىشى ئۈچۈن قۇرۇلغان ھېسابات نومۇرى. ئىناۋەتلىك بولغان پۈتۈن ئىسىم ئىشلىتىڭ مەسىلەن: . LDAP كۆپ ئەھۋالدا ، ئۇ ئەزا <br/>نىڭ ئىچىدە ئىزدەش ۋە دەلىللەش رولىنى ئۆتەيدۇ.LDAP ئەزا باشقا ئەزالار كىرگەن چاغدا LDAP بۇ",
   "LDAP_Enable": "قوزغىتىش",
   "LDAP_Enable_Description": "ئارقىلىق سالاھىيەتنى تەكشۈرۈشنى سىناش.LDAP",
   "LDAP_Encryption": "مەخپىيلەشتۈرۈش ئۇسۇلى",
@@ -595,12 +583,9 @@
   "LDAP_Sync_User_Data_Description": "(مەسىلەن ، ئىسىم فامىلە ، ئىلخەت ئادرېس.) كىرگەندە ئەزانىڭ سانلىق مەلۇماتى بىلەن مۇلازىمىتېرنى قەدەملەشتۈرۈش",
   "LDAP_Sync_User_Data_FieldMap": "ئەزانىڭ سانلىق مەلۇمات بۆلىكىنى قايتۇرما ئەكس ئېتىش",
   "LDAP_Sync_User_Data_FieldMap_Description": "设置用户数据字段（比如 E-mail）来自 LDAP 何处（如果能找到）。 <br/>；例如：`{\"cn\":\"name\", \"mail\":\"email\"}` 会从属性 cn 中取出名字字段，从 mail 属性中取出 email 字段。<br/>有效字段包括 `name` 和 `email`。",
-  "LDAP_Sync_Users": "同步用户",
   "LDAP_Test_Connection": "ئۇلاشنى سىناش",
   "LDAP_Unique_Identifier_Field": "بىردىنبىر تونۇيدىغان خەت بۆلىكى",
   "LDAP_Unique_Identifier_Field_Description": "`objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber` بەلگىلەنگەن قىممتى بولسا : <br/> تىكى ئەزا ئۇچۇرىنى ئۇلاش Rocket.Chat ۋە LDAPقايسى خەت بۆلىكىنى ئىشلىتىپ",
-  "LDAP_Use_Custom_Domain_Search": "ئۆزى بەلگىلىگەن تور نامى ئىزدەشنى ئىشلىتىش",
-  "LDAP_Use_Custom_Domain_Search_Description": "مۇلازىمىتېردە ئەزا ئىزدەشتىكى تاللاش شەرتلىرىنى كىرگۈزۈڭ .LDAP",
   "LDAP_Username_Field": "ئەزا ئىسمى خەت بۆلىكى",
   "LDAP_Username_Field_Description": "`sAMAccountName`بەلگىلەنگەن خەت بۆلىكى بولسا <br/>`#{givenName}.#{sn}`خەتكۈچ ئۈلگىسى ئىشلەتسىڭىز بولىدۇ ، مەسلەن <br/>*ئەزا ئىسمى* قايسى خەت بۆلەك قىممىتىنى قىلىپ ئىشلىتىش ئەگەر كىرىش بېتىدىكى ئەزا نامىنى ئىشلەتكەن بولسا بوش ئورۇن قويۇڭ .LDAP يېڭى ئەزانىڭ كىرىشىنى بېكىتكەندە",
   "Leave_Group_Warning": "ئەزا گۇرۇپپىسىدىن ئايرىلىشنى جەزملەشتۈردىڭىزمۇ ؟ “%s”سىز",
diff --git a/packages/rocketchat-i18n/i18n/uk.i18n.json b/packages/rocketchat-i18n/i18n/uk.i18n.json
index 1e190f7f6dc..e6373e31d52 100644
--- a/packages/rocketchat-i18n/i18n/uk.i18n.json
+++ b/packages/rocketchat-i18n/i18n/uk.i18n.json
@@ -567,24 +567,12 @@
   "Layout_Terms_of_Service": "Умови обслуговування",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA Cert",
-  "LDAP_Custom_Domain_Search": "Пошук Персональний домен",
-  "LDAP_Custom_Domain_Search_Description": "Шматок JSON, який регулює прив'язку і підключення до інформації і має вигляд: <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "Домен за замовчуванням",
   "LDAP_Description": "LDAP є ієрархічною базу даних, що багато компаній використовують для забезпечення єдиного входу - об'єкта для спільного використання одного пароля між декількома сайтами і послугами. Для отримання попередньої інформації про конфігурацію і приклади, будь ласка, зверніться до нашої вікі: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "базовий домен",
-  "LDAP_Domain_Base_Description": "Повний відмітна ім'я (DN) з поддерева LDAP, який потрібно для пошуку користувачів і груп. Ви можете додати стільки, скільки вам подобається; Проте, кожна група повинна бути визначена в тому ж домені, що і базою користувачів, які належать до нього. Якщо вказати обмежені групи користувачів, тільки користувачі, що належать до цих груп буде знаходитися в області видимості. Ми рекомендуємо вам вказати верхній рівень вашого LDAP дерева каталогів в якості домену бази і використовувати фільтр пошуку для управління доступом.",
-  "LDAP_Domain_Search_Filter": "Фільтр пошуку домену",
-  "LDAP_Domain_Search_Filter_Description": "Якщо вказано, тільки ті користувачі, які відповідають цьому фільтру буде дозволено увійти в систему. Якщо не вказано ні один фільтр, всі користувачі в межах обсягу зазначеного домену бази матиме можливість увійти в систему. <br/> Наприклад, для Active Directory `memberOf = сп = ROCKET_CHAT, НУ = Загальні Groups`. <br/> Наприклад, для OpenLDAP (розширюваний пошук матчу) `НУ: дп: = ROCKET_CHAT`.",
-  "LDAP_Domain_Search_Object_Category": "Домен Об'єкт пошуку Категорія",
-  "LDAP_Domain_Search_Object_Category_Description": "* ObjectCategory *, які ідентифікують користувачів. <br/> Залиште порожнім * * OpenLDAP. <br/> Наприклад, `person` і т.д.",
-  "LDAP_Domain_Search_Object_Class": "Домен Клас Об'єкт пошуку",
-  "LDAP_Domain_Search_Object_Class_Description": "* ObjectClass *, які ідентифікують користувачів. <br/> Наприклад, `organizationalPerson`,` user`, `inetOrgPerson` і т.д.",
-  "LDAP_Domain_Search_Password": "Домен пошуку пароля",
-  "LDAP_Domain_Search_Password_Description": "Пароль для користувача пошуку домену.",
-  "LDAP_Domain_Search_User": "Домен Пошук користувача",
-  "LDAP_Domain_Search_User_Description": "Користувач LDAP, який виконує операцій пошуку користувачів для аутентифікації інших користувачів, коли вони підписують в. <br/> Як правило, це обліковий запис служби, створена спеціально для сторонніх інтеграції. Використовуйте повне ім'я, наприклад `CN = Administrator, CN = Users, DC = Example, DC = com`.",
-  "LDAP_Domain_Search_User_ID": "Пошук домена Ідентифікатор користувача",
-  "LDAP_Domain_Search_User_ID_Description": "Атрибут LDAP, який ідентифікує користувача LDAP, який намагається аутентифікацію. Це поле повинно бути `sAMAccountName` для установки найбільш Active Directory, але це може бить` uid` для інших рішень LDAP, таких як OpenLDAP. Ви можете використовувати `mail` для ідентифікації користувачів по електронній пошті або будь-який інший атрибут ви хочете. <br> Можна використовувати декілька значень, розділених комами, щоб дозволити користувачам увійти в систему, використовуючи кілька ідентифікаторів, таких як ім'я користувача або адресу електронної пошти.",
+  "LDAP_BaseDN_Description": "Повний відмітна ім'я (DN) з поддерева LDAP, який потрібно для пошуку користувачів і груп. Ви можете додати стільки, скільки вам подобається; Проте, кожна група повинна бути визначена в тому ж домені, що і базою користувачів, які належать до нього. Якщо вказати обмежені групи користувачів, тільки користувачі, що належать до цих груп буде знаходитися в області видимості. Ми рекомендуємо вам вказати верхній рівень вашого LDAP дерева каталогів в якості домену бази і використовувати фільтр пошуку для управління доступом.",
+  "LDAP_User_Search_Field_Description": "Атрибут LDAP, який ідентифікує користувача LDAP, який намагається аутентифікацію. Це поле повинно бути `sAMAccountName` для установки найбільш Active Directory, але це може бить` uid` для інших рішень LDAP, таких як OpenLDAP. Ви можете використовувати `mail` для ідентифікації користувачів по електронній пошті або будь-який інший атрибут ви хочете. <br> Можна використовувати декілька значень, розділених комами, щоб дозволити користувачам увійти в систему, використовуючи кілька ідентифікаторів, таких як ім'я користувача або адресу електронної пошти.",
+  "LDAP_User_Search_Filter_Description": "Якщо вказано, тільки ті користувачі, які відповідають цьому фільтру буде дозволено увійти в систему. Якщо не вказано ні один фільтр, всі користувачі в межах обсягу зазначеного домену бази матиме можливість увійти в систему. <br/> Наприклад, для Active Directory `memberOf = сп = ROCKET_CHAT, НУ = Загальні Groups`. <br/> Наприклад, для OpenLDAP (розширюваний пошук матчу) `НУ: дп: = ROCKET_CHAT`.",
+  "LDAP_Authentication_UserDN_Description": "Користувач LDAP, який виконує операцій пошуку користувачів для аутентифікації інших користувачів, коли вони підписують в. <br/> Як правило, це обліковий запис служби, створена спеціально для сторонніх інтеграції. Використовуйте повне ім'я, наприклад `CN = Administrator, CN = Users, DC = Example, DC = com`.",
   "LDAP_Enable": "включити",
   "LDAP_Enable_Description": "Спроба використовувати LDAP для аутентифікації.",
   "LDAP_Encryption": "шифрування",
@@ -599,12 +587,9 @@
   "LDAP_Sync_User_Data_Description": "Зберігати дані користувача в синхронізації з сервером при вході в систему (наприклад: ім'я, адреса електронної пошти).",
   "LDAP_Sync_User_Data_FieldMap": "Дані користувача Карта Поле",
   "LDAP_Sync_User_Data_FieldMap_Description": "Налаштування, як поля облікових записів користувачів (наприклад, електронної пошти) заповнюються із запису в LDAP (колись знайшла). <br/> Як приклад, `{\" сп \":\" ім'я \",\" пошта \":\" електронна пошта \"}` буде вибрати удобочитаем ім'я людини з атрибута CN, і їх електронну пошту від атрибута пошти. <br/> Доступні поля включають `name` і` email`.",
-  "LDAP_Sync_Users": "Синхронізація користувачів",
   "LDAP_Test_Connection": "Пров.соед",
   "LDAP_Unique_Identifier_Field": "Унікальний ідентифікатор поля",
   "LDAP_Unique_Identifier_Field_Description": "Яке поле буде використовуватися для з'єднання користувача LDAP і користувач Rocket.Chat. Ви можете повідомити кілька значень, розділених комою, щоб спробувати отримати значення з записи LDAP. <br/> Значення за замовчуванням є `ObjectGUID, IBM-entryUUID, ідентифікатор GUID, dominoUNID, nsuniqueId, uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "Використовуйте Пошук користувальницьких доменів",
-  "LDAP_Use_Custom_Domain_Search_Description": "Напишіть свій власний фільтр для пошуку користувачів на сервері LDAP.",
   "LDAP_Username_Field": "Ім'я користувача поле",
   "LDAP_Username_Field_Description": "Яке поле буде використовуватися в якості * Ім'я користувача * для нових користувачів. Залиште порожнім, щоб використовувати ім'я користувача повідомляється на сторінці входу. <br/> Ви можете використовувати теги шаблонів теж, як `#{givenName}.#{sn}`. <br/> Значення за замовчуванням є `sAMAccountName`.",
   "Leave_Group_Warning": "Ви впевнені, що хочете залишити групу \" %s\"?",
diff --git a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index a0607abd136..201bd8c9884 100644
--- a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -568,24 +568,12 @@
   "Layout_Terms_of_Service": "服務條款",
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA證書",
-  "LDAP_Custom_Domain_Search": "自定義域搜索",
-  "LDAP_Custom_Domain_Search_Description": "一塊JSON的管轄綁定和連接信息，並為下面的形式： <br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "默認域",
   "LDAP_Description": "LDAP is a hierarchical database that many companies use to provide single sign on - a facility for sharing one password between multiple sites and services. For advanced configuration information and examples, please consult our wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
-  "LDAP_Domain_Base": "域基",
-  "LDAP_Domain_Base_Description": "要搜索用戶和組的LDAP子樹的完全合格的名稱（DN）。您可以添加你喜歡的盡可能多的;然而，每一組必須在相同的域中鹼作為屬於它的用戶來定義。如果指定了受限制的用戶群體，只有屬於這些組的用戶將在範圍內。我們建議您指定的LDAP目錄樹的頂層為您的域名基地，並使用搜索過濾器來控制訪問。",
-  "LDAP_Domain_Search_Filter": "域搜索過濾器",
-  "LDAP_Domain_Search_Filter_Description": "如果指定，只有符合此過濾器，用戶將被允許登錄。如果沒有指定過濾器，指定域的基本範圍內的所有用戶都將能夠登錄。 <br/>例如，對於Active Directory的`的memberOf = CN = ROCKET_CHAT，OU =一般Groups`。 <br/>例如，OpenLDAP（可擴展匹配搜索）`OU：DN：= ROCKET_CHAT`。",
-  "LDAP_Domain_Search_Object_Category": "域名查詢對象類別",
-  "LDAP_Domain_Search_Object_Category_Description": "在* objectCategory屬性*標識用戶。 <br/>留空為* OpenLDAP的*。 <br/>比如`person`等。",
-  "LDAP_Domain_Search_Object_Class": "域名查詢對象類",
-  "LDAP_Domain_Search_Object_Class_Description": "在* *對象類標識用戶。 <br/>比如`organizationalPerson`，`user`，`inetOrgPerson`等。",
-  "LDAP_Domain_Search_Password": "域名查詢密碼",
-  "LDAP_Domain_Search_Password_Description": "密碼域搜索用戶。",
-  "LDAP_Domain_Search_User": "域名搜索用戶",
-  "LDAP_Domain_Search_User_Description": "執行用戶查找驗證其他用戶在登錄的LDAP用戶。 <br/>這通常是專為第三方集成創建一個服務帳戶。使用一個完全合格的名稱，比如'CN =管理員，CN =用戶，DC =示例，DC = com`。",
-  "LDAP_Domain_Search_User_ID": "域名查詢用戶ID",
-  "LDAP_Domain_Search_User_ID_Description": "標識誰試圖驗證的LDAP用戶的LDAP屬性。這個字段應`sAMAccountName`對於大多數活動目錄的安裝，但也可以是對其他LDAP解決方案，如OpenLDAP的`uid`。你可以用`mail`通過電子郵件或任何屬性要識別用戶。 <br>您可以使用逗號分隔的多個值，以允許用戶使用多個標識符喜歡的用戶名或郵箱登錄。",
+  "LDAP_BaseDN_Description": "要搜索用戶和組的LDAP子樹的完全合格的名稱（DN）。您可以添加你喜歡的盡可能多的;然而，每一組必須在相同的域中鹼作為屬於它的用戶來定義。如果指定了受限制的用戶群體，只有屬於這些組的用戶將在範圍內。我們建議您指定的LDAP目錄樹的頂層為您的域名基地，並使用搜索過濾器來控制訪問。",
+  "LDAP_User_Search_Field_Description": "標識誰試圖驗證的LDAP用戶的LDAP屬性。這個字段應`sAMAccountName`對於大多數活動目錄的安裝，但也可以是對其他LDAP解決方案，如OpenLDAP的`uid`。你可以用`mail`通過電子郵件或任何屬性要識別用戶。 <br>您可以使用逗號分隔的多個值，以允許用戶使用多個標識符喜歡的用戶名或郵箱登錄。",
+  "LDAP_User_Search_Filter_Description": "如果指定，只有符合此過濾器，用戶將被允許登錄。如果沒有指定過濾器，指定域的基本範圍內的所有用戶都將能夠登錄。 <br/>例如，對於Active Directory的`的memberOf = CN = ROCKET_CHAT，OU =一般Groups`。 <br/>例如，OpenLDAP（可擴展匹配搜索）`OU：DN：= ROCKET_CHAT`。",
+  "LDAP_Authentication_UserDN_Description": "執行用戶查找驗證其他用戶在登錄的LDAP用戶。 <br/>這通常是專為第三方集成創建一個服務帳戶。使用一個完全合格的名稱，比如'CN =管理員，CN =用戶，DC =示例，DC = com`。",
   "LDAP_Enable": "啟用",
   "LDAP_Enable_Description": "嘗試使用 LDAP 進行身份驗證。",
   "LDAP_Encryption": "加密",
@@ -600,12 +588,9 @@
   "LDAP_Sync_User_Data_Description": "在登入時保持與伺服器的使用者資料同步。（例如姓名或電子郵件）",
   "LDAP_Sync_User_Data_FieldMap": "User Data Field Map",
   "LDAP_Sync_User_Data_FieldMap_Description": "如何配置用戶帳戶字段（如電子郵件）是從LDAP記錄填充（一旦發現）。 <br/>作為一個例子，`{“CN”：“姓名”，“郵件”：“電子郵件”}`會選擇從cn屬性一個人的人類可讀的名稱，然後從郵件屬性他們的電子郵件。 <br/>可用字段包括`name`和`email`。",
-  "LDAP_Sync_Users": "同步用戶",
   "LDAP_Test_Connection": "測試連接",
   "LDAP_Unique_Identifier_Field": "唯一標識符字段",
   "LDAP_Unique_Identifier_Field_Description": "哪個字段將被用於向LDAP用戶和Rocket.Chat用戶聯繫起來。您可以告知以逗號分隔的多個值，從而嘗試從LDAP記錄的值。 <br/>默認值是`的objectGUID，IBM-entryUUID，GUID，dominoUNID，nsuniqueId，uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "使用自定義域名查詢",
-  "LDAP_Use_Custom_Domain_Search_Description": "寫自己的過濾器來搜索用戶在LDAP服務器中。",
   "LDAP_Username_Field": "用戶名現場",
   "LDAP_Username_Field_Description": "這將被用於為*用戶名*為新用戶。留空使用的用戶名告知登錄頁面上。 <br/>您可以使用模板標籤太像`#{givenName}.#{sn}`。 <br/>默認值是`sAMAccountName`。",
   "Leave_Group_Warning": "你確定你要離開組“%s”嗎？",
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index 3cc76c682ee..f5efc52c962 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -759,24 +759,12 @@
   "LDAP": "LDAP",
   "LDAP_CA_Cert": "CA 证书",
   "LDAP_Connect_Timeout": "连接超时（ms）",
-  "LDAP_Custom_Domain_Search": "自定义域搜索条件",
-  "LDAP_Custom_Domain_Search_Description": "这样管理信息绑定和连接的 JSON 数据：<br/> <code>{\"filter\": \"(&(objectCategory=person)(objectclass=user)(memberOf=CN=ROCKET_ACCESS,CN=Users,DC=domain,DC=com)(sAMAccountName=#{username}))\", \"scope\": \"sub\", \"userDN\": \"rocket.service@domain.com\", \"password\": \"urpass\"}</code>",
   "LDAP_Default_Domain": "默认域名",
   "LDAP_Description": "LDAP(轻量目录访问协议)是一种层次数据库，常被企业用于提供单点登录机制——该机制允许用户使用同一套帐号密码登录多个网站或服务。想要了解LDAP认证的设置及示例，可参考我们的wiki页： https://rocket.chat/docs/administrator-guides/authentication/ldap/",
-  "LDAP_Domain_Base": "基础域",
-  "LDAP_Domain_Base_Description": "请填写有效的 DN 作为基础域（Domain Base），以便在该DN指向的 LDAP 子树中检索用户和组。您可添加多个DN，但组与组内用户必须定义在同一个基础域中。若您限定了某些 DN 作为基础域，则只能检索到这些DN下的用户。建议使用 LDAP 中的顶级目录作为基础域，配合下面的“自定义域搜索”筛选条件来进行用户的限制。",
-  "LDAP_Domain_Search_Filter": "筛选条件",
-  "LDAP_Domain_Search_Filter_Description": "若在此处指定了筛选条件，则仅有符合条件的用户方可登录。若为指定筛选条件，则 domain base 中的所有用户均可登录。<br/>举例：<br/>Windows AD域 `memberOf=cn=ROCKET_CHAT,ou=General Groups`。<br/>OpenLDAP (extensible match search) `ou:dn:=ROCKET_CHAT`。",
-  "LDAP_Domain_Search_Object_Category": "检索用户所用的objectCategory ",
-  "LDAP_Domain_Search_Object_Category_Description": "请输入 LDAP 中用以识别用户的*objectCategory*。<br/>若使用 *OpenLDAP* 则此项留空。<br/>举例：对于Windows AD，常用分类为`person`。",
-  "LDAP_Domain_Search_Object_Class": "检索用户所用的objectclass",
-  "LDAP_Domain_Search_Object_Class_Description": "请输入 LDAP 中用以识别用户的*objectclass*。<br/>例如：`user`，`organizationalPerson`，`inetOrgPerson`等。",
-  "LDAP_Domain_Search_Password": "域管理员密码",
-  "LDAP_Domain_Search_Password_Description": "域管理员登录 LDAP 的密码",
-  "LDAP_Domain_Search_User": "域管理员",
-  "LDAP_Domain_Search_User_Description": "该LDAP用户将在其他用户登录时被用于在 LDAP 中执行检索和认证。<br/>通常情况下，该用户是在 LDAP 中特地为第三方集成而创建的帐号。请使用有效的全名，如`cn=Administrator,cn=Users,dc=Example,dc=com`。",
-  "LDAP_Domain_Search_User_ID": "帐号认证字段",
-  "LDAP_Domain_Search_User_ID_Description": "该 LDAP 属性是用于识别登录者的字段。对于 Windows AD，通常应使用 `sAMAccountName` 字段，而其他 LDAP 方案（如 OpenLDAP）可能使用 `uid` 字段。假如要使用邮箱地址作为帐号，可使用 `mail` 之类的字段。<br>若要同时使用多种认证字段，可通过逗号分隔字段名。<br>举例：若要同时使用用户名和邮箱作为认证帐号，可使用`sAMAccountName,mail`。",
+  "LDAP_BaseDN_Description": "请填写有效的 DN 作为基础域（Domain Base），以便在该DN指向的 LDAP 子树中检索用户和组。您可添加多个DN，但组与组内用户必须定义在同一个基础域中。若您限定了某些 DN 作为基础域，则只能检索到这些DN下的用户。建议使用 LDAP 中的顶级目录作为基础域，配合下面的“自定义域搜索”筛选条件来进行用户的限制。",
+  "LDAP_User_Search_Field_Description": "该 LDAP 属性是用于识别登录者的字段。对于 Windows AD，通常应使用 `sAMAccountName` 字段，而其他 LDAP 方案（如 OpenLDAP）可能使用 `uid` 字段。假如要使用邮箱地址作为帐号，可使用 `mail` 之类的字段。<br>若要同时使用多种认证字段，可通过逗号分隔字段名。<br>举例：若要同时使用用户名和邮箱作为认证帐号，可使用`sAMAccountName,mail`。",
+  "LDAP_User_Search_Filter_Description": "若在此处指定了筛选条件，则仅有符合条件的用户方可登录。若为指定筛选条件，则 domain base 中的所有用户均可登录。<br/>举例：<br/>Windows AD域 `memberOf=cn=ROCKET_CHAT,ou=General Groups`。<br/>OpenLDAP (extensible match search) `ou:dn:=ROCKET_CHAT`。",
+  "LDAP_Authentication_UserDN_Description": "该LDAP用户将在其他用户登录时被用于在 LDAP 中执行检索和认证。<br/>通常情况下，该用户是在 LDAP 中特地为第三方集成而创建的帐号。请使用有效的全名，如`cn=Administrator,cn=Users,dc=Example,dc=com`。",
   "LDAP_Enable": "启用",
   "LDAP_Enable_Description": "尝试使用 LDAP 进行身份验证。",
   "LDAP_Encryption": "加密方法",
@@ -787,7 +775,6 @@
   "LDAP_Host": "服务器",
   "LDAP_Host_Description": "LDAP服务器的域名或 IP，如 `ldap.example.com` 或 `10.0.0.30`。",
   "LDAP_Idle_Timeout": "空闲超时（ms）",
-  "LDAP_Import_Users": "导入 LDAP 用户",
   "LDAP_Import_Users_Description": "设置为 True，同步过程将导入所有 LDAP 用户。<br/>*小心！* 使用搜索过滤排除那些你不想导入的用户。",
   "LDAP_Login_Fallback": "备用登录",
   "LDAP_Login_Fallback_Description": "如果无法在 LDAP 上成功登录，则尝试在 默认/本地 账户系统上登录。这在 LDAP 服务器因为某些原因宕机时会有帮助。",
@@ -801,12 +788,9 @@
   "LDAP_Sync_User_Data_Description": "登录时保持用户数据和服务器同步（例如：姓名、电子邮箱地址）。",
   "LDAP_Sync_User_Data_FieldMap": "用户数据字段映射",
   "LDAP_Sync_User_Data_FieldMap_Description": "设置用户数据字段（比如 E-mail）来自 LDAP 何处（如果能找到）。 <br/>；例如：`{\"cn\":\"name\", \"mail\":\"email\"}` 会从属性 cn 中取出名字字段，从 mail 属性中取出 email 字段。<br/>有效字段包括 `name` 和 `email`。",
-  "LDAP_Sync_Users": "同步用户",
   "LDAP_Test_Connection": "测试连接",
   "LDAP_Unique_Identifier_Field": "唯一识别字段",
   "LDAP_Unique_Identifier_Field_Description": "使用哪个字段来连接 LDAP 和 Rocket.Chat 的用户信息。可使用逗号分隔的多个字段。<br/>默认值： `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
-  "LDAP_Use_Custom_Domain_Search": "使用自定义的域搜索",
-  "LDAP_Use_Custom_Domain_Search_Description": "请输入在 LDAP 服务器中搜索用户时的筛选条件",
   "LDAP_Username_Field": "用户名字段",
   "LDAP_Username_Field_Description": "指定新用户登录时，使用 LDAP 中哪个字段的值作为*用户名*。若要使用登录页面所用的用户名，请留空。<br/>可使用模版标签，比如 `#{givenName}.#{sn}`。<br/>默认字段为 `sAMAccountName`。",
   "Leave_Group_Warning": "您确定要离开用户组“%s”吗？",

From ade5fee6677d912c44b055c27fa28baddddd5e1f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 2 Oct 2017 23:09:55 -0300
Subject: [PATCH 126/244] Bump version to 0.59.0-rc.11

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 29 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 84b1080342f..b936c4af74f 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.10
+ENV RC_VERSION 0.59.0-rc.11
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 2b5c8c0b6d1..eb86ef3bcdd 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.10"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.11"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index e9e6d24f260..49605fdab9e 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.10
+    RC_VERSION=0.59.0-rc.11
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 83b93a79ccd..6c64fd4c6af 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,32 @@
+<a name="0.59.0-rc.11"></a>
+# 0.59.0-rc.11 (2017-10-03)
+
+
+### New Features
+
+- [#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) Sidebar item width to 100%
+- [#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) Smaller accountBox
+- [#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) Unify unread and mentions badge
+
+
+### Bug Fixes
+
+- [#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357) Missing i18n translations
+- [#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) remove accountBox from admin menu
+- [#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372) Various LDAP issues & Missing pagination
+
+
+<details>
+<summary>Others</summary>
+
+- [#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375) LingoHub based on develop
+- [#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345) Remove field `lastActivity` from subscription data
+- [#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363) Sync translations from LingoHub
+- [#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364) Update Meteor to 1.5.2.2
+</details>
+
+
+
 <a name="0.59.0-rc.10"></a>
 # 0.59.0-rc.10 (2017-09-29)
 
diff --git a/package.json b/package.json
index 4b2af3cb6bb..6aa80c921a3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.10",
+	"version": "0.59.0-rc.11",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index d335754afc0..e2747b57e06 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.10"
+	"version": "0.59.0-rc.11"
 }

From cdba3eb786cc59dad144911a1a940dda3ac2e3b2 Mon Sep 17 00:00:00 2001
From: Chris Pitman <cpitman1@gmail.com>
Date: Thu, 5 Oct 2017 12:58:31 -0400
Subject: [PATCH 127/244] Store int history as string in mongo

Http Results can include keps which are vaild JSON but invalid mongo
keys. Store them as a string, then check when formatting them for
dispkay if they are json that needs to be stringifies or already a
string.
---
 .../client/views/integrationsOutgoingHistory.html    |  2 +-
 .../client/views/integrationsOutgoingHistory.js      | 12 ++++--------
 .../server/lib/triggerHandler.js                     |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
index eb57c122e3a..e58d746a2d0 100644
--- a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
+++ b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
@@ -121,7 +121,7 @@
 									<div class="input-line double-col">
 										<label>{{_ "Integration_Outgoing_WebHook_History_Error_Stacktrace"}}</label>
 										<div>
-											<pre><code class="code-colors hljs json">{{{ hljsStack history.errorStack }}}</code></pre>
+											<pre><code class="code-colors hljs json">{{{ jsonStringify history.errorStack }}}</code></pre>
 										</div>
 									</div>
 								{{/if}}
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
index 383b5d1ba9b..9a110dffd58 100644
--- a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
+++ b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
@@ -94,16 +94,12 @@ Template.integrationsOutgoingHistory.helpers({
 	},
 
 	jsonStringify(data) {
-		return data ? hljs.highlight('json', JSON.stringify(data, null, 2)).value : '';
-	},
-
-	hljsStack(errorStack) {
-		if (!errorStack) {
+		if (!data) {
 			return '';
-		} else if (typeof errorStack === 'object') {
-			return hljs.highlight('json', JSON.stringify(errorStack, null, 2)).value;
+		} else if (typeof data === 'object') {
+			return hljs.highlight('json', JSON.stringify(data, null, 2)).value;
 		} else {
-			return hljs.highlight('json', errorStack).value;
+			return hljs.highlight('json', data).value;
 		}
 	},
 
diff --git a/packages/rocketchat-integrations/server/lib/triggerHandler.js b/packages/rocketchat-integrations/server/lib/triggerHandler.js
index 5012c42e643..000a1d5af85 100644
--- a/packages/rocketchat-integrations/server/lib/triggerHandler.js
+++ b/packages/rocketchat-integrations/server/lib/triggerHandler.js
@@ -130,7 +130,7 @@ RocketChat.integrations.triggerHandler = new class RocketChatIntegrationHandler
 		}
 
 		if (typeof httpResult !== 'undefined') {
-			history.httpResult = httpResult;
+			history.httpResult = JSON.stringify(httpResult, null, 2);
 		}
 
 		if (typeof error !== 'undefined') {

From 3a90df3f30003f4a414570c1ef853635a7a8d768 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 21:30:54 -0300
Subject: [PATCH 128/244] [FIX] Meteor accounts issue - function which caused
 users to be  logged out shortly after logging in

---
 .meteor/versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.meteor/versions b/.meteor/versions
index 614c87b262f..e003d0d0ddf 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.3
+accounts-base@1.3.4
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0

From 3e69c89368c8f53578a0db8400d90ebc4ddd4ccf Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 17:29:28 -0300
Subject: [PATCH 129/244] Merge pull request #8389 from
 RocketChat/fix-snap-npm-dep

[FIX] Add needed dependency for snaps
---
 .snapcraft/candidate/snapcraft.yaml    | 102 -------------------------
 .snapcraft/edge/snapcraft.yaml         | 102 -------------------------
 .snapcraft/{stable => }/snapcraft.yaml |  13 +---
 .travis/snap.sh                        |   2 +-
 4 files changed, 4 insertions(+), 215 deletions(-)
 delete mode 100644 .snapcraft/candidate/snapcraft.yaml
 delete mode 100644 .snapcraft/edge/snapcraft.yaml
 rename .snapcraft/{stable => }/snapcraft.yaml (89%)

diff --git a/.snapcraft/candidate/snapcraft.yaml b/.snapcraft/candidate/snapcraft.yaml
deleted file mode 100644
index 2a4d3c71975..00000000000
--- a/.snapcraft/candidate/snapcraft.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Easiest way to work with this file, from an updated Ubuntu 16.04 LTS image
-# 1.   create a non-root user with sudo priv and perform following steps as non-root
-# 2.  `sudo apt-get update`
-# 3.  `sudo apt-get install snapcraft python build-essential`
-# 4.  `snapcraft stage`
-# 5.  `snapcraft snap`
-
-name: rocketchat-server
-version: #{RC_VERSION}
-summary: Rocket.Chat server
-description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
-confinement: strict
-assumes: [snapd2.21]
-apps:
-    rocketchat-server:
-        command: startRocketChat
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-mongo:
-        command: startmongo
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-caddy:
-        command: env LC_ALL=C caddy -conf=$SNAP_DATA/Caddyfile -host=localhost:8080
-        daemon: simple
-        plugs: [network, network-bind]
-    mongo:
-        command: env LC_ALL=C mongo
-        plugs: [network]
-    restoredb:
-        command: env LC_ALL=C restoredb
-        plugs: [network]
-    backupdb:
-        command: env LC_ALL=c rcbackup
-        plugs: [network]
-    initcaddy:
-        command: env LC_ALL=c initcaddy
-parts:
-    node:
-        plugin: nodejs
-        node-engine: 4.8.3
-        node-packages:
-            - promise
-            - fibers
-            - underscore
-            - source-map-support
-            - semver
-        build-packages:
-            # For fibers
-            - python
-            - build-essential
-            - nodejs
-        organize:
-            lib/node_modules: node_modules
-    rocketchat-server:
-        plugin: dump
-        after: [node]
-        source: https://rocket.chat/releases/release-candidate/download
-        source-type: tar
-        stage-packages:
-            - graphicsmagick
-        stage:
-            - programs
-            - main.js
-            - .node_version.txt
-            - usr
-            - lib
-    mongodb:
-        build-packages:
-            - wget
-        source: ./
-        prepare: ./resources/preparemongo
-        plugin: dump
-        stage-packages:
-            - libssl1.0.0
-        prime:
-            - usr
-            - bin
-            - lib
-    scripts:
-        plugin: dump
-        source: resources/
-        organize:
-            rcbackup: bin/rcbackup
-            restoredb: bin/restoredb
-            startmongo: bin/startmongo
-            startRocketChat: bin/startRocketChat
-            initreplset.js: bin/initreplset.js
-            Caddyfile: bin/Caddyfile
-            initcaddy: bin/initcaddy
-        prime:
-            - bin
-    caddy:
-        prepare: ./resources/preparecaddy
-        plugin: dump
-        source: ./
-        prime:
-            - bin
-        organize:
-            caddy: bin/caddy
-        after: [mongodb]
diff --git a/.snapcraft/edge/snapcraft.yaml b/.snapcraft/edge/snapcraft.yaml
deleted file mode 100644
index d12d69d8393..00000000000
--- a/.snapcraft/edge/snapcraft.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Easiest way to work with this file, from an updated Ubuntu 16.04 LTS image
-# 1.   create a non-root user with sudo priv and perform following steps as non-root
-# 2.  `sudo apt-get update`
-# 3.  `sudo apt-get install snapcraft python build-essential`
-# 4.  `snapcraft stage`
-# 5.  `snapcraft snap`
-
-name: rocketchat-server
-version: #{RC_VERSION}
-summary: Rocket.Chat server
-description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
-confinement: strict
-assumes: [snapd2.21]
-apps:
-    rocketchat-server:
-        command: startRocketChat
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-mongo:
-        command: startmongo
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-caddy:
-        command: env LC_ALL=C caddy -conf=$SNAP_DATA/Caddyfile -host=localhost:8080
-        daemon: simple
-        plugs: [network, network-bind]
-    mongo:
-        command: env LC_ALL=C mongo
-        plugs: [network]
-    restoredb:
-        command: env LC_ALL=C restoredb
-        plugs: [network]
-    backupdb:
-        command: env LC_ALL=c rcbackup
-        plugs: [network]
-    initcaddy:
-        command: env LC_ALL=c initcaddy
-parts:
-    node:
-        plugin: nodejs
-        node-engine: 4.8.3
-        node-packages:
-            - promise
-            - fibers
-            - underscore
-            - source-map-support
-            - semver
-        build-packages:
-            # For fibers
-            - python
-            - build-essential
-            - nodejs
-        organize:
-            lib/node_modules: node_modules
-    rocketchat-server:
-        plugin: dump
-        after: [node]
-        source: https://rocket.chat/releases/develop/download
-        source-type: tar
-        stage-packages:
-            - graphicsmagick
-        stage:
-            - programs
-            - main.js
-            - .node_version.txt
-            - usr
-            - lib
-    mongodb:
-        build-packages:
-            - wget
-        source: ./
-        prepare: ./resources/preparemongo
-        plugin: dump
-        stage-packages:
-            - libssl1.0.0
-        prime:
-            - usr
-            - bin
-            - lib
-    scripts:
-        plugin: dump
-        source: resources/
-        organize:
-            rcbackup: bin/rcbackup
-            restoredb: bin/restoredb
-            startmongo: bin/startmongo
-            startRocketChat: bin/startRocketChat
-            initreplset.js: bin/initreplset.js
-            Caddyfile: bin/Caddyfile
-            initcaddy: bin/initcaddy
-        prime:
-            - bin
-    caddy:
-        prepare: ./resources/preparecaddy
-        plugin: dump
-        source: ./
-        prime:
-            - bin
-        organize:
-            caddy: bin/caddy
-        after: [mongodb]
diff --git a/.snapcraft/stable/snapcraft.yaml b/.snapcraft/snapcraft.yaml
similarity index 89%
rename from .snapcraft/stable/snapcraft.yaml
rename to .snapcraft/snapcraft.yaml
index f61321281a2..1171544edc8 100644
--- a/.snapcraft/stable/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -39,24 +39,17 @@ apps:
 parts:
     node:
         plugin: nodejs
-        node-engine: 4.8.3
-        node-packages:
-            - promise
-            - fibers
-            - underscore
-            - source-map-support
-            - semver
+        node-engine: 4.8.4
         build-packages:
             # For fibers
             - python
             - build-essential
             - nodejs
-        organize:
-            lib/node_modules: node_modules
     rocketchat-server:
         plugin: dump
+        prepare: cd programs/server; npm install
         after: [node]
-        source: https://rocket.chat/releases/latest/download
+        source: https://rocket.chat/releases/#{RC_VERSION}/download
         source-type: tar
         stage-packages:
             - graphicsmagick
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 4cd3613f9ad..2def149a00a 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -38,7 +38,7 @@ GIT_SSH_COMMAND="ssh -i launchpadkey" git clone -b $CHANNEL git+ssh://rocket.cha
 
 # Rarely will change, but just incase we copy it all
 cp -r resources buildinfo launchpad/
-sed s/#{RC_VERSION}/$RC_VERSION/ $CHANNEL/snapcraft.yaml > launchpad/snapcraft.yaml
+sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
 
 cd launchpad
 git add resources snapcraft.yaml buildinfo

From c51011eb05f0d31d5a665034ba5ef50427db339d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 16:50:55 -0300
Subject: [PATCH 130/244] Merge pull request #8390 from
 RocketChat/fixes-for-slack-import

[FIX] Slack import failing and not being able to be restarted
# Conflicts:
#	packages/rocketchat-i18n/i18n/en.i18n.json
---
 packages/rocketchat-i18n/i18n/en.i18n.json    |   6 +
 packages/rocketchat-importer-slack/server.js  | 530 ++++++++++--------
 .../client/admin/adminImport.html             |  12 +-
 .../client/admin/adminImport.js               |  12 +-
 .../client/admin/adminImportPrepare.html      |   2 +-
 .../client/admin/adminImportPrepare.js        |  15 +-
 .../server/classes/ImporterBase.js            |  21 +
 .../server/methods/startImport.js             |   6 +-
 .../server/methods/filterATAllTag.js          |  12 +-
 .../server/methods/setUsername.js             |  10 +-
 10 files changed, 342 insertions(+), 284 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 40b470db31e..cfc22b8c547 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -686,6 +686,11 @@
   "Iframe_Integration_send_enable_Description": "Send events to parent window",
   "Iframe_Integration_send_target_origin": "Send target origin",
   "Iframe_Integration_send_target_origin_Description": "Origin with protocol prefix, which commands are sent to e.g. 'https://localhost', or * to allow sending to anywhere.",
+  "IMAP_intercepter_already_running": "IMAP intercepter already running",
+  "IMAP_intercepter_Not_running": "IMAP intercepter Not running",
+  "Impersonate_user": "Impersonate User",
+  "Impersonate_user_description": "When enabled, integration posts as the user that triggered integration",
+  "Import": "Import",
   "Importer_Archived": "Archived",
   "Importer_CSV_Information": "The CSV importer requires a specific format, please read the documentation for how to structure your zip file:",
   "Importer_HipChatEnterprise_Information": "The file uploaded must be a decrypted tar.gz, please read the documentation for further information:",
@@ -1598,6 +1603,7 @@
   "SSL": "SSL",
   "Star_Message": "Star Message",
   "Starred_Messages": "Starred Messages",
+  "Start": "Start",
   "Start_audio_call": "Start audio call",
   "Start_Chat": "Start Chat",
   "Start_of_conversation": "Start of conversation",
diff --git a/packages/rocketchat-importer-slack/server.js b/packages/rocketchat-importer-slack/server.js
index ea12a7928bd..c48d5a3bc63 100644
--- a/packages/rocketchat-importer-slack/server.js
+++ b/packages/rocketchat-importer-slack/server.js
@@ -6,37 +6,48 @@ Importer.Slack = class extends Importer.Base {
 		this.bots = {};
 		this.logger.debug('Constructed a new Slack Importer.');
 	}
+
 	prepare(dataURI, sentContentType, fileName) {
 		super.prepare(dataURI, sentContentType, fileName);
-		const {image/*, contentType*/} = RocketChatFile.dataURIParse(dataURI);
+
+		const { image } = RocketChatFile.dataURIParse(dataURI);
 		const zip = new this.AdmZip(new Buffer(image, 'base64'));
 		const zipEntries = zip.getEntries();
+
 		let tempChannels = [];
 		let tempUsers = [];
 		const tempMessages = {};
+
 		zipEntries.forEach(entry => {
 			if (entry.entryName.indexOf('__MACOSX') > -1) {
 				return this.logger.debug(`Ignoring the file: ${ entry.entryName }`);
 			}
+
 			if (entry.entryName === 'channels.json') {
 				this.updateProgress(Importer.ProgressStep.PREPARING_CHANNELS);
 				tempChannels = JSON.parse(entry.getData().toString()).filter(channel => channel.creator != null);
 				return;
 			}
+
 			if (entry.entryName === 'users.json') {
 				this.updateProgress(Importer.ProgressStep.PREPARING_USERS);
 				tempUsers = JSON.parse(entry.getData().toString());
-				return tempUsers.forEach(user => {
+
+				tempUsers.forEach(user => {
 					if (user.is_bot) {
 						this.bots[user.profile.bot_id] = user;
 					}
 				});
+
+				return;
 			}
+
 			if (!entry.isDirectory && entry.entryName.indexOf('/') > -1) {
 				const item = entry.entryName.split('/');
 				const channelName = item[0];
 				const msgGroupData = item[1].split('.')[0];
 				tempMessages[channelName] = tempMessages[channelName] || {};
+
 				try {
 					tempMessages[channelName][msgGroupData] = JSON.parse(entry.getData().toString());
 				} catch (error) {
@@ -65,10 +76,11 @@ Importer.Slack = class extends Importer.Base {
 		Object.keys(tempMessages).forEach(channel => {
 			const messagesObj = tempMessages[channel];
 			this.messages[channel] = this.messages[channel] || {};
+
 			Object.keys(messagesObj).forEach(date => {
 				const msgs = messagesObj[date];
 				messagesCount += msgs.length;
-				this.updateRecord({ 'messagesstatus': '#{channel}/#{date}' });
+				this.updateRecord({ 'messagesstatus': `${ channel }/${ date }` });
 				if (Importer.Base.getBSONSize(msgs) > Importer.Base.MaxBSONSize) {
 					const tmp = Importer.Base.getBSONSafeArraysFromAnArray(msgs);
 					Object.keys(tmp).forEach(i => {
@@ -82,6 +94,7 @@ Importer.Slack = class extends Importer.Base {
 				}
 			});
 		});
+
 		this.updateRecord({ 'count.messages': messagesCount, 'messagesstatus': null });
 		this.addCountToTotal(messagesCount);
 		if ([tempUsers.length, tempChannels.length, messagesCount].some(e => e === 0)) {
@@ -99,6 +112,7 @@ Importer.Slack = class extends Importer.Base {
 	startImport(importSelection) {
 		super.startImport(importSelection);
 		const start = Date.now();
+
 		Object.keys(importSelection.users).forEach(key => {
 			const user = importSelection.users[key];
 			Object.keys(this.users.users).forEach(k => {
@@ -109,6 +123,7 @@ Importer.Slack = class extends Importer.Base {
 			});
 		});
 		this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
+
 		Object.keys(importSelection.channels).forEach(key => {
 			const channel = importSelection.channels[key];
 			Object.keys(this.channels.channels).forEach(k => {
@@ -119,283 +134,310 @@ Importer.Slack = class extends Importer.Base {
 			});
 		});
 		this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
+
 		const startedByUserId = Meteor.userId();
 		Meteor.defer(() => {
-			this.updateProgress(Importer.ProgressStep.IMPORTING_USERS);
-			this.users.users.forEach(user => {
-				if (!user.do_import) {
-					return;
-				}
-				Meteor.runAsUser(startedByUserId, () => {
-					const existantUser = RocketChat.models.Users.findOneByEmailAddress(user.profile.email) || RocketChat.models.Users.findOneByUsername(user.name);
-					if (existantUser) {
-						user.rocketId = existantUser._id;
-						RocketChat.models.Users.update({ _id: user.rocketId }, { $addToSet: { importIds: user.id } });
-						this.userTags.push({
-							slack: `<@${ user.id }>`,
-							slackLong: `<@${ user.id }|${ user.name }>`,
-							rocket: `@${ existantUser.username }`
-						});
-					} else {
-						const userId = user.profile.email ? Accounts.createUser({ email: user.profile.email, password: Date.now() + user.name + user.profile.email.toUpperCase() }) : Accounts.createUser({ username: user.name, password: Date.now() + user.name, joinDefaultChannelsSilenced: true });
-						Meteor.runAsUser(userId, () => {
-							Meteor.call('setUsername', user.name, {joinDefaultChannelsSilenced: true});
-							const url = user.profile.image_original || user.profile.image_512;
-							try {
-								Meteor.call('setAvatarFromService', url, undefined, 'url');
-							} catch (error) {
-								this.logger.warn(`Failed to set ${ user.name }'s avatar from url ${ url }`);
-								console.log(`Failed to set ${ user.name }'s avatar from url ${ url }`);
-							}
-							// Slack's is -18000 which translates to Rocket.Chat's after dividing by 3600
-							if (user.tz_offset) {
-								Meteor.call('userSetUtcOffset', user.tz_offset / 3600);
+			try {
+				this.updateProgress(Importer.ProgressStep.IMPORTING_USERS);
+				this.users.users.forEach(user => {
+					if (!user.do_import) {
+						return;
+					}
+
+					Meteor.runAsUser(startedByUserId, () => {
+						const existantUser = RocketChat.models.Users.findOneByEmailAddress(user.profile.email) || RocketChat.models.Users.findOneByUsername(user.name);
+						if (existantUser) {
+							user.rocketId = existantUser._id;
+							RocketChat.models.Users.update({ _id: user.rocketId }, { $addToSet: { importIds: user.id } });
+							this.userTags.push({
+								slack: `<@${ user.id }>`,
+								slackLong: `<@${ user.id }|${ user.name }>`,
+								rocket: `@${ existantUser.username }`
+							});
+						} else {
+							const userId = user.profile.email ? Accounts.createUser({ email: user.profile.email, password: Date.now() + user.name + user.profile.email.toUpperCase() }) : Accounts.createUser({ username: user.name, password: Date.now() + user.name, joinDefaultChannelsSilenced: true });
+							Meteor.runAsUser(userId, () => {
+								Meteor.call('setUsername', user.name, { joinDefaultChannelsSilenced: true });
+
+								const url = user.profile.image_original || user.profile.image_512;
+								try {
+									Meteor.call('setAvatarFromService', url, undefined, 'url');
+								} catch (error) {
+									this.logger.warn(`Failed to set ${ user.name }'s avatar from url ${ url }`);
+									console.log(`Failed to set ${ user.name }'s avatar from url ${ url }`);
+								}
+
+								// Slack's is -18000 which translates to Rocket.Chat's after dividing by 3600
+								if (user.tz_offset) {
+									Meteor.call('userSetUtcOffset', user.tz_offset / 3600);
+								}
+							});
+
+							RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: user.id } });
+
+							if (user.profile.real_name) {
+								RocketChat.models.Users.setName(userId, user.profile.real_name);
 							}
-						});
 
-						RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: user.id } });
+							//Deleted users are 'inactive' users in Rocket.Chat
+							if (user.deleted) {
+								Meteor.call('setUserActiveStatus', userId, false);
+							}
 
-						if (user.profile.real_name) {
-							RocketChat.models.Users.setName(userId, user.profile.real_name);
-						}
-						//Deleted users are 'inactive' users in Rocket.Chat
-						if (user.deleted) {
-							Meteor.call('setUserActiveStatus', userId, false);
+							user.rocketId = userId;
+							this.userTags.push({
+								slack: `<@${ user.id }>`,
+								slackLong: `<@${ user.id }|${ user.name }>`,
+								rocket: `@${ user.name }`
+							});
 						}
-						//TODO: Maybe send emails?
-						user.rocketId = userId;
-						this.userTags.push({
-							slack: `<@${ user.id }>`,
-							slackLong: `<@${ user.id }|${ user.name }>`,
-							rocket: `@${ user.name }`
-						});
 
-					}
-					this.addCountCompleted(1);
+						this.addCountCompleted(1);
+					});
 				});
-			});
-			this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
-			this.updateProgress(Importer.ProgressStep.IMPORTING_CHANNELS);
-			this.channels.channels.forEach(channel => {
-				if (!channel.do_import) {
-					return;
-				}
-				Meteor.runAsUser (startedByUserId, () => {
-					const existantRoom = RocketChat.models.Rooms.findOneByName(channel.name);
-					if (existantRoom || channel.is_general) {
-						if (channel.is_general && existantRoom && channel.name !== existantRoom.name) {
-							Meteor.call('saveRoomSettings', 'GENERAL', 'roomName', channel.name);
-						}
-						channel.rocketId = channel.is_general ? 'GENERAL' : existantRoom._id;
-						RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $addToSet: { importIds: channel.id } });
-					} else {
-						const users = channel.members
-							.reduce((ret, member) => {
-								if (member !== channel.creator) {
-									const user = this.getRocketUser(member);
-									if (user && user.username) {
-										ret.push(user.username);
+				this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
+
+				this.updateProgress(Importer.ProgressStep.IMPORTING_CHANNELS);
+				this.channels.channels.forEach(channel => {
+					if (!channel.do_import) {
+						return;
+					}
+
+					Meteor.runAsUser (startedByUserId, () => {
+						const existantRoom = RocketChat.models.Rooms.findOneByName(channel.name);
+						if (existantRoom || channel.is_general) {
+							if (channel.is_general && existantRoom && channel.name !== existantRoom.name) {
+								Meteor.call('saveRoomSettings', 'GENERAL', 'roomName', channel.name);
+							}
+
+							channel.rocketId = channel.is_general ? 'GENERAL' : existantRoom._id;
+							RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $addToSet: { importIds: channel.id } });
+						} else {
+							const users = channel.members
+								.reduce((ret, member) => {
+									if (member !== channel.creator) {
+										const user = this.getRocketUser(member);
+										if (user && user.username) {
+											ret.push(user.username);
+										}
 									}
+									return ret;
+								}, []);
+							let userId = startedByUserId;
+							this.users.users.forEach(user => {
+								if (user.id === channel.creator && user.do_import) {
+									userId = user.rocketId;
 								}
-								return ret;
-							}, []);
-						let userId = startedByUserId;
-						this.users.users.forEach(user => {
-							if (user.id === channel.creator && user.do_import) {
-								userId = user.rocketId;
-							}
-						});
-						Meteor.runAsUser(userId, () => {
-							const returned = Meteor.call('createChannel', channel.name, users);
-							channel.rocketId = returned.rid;
-						});
+							});
+							Meteor.runAsUser(userId, () => {
+								const returned = Meteor.call('createChannel', channel.name, users);
+								channel.rocketId = returned.rid;
+							});
 
-						// @TODO implement model specific function
-						const roomUpdate = {
-							ts: new Date(channel.created * 1000)
-						};
-						if (!_.isEmpty(channel.topic && channel.topic.value)) {
-							roomUpdate.topic = channel.topic.value;
-						}
-						if (!_.isEmpty(channel.purpose && channel.purpose.value)) {
-							roomUpdate.description = channel.purpose.value;
+							// @TODO implement model specific function
+							const roomUpdate = {
+								ts: new Date(channel.created * 1000)
+							};
+							if (!_.isEmpty(channel.topic && channel.topic.value)) {
+								roomUpdate.topic = channel.topic.value;
+							}
+							if (!_.isEmpty(channel.purpose && channel.purpose.value)) {
+								roomUpdate.description = channel.purpose.value;
+							}
+							RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $set: roomUpdate, $addToSet: { importIds: channel.id } });
 						}
-						RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $set: roomUpdate, $addToSet: { importIds: channel.id } });
-					}
-					this.addCountCompleted(1);
+						this.addCountCompleted(1);
+					});
 				});
-			});
-			this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
-			const missedTypes = {};
-			const ignoreTypes = { 'bot_add': true, 'file_comment': true, 'file_mention': true };
-			this.updateProgress(Importer.ProgressStep.IMPORTING_MESSAGES);
-			Object.keys(this.messages).forEach(channel => {
-				const messagesObj = this.messages[channel];
-
-				Meteor.runAsUser(startedByUserId, () =>{
-					const slackChannel = this.getSlackChannelFromName(channel);
-					if (!slackChannel || !slackChannel.do_import) { return; }
-					const room = RocketChat.models.Rooms.findOneById(slackChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
-					Object.keys(messagesObj).forEach(date => {
-						const msgs = messagesObj[date];
-						msgs.messages.forEach(message => {
-							this.updateRecord({ 'messagesstatus': '#{channel}/#{date}.#{msgs.messages.length}' });
-							const msgDataDefaults ={
-								_id: `slack-${ slackChannel.id }-${ message.ts.replace(/\./g, '-') }`,
-								ts: new Date(parseInt(message.ts.split('.')[0]) * 1000)
-							};
-							if (message.type === 'message') {
-								if (message.subtype) {
-									if (message.subtype === 'channel_join') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createUserJoinWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'channel_leave') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createUserLeaveWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'me_message') {
-										const msgObj = {
-											...msgDataDefaults,
-											msg: `_${ this.convertSlackMessageToRocketChat(message.text) }_`
-										};
-										RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
-									} else if (message.subtype === 'bot_message' || message.subtype === 'slackbot_response') {
-										const botUser = RocketChat.models.Users.findOneById('rocket.cat', { fields: { username: 1 }});
-										const botUsername = this.bots[message.bot_id] ? this.bots[message.bot_id].name : message.username;
-										const msgObj = {
-											...msgDataDefaults,
-											msg: this.convertSlackMessageToRocketChat(message.text),
-											rid: room._id,
-											bot: true,
-											attachments: message.attachments,
-											username: botUsername || undefined
-										};
-
-										if (message.edited) {
-											msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
-											const editedBy = this.getRocketUser(message.edited.user);
-											if (editedBy) {
-												msgObj.editedBy = {
-													_id: editedBy._id,
-													username: editedBy.username
-												};
-											}
-										}
+				this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
 
-										if (message.icons) {
-											msgObj.emoji = message.icons.emoji;
-										}
-										RocketChat.sendMessage(botUser, msgObj, room, true);
-									} else if (message.subtype === 'channel_purpose') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_description', room._id, message.purpose, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'channel_topic') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_topic', room._id, message.topic, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'channel_name') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createRoomRenamedWithRoomIdRoomNameAndUser(room._id, message.name, this.getRocketUser(message.user), msgDataDefaults);
+				const missedTypes = {};
+				const ignoreTypes = { 'bot_add': true, 'file_comment': true, 'file_mention': true };
+				this.updateProgress(Importer.ProgressStep.IMPORTING_MESSAGES);
+				Object.keys(this.messages).forEach(channel => {
+					const messagesObj = this.messages[channel];
+
+					Meteor.runAsUser(startedByUserId, () =>{
+						const slackChannel = this.getSlackChannelFromName(channel);
+						if (!slackChannel || !slackChannel.do_import) { return; }
+						const room = RocketChat.models.Rooms.findOneById(slackChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
+						Object.keys(messagesObj).forEach(date => {
+							const msgs = messagesObj[date];
+							msgs.messages.forEach(message => {
+								this.updateRecord({ 'messagesstatus': `${ channel }/${ date }.${ msgs.messages.length }` });
+								const msgDataDefaults ={
+									_id: `slack-${ slackChannel.id }-${ message.ts.replace(/\./g, '-') }`,
+									ts: new Date(parseInt(message.ts.split('.')[0]) * 1000)
+								};
+
+								// Process the reactions
+								if (message.reactions && message.reactions.length > 0) {
+									msgDataDefaults.reactions = {};
+
+									message.reactions.forEach(reaction => {
+										msgDataDefaults.reactions[reaction.name] = { usernames: [] };
+
+										reaction.users.forEach(u => {
+											const rcUser = this.getRocketUser(u);
+											if (!rcUser) { return; }
+
+											msgDataDefaults.reactions[reaction.name].usernames.push(rcUser.username);
+										});
+
+										if (msgDataDefaults.reactions[reaction.name].usernames.length === 0) {
+											delete msgDataDefaults.reactions[reaction.name];
 										}
-									} else if (message.subtype === 'pinned_item') {
-										if (message.attachments) {
+									});
+								}
+
+								if (message.type === 'message') {
+									if (message.subtype) {
+										if (message.subtype === 'channel_join') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createUserJoinWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'channel_leave') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createUserLeaveWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'me_message') {
 											const msgObj = {
 												...msgDataDefaults,
-												attachments: [{
-													'text': this.convertSlackMessageToRocketChat(message.attachments[0].text),
-													'author_name' : message.attachments[0].author_subname,
-													'author_icon' : getAvatarUrlFromUsername(message.attachments[0].author_subname)
-												}]
+												msg: `_${ this.convertSlackMessageToRocketChat(message.text) }_`
 											};
-											RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('message_pinned', room._id, '', this.getRocketUser(message.user), msgObj);
-										} else {
-											//TODO: make this better
-											this.logger.debug('Pinned item with no attachment, needs work.');
-											//RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser 'message_pinned', room._id, '', @getRocketUser(message.user), msgDataDefaults
-										}
-									} else if (message.subtype === 'file_share') {
-										if (message.file && message.file.url_private_download !== undefined) {
-											const details = {
-												message_id: `slack-${ message.ts.replace(/\./g, '-') }`,
-												name: message.file.name,
-												size: message.file.size,
-												type: message.file.mimetype,
-												rid: room._id
+											RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
+										} else if (message.subtype === 'bot_message' || message.subtype === 'slackbot_response') {
+											const botUser = RocketChat.models.Users.findOneById('rocket.cat', { fields: { username: 1 }});
+											const botUsername = this.bots[message.bot_id] ? this.bots[message.bot_id].name : message.username;
+											const msgObj = {
+												...msgDataDefaults,
+												msg: this.convertSlackMessageToRocketChat(message.text),
+												rid: room._id,
+												bot: true,
+												attachments: message.attachments,
+												username: botUsername || undefined
 											};
-											this.uploadFile(details, message.file.url_private_download, this.getRocketUser(message.user), room, new Date(parseInt(message.ts.split('.')[0]) * 1000));
-										}
-									} else if (!missedTypes[message.subtype] && !ignoreTypes[message.subtype]) {
-										missedTypes[message.subtype] = message;
-									}
-								} else {
-									const user = this.getRocketUser(message.user);
-									if (user) {
-										const msgObj = {
-											...msgDataDefaults,
-											msg: this.convertSlackMessageToRocketChat(message.text),
-											rid: room._id,
-											u: {
-												_id: user._id,
-												username: user.username
+
+											if (message.edited) {
+												msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
+												const editedBy = this.getRocketUser(message.edited.user);
+												if (editedBy) {
+													msgObj.editedBy = {
+														_id: editedBy._id,
+														username: editedBy.username
+													};
+												}
+											}
+
+											if (message.icons) {
+												msgObj.emoji = message.icons.emoji;
+											}
+											RocketChat.sendMessage(botUser, msgObj, room, true);
+										} else if (message.subtype === 'channel_purpose') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_description', room._id, message.purpose, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'channel_topic') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_topic', room._id, message.topic, this.getRocketUser(message.user), msgDataDefaults);
 											}
-										};
-
-										if (message.edited) {
-											msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
-											const editedBy = this.getRocketUser(message.edited.user);
-											if (editedBy) {
-												msgObj.editedBy = {
-													_id: editedBy._id,
-													username: editedBy.username
+										} else if (message.subtype === 'channel_name') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createRoomRenamedWithRoomIdRoomNameAndUser(room._id, message.name, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'pinned_item') {
+											if (message.attachments) {
+												const msgObj = {
+													...msgDataDefaults,
+													attachments: [{
+														'text': this.convertSlackMessageToRocketChat(message.attachments[0].text),
+														'author_name' : message.attachments[0].author_subname,
+														'author_icon' : getAvatarUrlFromUsername(message.attachments[0].author_subname)
+													}]
+												};
+												RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('message_pinned', room._id, '', this.getRocketUser(message.user), msgObj);
+											} else {
+												//TODO: make this better
+												this.logger.debug('Pinned item with no attachment, needs work.');
+												//RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser 'message_pinned', room._id, '', @getRocketUser(message.user), msgDataDefaults
+											}
+										} else if (message.subtype === 'file_share') {
+											if (message.file && message.file.url_private_download !== undefined) {
+												const details = {
+													message_id: `slack-${ message.ts.replace(/\./g, '-') }`,
+													name: message.file.name,
+													size: message.file.size,
+													type: message.file.mimetype,
+													rid: room._id
 												};
+												this.uploadFile(details, message.file.url_private_download, this.getRocketUser(message.user), room, new Date(parseInt(message.ts.split('.')[0]) * 1000));
 											}
+										} else if (!missedTypes[message.subtype] && !ignoreTypes[message.subtype]) {
+											missedTypes[message.subtype] = message;
 										}
+									} else {
+										const user = this.getRocketUser(message.user);
+										if (user) {
+											const msgObj = {
+												...msgDataDefaults,
+												msg: this.convertSlackMessageToRocketChat(message.text),
+												rid: room._id,
+												u: {
+													_id: user._id,
+													username: user.username
+												}
+											};
+
+											if (message.edited) {
+												msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
+												const editedBy = this.getRocketUser(message.edited.user);
+												if (editedBy) {
+													msgObj.editedBy = {
+														_id: editedBy._id,
+														username: editedBy.username
+													};
+												}
+											}
 
-										RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
+											try {
+												RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
+											} catch (e) {
+												this.logger.warn(`Failed to import the message: ${ msgDataDefaults._id }`);
+											}
+										}
 									}
 								}
-							}
 
-
-							// Process the reactions
-							if (RocketChat.models.Messages.findOneById(msgDataDefaults._id) && message.reactions && message.reactions.length > 0) {
-								message.reactions.forEach(reaction => {
-									reaction.users.forEach(u => {
-										const rcUser = this.getRocketUser(u);
-										if (!rcUser) { return; }
-										Meteor.runAsUser(rcUser._id, () => Meteor.call('setReaction', `:${ reaction.name }:`, msgDataDefaults._id));
-									});
-								});
-							}
-							this.addCountCompleted(1);
+								this.addCountCompleted(1);
+							});
 						});
 					});
 				});
-			});
-
-
-			if (!_.isEmpty(missedTypes)) {
-				console.log('Missed import types:', missedTypes);
-			}
 
-			this.updateProgress(Importer.ProgressStep.FINISHING);
-
-			this.channels.channels.forEach(channel => {
-				if (channel.do_import && channel.is_archived) {
-					Meteor.runAsUser(startedByUserId, function() {
-						Meteor.call('archiveRoom', channel.rocketId);
-					});
+				if (!_.isEmpty(missedTypes)) {
+					console.log('Missed import types:', missedTypes);
 				}
-			});
-			this.updateProgress(Importer.ProgressStep.DONE);
 
-			const timeTook = Date.now() - start;
+				this.updateProgress(Importer.ProgressStep.FINISHING);
 
-			this.logger.log(`Import took ${ timeTook } milliseconds.`);
+				this.channels.channels.forEach(channel => {
+					if (channel.do_import && channel.is_archived) {
+						Meteor.runAsUser(startedByUserId, function() {
+							Meteor.call('archiveRoom', channel.rocketId);
+						});
+					}
+				});
+				this.updateProgress(Importer.ProgressStep.DONE);
 
+				const timeTook = Date.now() - start;
+
+				this.logger.log(`Import took ${ timeTook } milliseconds.`);
+			} catch (e) {
+				this.logger.error(e);
+				this.updateProgress(Importer.ProgressStep.ERROR);
+			}
 		});
+
 		return this.getProgress();
 	}
 	getSlackChannelFromName(channelName) {
diff --git a/packages/rocketchat-importer/client/admin/adminImport.html b/packages/rocketchat-importer/client/admin/adminImport.html
index 3e22cbcbc29..73977662772 100644
--- a/packages/rocketchat-importer/client/admin/adminImport.html
+++ b/packages/rocketchat-importer/client/admin/adminImport.html
@@ -3,30 +3,26 @@
 		<header class="fixed-title border-component-color">
 			{{> burger}}
 			<h2>
-				<span class="room-title">Import</span>
+				<span class="room-title">{{_ "Import"}}</span>
 			</h2>
 		</header>
 		<div class="content">
 			{{#unless isAdmin}}
-				<p>You are not authorized to view this page.</p>
+				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 			{{else}}
-				{{#if isImporters}}
 				<div class="rocket-form">
 					<fieldset>
 						{{#each importers}}
 							<div class="section">
-								<h1>{{name}}</h1>
+								<h1>{{ name }}</h1>
 								<div class="section-content">
 									<div>{{getDescription .}}</div>
-									<button class="button primary start-import">Start</button>
+									<button class="button primary start-import">{{_ "Start"}}</button>
 								</div>
 							</div>
 						{{/each}}
 					</fieldset>
 				</div>
-				{{else}}
-					No Importers Available
-				{{/if}}
 			{{/unless}}
 		</div>
 	</section>
diff --git a/packages/rocketchat-importer/client/admin/adminImport.js b/packages/rocketchat-importer/client/admin/adminImport.js
index 9bfd1e34a4c..fde895bf7f9 100644
--- a/packages/rocketchat-importer/client/admin/adminImport.js
+++ b/packages/rocketchat-importer/client/admin/adminImport.js
@@ -3,9 +3,6 @@ Template.adminImport.helpers({
 	isAdmin() {
 		return RocketChat.authz.hasRole(Meteor.userId(), 'admin');
 	},
-	isImporters() {
-		return Object.keys(Importer.Importers).length > 0;
-	},
 	getDescription(importer) {
 		return TAPi18n.__('Importer_From_Description', { from: importer.name });
 	},
@@ -22,12 +19,15 @@ Template.adminImport.helpers({
 Template.adminImport.events({
 	'click .start-import'() {
 		const importer = this;
-		return Meteor.call('setupImporter', importer.key, function(error) {
+
+		Meteor.call('setupImporter', importer.key, function(error) {
 			if (error) {
 				console.log(t('importer_setup_error'), importer.key, error);
-				return handleError(error);
+				handleError(error);
+				return;
 			}
-			return FlowRouter.go(`/admin/import/prepare/${ importer.key }`);
+
+			FlowRouter.go(`/admin/import/prepare/${ importer.key }`);
 		});
 	}
 });
diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.html b/packages/rocketchat-importer/client/admin/adminImportPrepare.html
index 82efec25c97..346ff050842 100644
--- a/packages/rocketchat-importer/client/admin/adminImportPrepare.html
+++ b/packages/rocketchat-importer/client/admin/adminImportPrepare.html
@@ -9,7 +9,7 @@
 			</header>
 			<div class="content">
 				{{#unless isAdmin}}
-					<p>You are not authorized to view this page.</p>
+					<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 				{{else}}
 					<div class="rocket-form">
 						<fieldset>
diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/packages/rocketchat-importer/client/admin/adminImportPrepare.js
index bdc11eb442f..f47d996000d 100644
--- a/packages/rocketchat-importer/client/admin/adminImportPrepare.js
+++ b/packages/rocketchat-importer/client/admin/adminImportPrepare.js
@@ -36,7 +36,7 @@ Template.adminImportPrepare.helpers({
 Template.adminImportPrepare.events({
 	'change .import-file-input'(event, template) {
 		const importer = this;
-		if (!importer.key) { return; }
+		if (!importer || !importer.key) { return; }
 
 		const e = event.originalEvent || event;
 		let { files } = e.target;
@@ -44,13 +44,13 @@ Template.adminImportPrepare.events({
 			files = (e.dataTransfer != null ? e.dataTransfer.files : undefined) || [];
 		}
 
-		return Array.from(files).map((blob) => {
+		return Array.from(files).map((file) => {
 			template.preparing.set(true);
 
 			const reader = new FileReader();
-			reader.readAsDataURL(blob);
+			reader.readAsDataURL(file);
 			reader.onloadend = () => {
-				Meteor.call('prepareImport', importer.key, reader.result, blob.type, blob.name, function(error, data) {
+				Meteor.call('prepareImport', importer.key, reader.result, file.type, file.name, function(error, data) {
 					if (error) {
 						toastr.error(t('Invalid_Import_File_Type'));
 						template.preparing.set(false);
@@ -84,7 +84,6 @@ Template.adminImportPrepare.events({
 	'click .button.start'(event, template) {
 		const btn = this;
 		$(btn).prop('disabled', true);
-		// const importer = this;
 		for (const user of Array.from(template.users.get())) {
 			user.do_import = $(`[name=${ user.user_id }]`).is(':checked');
 		}
@@ -93,12 +92,12 @@ Template.adminImportPrepare.events({
 			channel.do_import = $(`[name=${ channel.channel_id }]`).is(':checked');
 		}
 
-		return Meteor.call('startImport', FlowRouter.getParam('importer'), { users: template.users.get(), channels: template.channels.get() }, function(error) {
+		Meteor.call('startImport', FlowRouter.getParam('importer'), { users: template.users.get(), channels: template.channels.get() }, function(error) {
 			if (error) {
 				console.warn('Error on starting the import:', error);
-				return handleError(error);
+				handleError(error);
 			} else {
-				return FlowRouter.go(`/admin/import/progress/${ FlowRouter.getParam('importer') }`);
+				FlowRouter.go(`/admin/import/progress/${ FlowRouter.getParam('importer') }`);
 			}
 		});
 	},
diff --git a/packages/rocketchat-importer/server/classes/ImporterBase.js b/packages/rocketchat-importer/server/classes/ImporterBase.js
index 38420f69586..84422a3d81d 100644
--- a/packages/rocketchat-importer/server/classes/ImporterBase.js
+++ b/packages/rocketchat-importer/server/classes/ImporterBase.js
@@ -61,17 +61,22 @@ Importer.Base = class Base {
 		this.addCountCompleted = this.addCountCompleted.bind(this);
 		this.updateRecord = this.updateRecord.bind(this);
 		this.uploadFile = this.uploadFile.bind(this);
+
 		this.name = name;
 		this.description = description;
 		this.mimeType = mimeType;
+
 		this.logger = new Logger(`${ this.name } Importer`, {});
 		this.progress = new Importer.Progress(this.name);
 		this.collection = Importer.RawImports;
+
 		const importId = Importer.Imports.insert({ 'type': this.name, 'ts': Date.now(), 'status': this.progress.step, 'valid': true, 'user': Meteor.user()._id });
 		this.importRecord = Importer.Imports.findOne(importId);
+
 		this.users = {};
 		this.channels = {};
 		this.messages = {};
+		this.oldSettings = {};
 	}
 
 	// Takes the uploaded file and extracts the users, channels, and messages from it.
@@ -89,6 +94,7 @@ Importer.Base = class Base {
 
 		if (!fileType || (fileType.mime !== this.mimeType)) {
 			this.logger.warn(`Invalid file uploaded for the ${ this.name } importer.`);
+			this.updateProgress(Importer.ProgressStep.ERROR);
 			throw new Meteor.Error('error-invalid-file-uploaded', `Invalid file uploaded to import ${ this.name } data from.`, { step: 'prepare' });
 		}
 
@@ -137,6 +143,21 @@ Importer.Base = class Base {
 	updateProgress(step) {
 		this.progress.step = step;
 
+		switch (step) {
+			case Importer.ProgressStep.IMPORTING_STARTED:
+				this.oldSettings.Accounts_AllowedDomainsList = RocketChat.models.Settings.findOneById('Accounts_AllowedDomainsList').value;
+				RocketChat.models.Settings.updateValueById('Accounts_AllowedDomainsList', '');
+
+				this.oldSettings.Accounts_AllowUsernameChange = RocketChat.models.Settings.findOneById('Accounts_AllowUsernameChange').value;
+				RocketChat.models.Settings.updateValueById('Accounts_AllowUsernameChange', true);
+				break;
+			case Importer.ProgressStep.DONE:
+			case Importer.ProgressStep.ERROR:
+				RocketChat.models.Settings.updateValueById('Accounts_AllowedDomainsList', this.oldSettings.Accounts_AllowedDomainsList);
+				RocketChat.models.Settings.updateValueById('Accounts_AllowUsernameChange', this.oldSettings.Accounts_AllowUsernameChange);
+				break;
+		}
+
 		this.logger.debug(`${ this.name } is now at ${ step }.`);
 		this.updateRecord({ 'status': this.progress.step });
 
diff --git a/packages/rocketchat-importer/server/methods/startImport.js b/packages/rocketchat-importer/server/methods/startImport.js
index 352193e28a2..4a95e315b44 100644
--- a/packages/rocketchat-importer/server/methods/startImport.js
+++ b/packages/rocketchat-importer/server/methods/startImport.js
@@ -7,7 +7,11 @@ Meteor.methods({
 		}
 
 		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'run-import')) {
-			throw new Meteor.Error('error-action-not-allowed', 'Importing is not allowed', { method: 'setupImporter'});
+			throw new Meteor.Error('error-action-not-allowed', 'Importing is not allowed', { method: 'startImport'});
+		}
+
+		if (!name) {
+			throw new Meteor.Error('error-invalid-importer', `No defined importer by: "${ name }"`, { method: 'startImport' });
 		}
 
 		if (Importer.Importers[name] && Importer.Importers[name].importerInstance) {
diff --git a/packages/rocketchat-lib/server/methods/filterATAllTag.js b/packages/rocketchat-lib/server/methods/filterATAllTag.js
index 801563172f4..7dac2b3e4ce 100644
--- a/packages/rocketchat-lib/server/methods/filterATAllTag.js
+++ b/packages/rocketchat-lib/server/methods/filterATAllTag.js
@@ -20,14 +20,10 @@ RocketChat.callbacks.add('beforeSaveMessage', function(message) {
 			});
 
 			// Also throw to stop propagation of 'sendMessage'.
-			throw new Meteor.Error(
-				'error-action-not-allowed',
-				'Notify all in this room not allowed',
-				{
-					method: 'filterATAllTag',
-					action: 'Notify_all_in_this_room'
-				}
-			);
+			throw new Meteor.Error('error-action-not-allowed', 'Notify all in this room not allowed', {
+				method: 'filterATAllTag',
+				action: 'Notify_all_in_this_room'
+			});
 		}
 	}
 
diff --git a/packages/rocketchat-lib/server/methods/setUsername.js b/packages/rocketchat-lib/server/methods/setUsername.js
index 9f5af1436a9..041dc6e4276 100644
--- a/packages/rocketchat-lib/server/methods/setUsername.js
+++ b/packages/rocketchat-lib/server/methods/setUsername.js
@@ -13,7 +13,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setUsername' });
 		}
 
-		if (user.username === username) {
+		if (user.username === username || (user.username && user.username.toLowerCase() === username.toLowerCase())) {
 			return username;
 		}
 
@@ -28,13 +28,7 @@ Meteor.methods({
 			throw new Meteor.Error('username-invalid', `${ _.escape(username) } is not a valid username, use only letters, numbers, dots, hyphens and underscores`);
 		}
 
-		if (user.username !== undefined) {
-			if (!username.toLowerCase() === user.username.toLowerCase()) {
-				if (!RocketChat.checkUsernameAvailability(username)) {
-					throw new Meteor.Error('error-field-unavailable', `<strong>${ _.escape(username) }</strong> is already in use :(`, { method: 'setUsername', field: username });
-				}
-			}
-		} else if (!RocketChat.checkUsernameAvailability(username)) {
+		if (!RocketChat.checkUsernameAvailability(username)) {
 			throw new Meteor.Error('error-field-unavailable', `<strong>${ _.escape(username) }</strong> is already in use :(`, { method: 'setUsername', field: username });
 		}
 

From cf1eef4e5d53d46f55f5d2a8f4290fa6b0037cb5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 10:09:16 -0300
Subject: [PATCH 131/244] Merge pull request #8408 from
 RocketChat/rest-api-improve-json-query-helper

[FIX] Duplicate code in rest api letting in a few bugs with the rest api
# Conflicts:
#	packages/rocketchat-api/server/api.js
#	packages/rocketchat-api/server/v1/channels.js
#	packages/rocketchat-api/server/v1/groups.js
#	packages/rocketchat-api/server/v1/im.js
---
 packages/rocketchat-api/server/api.js         | 20 ++++++++++-
 packages/rocketchat-api/server/v1/channels.js |  6 ++--
 packages/rocketchat-api/server/v1/groups.js   |  4 +--
 .../server/v1/helpers/parseJsonQuery.js       | 34 +++++++++++++++++++
 packages/rocketchat-api/server/v1/im.js       |  6 ++--
 packages/rocketchat-api/server/v1/stats.js    |  8 ++---
 packages/rocketchat-api/server/v1/users.js    | 28 ++-------------
 7 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
index a8ee3da879d..a73beac1d97 100644
--- a/packages/rocketchat-api/server/api.js
+++ b/packages/rocketchat-api/server/api.js
@@ -5,10 +5,28 @@ class API extends Restivus {
 		this.logger = new Logger(`API ${ properties.version ? properties.version : 'default' } Logger`, {});
 		this.authMethods = [];
 		this.helperMethods = new Map();
+		this.fieldSeparator = '.';
 		this.defaultFieldsToExclude = {
 			joinCode: 0,
 			$loki: 0,
-			meta: 0
+			meta: 0,
+			members: 0,
+			importIds: 0
+		};
+		this.limitedUserFieldsToExclude = {
+			avatarOrigin: 0,
+			emails: 0,
+			phone: 0,
+			statusConnection: 0,
+			createdAt: 0,
+			lastLogin: 0,
+			services: 0,
+			requirePasswordChange: 0,
+			requirePasswordChangeReason: 0,
+			roles: 0,
+			statusDefault: 0,
+			_updatedAt: 0,
+			customFields: 0
 		};
 
 		this._config.defaultOptionsEndpoint = function() {
diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index 95e10d278eb..0a929f7da9f 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -208,7 +208,7 @@ RocketChat.API.v1.addRoute('channels.getIntegrations', { authRequired: true }, {
 			sort: sort ? sort : { _createdAt: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -352,7 +352,7 @@ RocketChat.API.v1.addRoute('channels.list', { authRequired: true }, {
 				sort: sort ? sort : { name: 1 },
 				skip: offset,
 				limit: count,
-				fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+				fields
 			}).fetch();
 
 			return RocketChat.API.v1.success({
@@ -376,7 +376,7 @@ RocketChat.API.v1.addRoute('channels.list.joined', { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		});
 
 		return RocketChat.API.v1.success({
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index f2b38a74761..d61d4787b02 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -180,7 +180,7 @@ RocketChat.API.v1.addRoute('groups.getIntegrations', { authRequired: true }, {
 			sort: sort ? sort : { _createdAt: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -296,7 +296,7 @@ RocketChat.API.v1.addRoute('groups.list', { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		});
 
 		return RocketChat.API.v1.success({
diff --git a/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js b/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js
index 1a07cacfa42..663a19f938d 100644
--- a/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js
+++ b/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js
@@ -19,6 +19,26 @@ RocketChat.API.v1.helperMethods.set('parseJsonQuery', function _parseJsonQuery()
 		}
 	}
 
+	// Verify the user's selected fields only contains ones which their role allows
+	if (typeof fields === 'object') {
+		let nonSelectableFields = Object.keys(RocketChat.API.v1.defaultFieldsToExclude);
+		if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info') && this.request.route.includes('/v1/users.')) {
+			nonSelectableFields = nonSelectableFields.concat(Object.keys(RocketChat.API.v1.limitedUserFieldsToExclude));
+		}
+
+		Object.keys(fields).forEach((k) => {
+			if (nonSelectableFields.includes(k) || nonSelectableFields.includes(k.split(RocketChat.API.v1.fieldSeparator)[0])) {
+				delete fields[k];
+			}
+		});
+	}
+
+	// Limit the fields by default
+	fields = Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude);
+	if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info') && this.request.route.includes('/v1/users.')) {
+		fields = Object.assign(fields, RocketChat.API.v1.limitedUserFieldsToExclude);
+	}
+
 	let query;
 	if (this.queryParams.query) {
 		try {
@@ -29,6 +49,20 @@ RocketChat.API.v1.helperMethods.set('parseJsonQuery', function _parseJsonQuery()
 		}
 	}
 
+	// Verify the user has permission to query the fields they are
+	if (typeof query === 'object') {
+		let nonQuerableFields = Object.keys(RocketChat.API.v1.defaultFieldsToExclude);
+		if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info') && this.request.route.includes('/v1/users.')) {
+			nonQuerableFields = nonQuerableFields.concat(Object.keys(RocketChat.API.v1.limitedUserFieldsToExclude));
+		}
+
+		Object.keys(query).forEach((k) => {
+			if (nonQuerableFields.includes(k) || nonQuerableFields.includes(k.split(RocketChat.API.v1.fieldSeparator)[0])) {
+				delete query[k];
+			}
+		});
+	}
+
 	return {
 		sort,
 		fields,
diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
index f0f2c08c8da..36dbb7b62a2 100644
--- a/packages/rocketchat-api/server/v1/im.js
+++ b/packages/rocketchat-api/server/v1/im.js
@@ -106,7 +106,7 @@ RocketChat.API.v1.addRoute(['dm.messages.others', 'im.messages.others'], { authR
 			sort: sort ? sort : { ts: -1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -129,7 +129,7 @@ RocketChat.API.v1.addRoute(['dm.list', 'im.list'], { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		});
 
 		return RocketChat.API.v1.success({
@@ -156,7 +156,7 @@ RocketChat.API.v1.addRoute(['dm.list.everyone', 'im.list.everyone'], { authRequi
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
diff --git a/packages/rocketchat-api/server/v1/stats.js b/packages/rocketchat-api/server/v1/stats.js
index a1035a43636..33d0e638b03 100644
--- a/packages/rocketchat-api/server/v1/stats.js
+++ b/packages/rocketchat-api/server/v1/stats.js
@@ -25,20 +25,18 @@ RocketChat.API.v1.addRoute('statistics.list', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
-		const ourQuery = Object.assign({}, query);
-
-		const statistics = RocketChat.models.Statistics.find(ourQuery, {
+		const statistics = RocketChat.models.Statistics.find(query, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
 			statistics,
 			count: statistics.length,
 			offset,
-			total: RocketChat.models.Statistics.find(ourQuery).count()
+			total: RocketChat.models.Statistics.find(query).count()
 		});
 	}
 });
diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index d2fdd1349f4..70b71abbba6 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -117,40 +117,18 @@ RocketChat.API.v1.addRoute('users.list', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
-		let fieldsToKeepFromRegularUsers;
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info')) {
-			fieldsToKeepFromRegularUsers = {
-				avatarOrigin: 0,
-				emails: 0,
-				phone: 0,
-				statusConnection: 0,
-				createdAt: 0,
-				lastLogin: 0,
-				services: 0,
-				requirePasswordChange: 0,
-				requirePasswordChangeReason: 0,
-				roles: 0,
-				statusDefault: 0,
-				_updatedAt: 0,
-				customFields: 0
-			};
-		}
-
-		const ourQuery = Object.assign({}, query);
-		const ourFields = Object.assign({}, fields, fieldsToKeepFromRegularUsers, RocketChat.API.v1.defaultFieldsToExclude);
-
-		const users = RocketChat.models.Users.find(ourQuery, {
+		const users = RocketChat.models.Users.find(query, {
 			sort: sort ? sort : { username: 1 },
 			skip: offset,
 			limit: count,
-			fields: ourFields
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
 			users,
 			count: users.length,
 			offset,
-			total: RocketChat.models.Users.find(ourQuery).count()
+			total: RocketChat.models.Users.find(query).count()
 		});
 	}
 });

From 60fa18c32efaf0113035082475d60ef9050aaf3c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 21:47:38 -0300
Subject: [PATCH 132/244] Bump version to 0.58.4

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 12 ++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index c3596c9f7c3..4e56fd18650 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.58.3
+ENV RC_VERSION 0.58.4
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 79a1116c533..126c2305931 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.58.3"),
+		appMarketingVersion = (defaultText = "0.58.4"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 2def149a00a..abefa92befe 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.58.3
+    RC_VERSION=0.58.4
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 24927916816..beff1d457ed 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,15 @@
+<a name="0.58.4"></a>
+## 0.58.4 (2017-10-06)
+
+
+### Bug Fixes
+
+- [#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389) Add needed dependency for snaps
+- [#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408) Duplicate code in rest api letting in a few bugs with the rest api
+- [#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390) Slack import failing and not being able to be restarted
+
+
+
 <a name="0.58.3"></a>
 ## 0.58.3 (2017-09-27)
 - Dependencies update
diff --git a/package.json b/package.json
index 7bb1fb3bb3d..947b95f95c3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.58.3",
+	"version": "0.58.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 47cb647194e..88588fa4317 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.58.3"
+	"version": "0.58.4"
 }

From cdc07d2994659607bf5103261a34c503bf1c9ed1 Mon Sep 17 00:00:00 2001
From: CYCLOPS <cyclops.sh@gmail.com>
Date: Sat, 7 Oct 2017 19:43:12 +0330
Subject: [PATCH 133/244] fix highlighted color height issue

---
 .../rocketchat-theme/client/imports/general/base_old.css    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 35e0f1ca16e..b766ce8f6eb 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3227,10 +3227,6 @@
 			list-style-type: decimal;
 		}
 
-		& > * + * {
-			padding-top: 10px;
-		}
-
 		& > table {
 			display: block;
 			overflow: auto;
@@ -3757,7 +3753,7 @@ body:not(.is-cordova) {
 			margin-bottom: 10px;
 		  }
 		}
-		
+
 		& .file-name {
 			display: block;
 

From 17c0725a2354847e9ef6355bd4f861ee116f9490 Mon Sep 17 00:00:00 2001
From: Vikas Kedia <kedia.vikas@gmail.com>
Date: Sat, 7 Oct 2017 11:34:00 -0700
Subject: [PATCH 134/244] removing a duplicate line

---
 .docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 40e54c7a30c..9ac42934699 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,7 +7,6 @@ MAINTAINER buildmaster@rocket.chat
 RUN set -x \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
- && mkdir /app \
  && gpg --verify rocket.chat.tgz.asc \
  && mkdir -p /app \
  && tar -zxf rocket.chat.tgz -C /app \

From 188e13654d77c84054d4096a6a91f518a83ed031 Mon Sep 17 00:00:00 2001
From: CYCLOPS <cyclops.sh@gmail.com>
Date: Sun, 8 Oct 2017 15:34:27 +0330
Subject: [PATCH 135/244] Range Slider Value label has bug in RTL

---
 .../client/imports/components/slider.css      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/slider.css b/packages/rocketchat-theme/client/imports/components/slider.css
index 4fbc79197f8..70db410152e 100644
--- a/packages/rocketchat-theme/client/imports/components/slider.css
+++ b/packages/rocketchat-theme/client/imports/components/slider.css
@@ -8,7 +8,6 @@
 	height: 10px;
 	margin: 0;
 	padding: 0;
-
 	border-radius: 5px;
 	outline: none;
 	appearance: none;
@@ -17,10 +16,8 @@
 .range-slider-range::-webkit-slider-thumb {
 	width: 20px;
 	height: 20px;
-
 	cursor: pointer;
 	transition: background 0.15s ease-in-out;
-
 	border-radius: 50%;
 	appearance: none;
 }
@@ -28,45 +25,48 @@
 .range-slider-range::-moz-range-thumb {
 	width: 20px;
 	height: 20px;
-
 	cursor: pointer;
 	transition: background 0.15s ease-in-out;
-
 	border: 0;
 	border-radius: 50%;
 }
 
 .range-slider-value {
 	position: relative;
-
 	display: inline-block;
-
 	width: 60px;
 	margin-left: 8px;
 	padding: 5px 10px;
-
 	text-align: center;
-
 	border-radius: 3px;
-
 	line-height: 20px;
 }
 
+.rtl .range-slider-value {
+  margin-right: 8px;
+  margin-left: unset;
+}
+
 .range-slider-value::after {
 	position: absolute;
 	top: 8px;
 	left: -7px;
-
 	width: 0;
 	height: 0;
-
 	content: '';
-
 	border-top: 7px solid;
 	border-right: 7px solid;
 	border-bottom: 7px solid;
 }
 
+.rtl .range-slider-value::after {
+  right: -7px;
+  left: unset;
+  -ms-transform: rotate(180deg); /* IE 9 */
+  -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */
+  transform: rotate(180deg);
+}
+
 .range-slider-range::-moz-range-track,
 .range-slider-range::-moz-focus-inner,
 .range-slider-range::-moz-focus-outer {

From cc6fad4380e8e2a6a4b28b0cc4f8d698e54053d8 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 4 Oct 2017 19:35:31 -0300
Subject: [PATCH 136/244] Merge pull request #8398 from
 RocketChat/improvements/ldap-size-config

Fix: Missing settings to configure LDAP size and page limits
---
 packages/rocketchat-i18n/i18n/en.i18n.json  | 6 +++++-
 packages/rocketchat-ldap/server/ldap.js     | 5 ++++-
 packages/rocketchat-ldap/server/settings.js | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 367b6a5ee78..28d6c77be58 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1044,6 +1044,10 @@
   "LDAP_Sync_User_Data_Description": "Keep user data in sync with server on **login** or on **background sync** (eg: name, email).",
   "LDAP_Sync_User_Data_FieldMap": "User Data Field Map",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configure how user account fields (like email) are populated from a record in LDAP (once found). <br/>As an example, `{\"cn\":\"name\", \"mail\":\"email\"}` will choose a person's human readable name from the cn attribute, and their email from the mail attribute. Additionally it is possible to use variables, for example: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` uses a combination of the user's first name and last name for the rocket chat `name` field.<br/>Available fields in Rocket.Chat: `name`, `email` and `customFields`.",
+  "LDAP_Search_Page_Size": "Search Page Size",
+  "LDAP_Search_Page_Size_Description": "The maximum number of entries each result page will return to be processed",
+  "LDAP_Search_Size_Limit": "Search Size Limit",
+  "LDAP_Search_Size_Limit_Description": "The maximum number of entries to return.<br/>**Attention** This number should greater than **Search Page Size**",
   "LDAP_Test_Connection": "Test Connection",
   "LDAP_Timeout": "Timeout (ms)",
   "LDAP_Timeout_Description": "How many mileseconds wait for a search result before return an error",
@@ -2029,4 +2033,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 65fa5f953a8..0311151979c 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -33,6 +33,8 @@ export default class LDAP {
 			User_Search_Filter: RocketChat.settings.get('LDAP_User_Search_Filter'),
 			User_Search_Scope: RocketChat.settings.get('LDAP_User_Search_Scope'),
 			User_Search_Field: RocketChat.settings.get('LDAP_User_Search_Field'),
+			Search_Page_Size: RocketChat.settings.get('LDAP_Search_Page_Size'),
+			Search_Size_Limit: RocketChat.settings.get('LDAP_Search_Size_Limit'),
 			group_filter_enabled: RocketChat.settings.get('LDAP_Group_Filter_Enable'),
 			group_filter_object_class: RocketChat.settings.get('LDAP_Group_Filter_ObjectClass'),
 			group_filter_group_id_attribute: RocketChat.settings.get('LDAP_Group_Filter_Group_Id_Attribute'),
@@ -209,8 +211,9 @@ export default class LDAP {
 		const searchOptions = {
 			filter: this.getUserFilter(username),
 			scope: this.options.User_Search_Scope || 'sub',
+			sizeLimit: this.options.Search_Size_Limit,
 			paged: {
-				pageSize: 250,
+				pageSize: this.options.Search_Page_Size,
 				pagePause: !!page
 			}
 		};
diff --git a/packages/rocketchat-ldap/server/settings.js b/packages/rocketchat-ldap/server/settings.js
index e92eb52e243..054c6fdda56 100644
--- a/packages/rocketchat-ldap/server/settings.js
+++ b/packages/rocketchat-ldap/server/settings.js
@@ -47,6 +47,8 @@ RocketChat.settings.addGroup('LDAP', function() {
 		this.add('LDAP_User_Search_Filter', '(objectclass=*)', { type: 'string', enableQuery });
 		this.add('LDAP_User_Search_Scope', 'sub', { type: 'string', enableQuery });
 		this.add('LDAP_User_Search_Field', 'sAMAccountName', { type: 'string', enableQuery });
+		this.add('LDAP_Search_Page_Size', 250, { type: 'int', enableQuery });
+		this.add('LDAP_Search_Size_Limit', 1000, { type: 'int', enableQuery });
 	});
 
 	this.section('User Search (Group Validation)', function() {

From 17472d86089a151325ea3cf653ed011a0d111100 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 10:09:16 -0300
Subject: [PATCH 137/244] Merge pull request #8408 from
 RocketChat/rest-api-improve-json-query-helper

[FIX] Duplicate code in rest api letting in a few bugs with the rest api
---
 packages/rocketchat-api/server/api.js         | 19 ++++++++++-
 packages/rocketchat-api/server/v1/channels.js | 10 +++---
 packages/rocketchat-api/server/v1/groups.js   | 10 +++---
 .../server/v1/helpers/parseJsonQuery.js       | 34 +++++++++++++++++++
 packages/rocketchat-api/server/v1/im.js       | 10 +++---
 packages/rocketchat-api/server/v1/stats.js    |  8 ++---
 packages/rocketchat-api/server/v1/users.js    | 28 ++-------------
 7 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
index 5bc15d9c5d4..1f0ee1a669e 100644
--- a/packages/rocketchat-api/server/api.js
+++ b/packages/rocketchat-api/server/api.js
@@ -5,11 +5,28 @@ class API extends Restivus {
 		this.logger = new Logger(`API ${ properties.version ? properties.version : 'default' } Logger`, {});
 		this.authMethods = [];
 		this.helperMethods = new Map();
+		this.fieldSeparator = '.';
 		this.defaultFieldsToExclude = {
 			joinCode: 0,
 			$loki: 0,
 			meta: 0,
-			members: 0
+			members: 0,
+			importIds: 0
+		};
+		this.limitedUserFieldsToExclude = {
+			avatarOrigin: 0,
+			emails: 0,
+			phone: 0,
+			statusConnection: 0,
+			createdAt: 0,
+			lastLogin: 0,
+			services: 0,
+			requirePasswordChange: 0,
+			requirePasswordChangeReason: 0,
+			roles: 0,
+			statusDefault: 0,
+			_updatedAt: 0,
+			customFields: 0
 		};
 
 		this._config.defaultOptionsEndpoint = function() {
diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index 60f4941689c..5952837facf 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -191,7 +191,7 @@ RocketChat.API.v1.addRoute('channels.files', { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -235,7 +235,7 @@ RocketChat.API.v1.addRoute('channels.getIntegrations', { authRequired: true }, {
 			sort: sort ? sort : { _createdAt: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -381,7 +381,7 @@ RocketChat.API.v1.addRoute('channels.list', { authRequired: true }, {
 				sort: sort ? sort : { name: 1 },
 				skip: offset,
 				limit: count,
-				fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+				fields
 			}).fetch();
 
 			return RocketChat.API.v1.success({
@@ -405,7 +405,7 @@ RocketChat.API.v1.addRoute('channels.list.joined', { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		});
 
 		return RocketChat.API.v1.success({
@@ -461,7 +461,7 @@ RocketChat.API.v1.addRoute('channels.messages', { authRequired: true }, {
 			sort: sort ? sort : { ts: -1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index e7ce5184cc8..29d5bdb4b7a 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -167,7 +167,7 @@ RocketChat.API.v1.addRoute('groups.files', { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -205,7 +205,7 @@ RocketChat.API.v1.addRoute('groups.getIntegrations', { authRequired: true }, {
 			sort: sort ? sort : { _createdAt: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -323,7 +323,7 @@ RocketChat.API.v1.addRoute('groups.list', { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		});
 
 		return RocketChat.API.v1.success({
@@ -350,7 +350,7 @@ RocketChat.API.v1.addRoute('groups.listAll', { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		});
 
 		return RocketChat.API.v1.success({
@@ -398,7 +398,7 @@ RocketChat.API.v1.addRoute('groups.messages', { authRequired: true }, {
 			sort: sort ? sort : { ts: -1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
diff --git a/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js b/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js
index 1a07cacfa42..663a19f938d 100644
--- a/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js
+++ b/packages/rocketchat-api/server/v1/helpers/parseJsonQuery.js
@@ -19,6 +19,26 @@ RocketChat.API.v1.helperMethods.set('parseJsonQuery', function _parseJsonQuery()
 		}
 	}
 
+	// Verify the user's selected fields only contains ones which their role allows
+	if (typeof fields === 'object') {
+		let nonSelectableFields = Object.keys(RocketChat.API.v1.defaultFieldsToExclude);
+		if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info') && this.request.route.includes('/v1/users.')) {
+			nonSelectableFields = nonSelectableFields.concat(Object.keys(RocketChat.API.v1.limitedUserFieldsToExclude));
+		}
+
+		Object.keys(fields).forEach((k) => {
+			if (nonSelectableFields.includes(k) || nonSelectableFields.includes(k.split(RocketChat.API.v1.fieldSeparator)[0])) {
+				delete fields[k];
+			}
+		});
+	}
+
+	// Limit the fields by default
+	fields = Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude);
+	if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info') && this.request.route.includes('/v1/users.')) {
+		fields = Object.assign(fields, RocketChat.API.v1.limitedUserFieldsToExclude);
+	}
+
 	let query;
 	if (this.queryParams.query) {
 		try {
@@ -29,6 +49,20 @@ RocketChat.API.v1.helperMethods.set('parseJsonQuery', function _parseJsonQuery()
 		}
 	}
 
+	// Verify the user has permission to query the fields they are
+	if (typeof query === 'object') {
+		let nonQuerableFields = Object.keys(RocketChat.API.v1.defaultFieldsToExclude);
+		if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info') && this.request.route.includes('/v1/users.')) {
+			nonQuerableFields = nonQuerableFields.concat(Object.keys(RocketChat.API.v1.limitedUserFieldsToExclude));
+		}
+
+		Object.keys(query).forEach((k) => {
+			if (nonQuerableFields.includes(k) || nonQuerableFields.includes(k.split(RocketChat.API.v1.fieldSeparator)[0])) {
+				delete query[k];
+			}
+		});
+	}
+
 	return {
 		sort,
 		fields,
diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
index 087725da9f7..44ba96588cc 100644
--- a/packages/rocketchat-api/server/v1/im.js
+++ b/packages/rocketchat-api/server/v1/im.js
@@ -60,7 +60,7 @@ RocketChat.API.v1.addRoute(['dm.files', 'im.files'], { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -160,7 +160,7 @@ RocketChat.API.v1.addRoute(['dm.messages', 'im.messages'], { authRequired: true
 			sort: sort ? sort : { ts: -1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -200,7 +200,7 @@ RocketChat.API.v1.addRoute(['dm.messages.others', 'im.messages.others'], { authR
 			sort: sort ? sort : { ts: -1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
@@ -223,7 +223,7 @@ RocketChat.API.v1.addRoute(['dm.list', 'im.list'], { authRequired: true }, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		});
 
 		return RocketChat.API.v1.success({
@@ -250,7 +250,7 @@ RocketChat.API.v1.addRoute(['dm.list.everyone', 'im.list.everyone'], { authRequi
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
diff --git a/packages/rocketchat-api/server/v1/stats.js b/packages/rocketchat-api/server/v1/stats.js
index a1035a43636..33d0e638b03 100644
--- a/packages/rocketchat-api/server/v1/stats.js
+++ b/packages/rocketchat-api/server/v1/stats.js
@@ -25,20 +25,18 @@ RocketChat.API.v1.addRoute('statistics.list', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
-		const ourQuery = Object.assign({}, query);
-
-		const statistics = RocketChat.models.Statistics.find(ourQuery, {
+		const statistics = RocketChat.models.Statistics.find(query, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
-			fields: Object.assign({}, fields, RocketChat.API.v1.defaultFieldsToExclude)
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
 			statistics,
 			count: statistics.length,
 			offset,
-			total: RocketChat.models.Statistics.find(ourQuery).count()
+			total: RocketChat.models.Statistics.find(query).count()
 		});
 	}
 });
diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index d2fdd1349f4..70b71abbba6 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -117,40 +117,18 @@ RocketChat.API.v1.addRoute('users.list', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
-		let fieldsToKeepFromRegularUsers;
-		if (!RocketChat.authz.hasPermission(this.userId, 'view-full-other-user-info')) {
-			fieldsToKeepFromRegularUsers = {
-				avatarOrigin: 0,
-				emails: 0,
-				phone: 0,
-				statusConnection: 0,
-				createdAt: 0,
-				lastLogin: 0,
-				services: 0,
-				requirePasswordChange: 0,
-				requirePasswordChangeReason: 0,
-				roles: 0,
-				statusDefault: 0,
-				_updatedAt: 0,
-				customFields: 0
-			};
-		}
-
-		const ourQuery = Object.assign({}, query);
-		const ourFields = Object.assign({}, fields, fieldsToKeepFromRegularUsers, RocketChat.API.v1.defaultFieldsToExclude);
-
-		const users = RocketChat.models.Users.find(ourQuery, {
+		const users = RocketChat.models.Users.find(query, {
 			sort: sort ? sort : { username: 1 },
 			skip: offset,
 			limit: count,
-			fields: ourFields
+			fields
 		}).fetch();
 
 		return RocketChat.API.v1.success({
 			users,
 			count: users.length,
 			offset,
-			total: RocketChat.models.Users.find(ourQuery).count()
+			total: RocketChat.models.Users.find(query).count()
 		});
 	}
 });

From 830849aa50ae4aba0d6500e8407fe7b386b302b2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 16:39:26 -0300
Subject: [PATCH 138/244] Merge pull request #8394 from
 RocketChat/fix-snippet-i18n

Add i18n Title to snippet messages
---
 packages/rocketchat-message-snippet/client/tabBar/tabBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-message-snippet/client/tabBar/tabBar.js b/packages/rocketchat-message-snippet/client/tabBar/tabBar.js
index e4e8d1ce302..63c8f474577 100644
--- a/packages/rocketchat-message-snippet/client/tabBar/tabBar.js
+++ b/packages/rocketchat-message-snippet/client/tabBar/tabBar.js
@@ -4,7 +4,7 @@ Meteor.startup(function() {
 			RocketChat.TabBar.addButton({
 				groups: ['channel', 'group', 'direct'],
 				id: 'snippeted-messages',
-				i18nTitle: 'Snippeted_Messages',
+				i18nTitle: 'snippet-message',
 				icon: 'code',
 				template: 'snippetedMessages',
 				order: 20

From 49cef0daf420a261ca99cfbe0b2dc2cc004adc58 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 16:39:54 -0300
Subject: [PATCH 139/244] Merge pull request #8386 from RocketChat/katex

[FIX] disabled katex tooltip on messageBox
---
 packages/rocketchat-ui-message/client/messageBox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 74228fed869..cc1d3067095 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -126,7 +126,7 @@ const markdownButtons = [
 	{
 		label: katexSyntax,
 		link: 'https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX',
-		condition: () => RocketChat.katex
+		condition: () => RocketChat.katex.katex_enabled()
 	}
 ];
 

From 55398f162a76f7bda85d35084fe8c0da1928580e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 16:40:25 -0300
Subject: [PATCH 140/244] Merge pull request #8397 from intwarehq/fix-8384

[FIX] Sidebar item menu position in RTL
---
 .../client/imports/components/sidebar/sidebar-item.css       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 687c40b8d17..8a298eb90d5 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -135,6 +135,11 @@
 	}
 }
 
+.rtl .sidebar-item__menu {
+  left: 0;
+  right: auto;
+}
+
 .rtl .sidebar-item__user-status {
 	right: 4px;
 	left: initial;

From 4fd0d3ddbd7fd16e49dc0173e695420330ffe8e5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 16:50:55 -0300
Subject: [PATCH 141/244] Merge pull request #8390 from
 RocketChat/fixes-for-slack-import

[FIX] Slack import failing and not being able to be restarted
---
 packages/rocketchat-i18n/i18n/en.i18n.json    |   2 +
 packages/rocketchat-importer-slack/server.js  | 530 ++++++++++--------
 .../client/admin/adminImport.html             |  12 +-
 .../client/admin/adminImport.js               |  12 +-
 .../client/admin/adminImportPrepare.html      |   2 +-
 .../client/admin/adminImportPrepare.js        |  15 +-
 .../server/classes/ImporterBase.js            |  21 +
 .../server/methods/startImport.js             |   6 +-
 .../server/methods/filterATAllTag.js          |  12 +-
 .../server/methods/setUsername.js             |  10 +-
 10 files changed, 338 insertions(+), 284 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 28d6c77be58..43f7c088143 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -807,6 +807,7 @@
   "IMAP_intercepter_Not_running": "IMAP intercepter Not running",
   "Impersonate_user": "Impersonate User",
   "Impersonate_user_description": "When enabled, integration posts as the user that triggered integration",
+  "Import": "Import",
   "Importer_Archived": "Archived",
   "Importer_CSV_Information": "The CSV importer requires a specific format, please read the documentation for how to structure your zip file:",
   "Importer_done": "Importing complete!",
@@ -1667,6 +1668,7 @@
   "SSL": "SSL",
   "Star_Message": "Star Message",
   "Starred_Messages": "Starred Messages",
+  "Start": "Start",
   "Start_audio_call": "Start audio call",
   "Start_Chat": "Start Chat",
   "Start_of_conversation": "Start of conversation",
diff --git a/packages/rocketchat-importer-slack/server.js b/packages/rocketchat-importer-slack/server.js
index ea12a7928bd..c48d5a3bc63 100644
--- a/packages/rocketchat-importer-slack/server.js
+++ b/packages/rocketchat-importer-slack/server.js
@@ -6,37 +6,48 @@ Importer.Slack = class extends Importer.Base {
 		this.bots = {};
 		this.logger.debug('Constructed a new Slack Importer.');
 	}
+
 	prepare(dataURI, sentContentType, fileName) {
 		super.prepare(dataURI, sentContentType, fileName);
-		const {image/*, contentType*/} = RocketChatFile.dataURIParse(dataURI);
+
+		const { image } = RocketChatFile.dataURIParse(dataURI);
 		const zip = new this.AdmZip(new Buffer(image, 'base64'));
 		const zipEntries = zip.getEntries();
+
 		let tempChannels = [];
 		let tempUsers = [];
 		const tempMessages = {};
+
 		zipEntries.forEach(entry => {
 			if (entry.entryName.indexOf('__MACOSX') > -1) {
 				return this.logger.debug(`Ignoring the file: ${ entry.entryName }`);
 			}
+
 			if (entry.entryName === 'channels.json') {
 				this.updateProgress(Importer.ProgressStep.PREPARING_CHANNELS);
 				tempChannels = JSON.parse(entry.getData().toString()).filter(channel => channel.creator != null);
 				return;
 			}
+
 			if (entry.entryName === 'users.json') {
 				this.updateProgress(Importer.ProgressStep.PREPARING_USERS);
 				tempUsers = JSON.parse(entry.getData().toString());
-				return tempUsers.forEach(user => {
+
+				tempUsers.forEach(user => {
 					if (user.is_bot) {
 						this.bots[user.profile.bot_id] = user;
 					}
 				});
+
+				return;
 			}
+
 			if (!entry.isDirectory && entry.entryName.indexOf('/') > -1) {
 				const item = entry.entryName.split('/');
 				const channelName = item[0];
 				const msgGroupData = item[1].split('.')[0];
 				tempMessages[channelName] = tempMessages[channelName] || {};
+
 				try {
 					tempMessages[channelName][msgGroupData] = JSON.parse(entry.getData().toString());
 				} catch (error) {
@@ -65,10 +76,11 @@ Importer.Slack = class extends Importer.Base {
 		Object.keys(tempMessages).forEach(channel => {
 			const messagesObj = tempMessages[channel];
 			this.messages[channel] = this.messages[channel] || {};
+
 			Object.keys(messagesObj).forEach(date => {
 				const msgs = messagesObj[date];
 				messagesCount += msgs.length;
-				this.updateRecord({ 'messagesstatus': '#{channel}/#{date}' });
+				this.updateRecord({ 'messagesstatus': `${ channel }/${ date }` });
 				if (Importer.Base.getBSONSize(msgs) > Importer.Base.MaxBSONSize) {
 					const tmp = Importer.Base.getBSONSafeArraysFromAnArray(msgs);
 					Object.keys(tmp).forEach(i => {
@@ -82,6 +94,7 @@ Importer.Slack = class extends Importer.Base {
 				}
 			});
 		});
+
 		this.updateRecord({ 'count.messages': messagesCount, 'messagesstatus': null });
 		this.addCountToTotal(messagesCount);
 		if ([tempUsers.length, tempChannels.length, messagesCount].some(e => e === 0)) {
@@ -99,6 +112,7 @@ Importer.Slack = class extends Importer.Base {
 	startImport(importSelection) {
 		super.startImport(importSelection);
 		const start = Date.now();
+
 		Object.keys(importSelection.users).forEach(key => {
 			const user = importSelection.users[key];
 			Object.keys(this.users.users).forEach(k => {
@@ -109,6 +123,7 @@ Importer.Slack = class extends Importer.Base {
 			});
 		});
 		this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
+
 		Object.keys(importSelection.channels).forEach(key => {
 			const channel = importSelection.channels[key];
 			Object.keys(this.channels.channels).forEach(k => {
@@ -119,283 +134,310 @@ Importer.Slack = class extends Importer.Base {
 			});
 		});
 		this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
+
 		const startedByUserId = Meteor.userId();
 		Meteor.defer(() => {
-			this.updateProgress(Importer.ProgressStep.IMPORTING_USERS);
-			this.users.users.forEach(user => {
-				if (!user.do_import) {
-					return;
-				}
-				Meteor.runAsUser(startedByUserId, () => {
-					const existantUser = RocketChat.models.Users.findOneByEmailAddress(user.profile.email) || RocketChat.models.Users.findOneByUsername(user.name);
-					if (existantUser) {
-						user.rocketId = existantUser._id;
-						RocketChat.models.Users.update({ _id: user.rocketId }, { $addToSet: { importIds: user.id } });
-						this.userTags.push({
-							slack: `<@${ user.id }>`,
-							slackLong: `<@${ user.id }|${ user.name }>`,
-							rocket: `@${ existantUser.username }`
-						});
-					} else {
-						const userId = user.profile.email ? Accounts.createUser({ email: user.profile.email, password: Date.now() + user.name + user.profile.email.toUpperCase() }) : Accounts.createUser({ username: user.name, password: Date.now() + user.name, joinDefaultChannelsSilenced: true });
-						Meteor.runAsUser(userId, () => {
-							Meteor.call('setUsername', user.name, {joinDefaultChannelsSilenced: true});
-							const url = user.profile.image_original || user.profile.image_512;
-							try {
-								Meteor.call('setAvatarFromService', url, undefined, 'url');
-							} catch (error) {
-								this.logger.warn(`Failed to set ${ user.name }'s avatar from url ${ url }`);
-								console.log(`Failed to set ${ user.name }'s avatar from url ${ url }`);
-							}
-							// Slack's is -18000 which translates to Rocket.Chat's after dividing by 3600
-							if (user.tz_offset) {
-								Meteor.call('userSetUtcOffset', user.tz_offset / 3600);
+			try {
+				this.updateProgress(Importer.ProgressStep.IMPORTING_USERS);
+				this.users.users.forEach(user => {
+					if (!user.do_import) {
+						return;
+					}
+
+					Meteor.runAsUser(startedByUserId, () => {
+						const existantUser = RocketChat.models.Users.findOneByEmailAddress(user.profile.email) || RocketChat.models.Users.findOneByUsername(user.name);
+						if (existantUser) {
+							user.rocketId = existantUser._id;
+							RocketChat.models.Users.update({ _id: user.rocketId }, { $addToSet: { importIds: user.id } });
+							this.userTags.push({
+								slack: `<@${ user.id }>`,
+								slackLong: `<@${ user.id }|${ user.name }>`,
+								rocket: `@${ existantUser.username }`
+							});
+						} else {
+							const userId = user.profile.email ? Accounts.createUser({ email: user.profile.email, password: Date.now() + user.name + user.profile.email.toUpperCase() }) : Accounts.createUser({ username: user.name, password: Date.now() + user.name, joinDefaultChannelsSilenced: true });
+							Meteor.runAsUser(userId, () => {
+								Meteor.call('setUsername', user.name, { joinDefaultChannelsSilenced: true });
+
+								const url = user.profile.image_original || user.profile.image_512;
+								try {
+									Meteor.call('setAvatarFromService', url, undefined, 'url');
+								} catch (error) {
+									this.logger.warn(`Failed to set ${ user.name }'s avatar from url ${ url }`);
+									console.log(`Failed to set ${ user.name }'s avatar from url ${ url }`);
+								}
+
+								// Slack's is -18000 which translates to Rocket.Chat's after dividing by 3600
+								if (user.tz_offset) {
+									Meteor.call('userSetUtcOffset', user.tz_offset / 3600);
+								}
+							});
+
+							RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: user.id } });
+
+							if (user.profile.real_name) {
+								RocketChat.models.Users.setName(userId, user.profile.real_name);
 							}
-						});
 
-						RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: user.id } });
+							//Deleted users are 'inactive' users in Rocket.Chat
+							if (user.deleted) {
+								Meteor.call('setUserActiveStatus', userId, false);
+							}
 
-						if (user.profile.real_name) {
-							RocketChat.models.Users.setName(userId, user.profile.real_name);
-						}
-						//Deleted users are 'inactive' users in Rocket.Chat
-						if (user.deleted) {
-							Meteor.call('setUserActiveStatus', userId, false);
+							user.rocketId = userId;
+							this.userTags.push({
+								slack: `<@${ user.id }>`,
+								slackLong: `<@${ user.id }|${ user.name }>`,
+								rocket: `@${ user.name }`
+							});
 						}
-						//TODO: Maybe send emails?
-						user.rocketId = userId;
-						this.userTags.push({
-							slack: `<@${ user.id }>`,
-							slackLong: `<@${ user.id }|${ user.name }>`,
-							rocket: `@${ user.name }`
-						});
 
-					}
-					this.addCountCompleted(1);
+						this.addCountCompleted(1);
+					});
 				});
-			});
-			this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
-			this.updateProgress(Importer.ProgressStep.IMPORTING_CHANNELS);
-			this.channels.channels.forEach(channel => {
-				if (!channel.do_import) {
-					return;
-				}
-				Meteor.runAsUser (startedByUserId, () => {
-					const existantRoom = RocketChat.models.Rooms.findOneByName(channel.name);
-					if (existantRoom || channel.is_general) {
-						if (channel.is_general && existantRoom && channel.name !== existantRoom.name) {
-							Meteor.call('saveRoomSettings', 'GENERAL', 'roomName', channel.name);
-						}
-						channel.rocketId = channel.is_general ? 'GENERAL' : existantRoom._id;
-						RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $addToSet: { importIds: channel.id } });
-					} else {
-						const users = channel.members
-							.reduce((ret, member) => {
-								if (member !== channel.creator) {
-									const user = this.getRocketUser(member);
-									if (user && user.username) {
-										ret.push(user.username);
+				this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
+
+				this.updateProgress(Importer.ProgressStep.IMPORTING_CHANNELS);
+				this.channels.channels.forEach(channel => {
+					if (!channel.do_import) {
+						return;
+					}
+
+					Meteor.runAsUser (startedByUserId, () => {
+						const existantRoom = RocketChat.models.Rooms.findOneByName(channel.name);
+						if (existantRoom || channel.is_general) {
+							if (channel.is_general && existantRoom && channel.name !== existantRoom.name) {
+								Meteor.call('saveRoomSettings', 'GENERAL', 'roomName', channel.name);
+							}
+
+							channel.rocketId = channel.is_general ? 'GENERAL' : existantRoom._id;
+							RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $addToSet: { importIds: channel.id } });
+						} else {
+							const users = channel.members
+								.reduce((ret, member) => {
+									if (member !== channel.creator) {
+										const user = this.getRocketUser(member);
+										if (user && user.username) {
+											ret.push(user.username);
+										}
 									}
+									return ret;
+								}, []);
+							let userId = startedByUserId;
+							this.users.users.forEach(user => {
+								if (user.id === channel.creator && user.do_import) {
+									userId = user.rocketId;
 								}
-								return ret;
-							}, []);
-						let userId = startedByUserId;
-						this.users.users.forEach(user => {
-							if (user.id === channel.creator && user.do_import) {
-								userId = user.rocketId;
-							}
-						});
-						Meteor.runAsUser(userId, () => {
-							const returned = Meteor.call('createChannel', channel.name, users);
-							channel.rocketId = returned.rid;
-						});
+							});
+							Meteor.runAsUser(userId, () => {
+								const returned = Meteor.call('createChannel', channel.name, users);
+								channel.rocketId = returned.rid;
+							});
 
-						// @TODO implement model specific function
-						const roomUpdate = {
-							ts: new Date(channel.created * 1000)
-						};
-						if (!_.isEmpty(channel.topic && channel.topic.value)) {
-							roomUpdate.topic = channel.topic.value;
-						}
-						if (!_.isEmpty(channel.purpose && channel.purpose.value)) {
-							roomUpdate.description = channel.purpose.value;
+							// @TODO implement model specific function
+							const roomUpdate = {
+								ts: new Date(channel.created * 1000)
+							};
+							if (!_.isEmpty(channel.topic && channel.topic.value)) {
+								roomUpdate.topic = channel.topic.value;
+							}
+							if (!_.isEmpty(channel.purpose && channel.purpose.value)) {
+								roomUpdate.description = channel.purpose.value;
+							}
+							RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $set: roomUpdate, $addToSet: { importIds: channel.id } });
 						}
-						RocketChat.models.Rooms.update({ _id: channel.rocketId }, { $set: roomUpdate, $addToSet: { importIds: channel.id } });
-					}
-					this.addCountCompleted(1);
+						this.addCountCompleted(1);
+					});
 				});
-			});
-			this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
-			const missedTypes = {};
-			const ignoreTypes = { 'bot_add': true, 'file_comment': true, 'file_mention': true };
-			this.updateProgress(Importer.ProgressStep.IMPORTING_MESSAGES);
-			Object.keys(this.messages).forEach(channel => {
-				const messagesObj = this.messages[channel];
-
-				Meteor.runAsUser(startedByUserId, () =>{
-					const slackChannel = this.getSlackChannelFromName(channel);
-					if (!slackChannel || !slackChannel.do_import) { return; }
-					const room = RocketChat.models.Rooms.findOneById(slackChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
-					Object.keys(messagesObj).forEach(date => {
-						const msgs = messagesObj[date];
-						msgs.messages.forEach(message => {
-							this.updateRecord({ 'messagesstatus': '#{channel}/#{date}.#{msgs.messages.length}' });
-							const msgDataDefaults ={
-								_id: `slack-${ slackChannel.id }-${ message.ts.replace(/\./g, '-') }`,
-								ts: new Date(parseInt(message.ts.split('.')[0]) * 1000)
-							};
-							if (message.type === 'message') {
-								if (message.subtype) {
-									if (message.subtype === 'channel_join') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createUserJoinWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'channel_leave') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createUserLeaveWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'me_message') {
-										const msgObj = {
-											...msgDataDefaults,
-											msg: `_${ this.convertSlackMessageToRocketChat(message.text) }_`
-										};
-										RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
-									} else if (message.subtype === 'bot_message' || message.subtype === 'slackbot_response') {
-										const botUser = RocketChat.models.Users.findOneById('rocket.cat', { fields: { username: 1 }});
-										const botUsername = this.bots[message.bot_id] ? this.bots[message.bot_id].name : message.username;
-										const msgObj = {
-											...msgDataDefaults,
-											msg: this.convertSlackMessageToRocketChat(message.text),
-											rid: room._id,
-											bot: true,
-											attachments: message.attachments,
-											username: botUsername || undefined
-										};
-
-										if (message.edited) {
-											msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
-											const editedBy = this.getRocketUser(message.edited.user);
-											if (editedBy) {
-												msgObj.editedBy = {
-													_id: editedBy._id,
-													username: editedBy.username
-												};
-											}
-										}
+				this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
 
-										if (message.icons) {
-											msgObj.emoji = message.icons.emoji;
-										}
-										RocketChat.sendMessage(botUser, msgObj, room, true);
-									} else if (message.subtype === 'channel_purpose') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_description', room._id, message.purpose, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'channel_topic') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_topic', room._id, message.topic, this.getRocketUser(message.user), msgDataDefaults);
-										}
-									} else if (message.subtype === 'channel_name') {
-										if (this.getRocketUser(message.user)) {
-											RocketChat.models.Messages.createRoomRenamedWithRoomIdRoomNameAndUser(room._id, message.name, this.getRocketUser(message.user), msgDataDefaults);
+				const missedTypes = {};
+				const ignoreTypes = { 'bot_add': true, 'file_comment': true, 'file_mention': true };
+				this.updateProgress(Importer.ProgressStep.IMPORTING_MESSAGES);
+				Object.keys(this.messages).forEach(channel => {
+					const messagesObj = this.messages[channel];
+
+					Meteor.runAsUser(startedByUserId, () =>{
+						const slackChannel = this.getSlackChannelFromName(channel);
+						if (!slackChannel || !slackChannel.do_import) { return; }
+						const room = RocketChat.models.Rooms.findOneById(slackChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
+						Object.keys(messagesObj).forEach(date => {
+							const msgs = messagesObj[date];
+							msgs.messages.forEach(message => {
+								this.updateRecord({ 'messagesstatus': `${ channel }/${ date }.${ msgs.messages.length }` });
+								const msgDataDefaults ={
+									_id: `slack-${ slackChannel.id }-${ message.ts.replace(/\./g, '-') }`,
+									ts: new Date(parseInt(message.ts.split('.')[0]) * 1000)
+								};
+
+								// Process the reactions
+								if (message.reactions && message.reactions.length > 0) {
+									msgDataDefaults.reactions = {};
+
+									message.reactions.forEach(reaction => {
+										msgDataDefaults.reactions[reaction.name] = { usernames: [] };
+
+										reaction.users.forEach(u => {
+											const rcUser = this.getRocketUser(u);
+											if (!rcUser) { return; }
+
+											msgDataDefaults.reactions[reaction.name].usernames.push(rcUser.username);
+										});
+
+										if (msgDataDefaults.reactions[reaction.name].usernames.length === 0) {
+											delete msgDataDefaults.reactions[reaction.name];
 										}
-									} else if (message.subtype === 'pinned_item') {
-										if (message.attachments) {
+									});
+								}
+
+								if (message.type === 'message') {
+									if (message.subtype) {
+										if (message.subtype === 'channel_join') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createUserJoinWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'channel_leave') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createUserLeaveWithRoomIdAndUser(room._id, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'me_message') {
 											const msgObj = {
 												...msgDataDefaults,
-												attachments: [{
-													'text': this.convertSlackMessageToRocketChat(message.attachments[0].text),
-													'author_name' : message.attachments[0].author_subname,
-													'author_icon' : getAvatarUrlFromUsername(message.attachments[0].author_subname)
-												}]
+												msg: `_${ this.convertSlackMessageToRocketChat(message.text) }_`
 											};
-											RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('message_pinned', room._id, '', this.getRocketUser(message.user), msgObj);
-										} else {
-											//TODO: make this better
-											this.logger.debug('Pinned item with no attachment, needs work.');
-											//RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser 'message_pinned', room._id, '', @getRocketUser(message.user), msgDataDefaults
-										}
-									} else if (message.subtype === 'file_share') {
-										if (message.file && message.file.url_private_download !== undefined) {
-											const details = {
-												message_id: `slack-${ message.ts.replace(/\./g, '-') }`,
-												name: message.file.name,
-												size: message.file.size,
-												type: message.file.mimetype,
-												rid: room._id
+											RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
+										} else if (message.subtype === 'bot_message' || message.subtype === 'slackbot_response') {
+											const botUser = RocketChat.models.Users.findOneById('rocket.cat', { fields: { username: 1 }});
+											const botUsername = this.bots[message.bot_id] ? this.bots[message.bot_id].name : message.username;
+											const msgObj = {
+												...msgDataDefaults,
+												msg: this.convertSlackMessageToRocketChat(message.text),
+												rid: room._id,
+												bot: true,
+												attachments: message.attachments,
+												username: botUsername || undefined
 											};
-											this.uploadFile(details, message.file.url_private_download, this.getRocketUser(message.user), room, new Date(parseInt(message.ts.split('.')[0]) * 1000));
-										}
-									} else if (!missedTypes[message.subtype] && !ignoreTypes[message.subtype]) {
-										missedTypes[message.subtype] = message;
-									}
-								} else {
-									const user = this.getRocketUser(message.user);
-									if (user) {
-										const msgObj = {
-											...msgDataDefaults,
-											msg: this.convertSlackMessageToRocketChat(message.text),
-											rid: room._id,
-											u: {
-												_id: user._id,
-												username: user.username
+
+											if (message.edited) {
+												msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
+												const editedBy = this.getRocketUser(message.edited.user);
+												if (editedBy) {
+													msgObj.editedBy = {
+														_id: editedBy._id,
+														username: editedBy.username
+													};
+												}
+											}
+
+											if (message.icons) {
+												msgObj.emoji = message.icons.emoji;
+											}
+											RocketChat.sendMessage(botUser, msgObj, room, true);
+										} else if (message.subtype === 'channel_purpose') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_description', room._id, message.purpose, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'channel_topic') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_topic', room._id, message.topic, this.getRocketUser(message.user), msgDataDefaults);
 											}
-										};
-
-										if (message.edited) {
-											msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
-											const editedBy = this.getRocketUser(message.edited.user);
-											if (editedBy) {
-												msgObj.editedBy = {
-													_id: editedBy._id,
-													username: editedBy.username
+										} else if (message.subtype === 'channel_name') {
+											if (this.getRocketUser(message.user)) {
+												RocketChat.models.Messages.createRoomRenamedWithRoomIdRoomNameAndUser(room._id, message.name, this.getRocketUser(message.user), msgDataDefaults);
+											}
+										} else if (message.subtype === 'pinned_item') {
+											if (message.attachments) {
+												const msgObj = {
+													...msgDataDefaults,
+													attachments: [{
+														'text': this.convertSlackMessageToRocketChat(message.attachments[0].text),
+														'author_name' : message.attachments[0].author_subname,
+														'author_icon' : getAvatarUrlFromUsername(message.attachments[0].author_subname)
+													}]
+												};
+												RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser('message_pinned', room._id, '', this.getRocketUser(message.user), msgObj);
+											} else {
+												//TODO: make this better
+												this.logger.debug('Pinned item with no attachment, needs work.');
+												//RocketChat.models.Messages.createWithTypeRoomIdMessageAndUser 'message_pinned', room._id, '', @getRocketUser(message.user), msgDataDefaults
+											}
+										} else if (message.subtype === 'file_share') {
+											if (message.file && message.file.url_private_download !== undefined) {
+												const details = {
+													message_id: `slack-${ message.ts.replace(/\./g, '-') }`,
+													name: message.file.name,
+													size: message.file.size,
+													type: message.file.mimetype,
+													rid: room._id
 												};
+												this.uploadFile(details, message.file.url_private_download, this.getRocketUser(message.user), room, new Date(parseInt(message.ts.split('.')[0]) * 1000));
 											}
+										} else if (!missedTypes[message.subtype] && !ignoreTypes[message.subtype]) {
+											missedTypes[message.subtype] = message;
 										}
+									} else {
+										const user = this.getRocketUser(message.user);
+										if (user) {
+											const msgObj = {
+												...msgDataDefaults,
+												msg: this.convertSlackMessageToRocketChat(message.text),
+												rid: room._id,
+												u: {
+													_id: user._id,
+													username: user.username
+												}
+											};
+
+											if (message.edited) {
+												msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000);
+												const editedBy = this.getRocketUser(message.edited.user);
+												if (editedBy) {
+													msgObj.editedBy = {
+														_id: editedBy._id,
+														username: editedBy.username
+													};
+												}
+											}
 
-										RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
+											try {
+												RocketChat.sendMessage(this.getRocketUser(message.user), msgObj, room, true);
+											} catch (e) {
+												this.logger.warn(`Failed to import the message: ${ msgDataDefaults._id }`);
+											}
+										}
 									}
 								}
-							}
 
-
-							// Process the reactions
-							if (RocketChat.models.Messages.findOneById(msgDataDefaults._id) && message.reactions && message.reactions.length > 0) {
-								message.reactions.forEach(reaction => {
-									reaction.users.forEach(u => {
-										const rcUser = this.getRocketUser(u);
-										if (!rcUser) { return; }
-										Meteor.runAsUser(rcUser._id, () => Meteor.call('setReaction', `:${ reaction.name }:`, msgDataDefaults._id));
-									});
-								});
-							}
-							this.addCountCompleted(1);
+								this.addCountCompleted(1);
+							});
 						});
 					});
 				});
-			});
-
-
-			if (!_.isEmpty(missedTypes)) {
-				console.log('Missed import types:', missedTypes);
-			}
 
-			this.updateProgress(Importer.ProgressStep.FINISHING);
-
-			this.channels.channels.forEach(channel => {
-				if (channel.do_import && channel.is_archived) {
-					Meteor.runAsUser(startedByUserId, function() {
-						Meteor.call('archiveRoom', channel.rocketId);
-					});
+				if (!_.isEmpty(missedTypes)) {
+					console.log('Missed import types:', missedTypes);
 				}
-			});
-			this.updateProgress(Importer.ProgressStep.DONE);
 
-			const timeTook = Date.now() - start;
+				this.updateProgress(Importer.ProgressStep.FINISHING);
 
-			this.logger.log(`Import took ${ timeTook } milliseconds.`);
+				this.channels.channels.forEach(channel => {
+					if (channel.do_import && channel.is_archived) {
+						Meteor.runAsUser(startedByUserId, function() {
+							Meteor.call('archiveRoom', channel.rocketId);
+						});
+					}
+				});
+				this.updateProgress(Importer.ProgressStep.DONE);
 
+				const timeTook = Date.now() - start;
+
+				this.logger.log(`Import took ${ timeTook } milliseconds.`);
+			} catch (e) {
+				this.logger.error(e);
+				this.updateProgress(Importer.ProgressStep.ERROR);
+			}
 		});
+
 		return this.getProgress();
 	}
 	getSlackChannelFromName(channelName) {
diff --git a/packages/rocketchat-importer/client/admin/adminImport.html b/packages/rocketchat-importer/client/admin/adminImport.html
index 3e22cbcbc29..73977662772 100644
--- a/packages/rocketchat-importer/client/admin/adminImport.html
+++ b/packages/rocketchat-importer/client/admin/adminImport.html
@@ -3,30 +3,26 @@
 		<header class="fixed-title border-component-color">
 			{{> burger}}
 			<h2>
-				<span class="room-title">Import</span>
+				<span class="room-title">{{_ "Import"}}</span>
 			</h2>
 		</header>
 		<div class="content">
 			{{#unless isAdmin}}
-				<p>You are not authorized to view this page.</p>
+				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 			{{else}}
-				{{#if isImporters}}
 				<div class="rocket-form">
 					<fieldset>
 						{{#each importers}}
 							<div class="section">
-								<h1>{{name}}</h1>
+								<h1>{{ name }}</h1>
 								<div class="section-content">
 									<div>{{getDescription .}}</div>
-									<button class="button primary start-import">Start</button>
+									<button class="button primary start-import">{{_ "Start"}}</button>
 								</div>
 							</div>
 						{{/each}}
 					</fieldset>
 				</div>
-				{{else}}
-					No Importers Available
-				{{/if}}
 			{{/unless}}
 		</div>
 	</section>
diff --git a/packages/rocketchat-importer/client/admin/adminImport.js b/packages/rocketchat-importer/client/admin/adminImport.js
index 9bfd1e34a4c..fde895bf7f9 100644
--- a/packages/rocketchat-importer/client/admin/adminImport.js
+++ b/packages/rocketchat-importer/client/admin/adminImport.js
@@ -3,9 +3,6 @@ Template.adminImport.helpers({
 	isAdmin() {
 		return RocketChat.authz.hasRole(Meteor.userId(), 'admin');
 	},
-	isImporters() {
-		return Object.keys(Importer.Importers).length > 0;
-	},
 	getDescription(importer) {
 		return TAPi18n.__('Importer_From_Description', { from: importer.name });
 	},
@@ -22,12 +19,15 @@ Template.adminImport.helpers({
 Template.adminImport.events({
 	'click .start-import'() {
 		const importer = this;
-		return Meteor.call('setupImporter', importer.key, function(error) {
+
+		Meteor.call('setupImporter', importer.key, function(error) {
 			if (error) {
 				console.log(t('importer_setup_error'), importer.key, error);
-				return handleError(error);
+				handleError(error);
+				return;
 			}
-			return FlowRouter.go(`/admin/import/prepare/${ importer.key }`);
+
+			FlowRouter.go(`/admin/import/prepare/${ importer.key }`);
 		});
 	}
 });
diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.html b/packages/rocketchat-importer/client/admin/adminImportPrepare.html
index 82efec25c97..346ff050842 100644
--- a/packages/rocketchat-importer/client/admin/adminImportPrepare.html
+++ b/packages/rocketchat-importer/client/admin/adminImportPrepare.html
@@ -9,7 +9,7 @@
 			</header>
 			<div class="content">
 				{{#unless isAdmin}}
-					<p>You are not authorized to view this page.</p>
+					<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 				{{else}}
 					<div class="rocket-form">
 						<fieldset>
diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/packages/rocketchat-importer/client/admin/adminImportPrepare.js
index bdc11eb442f..f47d996000d 100644
--- a/packages/rocketchat-importer/client/admin/adminImportPrepare.js
+++ b/packages/rocketchat-importer/client/admin/adminImportPrepare.js
@@ -36,7 +36,7 @@ Template.adminImportPrepare.helpers({
 Template.adminImportPrepare.events({
 	'change .import-file-input'(event, template) {
 		const importer = this;
-		if (!importer.key) { return; }
+		if (!importer || !importer.key) { return; }
 
 		const e = event.originalEvent || event;
 		let { files } = e.target;
@@ -44,13 +44,13 @@ Template.adminImportPrepare.events({
 			files = (e.dataTransfer != null ? e.dataTransfer.files : undefined) || [];
 		}
 
-		return Array.from(files).map((blob) => {
+		return Array.from(files).map((file) => {
 			template.preparing.set(true);
 
 			const reader = new FileReader();
-			reader.readAsDataURL(blob);
+			reader.readAsDataURL(file);
 			reader.onloadend = () => {
-				Meteor.call('prepareImport', importer.key, reader.result, blob.type, blob.name, function(error, data) {
+				Meteor.call('prepareImport', importer.key, reader.result, file.type, file.name, function(error, data) {
 					if (error) {
 						toastr.error(t('Invalid_Import_File_Type'));
 						template.preparing.set(false);
@@ -84,7 +84,6 @@ Template.adminImportPrepare.events({
 	'click .button.start'(event, template) {
 		const btn = this;
 		$(btn).prop('disabled', true);
-		// const importer = this;
 		for (const user of Array.from(template.users.get())) {
 			user.do_import = $(`[name=${ user.user_id }]`).is(':checked');
 		}
@@ -93,12 +92,12 @@ Template.adminImportPrepare.events({
 			channel.do_import = $(`[name=${ channel.channel_id }]`).is(':checked');
 		}
 
-		return Meteor.call('startImport', FlowRouter.getParam('importer'), { users: template.users.get(), channels: template.channels.get() }, function(error) {
+		Meteor.call('startImport', FlowRouter.getParam('importer'), { users: template.users.get(), channels: template.channels.get() }, function(error) {
 			if (error) {
 				console.warn('Error on starting the import:', error);
-				return handleError(error);
+				handleError(error);
 			} else {
-				return FlowRouter.go(`/admin/import/progress/${ FlowRouter.getParam('importer') }`);
+				FlowRouter.go(`/admin/import/progress/${ FlowRouter.getParam('importer') }`);
 			}
 		});
 	},
diff --git a/packages/rocketchat-importer/server/classes/ImporterBase.js b/packages/rocketchat-importer/server/classes/ImporterBase.js
index 38420f69586..84422a3d81d 100644
--- a/packages/rocketchat-importer/server/classes/ImporterBase.js
+++ b/packages/rocketchat-importer/server/classes/ImporterBase.js
@@ -61,17 +61,22 @@ Importer.Base = class Base {
 		this.addCountCompleted = this.addCountCompleted.bind(this);
 		this.updateRecord = this.updateRecord.bind(this);
 		this.uploadFile = this.uploadFile.bind(this);
+
 		this.name = name;
 		this.description = description;
 		this.mimeType = mimeType;
+
 		this.logger = new Logger(`${ this.name } Importer`, {});
 		this.progress = new Importer.Progress(this.name);
 		this.collection = Importer.RawImports;
+
 		const importId = Importer.Imports.insert({ 'type': this.name, 'ts': Date.now(), 'status': this.progress.step, 'valid': true, 'user': Meteor.user()._id });
 		this.importRecord = Importer.Imports.findOne(importId);
+
 		this.users = {};
 		this.channels = {};
 		this.messages = {};
+		this.oldSettings = {};
 	}
 
 	// Takes the uploaded file and extracts the users, channels, and messages from it.
@@ -89,6 +94,7 @@ Importer.Base = class Base {
 
 		if (!fileType || (fileType.mime !== this.mimeType)) {
 			this.logger.warn(`Invalid file uploaded for the ${ this.name } importer.`);
+			this.updateProgress(Importer.ProgressStep.ERROR);
 			throw new Meteor.Error('error-invalid-file-uploaded', `Invalid file uploaded to import ${ this.name } data from.`, { step: 'prepare' });
 		}
 
@@ -137,6 +143,21 @@ Importer.Base = class Base {
 	updateProgress(step) {
 		this.progress.step = step;
 
+		switch (step) {
+			case Importer.ProgressStep.IMPORTING_STARTED:
+				this.oldSettings.Accounts_AllowedDomainsList = RocketChat.models.Settings.findOneById('Accounts_AllowedDomainsList').value;
+				RocketChat.models.Settings.updateValueById('Accounts_AllowedDomainsList', '');
+
+				this.oldSettings.Accounts_AllowUsernameChange = RocketChat.models.Settings.findOneById('Accounts_AllowUsernameChange').value;
+				RocketChat.models.Settings.updateValueById('Accounts_AllowUsernameChange', true);
+				break;
+			case Importer.ProgressStep.DONE:
+			case Importer.ProgressStep.ERROR:
+				RocketChat.models.Settings.updateValueById('Accounts_AllowedDomainsList', this.oldSettings.Accounts_AllowedDomainsList);
+				RocketChat.models.Settings.updateValueById('Accounts_AllowUsernameChange', this.oldSettings.Accounts_AllowUsernameChange);
+				break;
+		}
+
 		this.logger.debug(`${ this.name } is now at ${ step }.`);
 		this.updateRecord({ 'status': this.progress.step });
 
diff --git a/packages/rocketchat-importer/server/methods/startImport.js b/packages/rocketchat-importer/server/methods/startImport.js
index 352193e28a2..4a95e315b44 100644
--- a/packages/rocketchat-importer/server/methods/startImport.js
+++ b/packages/rocketchat-importer/server/methods/startImport.js
@@ -7,7 +7,11 @@ Meteor.methods({
 		}
 
 		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'run-import')) {
-			throw new Meteor.Error('error-action-not-allowed', 'Importing is not allowed', { method: 'setupImporter'});
+			throw new Meteor.Error('error-action-not-allowed', 'Importing is not allowed', { method: 'startImport'});
+		}
+
+		if (!name) {
+			throw new Meteor.Error('error-invalid-importer', `No defined importer by: "${ name }"`, { method: 'startImport' });
 		}
 
 		if (Importer.Importers[name] && Importer.Importers[name].importerInstance) {
diff --git a/packages/rocketchat-lib/server/methods/filterATAllTag.js b/packages/rocketchat-lib/server/methods/filterATAllTag.js
index 801563172f4..7dac2b3e4ce 100644
--- a/packages/rocketchat-lib/server/methods/filterATAllTag.js
+++ b/packages/rocketchat-lib/server/methods/filterATAllTag.js
@@ -20,14 +20,10 @@ RocketChat.callbacks.add('beforeSaveMessage', function(message) {
 			});
 
 			// Also throw to stop propagation of 'sendMessage'.
-			throw new Meteor.Error(
-				'error-action-not-allowed',
-				'Notify all in this room not allowed',
-				{
-					method: 'filterATAllTag',
-					action: 'Notify_all_in_this_room'
-				}
-			);
+			throw new Meteor.Error('error-action-not-allowed', 'Notify all in this room not allowed', {
+				method: 'filterATAllTag',
+				action: 'Notify_all_in_this_room'
+			});
 		}
 	}
 
diff --git a/packages/rocketchat-lib/server/methods/setUsername.js b/packages/rocketchat-lib/server/methods/setUsername.js
index 9f5af1436a9..041dc6e4276 100644
--- a/packages/rocketchat-lib/server/methods/setUsername.js
+++ b/packages/rocketchat-lib/server/methods/setUsername.js
@@ -13,7 +13,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setUsername' });
 		}
 
-		if (user.username === username) {
+		if (user.username === username || (user.username && user.username.toLowerCase() === username.toLowerCase())) {
 			return username;
 		}
 
@@ -28,13 +28,7 @@ Meteor.methods({
 			throw new Meteor.Error('username-invalid', `${ _.escape(username) } is not a valid username, use only letters, numbers, dots, hyphens and underscores`);
 		}
 
-		if (user.username !== undefined) {
-			if (!username.toLowerCase() === user.username.toLowerCase()) {
-				if (!RocketChat.checkUsernameAvailability(username)) {
-					throw new Meteor.Error('error-field-unavailable', `<strong>${ _.escape(username) }</strong> is already in use :(`, { method: 'setUsername', field: username });
-				}
-			}
-		} else if (!RocketChat.checkUsernameAvailability(username)) {
+		if (!RocketChat.checkUsernameAvailability(username)) {
 			throw new Meteor.Error('error-field-unavailable', `<strong>${ _.escape(username) }</strong> is already in use :(`, { method: 'setUsername', field: username });
 		}
 

From b20094a04c4d44c51d1b17ddbbd3251624b2d5fd Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 17:29:28 -0300
Subject: [PATCH 142/244] Merge pull request #8389 from
 RocketChat/fix-snap-npm-dep

[FIX] Add needed dependency for snaps
---
 .snapcraft/candidate/snapcraft.yaml    | 102 -------------------------
 .snapcraft/edge/snapcraft.yaml         | 102 -------------------------
 .snapcraft/{stable => }/snapcraft.yaml |  13 +---
 .travis/snap.sh                        |   2 +-
 4 files changed, 4 insertions(+), 215 deletions(-)
 delete mode 100644 .snapcraft/candidate/snapcraft.yaml
 delete mode 100644 .snapcraft/edge/snapcraft.yaml
 rename .snapcraft/{stable => }/snapcraft.yaml (89%)

diff --git a/.snapcraft/candidate/snapcraft.yaml b/.snapcraft/candidate/snapcraft.yaml
deleted file mode 100644
index 2a4d3c71975..00000000000
--- a/.snapcraft/candidate/snapcraft.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Easiest way to work with this file, from an updated Ubuntu 16.04 LTS image
-# 1.   create a non-root user with sudo priv and perform following steps as non-root
-# 2.  `sudo apt-get update`
-# 3.  `sudo apt-get install snapcraft python build-essential`
-# 4.  `snapcraft stage`
-# 5.  `snapcraft snap`
-
-name: rocketchat-server
-version: #{RC_VERSION}
-summary: Rocket.Chat server
-description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
-confinement: strict
-assumes: [snapd2.21]
-apps:
-    rocketchat-server:
-        command: startRocketChat
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-mongo:
-        command: startmongo
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-caddy:
-        command: env LC_ALL=C caddy -conf=$SNAP_DATA/Caddyfile -host=localhost:8080
-        daemon: simple
-        plugs: [network, network-bind]
-    mongo:
-        command: env LC_ALL=C mongo
-        plugs: [network]
-    restoredb:
-        command: env LC_ALL=C restoredb
-        plugs: [network]
-    backupdb:
-        command: env LC_ALL=c rcbackup
-        plugs: [network]
-    initcaddy:
-        command: env LC_ALL=c initcaddy
-parts:
-    node:
-        plugin: nodejs
-        node-engine: 4.8.3
-        node-packages:
-            - promise
-            - fibers
-            - underscore
-            - source-map-support
-            - semver
-        build-packages:
-            # For fibers
-            - python
-            - build-essential
-            - nodejs
-        organize:
-            lib/node_modules: node_modules
-    rocketchat-server:
-        plugin: dump
-        after: [node]
-        source: https://rocket.chat/releases/release-candidate/download
-        source-type: tar
-        stage-packages:
-            - graphicsmagick
-        stage:
-            - programs
-            - main.js
-            - .node_version.txt
-            - usr
-            - lib
-    mongodb:
-        build-packages:
-            - wget
-        source: ./
-        prepare: ./resources/preparemongo
-        plugin: dump
-        stage-packages:
-            - libssl1.0.0
-        prime:
-            - usr
-            - bin
-            - lib
-    scripts:
-        plugin: dump
-        source: resources/
-        organize:
-            rcbackup: bin/rcbackup
-            restoredb: bin/restoredb
-            startmongo: bin/startmongo
-            startRocketChat: bin/startRocketChat
-            initreplset.js: bin/initreplset.js
-            Caddyfile: bin/Caddyfile
-            initcaddy: bin/initcaddy
-        prime:
-            - bin
-    caddy:
-        prepare: ./resources/preparecaddy
-        plugin: dump
-        source: ./
-        prime:
-            - bin
-        organize:
-            caddy: bin/caddy
-        after: [mongodb]
diff --git a/.snapcraft/edge/snapcraft.yaml b/.snapcraft/edge/snapcraft.yaml
deleted file mode 100644
index d12d69d8393..00000000000
--- a/.snapcraft/edge/snapcraft.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Easiest way to work with this file, from an updated Ubuntu 16.04 LTS image
-# 1.   create a non-root user with sudo priv and perform following steps as non-root
-# 2.  `sudo apt-get update`
-# 3.  `sudo apt-get install snapcraft python build-essential`
-# 4.  `snapcraft stage`
-# 5.  `snapcraft snap`
-
-name: rocketchat-server
-version: #{RC_VERSION}
-summary: Rocket.Chat server
-description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
-confinement: strict
-assumes: [snapd2.21]
-apps:
-    rocketchat-server:
-        command: startRocketChat
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-mongo:
-        command: startmongo
-        daemon: simple
-        plugs: [network, network-bind]
-    rocketchat-caddy:
-        command: env LC_ALL=C caddy -conf=$SNAP_DATA/Caddyfile -host=localhost:8080
-        daemon: simple
-        plugs: [network, network-bind]
-    mongo:
-        command: env LC_ALL=C mongo
-        plugs: [network]
-    restoredb:
-        command: env LC_ALL=C restoredb
-        plugs: [network]
-    backupdb:
-        command: env LC_ALL=c rcbackup
-        plugs: [network]
-    initcaddy:
-        command: env LC_ALL=c initcaddy
-parts:
-    node:
-        plugin: nodejs
-        node-engine: 4.8.3
-        node-packages:
-            - promise
-            - fibers
-            - underscore
-            - source-map-support
-            - semver
-        build-packages:
-            # For fibers
-            - python
-            - build-essential
-            - nodejs
-        organize:
-            lib/node_modules: node_modules
-    rocketchat-server:
-        plugin: dump
-        after: [node]
-        source: https://rocket.chat/releases/develop/download
-        source-type: tar
-        stage-packages:
-            - graphicsmagick
-        stage:
-            - programs
-            - main.js
-            - .node_version.txt
-            - usr
-            - lib
-    mongodb:
-        build-packages:
-            - wget
-        source: ./
-        prepare: ./resources/preparemongo
-        plugin: dump
-        stage-packages:
-            - libssl1.0.0
-        prime:
-            - usr
-            - bin
-            - lib
-    scripts:
-        plugin: dump
-        source: resources/
-        organize:
-            rcbackup: bin/rcbackup
-            restoredb: bin/restoredb
-            startmongo: bin/startmongo
-            startRocketChat: bin/startRocketChat
-            initreplset.js: bin/initreplset.js
-            Caddyfile: bin/Caddyfile
-            initcaddy: bin/initcaddy
-        prime:
-            - bin
-    caddy:
-        prepare: ./resources/preparecaddy
-        plugin: dump
-        source: ./
-        prime:
-            - bin
-        organize:
-            caddy: bin/caddy
-        after: [mongodb]
diff --git a/.snapcraft/stable/snapcraft.yaml b/.snapcraft/snapcraft.yaml
similarity index 89%
rename from .snapcraft/stable/snapcraft.yaml
rename to .snapcraft/snapcraft.yaml
index f61321281a2..1171544edc8 100644
--- a/.snapcraft/stable/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -39,24 +39,17 @@ apps:
 parts:
     node:
         plugin: nodejs
-        node-engine: 4.8.3
-        node-packages:
-            - promise
-            - fibers
-            - underscore
-            - source-map-support
-            - semver
+        node-engine: 4.8.4
         build-packages:
             # For fibers
             - python
             - build-essential
             - nodejs
-        organize:
-            lib/node_modules: node_modules
     rocketchat-server:
         plugin: dump
+        prepare: cd programs/server; npm install
         after: [node]
-        source: https://rocket.chat/releases/latest/download
+        source: https://rocket.chat/releases/#{RC_VERSION}/download
         source-type: tar
         stage-packages:
             - graphicsmagick
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 49605fdab9e..cfae7c2f8dd 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -38,7 +38,7 @@ GIT_SSH_COMMAND="ssh -i launchpadkey" git clone -b $CHANNEL git+ssh://rocket.cha
 
 # Rarely will change, but just incase we copy it all
 cp -r resources buildinfo launchpad/
-sed s/#{RC_VERSION}/$RC_VERSION/ $CHANNEL/snapcraft.yaml > launchpad/snapcraft.yaml
+sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
 
 cd launchpad
 git add resources snapcraft.yaml buildinfo

From 8ddfc66f084be06f3b9fffce3fcf96ad6c5b235b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 19:54:57 -0300
Subject: [PATCH 143/244] Merge pull request #8414 from
 RocketChat/improvements/ldap-reconnect

Fix: Missing LDAP reconnect setting
---
 packages/rocketchat-i18n/i18n/en.i18n.json  |  2 ++
 packages/rocketchat-ldap/server/ldap.js     | 14 +++-----------
 packages/rocketchat-ldap/server/settings.js |  1 +
 packages/rocketchat-ldap/server/sync.js     | 15 +++++++++------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 43f7c088143..d77dd7376b2 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1029,6 +1029,8 @@
   "LDAP_Merge_Existing_Users_Description": "*Caution!* When importing an user from LDAP and an user with same username already exists the LDAP info and password will be set into the existing user.",
   "LDAP_Port": "Port",
   "LDAP_Port_Description": "Port to access LDAP. eg: `389` or `636` for LDAPS",
+  "LDAP_Reconnect": "Reconnect",
+  "LDAP_Reconnect_Description": "Try to reconnect automatically when connection is interrupted by some reason while executing operations",
   "LDAP_Reject_Unauthorized": "Reject Unauthorized",
   "LDAP_Reject_Unauthorized_Description": "Disable this option to allow certificates that can not be verified. Usually Self Signed Certificates will require this option disabled to work",
   "LDAP_Sync_User_Avatar": "Sync User Avatar",
diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 0311151979c..48f64f48591 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -20,6 +20,7 @@ export default class LDAP {
 		this.options = {
 			host: RocketChat.settings.get('LDAP_Host'),
 			port: RocketChat.settings.get('LDAP_Port'),
+			Reconnect: RocketChat.settings.get('LDAP_Reconnect'),
 			timeout: RocketChat.settings.get('LDAP_Timeout'),
 			connect_timeout: RocketChat.settings.get('LDAP_Connect_Timeout'),
 			idle_timeout: RocketChat.settings.get('LDAP_Idle_Timeout'),
@@ -68,7 +69,7 @@ export default class LDAP {
 			timeout: this.options.timeout,
 			connectTimeout: this.options.connect_timeout,
 			idleTimeout: this.options.idle_timeout,
-			reconnect: true
+			reconnect: this.options.Reconnect
 		};
 
 		const tlsOptions = {
@@ -363,22 +364,13 @@ export default class LDAP {
 				logger.search.debug('Page');
 				// Force LDAP idle to wait the record processing
 				this.client._updateIdle(true);
-				page(null, entries, {end: false, next: () => {
+				page(null, entries, {end: !next, next: () => {
 					// Reset idle timer
 					this.client._updateIdle();
 					next && next();
 				}});
 				entries = [];
 			});
-
-			res.on('end', () => {
-				logger.search.info('Search result count', entries.length);
-				page(null, [], {end: true, next: () => {
-					// Reset idle timer
-					this.client._updateIdle();
-				}});
-				// logger.search.debug('Search result', JSON.stringify(jsonEntries, null, 2));
-			});
 		});
 	}
 
diff --git a/packages/rocketchat-ldap/server/settings.js b/packages/rocketchat-ldap/server/settings.js
index 054c6fdda56..a1d0d109112 100644
--- a/packages/rocketchat-ldap/server/settings.js
+++ b/packages/rocketchat-ldap/server/settings.js
@@ -25,6 +25,7 @@ RocketChat.settings.addGroup('LDAP', function() {
 	this.add('LDAP_Login_Fallback', true, { type: 'boolean', enableQuery });
 	this.add('LDAP_Host', '', { type: 'string', enableQuery });
 	this.add('LDAP_Port', '389', { type: 'string', enableQuery });
+	this.add('LDAP_Reconnect', false, { type: 'boolean', enableQuery });
 	this.add('LDAP_Encryption', 'plain', { type: 'select', values: [ { key: 'plain', i18nLabel: 'No_Encryption' }, { key: 'tls', i18nLabel: 'StartTLS' }, { key: 'ssl', i18nLabel: 'SSL/LDAPS' } ], enableQuery });
 	this.add('LDAP_CA_Cert', '', { type: 'string', multiline: true, enableQuery: enableTLSQuery });
 	this.add('LDAP_Reject_Unauthorized', true, { type: 'boolean', enableQuery: enableTLSQuery });
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 7041725558a..3741ab80337 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -235,7 +235,7 @@ export function importNewUsers(ldap) {
 	}
 
 	let count = 0;
-	ldap.searchUsersSync('*', Meteor.bindEnvironment((error, ldapUsers, {next} = {}) => {
+	ldap.searchUsersSync('*', Meteor.bindEnvironment((error, ldapUsers, {next, end} = {}) => {
 		if (error) {
 			throw error;
 		}
@@ -275,14 +275,17 @@ export function importNewUsers(ldap) {
 				}
 			}
 
-			if (count % 1000 === 0) {
-				logger.info('Imported:', count);
+			if (count % 100 === 0) {
+				logger.info('Import running. Users imported until now:', count);
 			}
 		});
-		next && next();
-	}));
 
-	logger.info('Imported:', count);
+		if (end) {
+			logger.info('Import finished. Users imported:', count);
+		}
+
+		next(count);
+	}));
 }
 
 function sync() {

From 4055689afabc8882fbc1228b1fc30976c502fead Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 5 Oct 2017 20:42:01 -0300
Subject: [PATCH 144/244] Merge pull request #8417 from
 RocketChat/improvements/ldap-internal-log-level

Fix: Missing LDAP option to show internal logs
---
 package-lock.json                           | 760 ++------------------
 package.json                                |   2 +
 packages/rocketchat-i18n/i18n/en.i18n.json  |   1 +
 packages/rocketchat-ldap/package.js         |   1 -
 packages/rocketchat-ldap/server/ldap.js     |  15 +-
 packages/rocketchat-ldap/server/settings.js |  12 +
 6 files changed, 101 insertions(+), 690 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 516cfc5322a..aa93fee7efc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,64 +4,6 @@
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
-		"@google-cloud/common": {
-			"version": "0.13.5",
-			"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.5.tgz",
-			"integrity": "sha1-uQWZ8pzpV7NmreqNfAw/NZPZgco=",
-			"requires": {
-				"array-uniq": "1.0.3",
-				"arrify": "1.0.1",
-				"concat-stream": "1.6.0",
-				"create-error-class": "3.0.2",
-				"duplexify": "3.5.1",
-				"ent": "2.2.0",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"google-auto-auth": "0.7.2",
-				"is": "3.2.1",
-				"log-driver": "1.2.5",
-				"methmeth": "1.1.0",
-				"modelo": "4.2.0",
-				"request": "2.81.0",
-				"retry-request": "2.0.5",
-				"split-array-stream": "1.0.3",
-				"stream-events": "1.0.2",
-				"string-format-obj": "1.1.0",
-				"through2": "2.0.3"
-			}
-		},
-		"@google-cloud/storage": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
-			"integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
-			"requires": {
-				"@google-cloud/common": "0.13.5",
-				"arrify": "1.0.1",
-				"async": "2.5.0",
-				"concat-stream": "1.6.0",
-				"create-error-class": "3.0.2",
-				"duplexify": "3.5.1",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"gcs-resumable-upload": "0.8.1",
-				"hash-stream-validation": "0.2.1",
-				"is": "3.2.1",
-				"mime-types": "2.1.17",
-				"once": "1.4.0",
-				"pumpify": "1.3.5",
-				"stream-events": "1.0.2",
-				"string-format-obj": "1.1.0",
-				"through2": "2.0.3"
-			},
-			"dependencies": {
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-					"requires": {
-						"mime-db": "1.30.0"
-					}
-				}
-			}
-		},
 		"abbrev": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
@@ -107,7 +49,7 @@
 				"readable-stream": {
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
 					"requires": {
 						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
@@ -121,12 +63,12 @@
 				"safe-buffer": {
 					"version": "5.1.1",
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
 				},
 				"string_decoder": {
 					"version": "1.0.3",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
 					"requires": {
 						"safe-buffer": "5.1.1"
 					}
@@ -142,16 +84,6 @@
 				"es-abstract": "1.7.0"
 			}
 		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-		},
 		"asn1": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -162,42 +94,10 @@
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
 			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
 		},
-		"async": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-			"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-			"requires": {
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-			}
-		},
 		"asynckit": {
 			"version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
 			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
 		},
-		"aws-sdk": {
-			"version": "2.111.0",
-			"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.111.0.tgz",
-			"integrity": "sha1-qDTOE/9ECzSOReBHyNx71pbxsm0=",
-			"requires": {
-				"buffer": "4.9.1",
-				"crypto-browserify": "1.0.9",
-				"events": "1.1.1",
-				"jmespath": "0.15.0",
-				"querystring": "0.2.0",
-				"sax": "1.2.1",
-				"url": "0.10.3",
-				"uuid": "3.0.1",
-				"xml2js": "0.4.17",
-				"xmlbuilder": "4.2.1"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-					"integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
-				}
-			}
-		},
 		"aws-sign2": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
@@ -1007,7 +907,7 @@
 				"regenerator-runtime": {
 					"version": "0.11.0",
 					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-					"integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+					"integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
 				}
 			}
 		},
@@ -1059,16 +959,6 @@
 			"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
 			"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
 		},
-		"base64-js": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-			"integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
-		},
-		"base64url": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-			"integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
-		},
 		"bcrypt": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
@@ -1087,11 +977,6 @@
 				"tweetnacl": "0.14.5"
 			}
 		},
-		"bintrees": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
-			"integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
-		},
 		"block-stream": {
 			"version": "0.0.9",
 			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -1116,34 +1001,20 @@
 				"concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
 			}
 		},
-		"buffer": {
-			"version": "4.9.1",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-			"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-			"requires": {
-				"base64-js": "1.2.1",
-				"ieee754": "1.1.8",
-				"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-			}
-		},
-		"buffer-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-			"integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
-		},
-		"buffer-equal-constant-time": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-			"integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-		},
 		"buffer-shims": {
 			"version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
 			"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
 		},
-		"capture-stack-trace": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-			"integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
+		"bunyan": {
+			"version": "1.8.12",
+			"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
+			"integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
+			"requires": {
+				"dtrace-provider": "0.8.5",
+				"moment": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+				"mv": "2.1.1",
+				"safe-json-stringify": "1.0.4"
+			}
 		},
 		"caseless": {
 			"version": "0.12.0",
@@ -1172,11 +1043,6 @@
 			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
-		"codemirror": {
-			"version": "5.29.0",
-			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.29.0.tgz",
-			"integrity": "sha512-nlG9m0YQ0gFhdEdnKDG+XJRB/bW+K6M9Axs01+LScjVamWtd4dEwgyohf/r4voW1efnGi6U6hHHvDQ9tt9BtoA=="
-		},
 		"combined-stream": {
 			"version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
 			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
@@ -1193,58 +1059,6 @@
 			"version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
 		},
-		"concat-stream": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-			"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "2.3.3",
-				"typedarray": "0.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"configstore": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-			"integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
-			"requires": {
-				"dot-prop": "4.2.0",
-				"graceful-fs": "4.1.11",
-				"make-dir": "1.0.0",
-				"unique-string": "1.0.0",
-				"write-file-atomic": "2.3.0",
-				"xdg-basedir": "3.0.0"
-			}
-		},
 		"console-control-strings": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
@@ -1269,14 +1083,6 @@
 			"version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
 		},
-		"create-error-class": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-			"integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-			"requires": {
-				"capture-stack-trace": "1.0.0"
-			}
-		},
 		"cryptiles": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@@ -1285,16 +1091,6 @@
 				"boom": "2.10.1"
 			}
 		},
-		"crypto-browserify": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz",
-			"integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA="
-		},
-		"crypto-random-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-			"integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
-		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -1386,52 +1182,13 @@
 				"domelementtype": "1.3.0"
 			}
 		},
-		"dot-prop": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-			"integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-			"requires": {
-				"is-obj": "1.0.1"
-			}
-		},
-		"duplexify": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-			"integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+		"dtrace-provider": {
+			"version": "0.8.5",
+			"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz",
+			"integrity": "sha1-mOu6Ihr6xG4cOf02hY2Pk2dSS5I=",
+			"optional": true,
 			"requires": {
-				"end-of-stream": "1.4.0",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "2.3.3",
-				"stream-shift": "1.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
+				"nan": "2.6.2"
 			}
 		},
 		"ecc-jsbn": {
@@ -1443,40 +1200,11 @@
 				"jsbn": "0.1.1"
 			}
 		},
-		"ecdsa-sig-formatter": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-			"integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-			"requires": {
-				"base64url": "2.0.0",
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
 		"emailreplyparser": {
 			"version": "0.0.5",
 			"resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
 			"integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
 		},
-		"end-of-stream": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-			"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-			"requires": {
-				"once": "1.4.0"
-			}
-		},
-		"ent": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-			"integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
-		},
 		"entities": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
@@ -1512,11 +1240,6 @@
 			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
 			"dev": true
 		},
-		"events": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-		},
 		"extend": {
 			"version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
 			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
@@ -1526,11 +1249,6 @@
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
 		},
-		"file-type": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-6.1.0.tgz",
-			"integrity": "sha1-Wn26mBOPoKvsevxD5amgsqrHKfE="
-		},
 		"foreach": {
 			"version": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
 			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
@@ -1599,40 +1317,6 @@
 				"wide-align": "1.1.2"
 			}
 		},
-		"gcp-metadata": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.0.tgz",
-			"integrity": "sha512-puqMtZV/eukdfsafq0tir21+/k9hPbN9FRhgeN7NwtvEJQaviJoZOOlh1+dBeWgsRSYwAqcEVh63grU7a6bJyw==",
-			"requires": {
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"retry-request": "3.0.0"
-			},
-			"dependencies": {
-				"retry-request": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
-					"integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
-					"requires": {
-						"request": "2.81.0",
-						"through2": "2.0.3"
-					}
-				}
-			}
-		},
-		"gcs-resumable-upload": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.1.tgz",
-			"integrity": "sha512-Ps/yvSzdNL41oiRzSE8UgjcW8hdNQNyMqdsDSmCAn+fwWG8Sg5TR2CqSPchkMiYQQDqN7WWkheTEd0w1hfn/dw==",
-			"requires": {
-				"buffer-equal": "1.0.0",
-				"configstore": "3.1.1",
-				"google-auto-auth": "0.7.2",
-				"pumpify": "1.3.5",
-				"request": "2.81.0",
-				"stream-events": "1.0.2",
-				"through2": "2.0.3"
-			}
-		},
 		"getpass": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -1651,7 +1335,7 @@
 		"glob": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
 			"requires": {
 				"fs.realpath": "1.0.0",
 				"inflight": "1.0.6",
@@ -1666,59 +1350,11 @@
 			"integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY=",
 			"dev": true
 		},
-		"google-auth-library": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-			"integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-			"requires": {
-				"gtoken": "1.2.2",
-				"jws": "3.1.4",
-				"lodash.noop": "3.0.1",
-				"request": "2.81.0"
-			}
-		},
-		"google-auto-auth": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-			"integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
-			"requires": {
-				"async": "2.5.0",
-				"gcp-metadata": "0.3.0",
-				"google-auth-library": "0.10.0",
-				"request": "2.81.0"
-			}
-		},
-		"google-p12-pem": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-			"integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-			"requires": {
-				"node-forge": "0.7.1"
-			}
-		},
 		"graceful-fs": {
 			"version": "4.1.11",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
 			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
 		},
-		"gtoken": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-			"integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
-			"requires": {
-				"google-p12-pem": "0.1.2",
-				"jws": "3.1.4",
-				"mime": "1.4.0",
-				"request": "2.81.0"
-			},
-			"dependencies": {
-				"mime": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz",
-					"integrity": "sha512-n9ChLv77+QQEapYz8lV+rIZAW3HhAPW2CXnzb1GN5uMkuczshwvkW7XPsbzU0ZQN3sP47Er2KVkp2p3KyqZKSQ=="
-				}
-			}
-		},
 		"har-schema": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
@@ -1754,14 +1390,6 @@
 			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
 			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
 		},
-		"hash-stream-validation": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-			"integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
-			"requires": {
-				"through2": "2.0.3"
-			}
-		},
 		"hawk": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
@@ -1835,7 +1463,7 @@
 				"readable-stream": {
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
 					"requires": {
 						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
@@ -1849,12 +1477,12 @@
 				"safe-buffer": {
 					"version": "5.1.1",
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
 				},
 				"string_decoder": {
 					"version": "1.0.3",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
 					"requires": {
 						"safe-buffer": "5.1.1"
 					}
@@ -1871,11 +1499,6 @@
 				"sshpk": "1.13.1"
 			}
 		},
-		"ieee754": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-			"integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
-		},
 		"imap": {
 			"version": "0.8.19",
 			"resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
@@ -1908,11 +1531,6 @@
 				}
 			}
 		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -1946,11 +1564,6 @@
 				"loose-envify": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"
 			}
 		},
-		"is": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
-		},
 		"is-callable": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
@@ -1977,11 +1590,6 @@
 				"number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
 			}
 		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-		},
 		"is-regex": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -1990,11 +1598,6 @@
 				"has": "1.0.1"
 			}
 		},
-		"is-stream-ended": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-			"integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
-		},
 		"is-symbol": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
@@ -2014,11 +1617,6 @@
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
 		},
-		"jmespath": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-			"integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
-		},
 		"jquery": {
 			"version": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
 			"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
@@ -2085,41 +1683,6 @@
 				}
 			}
 		},
-		"jwa": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-			"integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
-			"requires": {
-				"base64url": "2.0.0",
-				"buffer-equal-constant-time": "1.0.1",
-				"ecdsa-sig-formatter": "1.0.9",
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
-		"jws": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-			"integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
-			"requires": {
-				"base64url": "2.0.0",
-				"jwa": "1.1.5",
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
 		"libbase64": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
@@ -2149,17 +1712,8 @@
 		},
 		"lodash": {
 			"version": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-		},
-		"lodash.noop": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-			"integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
-		},
-		"log-driver": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-			"integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
+			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+			"dev": true
 		},
 		"loose-envify": {
 			"version": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
@@ -2203,14 +1757,6 @@
 				"libqp": "1.1.0"
 			}
 		},
-		"make-dir": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-			"integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
-			"requires": {
-				"pify": "2.3.0"
-			}
-		},
 		"marked": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
@@ -2220,11 +1766,6 @@
 			"version": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
 			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
 		},
-		"methmeth": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-			"integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
-		},
 		"methods": {
 			"version": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
 			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
@@ -2281,11 +1822,6 @@
 				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
 			}
 		},
-		"modelo": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-			"integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
-		},
 		"moment": {
 			"version": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
 			"integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
@@ -2302,15 +1838,51 @@
 			"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
 			"dev": true
 		},
+		"mv": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+			"integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+			"optional": true,
+			"requires": {
+				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+				"ncp": "2.0.0",
+				"rimraf": "2.4.5"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "6.0.4",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+					"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+					"optional": true,
+					"requires": {
+						"inflight": "1.0.6",
+						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+						"once": "1.4.0",
+						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+					}
+				},
+				"rimraf": {
+					"version": "2.4.5",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+					"integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+					"optional": true,
+					"requires": {
+						"glob": "6.0.4"
+					}
+				}
+			}
+		},
 		"nan": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
 			"integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
 		},
-		"node-forge": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-			"integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
+		"ncp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+			"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+			"optional": true
 		},
 		"node-pre-gyp": {
 			"version": "0.6.36",
@@ -2426,11 +1998,6 @@
 			"version": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.2.tgz",
 			"integrity": "sha1-lcIKdc6iO3DWKZZBytguA8rn95c="
 		},
-		"pify": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-		},
 		"poplib": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
@@ -2448,33 +2015,6 @@
 			"version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
 			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
 		},
-		"prom-client": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.1.0.tgz",
-			"integrity": "sha512-ny9EdxpG6UcNnuc3W3LedE9qC3RFLSD+aBCv1i9OtcLS/nyHFck5uncoWHpD+rxmdttUPVd8qYRT1rb15Lpmjg==",
-			"requires": {
-				"tdigest": "0.1.1"
-			}
-		},
-		"pump": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-			"integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
-			"requires": {
-				"end-of-stream": "1.4.0",
-				"once": "1.4.0"
-			}
-		},
-		"pumpify": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-			"integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
-			"requires": {
-				"duplexify": "3.5.1",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"pump": "1.0.2"
-			}
-		},
 		"punycode": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -2484,11 +2024,6 @@
 			"version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
 			"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
 		},
-		"querystring": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-			"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-		},
 		"rc": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
@@ -2614,19 +2149,10 @@
 				"safe-buffer": {
 					"version": "5.1.1",
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
 				}
 			}
 		},
-		"retry-request": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
-			"integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
-			"requires": {
-				"request": "2.81.0",
-				"through2": "2.0.3"
-			}
-		},
 		"rimraf": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
@@ -2640,15 +2166,16 @@
 			"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
 			"dev": true
 		},
-		"sax": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-			"integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+		"safe-json-stringify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz",
+			"integrity": "sha1-gaCY9Efku8P/MxKiQ1IbwGDvWRE=",
+			"optional": true
 		},
 		"semver": {
 			"version": "5.4.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-			"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+			"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
 		},
 		"set-blocking": {
 			"version": "2.0.0",
@@ -2691,15 +2218,6 @@
 				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
 			}
 		},
-		"split-array-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
-			"integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
-			"requires": {
-				"async": "2.5.0",
-				"is-stream-ended": "0.1.3"
-			}
-		},
 		"sprintf-js": {
 			"version": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
 			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
@@ -2726,19 +2244,6 @@
 				}
 			}
 		},
-		"stream-events": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-			"integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
-			"requires": {
-				"stubs": "3.0.0"
-			}
-		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
-		},
 		"string_decoder": {
 			"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
 			"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
@@ -2747,11 +2252,6 @@
 				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
 			}
 		},
-		"string-format-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-			"integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
-		},
 		"string-width": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -2779,11 +2279,6 @@
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
 			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
 		},
-		"stubs": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-			"integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
-		},
 		"superagent": {
 			"version": "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz",
 			"integrity": "sha1-M2GjlxVnUEw1EGOr6q4PqiPb8/g=",
@@ -2882,52 +2377,6 @@
 				}
 			}
 		},
-		"tdigest": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
-			"integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=",
-			"requires": {
-				"bintrees": "1.0.1"
-			}
-		},
-		"through2": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-			"requires": {
-				"readable-stream": "2.3.3",
-				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
 		"to-fast-properties": {
 			"version": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
 			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
@@ -2971,11 +2420,6 @@
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
 			"optional": true
 		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-		},
 		"uid-number": {
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
@@ -2985,30 +2429,6 @@
 			"version": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
 			"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
 		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"requires": {
-				"crypto-random-string": "1.0.0"
-			}
-		},
-		"url": {
-			"version": "0.10.3",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-			"integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-				}
-			}
-		},
 		"utf7": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
@@ -3061,7 +2481,7 @@
 		"wide-align": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-			"integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+			"integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
 			"requires": {
 				"string-width": "1.0.2"
 			}
@@ -3080,38 +2500,6 @@
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
 		},
-		"write-file-atomic": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-			"integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"imurmurhash": "0.1.4",
-				"signal-exit": "3.0.2"
-			}
-		},
-		"xdg-basedir": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-			"integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
-		},
-		"xml2js": {
-			"version": "0.4.17",
-			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
-			"integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
-			"requires": {
-				"sax": "1.2.1",
-				"xmlbuilder": "4.2.1"
-			}
-		},
-		"xmlbuilder": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
-			"integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
-			"requires": {
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-			}
-		},
 		"xtend": {
 			"version": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
 			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
diff --git a/package.json b/package.json
index 6aa80c921a3..8ebd99074cc 100644
--- a/package.json
+++ b/package.json
@@ -107,12 +107,14 @@
 		"aws-sdk": "^2.125.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
+		"bunyan": "^1.8.12",
 		"codemirror": "^5.30.0",
 		"emailreplyparser": "0.0.5",
 		"file-type": "^6.2.0",
 		"highlight.js": "^9.12.0",
 		"imap": "^0.8.19",
 		"jquery": "^3.2.1",
+		"ldapjs": "^1.0.1",
 		"mailparser-node4": "^2.0.2-2",
 		"mime-db": "^1.30.0",
 		"mime-type": "^3.0.5",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index d77dd7376b2..3ae244ed59c 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1006,6 +1006,7 @@
   "LDAP_Enable_Description": "Attempt to utilize LDAP for authentication.",
   "LDAP_Encryption": "Encryption",
   "LDAP_Encryption_Description": "The encryption method used to secure communications to the LDAP server. Examples include `plain` (no encryption), `SSL/LDAPS` (encrypted from the start), and `StartTLS` (upgrade to encrypted communication once connected).",
+  "LDAP_Internal_Log_Level": "Internal Log Level",
   "LDAP_Group_Filter_Enable": "Enable LDAP user group filter",
   "LDAP_Group_Filter_Enable_Description": "Restrict access to users in a LDAP group<br/>Useful for OpenLDAP servers without overlays that not permit *memberOf* filter",
   "LDAP_Group_Filter_Group_Id_Attribute": "Group ID Attribute",
diff --git a/packages/rocketchat-ldap/package.js b/packages/rocketchat-ldap/package.js
index 879b0ecfe6a..fccce5e20c6 100644
--- a/packages/rocketchat-ldap/package.js
+++ b/packages/rocketchat-ldap/package.js
@@ -6,7 +6,6 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use('rocketchat:ldapjs');
 	api.use('rocketchat:logger');
 	api.use('rocketchat:lib');
 	api.use('yasaricli:slugify');
diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 48f64f48591..2f2ff776fde 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -1,6 +1,5 @@
-/* globals LDAPJS */
-
-const ldapjs = LDAPJS;
+import ldapjs from 'ldapjs';
+import Bunyan from 'bunyan';
 
 const logger = new Logger('LDAP', {
 	sections: {
@@ -21,6 +20,7 @@ export default class LDAP {
 			host: RocketChat.settings.get('LDAP_Host'),
 			port: RocketChat.settings.get('LDAP_Port'),
 			Reconnect: RocketChat.settings.get('LDAP_Reconnect'),
+			Internal_Log_Level: RocketChat.settings.get('LDAP_Internal_Log_Level'),
 			timeout: RocketChat.settings.get('LDAP_Timeout'),
 			connect_timeout: RocketChat.settings.get('LDAP_Connect_Timeout'),
 			idle_timeout: RocketChat.settings.get('LDAP_Idle_Timeout'),
@@ -72,6 +72,15 @@ export default class LDAP {
 			reconnect: this.options.Reconnect
 		};
 
+		if (this.options.Internal_Log_Level !== 'disabled') {
+			connectionOptions.log = new Bunyan({
+				name: 'ldapjs',
+				component: 'client',
+				stream: process.stderr,
+				level: this.options.Internal_Log_Level
+			});
+		}
+
 		const tlsOptions = {
 			rejectUnauthorized: this.options.reject_unauthorized
 		};
diff --git a/packages/rocketchat-ldap/server/settings.js b/packages/rocketchat-ldap/server/settings.js
index a1d0d109112..b51d0549f2c 100644
--- a/packages/rocketchat-ldap/server/settings.js
+++ b/packages/rocketchat-ldap/server/settings.js
@@ -30,6 +30,18 @@ RocketChat.settings.addGroup('LDAP', function() {
 	this.add('LDAP_CA_Cert', '', { type: 'string', multiline: true, enableQuery: enableTLSQuery });
 	this.add('LDAP_Reject_Unauthorized', true, { type: 'boolean', enableQuery: enableTLSQuery });
 	this.add('LDAP_BaseDN', '', { type: 'string', enableQuery });
+	this.add('LDAP_Internal_Log_Level', 'disabled', {
+		type: 'select',
+		values: [
+			{ key: 'disabled', i18nLabel: 'Disabled' },
+			{ key: 'error', i18nLabel: 'Error' },
+			{ key: 'warn', i18nLabel: 'Warn' },
+			{ key: 'info', i18nLabel: 'Info' },
+			{ key: 'debug', i18nLabel: 'Debug' },
+			{ key: 'trace', i18nLabel: 'Trace' }
+		],
+		enableQuery
+	});
 	this.add('LDAP_Test_Connection', 'ldap_test_connection', { type: 'action', actionText: 'Test_Connection' });
 
 	this.section('Authentication', function() {

From 061ecafcf428b508a221ab06ec0d348964bf6012 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 9 Oct 2017 09:28:32 -0300
Subject: [PATCH 145/244] Merge pull request #8416 from
 RocketChat/account-menu-rtl

Fix: Account menu position on RTL
---
 packages/rocketchat-ui-sidenav/client/accountBox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js
index ac087a1a3b8..6b3cb2de581 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.js
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.js
@@ -123,7 +123,7 @@ Template.accountBox.events({
 			customCSSProperties: {
 				width: `${ accountBox.offsetWidth - parseInt(getComputedStyle(accountBox)['padding-left'].replace('px', '')) * 2 }px`,
 				left: isRtl() ? 'auto' : getComputedStyle(accountBox)['padding-left'],
-				right: isRtl() ? getComputedStyle(accountBox)['padding-right'] : 'auto'
+				right: 'auto'
 			}
 		};
 

From 79326949cea2ad576acf6463a08cdf9436887632 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 9 Oct 2017 09:38:09 -0300
Subject: [PATCH 146/244] Bump version to 0.59.0-rc.12

---
 .docker/Dockerfile                      |  2 +-
 .meteor/versions                        |  1 -
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 25 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 7 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index b936c4af74f..631bfdbe02b 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.11
+ENV RC_VERSION 0.59.0-rc.12
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.meteor/versions b/.meteor/versions
index 752e9253d1d..ceda5fa8cbb 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -166,7 +166,6 @@ rocketchat:irc@0.0.2
 rocketchat:issuelinks@0.0.1
 rocketchat:katex@0.0.1
 rocketchat:ldap@0.0.1
-rocketchat:ldapjs@1.0.0
 rocketchat:lib@0.0.1
 rocketchat:livechat@0.0.1
 rocketchat:logger@0.0.1
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index eb86ef3bcdd..dc121ff0c08 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.11"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.12"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index cfae7c2f8dd..68724503180 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.11
+    RC_VERSION=0.59.0-rc.12
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 6c64fd4c6af..e6638f14c4e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,28 @@
+<a name="0.59.0-rc.12"></a>
+# 0.59.0-rc.12 (2017-10-09)
+
+
+### Bug Fixes
+
+- [#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389) Add needed dependency for snaps
+- [#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386) disabled katex tooltip on messageBox
+- [#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408) Duplicate code in rest api letting in a few bugs with the rest api
+- [#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) Sidebar item menu position in RTL
+- [#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390) Slack import failing and not being able to be restarted
+
+
+<details>
+<summary>Others</summary>
+
+- [#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394) Add i18n Title to snippet messages
+- [#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) Fix: Account menu position on RTL
+- [#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417) Fix: Missing LDAP option to show internal logs
+- [#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414) Fix: Missing LDAP reconnect setting
+- [#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398) Fix: Missing settings to configure LDAP size and page limits
+</details>
+
+
+
 <a name="0.59.0-rc.11"></a>
 # 0.59.0-rc.11 (2017-10-03)
 
diff --git a/package.json b/package.json
index 8ebd99074cc..c95d158c566 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.11",
+	"version": "0.59.0-rc.12",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index e2747b57e06..3c8b2a06061 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.11"
+	"version": "0.59.0-rc.12"
 }

From 2d95ca1a6468579d8b3d15e0eb3b5e1e961e178e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 10 Oct 2017 14:25:13 -0300
Subject: [PATCH 147/244] Merge pull request #8451 from
 RocketChat/improvements/markdown-parser

Improve markdown parser code
---
 .../parser/original/markdown.js               | 34 +++++++++----------
 .../rocketchat-markdown/tests/client.tests.js | 19 +++--------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/packages/rocketchat-markdown/parser/original/markdown.js b/packages/rocketchat-markdown/parser/original/markdown.js
index 5e49e2f2752..6b64da6734d 100644
--- a/packages/rocketchat-markdown/parser/original/markdown.js
+++ b/packages/rocketchat-markdown/parser/original/markdown.js
@@ -3,6 +3,7 @@
  * @param {String} msg - The message html
  */
 import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
 import { _ } from 'meteor/underscore';
 import { RocketChat } from 'meteor/rocketchat:lib';
 
@@ -11,6 +12,16 @@ const parseNotEscaped = function(msg, message) {
 		message.tokens = [];
 	}
 
+	const addAsToken = function(html) {
+		const token = `=!=${ Random.id() }=!=`;
+		message.tokens.push({
+			token,
+			text: html
+		});
+
+		return token;
+	};
+
 	const schemes = RocketChat.settings.get('Markdown_SupportSchemesForLink').split(',').join('|');
 
 	if (RocketChat.settings.get('Markdown_Headers')) {
@@ -53,34 +64,21 @@ const parseNotEscaped = function(msg, message) {
 	msg = msg.replace(/<\/blockquote>\n<blockquote/gm, '</blockquote><blockquote');
 
 	// Support ![alt text](http://image url)
-	msg = msg.replace(new RegExp(`!\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), function(match, title, url) {
+	msg = msg.replace(new RegExp(`!\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), (match, title, url) => {
 		const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
-		const html = `<a href="${ _.escapeHTML(url) }" title="${ _.escapeHTML(title) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer"><div class="inline-image" style="background-image: url(${ _.escapeHTML(url) });"></div></a>`;
-
-		if (message && message.tokens) {
-			const token = `=!=${ Random.id() }=!=`;
-
-			message.tokens.push({
-				token,
-				text: html
-			});
-
-			return token;
-		}
-
-		return html;
+		return addAsToken(`<a href="${ _.escapeHTML(url) }" title="${ _.escapeHTML(title) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer"><div class="inline-image" style="background-image: url(${ _.escapeHTML(url) });"></div></a>`);
 	});
 
 	// Support [Text](http://link)
-	msg = msg.replace(new RegExp(`\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), function(match, title, url) {
+	msg = msg.replace(new RegExp(`\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), (match, title, url) => {
 		const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
-		return `<a href="${ _.escapeHTML(url) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer">${ _.escapeHTML(title) }</a>`;
+		return addAsToken(`<a href="${ _.escapeHTML(url) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer">${ _.escapeHTML(title) }</a>`);
 	});
 
 	// Support <http://link|Text>
 	msg = msg.replace(new RegExp(`(?:<|&lt;)((?:${ schemes }):\\/\\/[^\\|]+)\\|(.+?)(?=>|&gt;)(?:>|&gt;)`, 'gm'), (match, url, title) => {
 		const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
-		return `<a href="${ _.escapeHTML(url) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer">${ _.escapeHTML(title) }</a>`;
+		return addAsToken(`<a href="${ _.escapeHTML(url) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer">${ _.escapeHTML(title) }</a>`);
 	});
 
 	return msg;
diff --git a/packages/rocketchat-markdown/tests/client.tests.js b/packages/rocketchat-markdown/tests/client.tests.js
index 546e84a382b..80822cc3be7 100644
--- a/packages/rocketchat-markdown/tests/client.tests.js
+++ b/packages/rocketchat-markdown/tests/client.tests.js
@@ -226,6 +226,9 @@ const testObject = (object, parser = original, test = defaultObjectTest) => {
 	Object.keys(object).forEach((objectKey) => {
 		describe(objectKey, () => {
 			const result = parser({html: objectKey});
+			result.tokens.forEach((token) => {
+				result.html = result.html.replace(token.token, token.text);
+			});
 			it(`should be equal to ${ object[objectKey] }`, () => {
 				test(result, object, objectKey);
 			});
@@ -254,21 +257,9 @@ describe('Original', function() {
 
 	describe('Link', () => testObject(link));
 
-	describe('Inline Code', () => testObject(inlinecode, undefined, (result, object, objectKey) => {
-		let html = result.html;
-		result.tokens.forEach((token) => {
-			html = html.replace(token.token, token.text);
-		});
-		assert.equal(html, object[objectKey]);
-	}));
+	describe('Inline Code', () => testObject(inlinecode));
 
-	describe('Code', () => testObject(code, undefined, (result, object, objectKey) => {
-		let html = result.html;
-		result.tokens.forEach((token) => {
-			html = html.replace(token.token, token.text);
-		});
-		assert.equal(html, object[objectKey]);
-	}));
+	describe('Code', () => testObject(code));
 });
 
 // describe.only('Marked', function() {

From 47afc0badaba6c2b2fb8aa1a754c9abe527e6b09 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 10 Oct 2017 21:46:55 -0300
Subject: [PATCH 148/244] Merge pull request #8457 from
 RocketChat/improvements/ldap-memory-leak

[FIX] LDAP memory issues when pagination is not available
---
 packages/rocketchat-ldap/server/ldap.js | 65 +++++++++++++++++--------
 packages/rocketchat-ldap/server/sync.js | 26 +++++-----
 2 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 2f2ff776fde..bbe7e28855a 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -221,12 +221,15 @@ export default class LDAP {
 		const searchOptions = {
 			filter: this.getUserFilter(username),
 			scope: this.options.User_Search_Scope || 'sub',
-			sizeLimit: this.options.Search_Size_Limit,
-			paged: {
+			sizeLimit: this.options.Search_Size_Limit
+		};
+
+		if (this.options.Search_Page_Size > 0) {
+			searchOptions.paged = {
 				pageSize: this.options.Search_Page_Size,
 				pagePause: !!page
-			}
-		};
+			};
+		}
 
 		logger.search.info('Searching user', username);
 		logger.search.debug('searchOptions', searchOptions);
@@ -362,23 +365,50 @@ export default class LDAP {
 			});
 
 			let entries = [];
-			const jsonEntries = [];
+
+			const internalPageSize = options.paged && options.paged.pageSize > 0 ? options.paged.pageSize * 2 : 500;
 
 			res.on('searchEntry', (entry) => {
-				entries.push(entry);
-				jsonEntries.push(entry.json);
+				const values = entry.raw;
+				Object.keys(values).forEach((key) => {
+					const value = values[key];
+					if (!['thumbnailPhoto', 'jpegPhoto'].includes(key) && value instanceof Buffer) {
+						values[key] = value.toString();
+					}
+				});
+
+				entries.push(values);
+
+				if (entries.length >= internalPageSize) {
+					logger.search.info('Internal Page');
+					this.client._updateIdle(true);
+					page(null, entries, {end: false, next: () => {
+						// Reset idle timer
+						this.client._updateIdle();
+					}});
+					entries = [];
+				}
 			});
 
 			res.on('page', (result, next) => {
-				logger.search.debug('Page');
-				// Force LDAP idle to wait the record processing
-				this.client._updateIdle(true);
-				page(null, entries, {end: !next, next: () => {
-					// Reset idle timer
-					this.client._updateIdle();
-					next && next();
-				}});
-				entries = [];
+				if (!next) {
+					logger.search.debug('Final Page');
+					this.client._updateIdle(true);
+					page(null, entries, {end: true, next: () => {
+						// Reset idle timer
+						this.client._updateIdle();
+					}});
+				} else if (entries.length) {
+					logger.search.info('Page');
+					// Force LDAP idle to wait the record processing
+					this.client._updateIdle(true);
+					page(null, entries, {end: !next, next: () => {
+						// Reset idle timer
+						this.client._updateIdle();
+						next();
+					}});
+					entries = [];
+				}
 			});
 		});
 	}
@@ -400,16 +430,13 @@ export default class LDAP {
 			});
 
 			const entries = [];
-			const jsonEntries = [];
 
 			res.on('searchEntry', (entry) => {
 				entries.push(entry);
-				jsonEntries.push(entry.json);
 			});
 
 			res.on('end', () => {
 				logger.search.info('Search result count', entries.length);
-				// logger.search.debug('Search result', JSON.stringify(jsonEntries, null, 2));
 				callback(null, entries);
 			});
 		});
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 3741ab80337..27bf6422607 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -18,11 +18,11 @@ export function getLdapUsername(ldapUser) {
 
 	if (usernameField.indexOf('#{') > -1) {
 		return usernameField.replace(/#{(.+?)}/g, function(match, field) {
-			return ldapUser.object[field];
+			return ldapUser[field];
 		});
 	}
 
-	return ldapUser.object[usernameField];
+	return ldapUser[usernameField];
 }
 
 
@@ -47,12 +47,12 @@ export function getLdapUserUniqueID(ldapUser) {
 
 	if (Unique_Identifier_Field.length > 0) {
 		Unique_Identifier_Field = Unique_Identifier_Field.find((field) => {
-			return !_.isEmpty(ldapUser.object[field]);
+			return !_.isEmpty(ldapUser[field]);
 		});
 		if (Unique_Identifier_Field) {
 			Unique_Identifier_Field = {
 				attribute: Unique_Identifier_Field,
-				value: ldapUser.raw[Unique_Identifier_Field].toString('hex')
+				value: new Buffer(ldapUser[Unique_Identifier_Field]).toString('hex')
 			};
 		}
 		return Unique_Identifier_Field;
@@ -72,17 +72,17 @@ export function getDataToSyncUserData(ldapUser, user) {
 		_.map(fieldMap, function(userField, ldapField) {
 			switch (userField) {
 				case 'email':
-					if (!ldapUser.object.hasOwnProperty(ldapField)) {
+					if (!ldapUser.hasOwnProperty(ldapField)) {
 						logger.debug(`user does not have attribute: ${ ldapField }`);
 						return;
 					}
 
-					if (_.isObject(ldapUser.object[ldapField])) {
-						_.map(ldapUser.object[ldapField], function(item) {
+					if (_.isObject(ldapUser[ldapField])) {
+						_.map(ldapUser[ldapField], function(item) {
 							emailList.push({ address: item, verified: true });
 						});
 					} else {
-						emailList.push({ address: ldapUser.object[ldapField], verified: true });
+						emailList.push({ address: ldapUser[ldapField], verified: true });
 					}
 					break;
 
@@ -92,7 +92,7 @@ export function getDataToSyncUserData(ldapUser, user) {
 						return;
 					}
 
-					const tmpLdapField = RocketChat.templateVarHandler(ldapField, ldapUser.object);
+					const tmpLdapField = RocketChat.templateVarHandler(ldapField, ldapUser);
 					const userFieldValue = _.reduce(userField.split('.'), (acc, el) => acc[el], user);
 
 					if (tmpLdapField && userFieldValue !== tmpLdapField) {
@@ -129,7 +129,7 @@ export function getDataToSyncUserData(ldapUser, user) {
 export function syncUserData(user, ldapUser) {
 	logger.info('Syncing user data');
 	logger.debug('user', {'email': user.email, '_id': user._id});
-	logger.debug('ldapUser', ldapUser.object);
+	logger.debug('ldapUser', ldapUser);
 
 	const userData = getDataToSyncUserData(ldapUser, user);
 	if (user && user._id && userData) {
@@ -151,7 +151,7 @@ export function syncUserData(user, ldapUser) {
 	}
 
 	if (user && user._id && RocketChat.settings.get('LDAP_Sync_User_Avatar') === true) {
-		const avatar = ldapUser.raw.thumbnailPhoto || ldapUser.raw.jpegPhoto;
+		const avatar = ldapUser.thumbnailPhoto || ldapUser.jpegPhoto;
 		if (avatar) {
 			logger.info('Syncing user avatar');
 
@@ -193,8 +193,8 @@ export function addLdapUser(ldapUser, username, password) {
 		} else {
 			userObject.email = userData.emails[0].address;
 		}
-	} else if (ldapUser.object.mail && ldapUser.object.mail.indexOf('@') > -1) {
-		userObject.email = ldapUser.object.mail;
+	} else if (ldapUser.mail && ldapUser.mail.indexOf('@') > -1) {
+		userObject.email = ldapUser.mail;
 	} else if (RocketChat.settings.get('LDAP_Default_Domain') !== '') {
 		userObject.email = `${ username || uniqueId.value }@${ RocketChat.settings.get('LDAP_Default_Domain') }`;
 	} else {

From 941051c57527826447cecb04d95cdbf5898bee91 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 10 Oct 2017 22:30:03 -0300
Subject: [PATCH 149/244] Merge pull request #8459 from
 RocketChat/improvements/md-autolinker-disable-option

[NEW] Setting to disable MarkDown and enable AutoLinker
---
 .../rocketchat-autolinker/client/client.js    |  4 ++++
 .../rocketchat-autolinker/server/settings.js  | 21 ++++++++++++-------
 packages/rocketchat-markdown/markdown.js      |  5 +++++
 packages/rocketchat-markdown/settings.js      |  3 +++
 .../client/messageBox.js                      |  6 +++---
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-autolinker/client/client.js b/packages/rocketchat-autolinker/client/client.js
index 4c91838d5e0..a4ac42cb937 100644
--- a/packages/rocketchat-autolinker/client/client.js
+++ b/packages/rocketchat-autolinker/client/client.js
@@ -6,6 +6,10 @@
 import Autolinker from 'autolinker';
 
 function AutoLinker(message) {
+	if (RocketChat.settings.get('AutoLinker') !== true) {
+		return message;
+	}
+
 	if (_.trim(message.html)) {
 		const regUrls = new RegExp(RocketChat.settings.get('AutoLinker_UrlsRegExp'));
 
diff --git a/packages/rocketchat-autolinker/server/settings.js b/packages/rocketchat-autolinker/server/settings.js
index 72205b5547a..469ced41f87 100644
--- a/packages/rocketchat-autolinker/server/settings.js
+++ b/packages/rocketchat-autolinker/server/settings.js
@@ -1,9 +1,16 @@
 Meteor.startup(function() {
-	RocketChat.settings.add('AutoLinker_StripPrefix', false, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nDescription: 'AutoLinker_StripPrefix_Description'});
-	RocketChat.settings.add('AutoLinker_Urls_Scheme', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true});
-	RocketChat.settings.add('AutoLinker_Urls_www', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true});
-	RocketChat.settings.add('AutoLinker_Urls_TLD', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true});
-	RocketChat.settings.add('AutoLinker_UrlsRegExp', '(://|www\\.).+', {type: 'string', group: 'Message', section: 'AutoLinker', public: true});
-	RocketChat.settings.add('AutoLinker_Email', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true});
-	RocketChat.settings.add('AutoLinker_Phone', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nDescription: 'AutoLinker_Phone_Description'});
+	const enableQuery = {
+		_id: 'AutoLinker',
+		value: true
+	};
+
+	RocketChat.settings.add('AutoLinker', false, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nLabel: 'Enabled'});
+
+	RocketChat.settings.add('AutoLinker_StripPrefix', false, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nDescription: 'AutoLinker_StripPrefix_Description', enableQuery});
+	RocketChat.settings.add('AutoLinker_Urls_Scheme', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, enableQuery});
+	RocketChat.settings.add('AutoLinker_Urls_www', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, enableQuery});
+	RocketChat.settings.add('AutoLinker_Urls_TLD', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, enableQuery});
+	RocketChat.settings.add('AutoLinker_UrlsRegExp', '(://|www\\.).+', {type: 'string', group: 'Message', section: 'AutoLinker', public: true, enableQuery});
+	RocketChat.settings.add('AutoLinker_Email', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, enableQuery});
+	RocketChat.settings.add('AutoLinker_Phone', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nDescription: 'AutoLinker_Phone_Description', enableQuery});
 });
diff --git a/packages/rocketchat-markdown/markdown.js b/packages/rocketchat-markdown/markdown.js
index 77d690ddf92..62907774289 100644
--- a/packages/rocketchat-markdown/markdown.js
+++ b/packages/rocketchat-markdown/markdown.js
@@ -31,6 +31,11 @@ class MarkdownClass {
 
 	parseMessageNotEscaped(message) {
 		const parser = RocketChat.settings.get('Markdown_Parser');
+
+		if (parser === 'disabled') {
+			return message;
+		}
+
 		if (typeof parsers[parser] === 'function') {
 			return parsers[parser](message);
 		}
diff --git a/packages/rocketchat-markdown/settings.js b/packages/rocketchat-markdown/settings.js
index e03cdbe2e31..13f614c52ce 100644
--- a/packages/rocketchat-markdown/settings.js
+++ b/packages/rocketchat-markdown/settings.js
@@ -5,6 +5,9 @@ Meteor.startup(() => {
 	RocketChat.settings.add('Markdown_Parser', 'original', {
 		type: 'select',
 		values: [{
+			key: 'disabled',
+			i18nLabel: 'Disabled'
+		}, {
 			key: 'original',
 			i18nLabel: 'Original'
 		}, {
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index cc1d3067095..6028c4d0311 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -97,7 +97,7 @@ const markdownButtons = [
 		icon: 'italic',
 		pattern: '_{{text}}_',
 		command: 'i',
-		condition: () => RocketChat.Markdown
+		condition: () => RocketChat.Markdown && RocketChat.settings.get('Markdown_Parser') !== 'disabled'
 	},
 	{
 		label: 'strike',
@@ -115,13 +115,13 @@ const markdownButtons = [
 		label: 'inline_code',
 		icon: 'code',
 		pattern: '`{{text}}`',
-		condition: () => RocketChat.Markdown
+		condition: () => RocketChat.Markdown && RocketChat.settings.get('Markdown_Parser') !== 'disabled'
 	},
 	{
 		label: 'multi_line',
 		icon: 'multi-line',
 		pattern: '```\n{{text}}\n``` ',
-		condition: () => RocketChat.Markdown
+		condition: () => RocketChat.Markdown && RocketChat.settings.get('Markdown_Parser') !== 'disabled'
 	},
 	{
 		label: katexSyntax,

From 74a8fce1d7409a3d8a61f2057e3cda1a01ca93e8 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 10 Oct 2017 22:34:16 -0300
Subject: [PATCH 150/244] Bump version to 0.59.0-rc.13

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 22 ++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 631bfdbe02b..a0e13239da8 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.12
+ENV RC_VERSION 0.59.0-rc.13
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index dc121ff0c08..f41408f6312 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.12"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.13"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 68724503180..42dabda8066 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.12
+    RC_VERSION=0.59.0-rc.13
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index e6638f14c4e..d445c6cc426 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,25 @@
+<a name="0.59.0-rc.13"></a>
+# 0.59.0-rc.13 (2017-10-11)
+
+
+### New Features
+
+- [#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459) Setting to disable MarkDown and enable AutoLinker
+
+
+### Bug Fixes
+
+- [#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457) LDAP memory issues when pagination is not available
+
+
+<details>
+<summary>Others</summary>
+
+- [#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451) Improve markdown parser code
+</details>
+
+
+
 <a name="0.59.0-rc.12"></a>
 # 0.59.0-rc.12 (2017-10-09)
 
diff --git a/package.json b/package.json
index c95d158c566..5eeb1bfde69 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.12",
+	"version": "0.59.0-rc.13",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 3c8b2a06061..cb43006af32 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.12"
+	"version": "0.59.0-rc.13"
 }

From 6593eca882a8ecd7a0e537bda3e24001db9e3a43 Mon Sep 17 00:00:00 2001
From: CYCLOPS <cyclops.sh@gmail.com>
Date: Sat, 14 Oct 2017 19:14:36 +0330
Subject: [PATCH 151/244] Fix indentation

---
 .../client/imports/components/slider.css      | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/slider.css b/packages/rocketchat-theme/client/imports/components/slider.css
index 70db410152e..30db1491b01 100644
--- a/packages/rocketchat-theme/client/imports/components/slider.css
+++ b/packages/rocketchat-theme/client/imports/components/slider.css
@@ -8,6 +8,7 @@
 	height: 10px;
 	margin: 0;
 	padding: 0;
+
 	border-radius: 5px;
 	outline: none;
 	appearance: none;
@@ -16,8 +17,10 @@
 .range-slider-range::-webkit-slider-thumb {
 	width: 20px;
 	height: 20px;
+
 	cursor: pointer;
 	transition: background 0.15s ease-in-out;
+
 	border-radius: 50%;
 	appearance: none;
 }
@@ -25,46 +28,56 @@
 .range-slider-range::-moz-range-thumb {
 	width: 20px;
 	height: 20px;
+
 	cursor: pointer;
 	transition: background 0.15s ease-in-out;
+
 	border: 0;
 	border-radius: 50%;
 }
 
 .range-slider-value {
 	position: relative;
+
 	display: inline-block;
+
 	width: 60px;
 	margin-left: 8px;
 	padding: 5px 10px;
+
 	text-align: center;
+
 	border-radius: 3px;
+
 	line-height: 20px;
 }
 
 .rtl .range-slider-value {
-  margin-right: 8px;
-  margin-left: unset;
+	margin-right: 8px;
+	margin-left: unset;
 }
 
 .range-slider-value::after {
 	position: absolute;
 	top: 8px;
 	left: -7px;
+
 	width: 0;
 	height: 0;
+
 	content: '';
+  
 	border-top: 7px solid;
 	border-right: 7px solid;
 	border-bottom: 7px solid;
 }
 
 .rtl .range-slider-value::after {
-  right: -7px;
-  left: unset;
-  -ms-transform: rotate(180deg); /* IE 9 */
-  -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */
-  transform: rotate(180deg);
+	right: -7px;
+	left: unset;
+	-ms-transform: rotate(180deg); /* IE 9 */
+	-webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */
+	transform: rotate(180deg);
 }
 
 .range-slider-range::-moz-range-track,

From aea9c731aea1721ee26ae72baa5147184f620376 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 14 Oct 2017 17:12:51 -0300
Subject: [PATCH 152/244] Merge pull request #8490 from
 RocketChat/hotfix/enable-autolinker

Enable AutoLinker back
---
 packages/rocketchat-autolinker/server/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-autolinker/server/settings.js b/packages/rocketchat-autolinker/server/settings.js
index 469ced41f87..06edeee4055 100644
--- a/packages/rocketchat-autolinker/server/settings.js
+++ b/packages/rocketchat-autolinker/server/settings.js
@@ -4,7 +4,7 @@ Meteor.startup(function() {
 		value: true
 	};
 
-	RocketChat.settings.add('AutoLinker', false, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nLabel: 'Enabled'});
+	RocketChat.settings.add('AutoLinker', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nLabel: 'Enabled'});
 
 	RocketChat.settings.add('AutoLinker_StripPrefix', false, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nDescription: 'AutoLinker_StripPrefix_Description', enableQuery});
 	RocketChat.settings.add('AutoLinker_Urls_Scheme', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, enableQuery});

From 342ed3ab5d3661c747419f537580b88af2c96f72 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 14 Oct 2017 17:31:17 -0300
Subject: [PATCH 153/244] Merge pull request #8489 from
 RocketChat/hotfix/reset-password-message-with-2fa

[FIX] Wrong message when reseting password and 2FA is enabled
---
 .../client/reset-password/resetPassword.js         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
index 00a5f0b4210..cd6c0181e3c 100644
--- a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
+++ b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
@@ -44,10 +44,16 @@ Template.resetPassword.events({
 				RocketChat.Button.reset(button);
 				if (error) {
 					console.log(error);
-					swal({
-						title: t('Error_changing_password'),
-						type: 'error'
-					});
+					if (error.error === 'totp-required') {
+						toastr.success(t('Password_changed_successfully'));
+						RocketChat.callbacks.run('userPasswordReset');
+						FlowRouter.go('login');
+					} else {
+						swal({
+							title: t('Error_changing_password'),
+							type: 'error'
+						});
+					}
 				} else {
 					FlowRouter.go('home');
 					toastr.success(t('Password_changed_successfully'));

From a38d9174eefbd3fe701adcf110e7ae1a232d7ef7 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 14 Oct 2017 21:39:36 -0300
Subject: [PATCH 154/244] Merge pull request #8491 from
 RocketChat/hotfix/join-code

[FIX] Invalid Code message for password protected channel
---
 .../rocketchat-lib/server/methods/joinRoom.js |  2 +-
 .../client/messageBox.html                    |  2 +-
 .../client/messageBox.js                      |  4 +-
 .../rocketchat-ui/client/lib/chatMessages.js  |  2 +-
 .../rocketchat-ui/client/views/app/room.js    |  4 +-
 server/publications/room.js                   | 85 +++++++++++--------
 6 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/packages/rocketchat-lib/server/methods/joinRoom.js b/packages/rocketchat-lib/server/methods/joinRoom.js
index 16467bdbf2b..c2f7ab9bb6d 100644
--- a/packages/rocketchat-lib/server/methods/joinRoom.js
+++ b/packages/rocketchat-lib/server/methods/joinRoom.js
@@ -18,7 +18,7 @@ Meteor.methods({
 		}
 
 		if ((room.joinCodeRequired === true) && (code !== room.joinCode) && !RocketChat.authz.hasPermission(Meteor.userId(), 'join-without-join-code')) {
-			throw new Meteor.Error('error-code-invalid', 'Invalid Code', { method: 'joinRoom' });
+			throw new Meteor.Error('error-code-invalid', 'Invalid Room Password', { method: 'joinRoom' });
 		}
 
 		return RocketChat.addUserToRoom(rid, Meteor.user());
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 0b1d080ec6f..9a8ff55e5bb 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -73,7 +73,7 @@
 					<div>
 						{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
 						{{#if joinCodeRequired}}
-							<input type="text" name="joinCode" placeholder="{{_ 'Code'}}" style="width: 100px">
+							<input type="text" name="joinCode" placeholder="{{_ 'Password'}}" style="width: 100px">
 						{{/if}}
 						<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
 					</div>
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 6028c4d0311..bb44c1bf62c 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -506,7 +506,9 @@ Meteor.startup(function() {
 	});
 	RocketChat.callbacks.add('enter-room', function() {
 		setTimeout(()=> {
-			chatMessages[RocketChat.openedRoom].input.focus();
+			if (chatMessages[RocketChat.openedRoom].input) {
+				chatMessages[RocketChat.openedRoom].input.focus();
+			}
 		}, 200);
 	});
 });
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
index f2571e149f8..4995a98b268 100644
--- a/packages/rocketchat-ui/client/lib/chatMessages.js
+++ b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -381,7 +381,7 @@ this.ChatMessages = class ChatMessages {
 
 	restoreText(rid) {
 		const text = localStorage.getItem(`messagebox_${ rid }`);
-		if (typeof text === 'string') {
+		if (typeof text === 'string' && this.input) {
 			this.input.value = text;
 		}
 	}
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 81bfc6b141d..6fa33dab578 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -955,8 +955,8 @@ Template.room.onRendered(function() {
 		}
 	});
 	Tracker.autorun(function() {
-		const subRoom = ChatSubscription.findOne({rid:template.data._id});
-		if (!subRoom) {
+		const room = RocketChat.models.Rooms.findOne({ _id: template.data._id });
+		if (!room) {
 			FlowRouter.go('home');
 		}
 	});
diff --git a/server/publications/room.js b/server/publications/room.js
index cb35cd9c789..c52722cf67d 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -1,47 +1,58 @@
-const options = {
-	fields: {
-		_id: 1,
-		name: 1,
-		fname: 1,
-		t: 1,
-		cl: 1,
-		u: 1,
-		// usernames: 1,
-		topic: 1,
-		announcement: 1,
-		muted: 1,
-		_updatedAt: 1,
-		archived: 1,
-		jitsiTimeout: 1,
-		description: 1,
-		default: 1,
-		customFields: 1,
-
-		// @TODO create an API to register this fields based on room type
-		livechatData: 1,
-		tags: 1,
-		sms: 1,
-		code: 1,
-		open: 1,
-		v: 1,
-		label: 1,
-		ro: 1,
-		sentiment: 1
-	}
+const fields = {
+	_id: 1,
+	name: 1,
+	fname: 1,
+	t: 1,
+	cl: 1,
+	u: 1,
+	// usernames: 1,
+	topic: 1,
+	announcement: 1,
+	muted: 1,
+	_updatedAt: 1,
+	archived: 1,
+	jitsiTimeout: 1,
+	description: 1,
+	default: 1,
+	customFields: 1,
+
+	// @TODO create an API to register this fields based on room type
+	livechatData: 1,
+	tags: 1,
+	sms: 1,
+	code: 1,
+	joinCodeRequired: 1,
+	open: 1,
+	v: 1,
+	label: 1,
+	ro: 1,
+	sentiment: 1
 };
 
 
-const roomMap = (record) => {
+const roomMap = (record, fields) => {
 	if (record._room) {
-		return _.pick(record._room, ...Object.keys(options.fields));
+		return _.pick(record._room, ...Object.keys(fields));
 	}
 	console.log('Empty Room for Subscription', record);
 	return {};
 };
 
+function getFieldsForUserId(userId) {
+	if (RocketChat.authz.hasPermission(userId, 'view-join-code')) {
+		return {
+			...fields,
+			joinCode: 1
+		};
+	}
+
+	return fields;
+}
 
 Meteor.methods({
 	'rooms/get'(updatedAt) {
+		let options = {fields};
+
 		if (!Meteor.userId()) {
 			if (RocketChat.settings.get('Accounts_AllowAnonymousRead') === true) {
 				return RocketChat.models.Rooms.findByDefaultAndTypes(true, ['c'], options).fetch();
@@ -51,6 +62,10 @@ Meteor.methods({
 
 		this.unblock();
 
+		options = {
+			fields: getFieldsForUserId(this.userId)
+		};
+
 		if (updatedAt instanceof Date) {
 			return {
 				update: RocketChat.models.Rooms.findBySubscriptionUserIdUpdatedAfter(Meteor.userId(), updatedAt, options).fetch(),
@@ -84,14 +99,14 @@ Meteor.methods({
 			throw new Meteor.Error('error-no-permission', 'No permission', { method: 'getRoomByTypeAndName' });
 		}
 
-		return roomMap({_room: room});
+		return roomMap({_room: room}, getFieldsForUserId(this.userId));
 	}
 });
 
 RocketChat.models.Rooms.cache.on('sync', (type, room/*, diff*/) => {
 	const records = RocketChat.models.Subscriptions.findByRoomId(room._id).fetch();
 	for (const record of records) {
-		RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, roomMap({_room: room}));
+		RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(record.u._id)));
 	}
 });
 
@@ -99,7 +114,7 @@ RocketChat.models.Subscriptions.on('changed', (type, subscription/*, diff*/) =>
 	if (type === 'inserted' || type === 'removed') {
 		const room = RocketChat.models.Rooms.findOneById(subscription.rid);
 		if (room) {
-			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}));
+			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(subscription.u._id)));
 		}
 	}
 });

From ddd6a735bbd3da95094e44635932a1d6b833d63c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 17 Oct 2017 12:03:05 -0200
Subject: [PATCH 155/244] Merge pull request #8514 from
 RocketChat/hotfix/uncessary-route-reload

[FIX] Uncessary route reload break some routes
---
 packages/rocketchat-ui/client/lib/RoomManager.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index 6b9fa703108..af895ee9d5d 100644
--- a/packages/rocketchat-ui/client/lib/RoomManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -265,7 +265,12 @@ Meteor.startup(() => {
 		if ((currentUsername === undefined) && ((user != null ? user.username : undefined) != null)) {
 			currentUsername = user.username;
 			RoomManager.closeAllRooms();
-			FlowRouter.reload();
+			const roomTypes = RocketChat.roomTypes.roomTypes;
+			// Reload only if the current route is a channel route
+			const roomType = Object.keys(roomTypes).find(key => roomTypes[key].route && roomTypes[key].route.name === FlowRouter.current().route.name);
+			if (roomType) {
+				FlowRouter.reload();
+			}
 		}
 	});
 

From d9fda62146ba176936d3630a57d413e9bf380495 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 17 Oct 2017 17:48:06 -0200
Subject: [PATCH 156/244] Merge pull request #8516 from
 RocketChat/hotfix/cant-change-password

Fix: Change password not working in new UI
---
 packages/rocketchat-ui-account/client/accountProfile.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js
index 44fd4a755f1..8bd364d6c5d 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.js
+++ b/packages/rocketchat-ui-account/client/accountProfile.js
@@ -79,6 +79,7 @@ Template.accountProfile.helpers({
 		instance.dep.depend();
 		const realname = instance.realname.get();
 		const username = instance.username.get();
+		const password = instance.password.get();
 		const email = instance.email.get();
 		const usernameAvaliable = instance.usernameAvaliable.get();
 		const avatar = instance.avatar.get();
@@ -93,7 +94,7 @@ Template.accountProfile.helpers({
 				return;
 			}
 		}
-		if (!avatar && user.name === realname && user.username === username && user.emails[0].address === email) {
+		if (!avatar && user.name === realname && user.username === username && user.emails[0].address === email && !password) {
 			return ret;
 		}
 		if (!validateEmail(email) || (!validateUsername(username) || usernameAvaliable !== true) || !validateName(realname)) {
@@ -236,6 +237,7 @@ Template.accountProfile.onCreated(function() {
 				toastr.success(t('Profile_saved_successfully'));
 				swal.close();
 				instance.clearForm();
+				self.password.set();
 			}
 			if (error) {
 				toastr.remove();

From 41fe5750bd1239c5feae9110a87506fad42df05a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 17 Oct 2017 17:49:36 -0200
Subject: [PATCH 157/244] Merge pull request #8463 from
 RocketChat/migration-colors

Color variables migration
---
 .../.npm/package/npm-shrinkwrap.json          |  63 +--
 packages/rocketchat-i18n/i18n/en.i18n.json    |  15 +
 .../client/imports/components/messages.css    |   6 +-
 .../client/imports/components/popover.css     |   4 +-
 .../imports/components/sidebar/sidebar.css    |   2 +-
 .../imports/components/sidebar/toolbar.css    |  14 +-
 .../client/imports/forms/switch.css           |   8 +-
 .../client/imports/forms/tags.css             |   2 +-
 .../client/imports/general/base.css           |   4 +-
 .../client/imports/general/base_old.css       |   2 +-
 .../client/imports/general/variables.css      | 491 +++++++++---------
 packages/rocketchat-theme/server/variables.js |  29 +-
 packages/rocketchat-ui-master/client/main.js  |   2 +-
 .../server/dynamic-css.js                     |  14 +-
 .../rocketchat-ui-master/server/inject.js     |  24 +-
 server/startup/migrations/v103.js             |  87 ++++
 16 files changed, 451 insertions(+), 316 deletions(-)
 create mode 100644 server/startup/migrations/v103.js

diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 3485f52f8fb..2617915b67c 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -265,14 +265,7 @@
     "gcp-metadata": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-      "from": "gcp-metadata@>=0.3.0 <0.4.0",
-      "dependencies": {
-        "retry-request": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
-          "from": "retry-request@>=3.0.0 <4.0.0"
-        }
-      }
+      "from": "gcp-metadata@>=0.3.0 <0.4.0"
     },
     "gcs-resumable-upload": {
       "version": "0.8.2",
@@ -347,13 +340,13 @@
       "from": "graceful-fs@>=4.1.2 <5.0.0"
     },
     "grpc": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.0.tgz",
-      "from": "grpc@>=1.3.1 <2.0.0",
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
+      "from": "grpc@>=1.6.0 <2.0.0",
       "dependencies": {
         "abbrev": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
           "from": "abbrev@1"
         },
         "ajv": {
@@ -367,8 +360,8 @@
           "from": "ansi-regex@^2.0.0"
         },
         "aproba": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
           "from": "aproba@^1.0.3"
         },
         "are-we-there-yet": {
@@ -479,8 +472,8 @@
           }
         },
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "from": "debug@^2.2.0"
         },
         "deep-extend": {
@@ -583,7 +576,7 @@
         "hawk": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-          "from": "hawk@~3.1.3"
+          "from": "hawk@3.1.3"
         },
         "hoek": {
           "version": "2.16.3",
@@ -668,13 +661,13 @@
           }
         },
         "mime-db": {
-          "version": "1.29.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-          "from": "mime-db@~1.29.0"
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "from": "mime-db@~1.30.0"
         },
         "mime-types": {
-          "version": "2.1.16",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
+          "version": "2.1.17",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
           "from": "mime-types@~2.1.7"
         },
         "minimatch": {
@@ -705,9 +698,9 @@
           "from": "ms@2.0.0"
         },
         "node-pre-gyp": {
-          "version": "0.6.36",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-          "from": "node-pre-gyp@0.6.36"
+          "version": "0.6.38",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
+          "from": "node-pre-gyp@0.6.38"
         },
         "nopt": {
           "version": "4.0.1",
@@ -792,11 +785,11 @@
         "request": {
           "version": "2.81.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-          "from": "request@^2.81.0"
+          "from": "request@2.81.0"
         },
         "rimraf": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
           "from": "rimraf@^2.6.1"
         },
         "safe-buffer": {
@@ -872,8 +865,8 @@
           "from": "tar-pack@^3.4.0"
         },
         "tough-cookie": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
           "from": "tough-cookie@~2.3.0"
         },
         "tunnel-agent": {
@@ -1123,7 +1116,7 @@
     "nan": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "from": "nan@>=2.6.2 <3.0.0"
+      "from": "nan@>=2.7.0 <3.0.0"
     },
     "node-forge": {
       "version": "0.7.1",
@@ -1236,9 +1229,9 @@
       "from": "request@>=2.79.0 <3.0.0"
     },
     "retry-request": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
-      "from": "retry-request@>=2.0.0 <3.0.0"
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.1.tgz",
+      "from": "retry-request@>=3.0.0 <4.0.0"
     },
     "rgb-hex": {
       "version": "1.0.0",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 3ae244ed59c..9a2c48bcacd 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1767,6 +1767,21 @@
   "theme-color-transparent-lighter": "Transparent Lighter",
   "theme-color-transparent-lightest": "Transparent Lightest",
   "theme-color-unread-notification-color": "Unread Notifications Color",
+  "theme-color-rc-color-error": "Error",
+  "theme-color-rc-color-error-light": "Error Light",
+  "theme-color-rc-color-alert": "Alert",
+  "theme-color-rc-color-alert-light": "Alert Light",
+  "theme-color-rc-color-success": "Success",
+  "theme-color-rc-color-success-light": "Success Light",
+  "theme-color-rc-color-button-primary": "Button Primary",
+  "theme-color-rc-color-button-primary-light": "Button Primary Light",
+  "theme-color-rc-color-primary": "Primary",
+  "theme-color-rc-color-primary-darkest": "Primary Darkest",
+  "theme-color-rc-color-primary-dark": "Primary Dark",
+  "theme-color-rc-color-primary-light": "Primary Light",
+  "theme-color-rc-color-primary-light-medium": "Primary Light Medium",
+  "theme-color-rc-color-primary-lightest": "Primary Lightest",
+  "theme-color-rc-color-content": "Content",
   "theme-custom-css": "Custom CSS",
   "theme-font-body-font-family": "Body Font Family",
   "There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.",
diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 0731807509a..f2ecefaca29 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -17,7 +17,7 @@
 		margin: 0 0.2rem;
 
 		&:hover {
-			color: var(--color-button-primary);
+			color: var(--rc-color-button-primary);
 		}
 	}
 
@@ -27,7 +27,7 @@
 		cursor: pointer;
 
 		&:hover &-icon {
-			fill: var(--color-button-primary);
+			fill: var(--rc-color-button-primary);
 		}
 
 		&-icon {
@@ -48,7 +48,7 @@
 
 	&.active {
 		& .message-actions__label {
-			color: var(--color-button-primary);
+			color: var(--rc-color-button-primary);
 		}
 	}
 
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 25de8edb18c..fc1011b3b5c 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -94,10 +94,10 @@
 		align-items: center;
 
 		&--alert {
-			color: var(--color-error);
+			color: var(--rc-color-error);
 
 			& .rc-icon {
-				fill: var(--color-error);
+				fill: var(--rc-color-error);
 			}
 		}
 	}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index 98efa6a0940..f0e368af8cd 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -59,7 +59,7 @@
 		}
 
 		& a:any-link {
-			color: var(--color-gray);
+			color: var(--rc-color-primary-light);
 		}
 	}
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
index 757e1e0d195..4a94778e53b 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/toolbar.css
@@ -50,16 +50,16 @@
 		&__wrapper {
 			padding: 0;
 
-			color: var(--color-gray);
+			color: var(--rc-color-primary-light);
 		}
 
 		&__element {
 			color: var(--color-white);
-			border-color: #414852;
-			background-color: var(--color-darkest);
+			border-color: var(--rc-color-primary-dark);
+			background-color: var(--rc-color-primary-darkest);
 
 			&::placeholder {
-				color: var(--color-gray);
+				color: var(--rc-color-primary-light);
 			}
 
 			&:focus + .rc-input__icon--right {
@@ -93,9 +93,9 @@
 		margin-left: 0.25rem;
 		margin-right: 0.25rem;
 
-		color: var(--color-gray);
-		border-color: #414852;
-		background-color: var(--color-darkest);
+		color: var(--rc-color-primary-light);
+		border-color: var(--rc-color-primary-dark);
+		background-color: var(--rc-color-primary-darkest);
 	}
 
 	& .rc-input__icon-svg--magnifier {
diff --git a/packages/rocketchat-theme/client/imports/forms/switch.css b/packages/rocketchat-theme/client/imports/forms/switch.css
index 05018a2280d..f39940442d4 100644
--- a/packages/rocketchat-theme/client/imports/forms/switch.css
+++ b/packages/rocketchat-theme/client/imports/forms/switch.css
@@ -14,7 +14,7 @@
 				cursor: default;
 
 				border-color: var(--button-disabled-background);
-				background-color: var(--color-gray-lightest);
+				background-color: var(--rc-color-primary-lightest);
 			}
 
 			& ~ .rc-switch__text {
@@ -25,7 +25,7 @@
 		&:checked {
 			& + .rc-switch__button {
 				border-color: #26d198;
-				background-color: var(--color-success);
+				background-color: var(--rc-color-success);
 
 				& .rc-switch__button-inside {
 					transform: translate3d(1px, 1px, 0);
@@ -45,9 +45,9 @@
 		transition: all 0.2s cubic-bezier(0.65, 0.05, 0.36, 1);
 
 		border-width: 1px;
-		border-color: var(--color-error-light);
+		border-color: var(--rc-color-error-light);
 		border-radius: 13px;
-		background-color: var(--color-error);
+		background-color: var(--rc-color-error);
 	}
 
 	&__button-inside {
diff --git a/packages/rocketchat-theme/client/imports/forms/tags.css b/packages/rocketchat-theme/client/imports/forms/tags.css
index 64fcd8a5b89..ef7a4f86c01 100644
--- a/packages/rocketchat-theme/client/imports/forms/tags.css
+++ b/packages/rocketchat-theme/client/imports/forms/tags.css
@@ -48,7 +48,7 @@
 		font-size: 0.875rem;
 
 		&::placeholder {
-			color: var(--color-gray-medium);
+			color: var(--rc-color-primary-light-medium);
 		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index 2c7271d7c10..3feacf28d3b 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -88,11 +88,11 @@ button {
 	}
 
 	& .tab-button-icon {
-		color: var(--color-dark-medium);
+		color: var(--rc-color-primary-dark);
 
 		font-size: 1.125rem;
 
-		fill: var(--color-dark-medium);
+		fill: var(--rc-color-primary-dark);
 
 		&--star {
 			fill: none;
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 35e0f1ca16e..69055d64d9c 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -4604,7 +4604,7 @@ body:not(.is-cordova) {
 
 .full-page,
 .page-loading {
-	background-color: var(--color-primary);
+	background-color: var(--rc-color-primary);
 }
 
 .rc-old.full-page {
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index 994fb29d8cb..4735fc17660 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -1,267 +1,276 @@
-:root {
-	/*
-	* General Colors
-	*/
-	--color-primary: var(--color-dark);
-	--color-darkest: #1f2329;
-	--color-dark: #2f343d;
-	--color-dark-medium: #414852;
-	--color-dark-light: #6c727a;
-	--color-gray: #9ea2a8;
-	--color-gray-medium: #cbced1;
-	--color-gray-light: #e1e5e8;
-	--color-gray-lightest: #f2f3f5;
-	--color-black: #000000;
-	--color-white: #ffffff;
-	--color-error: #f5455c;
-	--color-error-light: #e1364c;
-	--color-alert: #ffd21f;
-	--color-alert-light: #f6c502;
-	--color-success: #2de0a5;
-	--color-success-light: #25d198;
-	--color-button-primary: #1d74f5;
-	--color-button-primary-light: #175cc4;
+	:root {
+		/*
+		* General Colors
+		*/
 
-	/*
-	* General
-	*/
-	--text-size: 0.875rem;
-	--header-min-height: 60px;
-	--toolbar-height: 55px;
-	--footer-min-height: 70px;
-	--rooms-box-width: 280px;
-	--flex-tab-width: 400px;
-	--flex-tab-webrtc-width: 400px;
-	--flex-tab-webrtc-2-width: 850px;
-	--user-image-square: 20px;
-	--border: 2px;
-	--border-radius: 2px;
-	--status-online: var(--color-success);
-	--status-away: var(--color-alert);
-	--status-busy: var(--color-error);
-	--status-invisible: var(--color-gray-medium);
-	--status-invisible-sidebar: var(--color-darkest);
-	--default-small-padding: 1rem;
+		--color-darkest: #1f2329;
+		--color-dark: #2f343d; 
+		--color-dark-medium: #414852;
+		--color-dark-light: #6c727a;
+		--color-gray: #9ea2a8;
+		--color-gray-medium: #cbced1;
+		--color-gray-light: #e1e5e8;
+		--color-gray-lightest: #f2f3f5;
+		--color-black: #000000;
+		--color-white: #ffffff;
 
-	/*
-	* Forms
-	*/
-	--gap-between-elements: 2.5rem;
-	--label-margin-bottom: 1rem;
+		--rc-color-error: #f5455c;
+		--rc-color-error-light: #e1364c;
+		--rc-color-alert: #ffd21f;
+		--rc-color-alert-light: #f6c502;
+		--rc-color-success: #2de0a5;
+		--rc-color-success-light: #25d198;
+		--rc-color-button-primary: #1d74f5;
+		--rc-color-button-primary-light: #175cc4;
 
-	/*
-	* Forms - Button
-	*/
-	--button-square-size: 36px;
-	--button-padding: 0.782rem;
-	--button-padding-small: 0.5rem;
-	--button-text-size: var(--input-font-size);
-	--button-border-width: var(--border);
-	--button-border-radius: var(--border-radius);
-	--button-disabled-background: var(--color-gray-light);
-	--button-disabled-text-color: var(--color-white);
-	--button-primary-background: var(--color-button-primary);
-	--button-primary-text-color: var(--color-white);
+		--rc-color-primary: var(--color-dark);
+		--rc-color-primary-darkest: var(--color-darkest);
+		--rc-color-primary-dark: var(--color-dark-medium);
+		--rc-color-primary-light: var(--color-gray);
+		--rc-color-primary-light-medium: var(--color-gray-medium);
+		--rc-color-primary-lightest: var(--color-gray-lightest);
+		--rc-color-content: var(--color-white);
 
-	/*
-	* Forms - Input
-	*/
-	--input-font-size: 0.875rem;
-	--input-title-text-size: var(--input-font-size);
-	--input-title-color: #2d343d;
-	--input-text-color: var(--color-dark-medium);
-	--input-placeholder-color: var(--color-gray-medium);
-	--input-icon-color: var(--color-dark);
-	--input-border-color: var(--color-gray-light);
-	--input-border-width: var(--border);
-	--input-border-radius: var(--border-radius);
-	--input-description-text-color: var(--color-gray);
-	--input-description-text-size: var(--input-font-size);
-	--input-error-color: var(--color-error);
+		/*
+		* General
+		*/
+		--text-size: 0.875rem;
+		--header-min-height: 60px;
+		--toolbar-height: 55px;
+		--footer-min-height: 70px;
+		--rooms-box-width: 280px;
+		--flex-tab-width: 400px;
+		--flex-tab-webrtc-width: 400px;
+		--flex-tab-webrtc-2-width: 850px;
+		--user-image-square: 20px;
+		--border: 2px;
+		--border-radius: 2px;
+		--status-online: var(--rc-color-success);
+		--status-away: var(--rc-color-alert);
+		--status-busy: var(--rc-color-error);
+		--status-invisible: var(--color-gray-medium);
+		--status-invisible-sidebar: var(--rc-color-primary-darkest);
+		--default-small-padding: 1rem;
 
-	/*
-	* Forms - popup list
-	*/
-	--popup-list-border-radius: var(--border-radius);
-	--popup-list-background: var(--color-white);
-	--popup-list-background-hover: var(--color-gray-lightest);
-	--popup-list-selected-background: var(--color-gray-lightest);
-	--popup-list-name-color: #2d343d;
-	--popup-list-name-size: 1rem;
+		/*
+		* Forms
+		*/
+		--gap-between-elements: 2.5rem;
+		--label-margin-bottom: 1rem;
 
-	/*
-	* Forms - tags
-	*/
-	--tags-border-width: var(--border);
-	--tags-border-radius: var(--border-radius);
-	--tags-border-color: var(--color-gray-light);
-	--tags-text-color: var(--color-dark);
-	--tags-background: #f2f3f5;
-	--tags-avatar-size: 20px;
+		/*
+		* Forms - Button
+		*/
+		--button-square-size: 36px;
+		--button-padding: 0.782rem;
+		--button-padding-small: 0.5rem;
+		--button-text-size: var(--input-font-size);
+		--button-border-width: var(--border);
+		--button-border-radius: var(--border-radius);
+		--button-disabled-background: var(--color-gray-light);
+		--button-disabled-text-color: var(--color-white);
+		--button-primary-background: var(--rc-color-button-primary);
+		--button-primary-text-color: var(--color-white);
 
-	/*
-	* Forms - select avatar
-	*/
-	--select-avatar-size: 48px;
-	--select-avatar-preview-size: 150px;
-	--select-avatar-upload-background: var(--color-gray-light);
-	--select-avatar-upload-color: #2d343d;
+		/*
+		* Forms - Input
+		*/
+		--input-font-size: 0.875rem;
+		--input-title-text-size: var(--input-font-size);
+		--input-title-color: #2d343d;
+		--input-text-color: var(--color-dark-medium);
+		--input-placeholder-color: var(--color-gray-medium);
+		--input-icon-color: var(--color-dark);
+		--input-border-color: var(--color-gray-light);
+		--input-border-width: var(--border);
+		--input-border-radius: var(--border-radius);
+		--input-description-text-color: var(--color-gray);
+		--input-description-text-size: var(--input-font-size);
+		--input-error-color: var(--rc-color-error);
 
-	/*
-	* Modal
-	*/
-	--modal-wrapper-width: 650px;
-	--modal-wrapper-margin: 3rem;
-	--modal-back-button-color: var(--color-gray);
+		/*
+		* Forms - popup list
+		*/
+		--popup-list-border-radius: var(--border-radius);
+		--popup-list-background: var(--color-white);
+		--popup-list-background-hover: var(--color-gray-lightest);
+		--popup-list-selected-background: var(--color-gray-lightest);
+		--popup-list-name-color: #2d343d;
+		--popup-list-name-size: 1rem;
 
-	/*
-	* Modal - Create Channel
-	*/
-	--create-channel-gap-between-elements: 2.5rem;
-	--create-channel-title-color: var(--color-darkest);
-	--create-channel-title-text-size: 1.375rem;
-	--create-channel-description-color: var(--color-gray);
-	--create-channel-description-text-size: 0.875rem;
+		/*
+		* Forms - tags
+		*/
+		--tags-border-width: var(--border);
+		--tags-border-radius: var(--border-radius);
+		--tags-border-color: var(--color-gray-light);
+		--tags-text-color: var(--rc-color-primary);
+		--tags-background: #f2f3f5;
+		--tags-avatar-size: 20px;
 
-	/*
-	* Sidebar
-	*/
-	--sidebar-width: 280px;
-	--sidebar-small-width: 90%;
-	--sidebar-background: var(--color-primary);
-	--sidebar-background-hover: var(--color-dark-medium);
-	--sidebar-background-light: var(--color-gray-lightest);
-	--sidebar-background-light-hover: var(--color-gray-light);
-	--sidebar-default-padding: 24px;
-	--sidebar-small-default-padding: 16px;
-	--sidebar-header-padding: 16px;
-	--sidebar-header-small-padding: 12px;
-	--sidebar-footer-height: 70px;
-	--sidebar-footer-padding: var(--sidebar-header-padding);
-	--sidebar-small-header-padding: var(--sidebar-small-default-padding);
+		/*
+		* Forms - select avatar
+		*/
+		--select-avatar-size: 48px;
+		--select-avatar-preview-size: 150px;
+		--select-avatar-upload-background: var(--color-gray-light);
+		--select-avatar-upload-color: #2d343d;
 
-	/*
-	* Sidebar flex
-	*/
-	--sidebar-flex-search-background: var(--color-white);
-	--sidebar-flex-search-placeholder-color: var(--color-gray);
+		/*
+		* Modal
+		*/
+		--modal-wrapper-width: 650px;
+		--modal-wrapper-margin: 3rem;
+		--modal-back-button-color: var(--color-gray);
 
-	/*
-	* Sidebar Account
-	*/
-	--sidebar-account-thumb-size: 36px;
-	--sidebar-small-account-thumb-size: 40px;
-	--sidebar-account-status-bullet-size: 12px;
-	--sidebar-small-account-status-bullet-size: 8px;
-	--sidebar-account-status-bullet-radius: 50%;
-	--sidebar-account-username-size: 1rem;
-	--sidebar-account-username-weight: 700;
-	--sidebar-small-account-username-weight: 400;
-	--sidebar-account-username-color: var(--color-white);
-	--sidebar-account-username-color-darker: var(--color-dark);
-	--sidebar-account-status-font-size: 0.875rem;
-	--sidebar-account-status-color: var(--color-gray);
+		/*
+		* Modal - Create Channel
+		*/
+		--create-channel-gap-between-elements: 2.5rem;
+		--create-channel-title-color: var(--color-darkest);
+		--create-channel-title-text-size: 1.375rem;
+		--create-channel-description-color: var(--color-gray);
+		--create-channel-description-text-size: 0.875rem;
 
-	/*
-	* Sidebar Item
-	*/
-	--sidebar-item-radius: 2px;
-	--sidebar-item-height: 32px;
-	--sidebar-item-thumb-size: 20px;
+		/*
+		* Sidebar
+		*/
+		--sidebar-width: 280px;
+		--sidebar-small-width: 90%;
+		--sidebar-background: var(--rc-color-primary);
+		--sidebar-background-hover: var(--rc-color-primary-dark);
+		--sidebar-background-light: var(--rc-color-primary-lightest);
+		--sidebar-background-light-hover: var(--rc-color-primary-light);
+		--sidebar-default-padding: 24px;
+		--sidebar-small-default-padding: 16px;
+		--sidebar-header-padding: 16px;
+		--sidebar-header-small-padding: 12px;
+		--sidebar-footer-height: 70px;
+		--sidebar-footer-padding: var(--sidebar-header-padding);
+		--sidebar-small-header-padding: var(--sidebar-small-default-padding);
 
-	--sidebar-item-text-color: var(--color-gray);
-	--sidebar-item-background: inherit;
-	--sidebar-item-hover-background: var(--color-darkest);
+		/*
+		* Sidebar flex
+		*/
+		--sidebar-flex-search-background: var(--color-white);
+		--sidebar-flex-search-placeholder-color: var(--color-gray);
 
-	--sidebar-item-active-background: var(--color-dark-medium);
-	--sidebar-item-active-color: var(--sidebar-item-text-color);
+		/*
+		* Sidebar Account
+		*/
+		--sidebar-account-thumb-size: 36px;
+		--sidebar-small-account-thumb-size: 40px;
+		--sidebar-account-status-bullet-size: 12px;
+		--sidebar-small-account-status-bullet-size: 8px;
+		--sidebar-account-status-bullet-radius: 50%;
+		--sidebar-account-username-size: 1rem;
+		--sidebar-account-username-weight: 700;
+		--sidebar-small-account-username-weight: 400;
+		--sidebar-account-username-color: var(--color-white);
+		--sidebar-account-username-color-darker: var(--rc-color-primary);
+		--sidebar-account-status-font-size: 0.875rem;
+		--sidebar-account-status-color: var(--color-gray);
 
-	--sidebar-item-unread-color: var(--color-white);
+		/*
+		* Sidebar Item
+		*/
+		--sidebar-item-radius: 2px;
+		--sidebar-item-height: 32px;
+		--sidebar-item-thumb-size: 20px;
 
-	--sidebar-item-popup-background: var(--color-dark-medium);
-	--sidebar-item-user-status-size: 6px;
-	--sidebar-small-item-user-status-size: 4px;
-	--sidebar-item-user-status-radius: 50%;
-	--sidebar-item-text-size: 1rem;
+		--sidebar-item-text-color: var(--color-gray);
+		--sidebar-item-background: inherit;
+		--sidebar-item-hover-background: var(--rc-color-primary-darkest);
 
-	/*
-	* Toolbar
-	*/
-	--toolbar-placeholder-color: var(--color-gray);
+		--sidebar-item-active-background: var(--rc-color-primary-dark);
+		--sidebar-item-active-color: var(--sidebar-item-text-color);
 
-	/*
-	* Rooms list
-	*/
-	--rooms-list-title-color: var(--color-gray);
-	--rooms-list-title-text-size: 0.75rem;
-	--rooms-list-empty-text-color: var(--color-gray);
-	--rooms-list-empty-text-size: 0.75rem;
-	--rooms-list-padding: var(--sidebar-default-padding);
-	--rooms-list-small-padding: var(--sidebar-small-default-padding);
+		--sidebar-item-unread-color: var(--color-white);
 
-	/*
-	* Chip
-	*/
-	--chip-background: #dddddd;
+		--sidebar-item-popup-background: var(--color-dark-medium);
+		--sidebar-item-user-status-size: 6px;
+		--sidebar-small-item-user-status-size: 4px;
+		--sidebar-item-user-status-radius: 50%;
+		--sidebar-item-text-size: 1rem;
 
-	/*
-	* Avatar
-	*/
-	--avatar-radius: var(--border-radius);
-	--avatar-initials-text-size: 22px;
-	--avatar-initials-text-weight: 700;
+		/*
+		* Toolbar
+		*/
+		--toolbar-placeholder-color: var(--color-gray);
 
-	/*
-	* Badge
-	*/
-	--badge-text-color: var(--color-white);
-	--badge-radius: var(--border-radius);
-	--badge-text-size: 0.75rem;
-	--badge-background: var(--color-dark-medium);
-	--badge-unread-background: var(--color-button-primary);
+		/*
+		* Rooms list
+		*/
+		--rooms-list-title-color: var(--color-gray);
+		--rooms-list-title-text-size: 0.75rem;
+		--rooms-list-empty-text-color: var(--color-gray);
+		--rooms-list-empty-text-size: 0.75rem;
+		--rooms-list-padding: var(--sidebar-default-padding);
+		--rooms-list-small-padding: var(--sidebar-small-default-padding);
 
-	/*
-	* Flex nav
-	*/
-	--flex-nav-background: var(--color-gray-lightest);
+		/*
+		* Chip
+		*/
+		--chip-background: #dddddd;
 
-	/*
-	* Popover
-	*/
-	--popover-padding: 1rem;
-	--popover-radius: var(--border-radius);
-	--popover-background: var(--color-white);
-	--popover-column-min-width: 130px;
-	--popover-column-padding: 1rem;
-	--popover-title-color: var(--color-dark);
-	--popover-title-text-size: 0.75rem;
-	--popover-item-color: var(--color-dark);
-	--popover-item-text-size: 0.875rem;
-	--popover-divider-height: 2px;
-	--popover-divider-color: var(--color-gray-light);
+		/*
+		* Avatar
+		*/
+		--avatar-radius: var(--border-radius);
+		--avatar-initials-text-size: 22px;
+		--avatar-initials-text-weight: 700;
 
-	/*
-	* Tooltip
-	*/
-	--tooltip-background: var(--color-darkest);
-	--tooltip-text-color: var(--color-white);
-	--tooltip-text-size: 0.75rem;
-	--tooltip-radius: var(--border-radius);
+		/*
+		* Badge
+		*/
+		--badge-text-color: var(--color-white);
+		--badge-radius: var(--border-radius);
+		--badge-text-size: 0.75rem;
+		--badge-background: var(--rc-color-primary-dark);
+		--badge-unread-background: var(--rc-color-button-primary);
 
-	/*
-	* Message box
-	*/
-	--message-box-text-size: var(--input-font-size);
-	--message-box-placeholder-color: var(--color-gray-medium);
-	--message-box-markdown-color: var(--color-gray);
-	--message-box-markdown-hover-color: var(--color-dark);
-	--message-box-user-typing-color: var(--color-gray);
-	--message-box-user-typing-text-size: 0.75rem;
-	--message-box-user-typing-user-color: var(--color-dark);
-	--message-box-container-border-color: var(--color-gray-medium);
-	--message-box-container-border-width: var(--border);
-	--message-box-container-border-radius: var(--border-radius);
-	--message-box-editing-color: #fff5df;
-	--message-box-popover-title-text-color: var(--color-gray);
-	--message-box-popover-title-text-size: 0.75rem;
-}
+		/*
+		* Flex nav
+		*/
+		--flex-nav-background: var(--color-gray-lightest);
+
+		/*
+		* Popover
+		*/
+		--popover-padding: 1rem;
+		--popover-radius: var(--border-radius);
+		--popover-background: var(--color-white);
+		--popover-column-min-width: 130px;
+		--popover-column-padding: 1rem;
+		--popover-title-color: var(--color-dark);
+		--popover-title-text-size: 0.75rem;
+		--popover-item-color: var(--color-dark);
+		--popover-item-text-size: 0.875rem;
+		--popover-divider-height: 2px;
+		--popover-divider-color: var(--color-gray-light);
+
+		/*
+		* Tooltip
+		*/
+		--tooltip-background: var(--color-darkest);
+		--tooltip-text-color: var(--color-white);
+		--tooltip-text-size: 0.75rem;
+		--tooltip-radius: var(--border-radius);
+
+		/*
+		* Message box
+		*/
+		--message-box-text-size: var(--input-font-size);
+		--message-box-placeholder-color: var(--color-gray-medium);
+		--message-box-markdown-color: var(--color-gray);
+		--message-box-markdown-hover-color: var(--color-dark);
+		--message-box-user-typing-color: var(--color-gray);
+		--message-box-user-typing-text-size: 0.75rem;
+		--message-box-user-typing-user-color: var(--color-dark);
+		--message-box-container-border-color: var(--color-gray-medium);
+		--message-box-container-border-width: var(--border);
+		--message-box-container-border-radius: var(--border-radius);
+		--message-box-editing-color: #fff5df;
+		--message-box-popover-title-text-color: var(--color-gray);
+		--message-box-popover-title-text-size: 0.75rem;
+	}
diff --git a/packages/rocketchat-theme/server/variables.js b/packages/rocketchat-theme/server/variables.js
index 022c5c12af1..57efdaad3ce 100644
--- a/packages/rocketchat-theme/server/variables.js
+++ b/packages/rocketchat-theme/server/variables.js
@@ -10,6 +10,22 @@
 // Defined range of transparencies reduces random colour variances
 // Major colors form the core of the scheme
 // Names changed to reflect usage, comments show pre-refactor names
+
+const reg = /--(rc-color-.*?): (.*?);/igm;
+
+const colors = [...Assets.getText('client/imports/general/variables.css').match(reg)].map(color => {
+	const [name, value] = color.split(': ');
+	return [name.replace('--', ''), value.replace(';', '')];
+});
+
+colors.forEach(([key, color]) => 	{
+	if (/var/.test(color)) {
+		const [, value] = color.match(/var\(--(.*?)\)/i);
+		return RocketChat.theme.addPublicColor(key, value, 'Colors', 'expression');
+	}
+	RocketChat.theme.addPublicColor(key, color, 'Colors');
+});
+
 const majorColors= {
 	'content-background-color': '#FFFFFF',
 	'primary-background-color': '#04436A',
@@ -42,12 +58,12 @@ const minorColors= {
 // Bulk-add settings for color scheme
 Object.keys(majorColors).forEach((key) => {
 	const value = majorColors[key];
-	RocketChat.theme.addPublicColor(key, value, 'Colors');
+	RocketChat.theme.addPublicColor(key, value, 'Old Colors');
 });
 
 Object.keys(minorColors).forEach((key) => {
 	const value = minorColors[key];
-	RocketChat.theme.addPublicColor(key, value, 'Colors (minor)', 'expression');
+	RocketChat.theme.addPublicColor(key, value, 'Old Colors (minor)', 'expression');
 });
 
 RocketChat.theme.addPublicFont('body-font-family', '-apple-system, BlinkMacSystemFont, Roboto, \'Helvetica Neue\', Arial, sans-serif, \'Apple Color Emoji\', \'Segoe UI\', \'Segoe UI Emoji\', \'Segoe UI Symbol\', \'Meiryo UI\'');
@@ -61,12 +77,3 @@ RocketChat.settings.add('theme-custom-css', '', {
 	public: true
 });
 
-
-RocketChat.settings.add('theme-custom-variables', Assets.getText('client/imports/general/variables.css'), {
-	group: 'Layout',
-	type: 'code',
-	code: 'text/css',
-	multiline: true,
-	section: 'Customize Theme',
-	public: true
-});
diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index f784ab6cbc0..d8e7707bfb3 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -1,7 +1,7 @@
 /* globals toolbarSearch, menu, isRtl, fireGlobalEvent, CachedChatSubscription, DynamicCss */
 import Clipboard from 'clipboard';
 
-RocketChat.settings.collection.find({_id:'theme-custom-variables'}, {fields:{ value: 1 }}).observe({changed: () => { DynamicCss.run(true); }});
+RocketChat.settings.collection.find({_id:/theme-color-rc/i}, {fields:{ value: 1 }}).observe({changed: () => { DynamicCss.run(true); }});
 
 Template.body.onRendered(function() {
 	new Clipboard('.clipboard');
diff --git a/packages/rocketchat-ui-master/server/dynamic-css.js b/packages/rocketchat-ui-master/server/dynamic-css.js
index 37acc385bce..9505c7ad4e8 100644
--- a/packages/rocketchat-ui-master/server/dynamic-css.js
+++ b/packages/rocketchat-ui-master/server/dynamic-css.js
@@ -153,7 +153,19 @@ export default () => {
 	DynamicCss.test = () => window.CSS && window.CSS.supports && window.CSS.supports('(--foo: red)');
 	DynamicCss.run = debounce((replace = false) => {
 		if (replace) {
-			document.querySelector('#css-variables').innerHTML = RocketChat.settings.get('theme-custom-variables');
+			// const variables = RocketChat.models.Settings.findOne({_id:'theme-custom-variables'}, {fields: { value: 1}});
+			const colors = RocketChat.settings.collection.find({_id:/theme-color-rc/i}, {fields: { value: 1, editor: 1}}).fetch().filter(color => color && color.value);
+
+			if (!colors) {
+				return;
+			}
+			const css = colors.map(({_id, value, editor}) => {
+				if (editor === 'expression') {
+					return `--${ _id.replace('theme-color-', '') }: var(--${ value });`;
+				}
+				return `--${ _id.replace('theme-color-', '') }: ${ value };`;
+			}).join('\n');
+			document.querySelector('#css-variables').innerHTML = `:root {${ css }}`;
 		}
 		cssVarPoly.init();
 	}, 1000);
diff --git a/packages/rocketchat-ui-master/server/inject.js b/packages/rocketchat-ui-master/server/inject.js
index b53d351029e..e8e60d3284d 100644
--- a/packages/rocketchat-ui-master/server/inject.js
+++ b/packages/rocketchat-ui-master/server/inject.js
@@ -1,15 +1,27 @@
 /* globals Inject */
-const renderDynamicCssList = () => {
-	const variables = RocketChat.models.Settings.findOne({_id:'theme-custom-variables'}, {fields: { value: 1}});
-	if (!variables || !variables.value) {
+const renderDynamicCssList = _.debounce(Meteor.bindEnvironment(() => {
+	// const variables = RocketChat.models.Settings.findOne({_id:'theme-custom-variables'}, {fields: { value: 1}});
+	const colors = RocketChat.models.Settings.find({_id:/theme-color-rc/i}, {fields: { value: 1, editor: 1}}).fetch().filter(color => color && color.value);
+
+	if (!colors) {
 		return;
 	}
-	Inject.rawBody('dynamic-variables', `<style id='css-variables'>${ variables.value }</style>`);
-};
+	const css = colors.map(({_id, value, editor}) => {
+		if (editor === 'expression') {
+			return `--${ _id.replace('theme-color-', '') }: var(--${ value });`;
+		}
+		return `--${ _id.replace('theme-color-', '') }: ${ value };`;
+	}).join('\n');
+	Inject.rawBody('dynamic-variables', `<style id='css-variables'> :root {${ css }}</style>`);
+}), 500);
 
 renderDynamicCssList();
 
-RocketChat.models.Settings.find({_id:'theme-custom-variables'}, {fields: { value: 1}}).observe({
+// RocketChat.models.Settings.find({_id:'theme-custom-variables'}, {fields: { value: 1}}).observe({
+// 	changed: renderDynamicCssList
+// });
+
+RocketChat.models.Settings.find({_id:/theme-color-rc/i}, {fields: { value: 1}}).observe({
 	changed: renderDynamicCssList
 });
 
diff --git a/server/startup/migrations/v103.js b/server/startup/migrations/v103.js
new file mode 100644
index 00000000000..0e25e0fc645
--- /dev/null
+++ b/server/startup/migrations/v103.js
@@ -0,0 +1,87 @@
+const majorColors = {
+	'content-background-color': '#FFFFFF',
+	'primary-background-color': 'color-primary',
+	'primary-font-color': '#444444',
+	'primary-action-color': '#13679A', // was action-buttons-color
+	'secondary-background-color': '#F4F4F4',
+	'secondary-font-color': '#A0A0A0',
+	'secondary-action-color': '#DDDDDD',
+	'component-color': '#EAEAEA',
+	'success-color': '#4dff4d',
+	'pending-color': '#FCB316',
+	'error-color': '#BC2031',
+	'selection-color': '#02ACEC',
+	'attention-color': '#9C27B0'
+};
+
+// Minor colours implement major colours by default, but can be overruled
+// const minorColors = {
+// 	'tertiary-background-color': '@component-color',
+// 	'tertiary-font-color': '@transparent-lightest',
+// 	'link-font-color': '@primary-action-color',
+// 	'info-font-color': '@secondary-font-color',
+// 	'custom-scrollbar-color': '@transparent-darker',
+// 	'status-online': '@success-color',
+// 	'status-away': '@pending-color',
+// 	'status-busy': '@error-color',
+// 	'status-offline': '@transparent-darker'
+// };
+
+const newvariables = {
+	'content-background-color': 'rc-color-primary-lightest',
+	'primary-background-color': 'rc-color-primary',
+	'success-color': 'rc-color-success',
+	'pending-color': 'rc-color-alert',
+	'error-color': 'rc-color-error',
+	'status-online': 'rc-color-success',
+	'status-away': 'rc-color-alert',
+	'status-busy': 'rc-color-error',
+	'status-offline': 'rc-color-primary-darkest'
+};
+
+function lightenDarkenColor(col, amt) {
+	let usePound = false;
+	if (col[0] === '#') {
+		col = col.slice(1);
+		usePound = true;
+	}
+
+	const num = parseInt(col, 16);
+	let r = (num >> 16) + amt;
+
+	if (r > 255) { r = 255; } else if (r < 0) { r = 0; }
+
+	let b = ((num >> 8) & 0x00FF) + amt;
+
+	if (b > 255) { b = 255; } else if (b < 0) { b = 0; }
+
+	let g = (num & 0x0000FF) + amt;
+
+	if (g > 255) { g = 255; } else if (g < 0) { g = 0; }
+
+	return (usePound ? '#' : '') + (g | (b << 8) | (r << 16)).toString(16);
+}
+
+RocketChat.Migrations.add({
+	version: 103,
+	up() {
+		Object.keys(majorColors).forEach(function(_id) {
+			const color = RocketChat.models.Settings.findOne({_id: `theme-color-${ _id }`});
+			const key = newvariables[_id];
+			if (color && color.value !== majorColors[_id] && key) {
+				if (/^@.+/.test(color.value)) {
+					color.value = newvariables[color.value.replace('@', '')];
+				}
+				const id = `theme-color-${ key }`;
+				RocketChat.models.Settings.update({_id: id}, {$set: { value : color.value, editor: /^#.+/.test(color.value) ? 'color' : 'expression' }});
+				if (key === 'rc-color-primary') {
+					RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-darkest'}, {$set: {editor: 'color', value: lightenDarkenColor(color.value, -16)}});
+					RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-dark'}, {$set: {editor: 'color', value: lightenDarkenColor(color.value, 18)}});
+					RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-light'}, {$set: {editor: 'color', value: lightenDarkenColor(color.value, 110)}});
+					RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-light-medium'}, {$set: {editor: 'color', value: lightenDarkenColor(color.value, 156)}});
+					RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-lightest'}, {$set: {editor: 'color', value: lightenDarkenColor(color.value, 200)}});
+				}
+			}
+		});
+	}
+});

From 2b8cfeb1439ee0c94a50b7bfa3e7790cdd4d9adf Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 17 Oct 2017 18:01:32 -0200
Subject: [PATCH 158/244] Merge pull request #8515 from
 RocketChat/change-artifact-path

Change artifact path
---
 .docker/Dockerfile        | 4 ++--
 .snapcraft/snapcraft.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index a0e13239da8..1dc4bcce4f9 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,8 +5,8 @@ ENV RC_VERSION 0.59.0-rc.13
 MAINTAINER buildmaster@rocket.chat
 
 RUN set -x \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+ && curl -SLf "https://download.rocket.chat/build/${RC_VERSION}.tgz" -o rocket.chat.tgz \
+ && curl -SLf "https://download.rocket.chat/build/${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
  && mkdir /app \
  && gpg --verify rocket.chat.tgz.asc \
  && mkdir -p /app \
diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index 1171544edc8..4c0e0808ba2 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -49,7 +49,7 @@ parts:
         plugin: dump
         prepare: cd programs/server; npm install
         after: [node]
-        source: https://rocket.chat/releases/#{RC_VERSION}/download
+        source: https://download.rocket.chat/build/#{RC_VERSION}.tgz
         source-type: tar
         stage-packages:
             - graphicsmagick

From 3c68961a11ed1231609c4f8b10a1669b2f9e939b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 17 Oct 2017 18:04:37 -0200
Subject: [PATCH 159/244] Bump version to 0.59.0-rc.14

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 22 ++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 1dc4bcce4f9..675cca66ccb 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.13
+ENV RC_VERSION 0.59.0-rc.14
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index f41408f6312..3667ec6543e 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.13"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.14"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 42dabda8066..3331134d003 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.13
+    RC_VERSION=0.59.0-rc.14
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index d445c6cc426..ad25e2c8286 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,25 @@
+<a name="0.59.0-rc.14"></a>
+# 0.59.0-rc.14 (2017-10-17)
+
+
+### Bug Fixes
+
+- [#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491) Invalid Code message for password protected channel
+- [#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514) Uncessary route reload break some routes
+- [#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489) Wrong message when reseting password and 2FA is enabled
+
+
+<details>
+<summary>Others</summary>
+
+- [#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515) Change artifact path
+- [#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) Color variables migration
+- [#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490) Enable AutoLinker back
+- [#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516) Fix: Change password not working in new UI
+</details>
+
+
+
 <a name="0.59.0-rc.13"></a>
 # 0.59.0-rc.13 (2017-10-11)
 
diff --git a/package.json b/package.json
index 5eeb1bfde69..0fa5fca19b9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.13",
+	"version": "0.59.0-rc.14",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index cb43006af32..8c5d55e42d5 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.13"
+	"version": "0.59.0-rc.14"
 }

From 840e9cdb6a98fa708accfee3e5f590cf0832c9f8 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Tue, 17 Oct 2017 15:52:08 -0500
Subject: [PATCH 160/244] Fix artifact path

---
 .docker/Dockerfile        | 4 ++--
 .snapcraft/snapcraft.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 675cca66ccb..bf106e76b29 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,8 +5,8 @@ ENV RC_VERSION 0.59.0-rc.14
 MAINTAINER buildmaster@rocket.chat
 
 RUN set -x \
- && curl -SLf "https://download.rocket.chat/build/${RC_VERSION}.tgz" -o rocket.chat.tgz \
- && curl -SLf "https://download.rocket.chat/build/${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
+ && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz" -o rocket.chat.tgz \
+ && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
  && mkdir /app \
  && gpg --verify rocket.chat.tgz.asc \
  && mkdir -p /app \
diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index 4c0e0808ba2..c085a3910b0 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -49,7 +49,7 @@ parts:
         plugin: dump
         prepare: cd programs/server; npm install
         after: [node]
-        source: https://download.rocket.chat/build/#{RC_VERSION}.tgz
+        source: https://download.rocket.chat/build/rocket.chat-#{RC_VERSION}.tgz
         source-type: tar
         stage-packages:
             - graphicsmagick

From be35d68c8cce81c5baf1616c51efcb7a4f1486b2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 18 Oct 2017 01:01:37 -0200
Subject: [PATCH 161/244] Merge pull request #8520 from
 RocketChat/hotifx/cpu-load

Fix high CPU load when sending messages on large rooms (regression)
---
 server/publications/room.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/publications/room.js b/server/publications/room.js
index c52722cf67d..047a9318b87 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -106,7 +106,10 @@ Meteor.methods({
 RocketChat.models.Rooms.cache.on('sync', (type, room/*, diff*/) => {
 	const records = RocketChat.models.Subscriptions.findByRoomId(room._id).fetch();
 	for (const record of records) {
-		RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(record.u._id)));
+		const user = RocketChat.models.Users.findOneById(record.u._id);
+		if (user && (user.statusConnection === 'online' || user.statusConnection === 'away')) {
+			RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(record.u._id)));
+		}
 	}
 });
 

From 66e63948b22cc0053f6db564bb8170ac8115123e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 18 Oct 2017 01:03:39 -0200
Subject: [PATCH 162/244] Bump version to 0.59.0-rc.15

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 12 ++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 675cca66ccb..861e4f9823c 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.14
+ENV RC_VERSION 0.59.0-rc.15
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 3667ec6543e..19bbcbbadb2 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.14"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.15"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 3331134d003..bcf1bb6d81b 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.14
+    RC_VERSION=0.59.0-rc.15
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index ad25e2c8286..17521ffa276 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,15 @@
+<a name="0.59.0-rc.15"></a>
+# 0.59.0-rc.15 (2017-10-18)
+
+
+<details>
+<summary>Others</summary>
+
+- [#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520) Fix high CPU load when sending messages on large rooms (regression)
+</details>
+
+
+
 <a name="0.59.0-rc.14"></a>
 # 0.59.0-rc.14 (2017-10-17)
 
diff --git a/package.json b/package.json
index 0fa5fca19b9..a1f46973f29 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.14",
+	"version": "0.59.0-rc.15",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 8c5d55e42d5..132be8314e5 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.14"
+	"version": "0.59.0-rc.15"
 }

From 8b15ba8195b16300198cff56f23c03e5b31ceae3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 18 Oct 2017 13:50:08 -0200
Subject: [PATCH 163/244] Merge pull request #8527 from
 RocketChat/do-not-send-joincode-field-to-clients

[FIX] Do not send joinCode field to clients
---
 .../client/stylesheets/channel-settings.css   |  6 +-
 .../client/views/channelSettings.html         |  5 ++
 .../client/views/channelSettings.js           | 69 +++++++++++++++++--
 packages/rocketchat-lib/package.js            |  1 +
 .../server/methods/getRoomJoinCode.js         | 17 +++++
 packages/rocketchat-theme/server/colors.less  |  2 +-
 server/publications/room.js                   |  9 +--
 server/startup/roomPublishes.js               |  4 --
 8 files changed, 93 insertions(+), 20 deletions(-)
 create mode 100644 packages/rocketchat-lib/server/methods/getRoomJoinCode.js

diff --git a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
index 973fadc683a..3c353185e19 100644
--- a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
+++ b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.css
@@ -68,7 +68,7 @@ html.rtl .flex-tab {
 			}
 		}
 
-		& .button.edit {
+		& .button {
 			display: inline-block;
 			visibility: hidden;
 
@@ -111,12 +111,14 @@ html.rtl .flex-tab {
 
 			font-size: 0;
 
+			display: flex;
+
 			& .loading-animation {
 				top: 30px;
 			}
 
 			&:hover {
-				& .button.edit {
+				& .button {
 					visibility: visible;
 				}
 			}
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index e8b3271be88..a2fcdf45cb9 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -66,6 +66,11 @@
 														</button>
 													</div>
 												{{else}}
+													{{#if $value.showHideValue room}}
+														<button type="button" class="button show">
+															<i class="{{#if showingValue $key}}icon-eye-off{{else}}icon-eye{{/if}}"></i>
+														</button>
+													{{/if}}
 													<button type="button" class="button edit">
 														<i class="icon-pencil" data-edit="{{$key}}"></i>
 													</button>
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
index d2ac089a722..408cc7e41e9 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.js
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -73,6 +73,11 @@ Template.channelSettings.helpers({
 			}
 		});
 		return t(room && room.ro ? 'True' : 'False');
+	},
+	showingValue(field) {
+		const { showingValue } = Template.instance().settings[field];
+
+		return showingValue && showingValue.get();
 	}
 });
 
@@ -111,10 +116,12 @@ Template.channelSettings.events({
 			t.saveSetting();
 		}
 	},
-	'click [data-edit], click .button.edit'(e, t) {
+	async 'click [data-edit], click .button.edit'(e, t) {
 		e.preventDefault();
 		let input = $(e.currentTarget);
 
+		await t.showValue(this.$key, true);
+
 		if (input.hasClass('button')) {
 			input = $(e.currentTarget).siblings('.current-setting');
 		}
@@ -126,6 +133,11 @@ Template.channelSettings.events({
 			}), 100);
 		}
 	},
+	'click .button.show'(e, t) {
+		e.preventDefault();
+
+		t.showValue(this.$key);
+	},
 	'change [type="radio"]'(e, t) {
 		return t.editing.set($(e.currentTarget).attr('name'));
 	},
@@ -135,7 +147,8 @@ Template.channelSettings.events({
 	},
 	'click .cancel'(e, t) {
 		e.preventDefault();
-		return t.editing.set();
+
+		t.cancelEditing(this.$key);
 	},
 	'click .save'(e, t) {
 		e.preventDefault();
@@ -404,14 +417,47 @@ Template.channelSettings.onCreated(function() {
 		joinCode: {
 			type: 'text',
 			label: 'Password',
+			showingValue: new ReactiveVar(false),
+			realValue: null,
 			canView(room) {
 				return room.t === 'c' && RocketChat.authz.hasAllPermission('edit-room', room._id);
 			},
 			canEdit(room) {
 				return RocketChat.authz.hasAllPermission('edit-room', room._id);
 			},
+			getValue(room) {
+				if (this.showingValue.get()) {
+					return this.realValue;
+				}
+				return room.joinCodeRequired ? '*****' : '';
+			},
+			showHideValue(room) {
+				return room.joinCodeRequired;
+			},
+			cancelEditing() {
+				this.showingValue.set(false);
+				this.realValue = null;
+			},
+			async showValue(room, forceShow = false) {
+				if (this.showingValue.get()) {
+					if (forceShow) {
+						return;
+					}
+					this.showingValue.set(false);
+					this.realValue = null;
+
+					return null;
+				}
+				return Meteor.call('getRoomJoinCode', room._id, (error, result) => {
+					if (error) {
+						return handleError(error);
+					}
+					this.realValue = result;
+					this.showingValue.set(true);
+				});
+			},
 			save(value, room) {
-				return Meteor.call('saveRoomSettings', room._id, 'joinCode', value, function(err) {
+				Meteor.call('saveRoomSettings', room._id, 'joinCode', value, function(err) {
 					if (err) {
 						return handleError(err);
 					}
@@ -421,7 +467,7 @@ Template.channelSettings.onCreated(function() {
 			}
 		}
 	};
-	return this.saveSetting = () => {
+	this.saveSetting = () => {
 		const room = ChatRoom.findOne(this.data && this.data.rid);
 		const field = this.editing.get();
 		let value;
@@ -435,6 +481,19 @@ Template.channelSettings.onCreated(function() {
 		if (value !== room[field]) {
 			this.settings[field].save(value, room);
 		}
-		return this.editing.set();
+
+		this.cancelEditing(field);
+	};
+	this.showValue = async(field, forceShow) => {
+		if (!this.settings[field].showValue) {
+			return;
+		}
+		const room = ChatRoom.findOne(this.data && this.data.rid);
+		return this.settings[field].showValue(room, forceShow);
+	};
+	this.cancelEditing = (field) => {
+		const { cancelEditing } = this.settings[field];
+		cancelEditing && cancelEditing.call(this.settings[field]);
+		this.editing.set();
 	};
 });
diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index 7be42499e08..f0e2fb5b6a7 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -152,6 +152,7 @@ Package.onUse(function(api) {
 	api.addFiles('server/methods/filterATAllTag.js', 'server');
 	api.addFiles('server/methods/getChannelHistory.js', 'server');
 	api.addFiles('server/methods/getFullUserData.js', 'server');
+	api.addFiles('server/methods/getRoomJoinCode.js', 'server');
 	api.addFiles('server/methods/getRoomRoles.js', 'server');
 	api.addFiles('server/methods/getServerInfo.js', 'server');
 	api.addFiles('server/methods/getSingleMessage.js', 'server');
diff --git a/packages/rocketchat-lib/server/methods/getRoomJoinCode.js b/packages/rocketchat-lib/server/methods/getRoomJoinCode.js
new file mode 100644
index 00000000000..fe127a084e9
--- /dev/null
+++ b/packages/rocketchat-lib/server/methods/getRoomJoinCode.js
@@ -0,0 +1,17 @@
+Meteor.methods({
+	getRoomJoinCode(rid) {
+		check(rid, String);
+
+		if (!Meteor.userId()) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getJoinCode' });
+		}
+
+		if (!RocketChat.authz.hasPermission(Meteor.userId(), 'view-join-code')) {
+			throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'getJoinCode' });
+		}
+
+		const [ room ] = RocketChat.models.Rooms.findById(rid).fetch();
+
+		return room && room.joinCode;
+	}
+});
diff --git a/packages/rocketchat-theme/server/colors.less b/packages/rocketchat-theme/server/colors.less
index 1f381243b80..627cea3d8e3 100755
--- a/packages/rocketchat-theme/server/colors.less
+++ b/packages/rocketchat-theme/server/colors.less
@@ -714,7 +714,7 @@ input:-webkit-autofill {
 			}
 		}
 
-		.button.edit {
+		.button {
 			.buttonColors(lighten(@primary-font-color, 25%), @secondary-background-color);
 		}
 
diff --git a/server/publications/room.js b/server/publications/room.js
index 047a9318b87..90d60a340e2 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -38,14 +38,7 @@ const roomMap = (record, fields) => {
 	return {};
 };
 
-function getFieldsForUserId(userId) {
-	if (RocketChat.authz.hasPermission(userId, 'view-join-code')) {
-		return {
-			...fields,
-			joinCode: 1
-		};
-	}
-
+function getFieldsForUserId(/*userId*/) {
 	return fields;
 }
 
diff --git a/server/startup/roomPublishes.js b/server/startup/roomPublishes.js
index 0bf9e17c0f3..4c310142388 100644
--- a/server/startup/roomPublishes.js
+++ b/server/startup/roomPublishes.js
@@ -20,10 +20,6 @@ Meteor.startup(function() {
 			}
 		};
 
-		if (RocketChat.authz.hasPermission(this.userId, 'view-join-code')) {
-			options.fields.joinCode = 1;
-		}
-
 		if (RocketChat.authz.hasPermission(this.userId, 'view-c-room')) {
 			return RocketChat.models.Rooms.findByTypeAndName('c', identifier, options);
 		} else if (RocketChat.authz.hasPermission(this.userId, 'view-joined-room')) {

From cb119f1ec49ebda929db5171c016539d9d9e40d5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 18 Oct 2017 13:52:53 -0200
Subject: [PATCH 164/244] Bump version to 0.59.0-rc.16

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 10 ++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 971b1b06c81..4d0036ce926 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.15
+ENV RC_VERSION 0.59.0-rc.16
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 19bbcbbadb2..ac314191fc7 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.15"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.16"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index bcf1bb6d81b..0698c3f52a0 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.15
+    RC_VERSION=0.59.0-rc.16
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 17521ffa276..fd1fc7754bd 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,13 @@
+<a name="0.59.0-rc.16"></a>
+# 0.59.0-rc.16 (2017-10-18)
+
+
+### Bug Fixes
+
+- [#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527) Do not send joinCode field to clients
+
+
+
 <a name="0.59.0-rc.15"></a>
 # 0.59.0-rc.15 (2017-10-18)
 
diff --git a/package.json b/package.json
index a1f46973f29..7fcb93bdddd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.15",
+	"version": "0.59.0-rc.16",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 132be8314e5..071149bae39 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.15"
+	"version": "0.59.0-rc.16"
 }

From 309634496affba77606f08fdbe31e23c1906e61f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 18 Oct 2017 17:50:28 -0200
Subject: [PATCH 165/244] Merge pull request #8529 from
 RocketChat/improvements/fast-room-sync

Improve room sync speed
---
 server/publications/room.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/server/publications/room.js b/server/publications/room.js
index 90d60a340e2..0e9e6a1190a 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -30,7 +30,7 @@ const fields = {
 };
 
 
-const roomMap = (record, fields) => {
+const roomMap = (record) => {
 	if (record._room) {
 		return _.pick(record._room, ...Object.keys(fields));
 	}
@@ -38,10 +38,6 @@ const roomMap = (record, fields) => {
 	return {};
 };
 
-function getFieldsForUserId(/*userId*/) {
-	return fields;
-}
-
 Meteor.methods({
 	'rooms/get'(updatedAt) {
 		let options = {fields};
@@ -56,7 +52,7 @@ Meteor.methods({
 		this.unblock();
 
 		options = {
-			fields: getFieldsForUserId(this.userId)
+			fields
 		};
 
 		if (updatedAt instanceof Date) {
@@ -92,17 +88,16 @@ Meteor.methods({
 			throw new Meteor.Error('error-no-permission', 'No permission', { method: 'getRoomByTypeAndName' });
 		}
 
-		return roomMap({_room: room}, getFieldsForUserId(this.userId));
+		return roomMap({_room: room});
 	}
 });
 
 RocketChat.models.Rooms.cache.on('sync', (type, room/*, diff*/) => {
 	const records = RocketChat.models.Subscriptions.findByRoomId(room._id).fetch();
+
+	const _room = roomMap({_room: room});
 	for (const record of records) {
-		const user = RocketChat.models.Users.findOneById(record.u._id);
-		if (user && (user.statusConnection === 'online' || user.statusConnection === 'away')) {
-			RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(record.u._id)));
-		}
+		RocketChat.Notifications.notifyUserInThisInstance(record.u._id, 'rooms-changed', type, _room);
 	}
 });
 
@@ -110,7 +105,7 @@ RocketChat.models.Subscriptions.on('changed', (type, subscription/*, diff*/) =>
 	if (type === 'inserted' || type === 'removed') {
 		const room = RocketChat.models.Rooms.findOneById(subscription.rid);
 		if (room) {
-			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}, getFieldsForUserId(subscription.u._id)));
+			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}));
 		}
 	}
 });

From c4d7fab32b5629ff50b8ec6e57f1fc821f89dbfb Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 18 Oct 2017 17:55:04 -0200
Subject: [PATCH 166/244] Bump version to 0.59.0-rc.17

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 12 ++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 4d0036ce926..18f263eff54 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.16
+ENV RC_VERSION 0.59.0-rc.17
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index ac314191fc7..f114e851f44 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.16"),
+		appMarketingVersion = (defaultText = "0.59.0-rc.17"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 0698c3f52a0..83751cf6b35 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.16
+    RC_VERSION=0.59.0-rc.17
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index fd1fc7754bd..ee91758b587 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,15 @@
+<a name="0.59.0-rc.17"></a>
+# 0.59.0-rc.17 (2017-10-18)
+
+
+<details>
+<summary>Others</summary>
+
+- [#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529) Improve room sync speed
+</details>
+
+
+
 <a name="0.59.0-rc.16"></a>
 # 0.59.0-rc.16 (2017-10-18)
 
diff --git a/package.json b/package.json
index 7fcb93bdddd..f31db2e8be4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.16",
+	"version": "0.59.0-rc.17",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 071149bae39..df8d87018e3 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.16"
+	"version": "0.59.0-rc.17"
 }

From 8f9a85b92fb411fdca1f05856e222cdbbf0c120d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 18 Oct 2017 21:15:54 -0200
Subject: [PATCH 167/244] Bump version to 0.59.0

---
 .docker/Dockerfile                      |   2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |   2 +-
 .travis/snap.sh                         |   2 +-
 HISTORY.md                              | 292 ++++++++++++++++++------
 package.json                            |   2 +-
 packages/rocketchat-lib/rocketchat.info |   2 +-
 6 files changed, 225 insertions(+), 77 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 18f263eff54..785f6813932 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0-rc.17
+ENV RC_VERSION 0.59.0
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index f114e851f44..53e5a9de1f8 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-rc.17"),
+		appMarketingVersion = (defaultText = "0.59.0"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 83751cf6b35..6bbb2f36be3 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-rc.17
+    RC_VERSION=0.59.0
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index ec86fbfe2b6..308474042e5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,27 +1,221 @@
-<a name="0.59.0-rc.17"></a>
-# 0.59.0-rc.17 (2017-10-18)
+<a name="0.59.0"></a>
+# 0.59.0 (2017-10-18)
+
+
+### New Features
+
+- [#7636](https://github.com/RocketChat/Rocket.Chat/pull/7636) Add classes to notification menu so they can be hidden in css
+- [#7852](https://github.com/RocketChat/Rocket.Chat/pull/7852) Add markdown parser "marked"
+- [#7711](https://github.com/RocketChat/Rocket.Chat/pull/7711) Add room type as a class to the ul-group of rooms
+- [#6301](https://github.com/RocketChat/Rocket.Chat/pull/6301) Add tags to uploaded images using Google Cloud Vision API
+- [#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658) Add unread options for direct messages
+- [#5902](https://github.com/RocketChat/Rocket.Chat/pull/5902) Adds a Keyboard Shortcut option to the flextab
+- [#7614](https://github.com/RocketChat/Rocket.Chat/pull/7614) Allow ldap mapping of customFields
+- [#7817](https://github.com/RocketChat/Rocket.Chat/pull/7817) Audio Notification updated in sidebar
+- [#7350](https://github.com/RocketChat/Rocket.Chat/pull/7350) Automatically select the first channel
+- [#7853](https://github.com/RocketChat/Rocket.Chat/pull/7853) Create a standard for svg icons
+- [#7342](https://github.com/RocketChat/Rocket.Chat/pull/7342) Integrated personal email gateway (GSoC'17)
+- [#7830](https://github.com/RocketChat/Rocket.Chat/pull/7830) Option to block users to mention unknow users
+- [#6700](https://github.com/RocketChat/Rocket.Chat/pull/6700) Package to render issue numbers into links to an issue tracker.
+- [#7864](https://github.com/RocketChat/Rocket.Chat/pull/7864) Replace message cog for vertical menu
+- [#7565](https://github.com/RocketChat/Rocket.Chat/pull/7565) REST API endpoint to list all private groups (permission limited)
+- [#7643](https://github.com/RocketChat/Rocket.Chat/pull/7643) Rocket.Chat UI Redesign
+- [#7612](https://github.com/RocketChat/Rocket.Chat/pull/7612) Search users by fields defined by admin
+- [#7688](https://github.com/RocketChat/Rocket.Chat/pull/7688) Template to show Custom Fields in user info view
+- [#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073) Upgrade to meteor 1.5.2
+- [#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) Enable read only channel creation
+- [#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304) Add RD Station integration to livechat
+- [#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) Sidebar item width to 100%
+- [#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) Smaller accountBox
+- [#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) Unify unread and mentions badge
+- [#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459) Setting to disable MarkDown and enable AutoLinker
+
+
+### Bug Fixes
+
+- [#7854](https://github.com/RocketChat/Rocket.Chat/pull/7854) Add CSS support for Safari versions > 7
+- [#7456](https://github.com/RocketChat/Rocket.Chat/pull/7456) Csv importer: work with more problematic data
+- [#7815](https://github.com/RocketChat/Rocket.Chat/pull/7815) Dutch translations
+- [#7846](https://github.com/RocketChat/Rocket.Chat/pull/7846) Email message forward error
+- [#7673](https://github.com/RocketChat/Rocket.Chat/pull/7673) Example usage of unsubscribe.js
+- [#7855](https://github.com/RocketChat/Rocket.Chat/pull/7855) File upload on multi-instances using a path prefix
+- [#7656](https://github.com/RocketChat/Rocket.Chat/pull/7656) Fix avatar upload fail on Cordova app
+- [#7168](https://github.com/RocketChat/Rocket.Chat/pull/7168) Fix black background on transparent avatars
+- [#7814](https://github.com/RocketChat/Rocket.Chat/pull/7814) Fix Dutch translation
+- [#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629) Fix messagebox growth
+- [#7863](https://github.com/RocketChat/Rocket.Chat/pull/7863) Fix migration 100
+- [#7823](https://github.com/RocketChat/Rocket.Chat/pull/7823) Fix new-message button showing on search
+- [#7687](https://github.com/RocketChat/Rocket.Chat/pull/7687) Fix room load on first hit
+- [#7758](https://github.com/RocketChat/Rocket.Chat/pull/7758) Fixed function closure syntax allowing validation emails to be sent.
+- [#7825](https://github.com/RocketChat/Rocket.Chat/pull/7825) Google vision NSFW tag
+- [#7679](https://github.com/RocketChat/Rocket.Chat/pull/7679) Make link inside YouTube preview open in new tab
+- [#7644](https://github.com/RocketChat/Rocket.Chat/pull/7644) Markdown noopener/noreferrer: use correct HTML attribute
+- [#7721](https://github.com/RocketChat/Rocket.Chat/pull/7721) meteor-accounts-saml issue with ns0,ns1 namespaces, makes it compatible with pysaml2 lib
+- [#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652) Only use "File Uploaded" prefix on files
+- [#7809](https://github.com/RocketChat/Rocket.Chat/pull/7809) Remove redundant "do" in "Are you sure ...?" messages.
+- [#7672](https://github.com/RocketChat/Rocket.Chat/pull/7672) Remove references to non-existent tests
+- [#7748](https://github.com/RocketChat/Rocket.Chat/pull/7748) scroll on flex-tab
+- [#7779](https://github.com/RocketChat/Rocket.Chat/pull/7779) Settings not getting applied from Meteor.settings and process.env
+- [#7778](https://github.com/RocketChat/Rocket.Chat/pull/7778) Update Snap links
+- [#7639](https://github.com/RocketChat/Rocket.Chat/pull/7639) Wrong email subject when "All Messages" setting enabled
+- [#7630](https://github.com/RocketChat/Rocket.Chat/pull/7630) Wrong render of snippet’s name
+- [#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) message actions over unread bar
+- [#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) popover position on mobile
+- [#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) search results position on sidebar
+- [#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) sidebar paddings
+- [#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) Fix google play logo on repo README
+- [#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904) Fix livechat toggle UI issue
+- [#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895) Remove break change in Realtime API
+- [#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893) Window exception when parsing Markdown on server
+- [#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971) Add padding on messages to allow space to the action buttons
+- [#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) Broken embedded view layout
+- [#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) Broken emoji picker on firefox
+- [#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984) Chat box no longer auto-focuses when typing
+- [#7942](https://github.com/RocketChat/Rocket.Chat/pull/7942) Create channel button on Firefox
+- [#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) Document README.md. Drupal repo out of date
+- [#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) Double scroll on 'keyboard shortcuts' menu in sidepanel
+- [#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) Fix placeholders in account profile
+- [#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963) Fix the status on the members list
+- [#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965) Markdown being rendered in code tags
+- [#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) OTR buttons padding
+- [#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) Show leader on first load
+- [#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970) Small alignment fixes
+- [#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) status and active room colors on sidebar
+- [#7985](https://github.com/RocketChat/Rocket.Chat/pull/7985) Text area buttons and layout on mobile
+- [#7986](https://github.com/RocketChat/Rocket.Chat/pull/7986) Textarea on firefox
+- [#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) username ellipsis on firefox
+- [#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) Dynamic popover
+- [#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099) Fix setting user avatar on LDAP login
+- [#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059) Not sending email to mentioned users with unchanged preference
+- [#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112) RTL
+- [#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047) Scroll on messagebox
+- [#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) copy to clipboard and update clipboard.js library
+- [#8001](https://github.com/RocketChat/Rocket.Chat/pull/8001) Error when translating message
+- [#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754) Fix email on mention
+- [#8014](https://github.com/RocketChat/Rocket.Chat/pull/8014) Hide scrollbar on login page if not necessary
+- [#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048) Invisible leader bar on hover
+- [#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) message-box autogrow
+- [#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046) Prevent autotranslate tokens race condition
+- [#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998) Recent emojis not updated when adding via text
+- [#8017](https://github.com/RocketChat/Rocket.Chat/pull/8017) room icon on header
+- [#8018](https://github.com/RocketChat/Rocket.Chat/pull/8018) search results height
+- [#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) Vertical menu on flex-tab
+- [#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122) Settings description not showing
+- [#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147) "*.members" rest api being useless and only returning usernames
+- [#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094) Add admin audio preferences translations
+- [#8172](https://github.com/RocketChat/Rocket.Chat/pull/8172) Allow unknown file types if no allowed whitelist has been set ([#7074](https://github.com/RocketChat/Rocket.Chat/issues/7074))
+- [#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) Fix iframe login API response (issue [#8145](https://github.com/RocketChat/Rocket.Chat/issues/8145))
+- [#8144](https://github.com/RocketChat/Rocket.Chat/pull/8144) Fix new room sound being played too much
+- [#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) Issue [#8166](https://github.com/RocketChat/Rocket.Chat/issues/8166) where empty analytics setting breaks to load Piwik script
+- [#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) Sidebar and RTL alignments
+- [#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159) Text area lost text when page reloads
+- [#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) Incorrect URL for login terms when using prefix
+- [#8213](https://github.com/RocketChat/Rocket.Chat/pull/8213) Leave and hide buttons was removed
+- [#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190) Scrollbar not using new style
+- [#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210) User avatar in DM list.
+- [#8241](https://github.com/RocketChat/Rocket.Chat/pull/8241) Api groups.files is always returning empty
+- [#8216](https://github.com/RocketChat/Rocket.Chat/pull/8216) Case insensitive SAML email check
+- [#8259](https://github.com/RocketChat/Rocket.Chat/pull/8259) clipboard and permalink on new popover
+- [#8262](https://github.com/RocketChat/Rocket.Chat/pull/8262) make sidebar item animation fast
+- [#8261](https://github.com/RocketChat/Rocket.Chat/pull/8261) RTL on reply
+- [#8257](https://github.com/RocketChat/Rocket.Chat/pull/8257) sidenav colors, hide and leave, create channel on safari
+- [#8252](https://github.com/RocketChat/Rocket.Chat/pull/8252) sidenav mentions on hover
+- [#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) "Cancel button" on modal in RTL in Firefox 55
+- [#8266](https://github.com/RocketChat/Rocket.Chat/pull/8266) "Channel Setting" buttons alignment in RTL
+- [#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) [i18n] My Profile & README.md links
+- [#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) Attachment icons alignment in LTR and RTL
+- [#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) Call buttons with wrong margin on RTL
+- [#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) Check attachments is defined before accessing first element
+- [#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) Emoji Picker hidden for reactions in RTL
+- [#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310) Execute meteor reset on TRAVIS_TAG builds
+- [#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286) Missing placeholder translations
+- [#8237](https://github.com/RocketChat/Rocket.Chat/pull/8237) Removing pipe and commas from custom emojis ([#8168](https://github.com/RocketChat/Rocket.Chat/issues/8168))
+- [#8269](https://github.com/RocketChat/Rocket.Chat/pull/8269) some placeholder and phrase traslation fix
+- [#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298) TypeError: Cannot read property 't' of undefined
+- [#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296) Wrong file name when upload to AWS S3
+- [#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) After deleting the room, cache is not synchronizing
+- [#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317) Email Subjects not being sent
+- [#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316) Mention unread indicator was removed
+- [#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) Put delete action on another popover group
+- [#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) Remove sidebar header on admin embedded version
+- [#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357) Missing i18n translations
+- [#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) remove accountBox from admin menu
+- [#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372) Various LDAP issues & Missing pagination
+- [#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386) disabled katex tooltip on messageBox
+- [#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408) Duplicate code in rest api letting in a few bugs with the rest api
+- [#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) Sidebar item menu position in RTL
+- [#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390) Slack import failing and not being able to be restarted
+- [#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457) LDAP memory issues when pagination is not available
+- [#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491) Invalid Code message for password protected channel
+- [#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514) Uncessary route reload break some routes
+- [#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489) Wrong message when reseting password and 2FA is enabled
+- [#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527) Do not send joinCode field to clients
+- [#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529) Improve room sync speed
 
 
 <details>
 <summary>Others</summary>
 
-- [#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529) Improve room sync speed
+- [#7793](https://github.com/RocketChat/Rocket.Chat/pull/7793) Additions to the REST API
+- [#7625](https://github.com/RocketChat/Rocket.Chat/pull/7625) Bump version to 0.59.0-develop
+- [#7661](https://github.com/RocketChat/Rocket.Chat/pull/7661) Fix typo in generated URI
+- [#7728](https://github.com/RocketChat/Rocket.Chat/pull/7728) FIX: Error when starting local development environment
+- [#7803](https://github.com/RocketChat/Rocket.Chat/pull/7803) LingoHub based on develop
+- [#2](https://github.com/RocketChat/Rocket.Chat/pull/2) local update
+- [#7677](https://github.com/RocketChat/Rocket.Chat/pull/7677) Meteor packages and npm dependencies update
+- [#7865](https://github.com/RocketChat/Rocket.Chat/pull/7865) Mobile sidenav
+- [#7842](https://github.com/RocketChat/Rocket.Chat/pull/7842) npm deps update
+- [#7755](https://github.com/RocketChat/Rocket.Chat/pull/7755) npm deps update
+- [#7739](https://github.com/RocketChat/Rocket.Chat/pull/7739) Remove CircleCI
+- [#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) Hide flex-tab close button
+- [#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) Remove unnecessary returns in cors common
+- [#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) Fix more rtl issues
+- [#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197) npm deps update
+- [#8244](https://github.com/RocketChat/Rocket.Chat/pull/8244) Disable perfect scrollbar
+- [#8243](https://github.com/RocketChat/Rocket.Chat/pull/8243) Fix `leave and hide` click, color and position
+- [#8253](https://github.com/RocketChat/Rocket.Chat/pull/8253) readme-file: fix broken link
+- [#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299)  [FIX] Amin menu not showing all items & File list breaking line
+- [#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273) Deps update
+- [#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282) fix color on unread messages
+- [#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) [FIX-RC] Mobile file upload not working
+- [#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355) Update meteor to 1.5.2.2-rc.0
+- [#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375) LingoHub based on develop
+- [#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345) Remove field `lastActivity` from subscription data
+- [#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363) Sync translations from LingoHub
+- [#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364) Update Meteor to 1.5.2.2
+- [#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394) Add i18n Title to snippet messages
+- [#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) Fix: Account menu position on RTL
+- [#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417) Fix: Missing LDAP option to show internal logs
+- [#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414) Fix: Missing LDAP reconnect setting
+- [#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398) Fix: Missing settings to configure LDAP size and page limits
+- [#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451) Improve markdown parser code
+- [#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515) Change artifact path
+- [#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) Color variables migration
+- [#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490) Enable AutoLinker back
+- [#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516) Fix: Change password not working in new UI
+- [#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520) Fix high CPU load when sending messages on large rooms (regression)
 </details>
 
+<details>
+<summary>Details</summary>
 
+## 0.59.0-rc.17 (2017-10-18)
 
-<a name="0.59.0-rc.16"></a>
-# 0.59.0-rc.16 (2017-10-18)
 
+<details>
+<summary>Others</summary>
 
-### Bug Fixes
+- [#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529) Improve room sync speed
+</details>
 
-- [#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527) Do not send joinCode field to clients
+## 0.59.0-rc.16 (2017-10-18)
 
 
+### Bug Fixes
+
+- [#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527) Do not send joinCode field to clients
 
-<a name="0.59.0-rc.15"></a>
-# 0.59.0-rc.15 (2017-10-18)
+## 0.59.0-rc.15 (2017-10-18)
 
 
 <details>
@@ -30,10 +224,7 @@
 - [#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520) Fix high CPU load when sending messages on large rooms (regression)
 </details>
 
-
-
-<a name="0.59.0-rc.14"></a>
-# 0.59.0-rc.14 (2017-10-17)
+## 0.59.0-rc.14 (2017-10-17)
 
 
 ### Bug Fixes
@@ -52,10 +243,7 @@
 - [#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516) Fix: Change password not working in new UI
 </details>
 
-
-
-<a name="0.59.0-rc.13"></a>
-# 0.59.0-rc.13 (2017-10-11)
+## 0.59.0-rc.13 (2017-10-11)
 
 
 ### New Features
@@ -73,9 +261,6 @@
 
 - [#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451) Improve markdown parser code
 </details>
-
-
-<a name="0.58.4"></a>
 ## 0.58.4 (2017-10-06)
 
 ### Bug Fixes
@@ -83,10 +268,7 @@
 - [#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389) Add needed dependency for snaps
 - [#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408) Duplicate code in rest api letting in a few bugs with the rest api
 - [#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390) Slack import failing and not being able to be restarted
-
-
-<a name="0.59.0-rc.12"></a>
-# 0.59.0-rc.12 (2017-10-09)
+## 0.59.0-rc.12 (2017-10-09)
 
 - [#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386) disabled katex tooltip on messageBox
 - [#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408) Duplicate code in rest api letting in a few bugs with the rest api
@@ -104,10 +286,7 @@
 - [#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398) Fix: Missing settings to configure LDAP size and page limits
 </details>
 
-
-
-<a name="0.59.0-rc.11"></a>
-# 0.59.0-rc.11 (2017-10-03)
+## 0.59.0-rc.11 (2017-10-03)
 
 
 ### New Features
@@ -133,10 +312,7 @@
 - [#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364) Update Meteor to 1.5.2.2
 </details>
 
-
-
-<a name="0.59.0-rc.10"></a>
-# 0.59.0-rc.10 (2017-09-29)
+## 0.59.0-rc.10 (2017-09-29)
 
 
 ### Bug Fixes
@@ -155,10 +331,7 @@
 - [#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355) Update meteor to 1.5.2.2-rc.0
 </details>
 
-
-
-<a name="0.59.0-rc.9"></a>
-# 0.59.0-rc.9 (2017-09-26)
+## 0.59.0-rc.9 (2017-09-26)
 
 
 ### New Features
@@ -191,10 +364,7 @@
 - [#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282) fix color on unread messages
 </details>
 
-
-
-<a name="0.59.0-rc.8"></a>
-# 0.59.0-rc.8 (2017-09-23)
+## 0.59.0-rc.8 (2017-09-23)
 
 
 ### New Features
@@ -221,10 +391,7 @@
 - [#8253](https://github.com/RocketChat/Rocket.Chat/pull/8253) readme-file: fix broken link
 </details>
 
-
-
-<a name="0.59.0-rc.7"></a>
-# 0.59.0-rc.7 (2017-09-20)
+## 0.59.0-rc.7 (2017-09-20)
 
 
 ### Bug Fixes
@@ -242,10 +409,7 @@
 - [#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197) npm deps update
 </details>
 
-
-
-<a name="0.59.0-rc.6"></a>
-# 0.59.0-rc.6 (2017-09-18)
+## 0.59.0-rc.6 (2017-09-18)
 
 
 ### New Features
@@ -264,10 +428,7 @@
 - [#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) Sidebar and RTL alignments
 - [#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159) Text area lost text when page reloads
 
-
-
-<a name="0.59.0-rc.5"></a>
-# 0.59.0-rc.5 (2017-09-14)
+## 0.59.0-rc.5 (2017-09-14)
 
 
 ### Bug Fixes
@@ -286,10 +447,7 @@
 - [#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) Remove unnecessary returns in cors common
 </details>
 
-
-
-<a name="0.59.0-rc.4"></a>
-# 0.59.0-rc.4 (2017-09-05)
+## 0.59.0-rc.4 (2017-09-05)
 
 
 ### Bug Fixes
@@ -306,10 +464,7 @@
 - [#8018](https://github.com/RocketChat/Rocket.Chat/pull/8018) search results height
 - [#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) Vertical menu on flex-tab
 
-
-
-<a name="0.59.0-rc.3"></a>
-# 0.59.0-rc.3 (2017-08-30)
+## 0.59.0-rc.3 (2017-08-30)
 
 
 ### Bug Fixes
@@ -332,10 +487,7 @@
 - [#7986](https://github.com/RocketChat/Rocket.Chat/pull/7986) Textarea on firefox
 - [#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) username ellipsis on firefox
 
-
-
-<a name="0.59.0-rc.2"></a>
-# 0.59.0-rc.2 (2017-08-28)
+## 0.59.0-rc.2 (2017-08-28)
 
 
 ### Bug Fixes
@@ -352,10 +504,7 @@
 - [#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) Hide flex-tab close button
 </details>
 
-
-
-<a name="0.59.0-rc.1"></a>
-# 0.59.0-rc.1 (2017-08-25)
+## 0.59.0-rc.1 (2017-08-25)
 
 
 ### Bug Fixes
@@ -365,10 +514,7 @@
 - [#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) search results position on sidebar
 - [#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) sidebar paddings
 
-
-
-<a name="0.59.0-rc.0"></a>
-# 0.59.0-rc.0 (2017-08-25)
+## 0.59.0-rc.0 (2017-08-25)
 
 
 ### New Features
@@ -437,6 +583,8 @@
 - [#7842](https://github.com/RocketChat/Rocket.Chat/pull/7842) npm deps update
 - [#7755](https://github.com/RocketChat/Rocket.Chat/pull/7755) npm deps update
 - [#7739](https://github.com/RocketChat/Rocket.Chat/pull/7739) Remove CircleCI
+- [#8420](https://github.com/RocketChat/Rocket.Chat/pull/8420) Merge 0.58.4 to master
+</details>
 </details>
 
 
diff --git a/package.json b/package.json
index f31db2e8be4..982f49e057b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-rc.17",
+	"version": "0.59.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index df8d87018e3..2f070e4b5af 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-rc.17"
+	"version": "0.59.0"
 }

From a65b86649cf15de254ff20a0d70c15bb9ad7481f Mon Sep 17 00:00:00 2001
From: Joe Sitton <jsitton2015@my.fit.edu>
Date: Thu, 19 Oct 2017 15:41:06 -0400
Subject: [PATCH 168/244] Update sendFileMessage.js

---
 .../rocketchat-file-upload/server/methods/sendFileMessage.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js b/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
index 59bf7d82b56..9e739986043 100644
--- a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
+++ b/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
@@ -20,7 +20,7 @@ Meteor.methods({
 
 		RocketChat.models.Uploads.updateFileComplete(file._id, Meteor.userId(), _.omit(file, '_id'));
 
-		const fileUrl = `/file-upload/${ file._id }/${ file.name }`;
+		const fileUrl = `/file-upload/${ file._id }/${ encodeURI(file.name) }`;
 
 		const attachment = {
 			title: file.name,

From bf6993ebbc59a9aee908581ea98b4ba77619ae58 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 19 Oct 2017 14:57:42 -0200
Subject: [PATCH 169/244] Merge pull request #8544 from
 RocketChat/hotfix/migration-103

[FIX] Migration 103 wrong converting primrary colors
---
 server/startup/migrations/v103.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/startup/migrations/v103.js b/server/startup/migrations/v103.js
index 0e25e0fc645..16a0359c886 100644
--- a/server/startup/migrations/v103.js
+++ b/server/startup/migrations/v103.js
@@ -1,6 +1,6 @@
 const majorColors = {
 	'content-background-color': '#FFFFFF',
-	'primary-background-color': 'color-primary',
+	'primary-background-color': '#04436A',
 	'primary-font-color': '#444444',
 	'primary-action-color': '#13679A', // was action-buttons-color
 	'secondary-background-color': '#F4F4F4',

From 7cca95874d55c74660f62b532c1e5b860aa3c067 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 19 Oct 2017 14:59:37 -0200
Subject: [PATCH 170/244] Merge pull request #8541 from
 RocketChat/hotifx/ldap-login-error

[FIX] LDAP login error regression at 0.59.0
---
 packages/rocketchat-ldap/server/ldap.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index bbe7e28855a..2a8d7e07d5a 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -348,6 +348,18 @@ export default class LDAP {
 		return true;
 	}
 
+	extractLdapEntryData(entry) {
+		const values = entry.raw;
+		Object.keys(values).forEach((key) => {
+			const value = values[key];
+			if (!['thumbnailPhoto', 'jpegPhoto'].includes(key) && value instanceof Buffer) {
+				values[key] = value.toString();
+			}
+		});
+
+		return values;
+	}
+
 	searchAllPaged(BaseDN, options, page) {
 		this.bindIfNecessary();
 
@@ -369,15 +381,7 @@ export default class LDAP {
 			const internalPageSize = options.paged && options.paged.pageSize > 0 ? options.paged.pageSize * 2 : 500;
 
 			res.on('searchEntry', (entry) => {
-				const values = entry.raw;
-				Object.keys(values).forEach((key) => {
-					const value = values[key];
-					if (!['thumbnailPhoto', 'jpegPhoto'].includes(key) && value instanceof Buffer) {
-						values[key] = value.toString();
-					}
-				});
-
-				entries.push(values);
+				entries.push(this.extractLdapEntryData(entry));
 
 				if (entries.length >= internalPageSize) {
 					logger.search.info('Internal Page');
@@ -432,7 +436,7 @@ export default class LDAP {
 			const entries = [];
 
 			res.on('searchEntry', (entry) => {
-				entries.push(entry);
+				entries.push(this.extractLdapEntryData(entry));
 			});
 
 			res.on('end', () => {

From c61036bbde6916b890faec8d2abbfe4415f3e4a1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 19 Oct 2017 16:43:57 -0200
Subject: [PATCH 171/244] Merge pull request #8547 from
 RocketChat/hotfix/revert-wrong-colors-from-migration-103

[FIX] Wrong colors after migration 103
---
 server/startup/migrations/v103.js |  1 +
 server/startup/migrations/v104.js | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 server/startup/migrations/v104.js

diff --git a/server/startup/migrations/v103.js b/server/startup/migrations/v103.js
index 16a0359c886..195ad775a11 100644
--- a/server/startup/migrations/v103.js
+++ b/server/startup/migrations/v103.js
@@ -84,4 +84,5 @@ RocketChat.Migrations.add({
 			}
 		});
 	}
+
 });
diff --git a/server/startup/migrations/v104.js b/server/startup/migrations/v104.js
new file mode 100644
index 00000000000..1524bc42e20
--- /dev/null
+++ b/server/startup/migrations/v104.js
@@ -0,0 +1,19 @@
+RocketChat.Migrations.add({
+	version: 104,
+	up() {
+		if ((RocketChat.models.Settings.findOne({_id: 'theme-color-rc-color-primary'}) || {}).value === '#04436A' &&
+			(RocketChat.models.Settings.findOne({_id: 'theme-color-rc-color-primary-darkest'}) || {}).value === '#335a' &&
+			(RocketChat.models.Settings.findOne({_id: 'theme-color-rc-color-primary-dark'}) || {}).value === '#16557c' &&
+			(RocketChat.models.Settings.findOne({_id: 'theme-color-rc-color-primary-light'}) || {}).value === '#72b1d8' &&
+			(RocketChat.models.Settings.findOne({_id: 'theme-color-rc-color-primary-light-medium'}) || {}).value === '#a0dfff' &&
+			(RocketChat.models.Settings.findOne({_id: 'theme-color-rc-color-primary-lightest'}) || {}).value === '#ccffff'
+		) {
+			RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary'}, {$set: {editor: 'expression', value: 'color-dark'}});
+			RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-darkest'}, {$set: {editor: 'expression', value: 'color-darkest'}});
+			RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-dark'}, {$set: {editor: 'expression', value: 'color-dark-medium'}});
+			RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-light'}, {$set: {editor: 'expression', value: 'color-gray'}});
+			RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-light-medium'}, {$set: {editor: 'expression', value: 'color-gray-medium'}});
+			RocketChat.models.Settings.update({_id: 'theme-color-rc-color-primary-lightest'}, {$set: {editor: 'expression', value: 'color-gray-lightest'}});
+		}
+	}
+});

From 1a29fd0797cd4f023bc48ee504a8aef4f555733c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 19 Oct 2017 18:19:09 -0200
Subject: [PATCH 172/244] Merge pull request #8543 from
 RocketChat/hotfix/color-reset

[FIX] Color reset when default value editor is different
---
 .../server/publications/settings.js              |  2 +-
 packages/rocketchat-ui-admin/client/admin.js     | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/rocketchat-lib/server/publications/settings.js b/packages/rocketchat-lib/server/publications/settings.js
index 3fb7be96702..cbc39fb4b8f 100644
--- a/packages/rocketchat-lib/server/publications/settings.js
+++ b/packages/rocketchat-lib/server/publications/settings.js
@@ -58,7 +58,7 @@ Meteor.methods({
 
 RocketChat.models.Settings.cache.on('changed', function(type, setting) {
 	if (setting['public'] === true) {
-		RocketChat.Notifications.notifyAllInThisInstance('public-settings-changed', type, _.pick(setting, '_id', 'value', 'properties'));
+		RocketChat.Notifications.notifyAllInThisInstance('public-settings-changed', type, _.pick(setting, '_id', 'value', 'editor', 'properties'));
 	}
 	return RocketChat.Notifications.notifyLoggedInThisInstance('private-settings-changed', type, setting);
 });
diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js
index fa88dc1ce79..b5a67575899 100644
--- a/packages/rocketchat-ui-admin/client/admin.js
+++ b/packages/rocketchat-ui-admin/client/admin.js
@@ -20,11 +20,9 @@ const setFieldValue = function(settingId, value, type, editor) {
 			input.next()[0].CodeMirror.setValue(value);
 			break;
 		case 'color':
+			editor = value && value[0] === '#' ? 'color' : 'expression';
 			input.parents('.horizontal').find('select[name="color-editor"]').val(editor).change();
 			input.val(value).change();
-			if (editor === 'color') {
-				new jscolor(input); //eslint-disable-line
-			}
 			break;
 		case 'roomPick':
 			const selectedRooms = Template.instance().selectedRooms.get();
@@ -341,6 +339,9 @@ Template.admin.events({
 				break;
 			case 'boolean':
 				value = value === '1';
+				break;
+			case 'color':
+				$(e.target).siblings('.colorpicker-swatch').css('background-color', value);
 		}
 		TempSettings.update({
 			_id: this._id
@@ -354,6 +355,7 @@ Template.admin.events({
 	'change select[name=color-editor]'(e) {
 		const value = _.trim($(e.target).val());
 		TempSettings.update({ _id: this._id }, { $set: { editor: value }});
+		RocketChat.settings.collectionPrivate.update({ _id: this._id }, { $set: { editor: value }});
 	},
 	'click .submit .discard'() {
 		const group = FlowRouter.getParam('group');
@@ -566,14 +568,16 @@ Template.admin.onRendered(function() {
 		SideNav.openFlex();
 	});
 	Tracker.autorun(function() {
-		const hasColor = TempSettings.findOne({
+		const hasColor = TempSettings.find({
 			group: FlowRouter.getParam('group'),
 			type: 'color'
-		}, { fields: { _id: 1 }});
+		}, { fields: { _id: 1, editor: 1 }}).fetch().length;
 		if (hasColor) {
 			Meteor.setTimeout(function() {
 				$('.colorpicker-input').each(function(index, el) {
-					new jscolor(el); //eslint-disable-line
+					if (!el._jscLinkedInstance) {
+						new jscolor(el); //eslint-disable-line
+					}
 				});
 			}, 400);
 		}

From 0710c94d6a0a88ce21b49eb327c211926ade4835 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 19 Oct 2017 18:22:44 -0200
Subject: [PATCH 173/244] Bump version to 0.59.1

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 13 +++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 785f6813932..fc754a6c030 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.0
+ENV RC_VERSION 0.59.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 53e5a9de1f8..ea4bc05c15a 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0"),
+		appMarketingVersion = (defaultText = "0.59.1"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 6bbb2f36be3..945baf5120e 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0
+    RC_VERSION=0.59.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 308474042e5..ddda71f043f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,16 @@
+<a name="0.59.1"></a>
+## 0.59.1 (2017-10-19)
+
+
+### Bug Fixes
+
+- [#8543](https://github.com/RocketChat/Rocket.Chat/pull/8543) Color reset when default value editor is different
+- [#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541) LDAP login error regression at 0.59.0
+- [#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544) Migration 103 wrong converting primrary colors
+- [#8547](https://github.com/RocketChat/Rocket.Chat/pull/8547) Wrong colors after migration 103
+
+
+
 <a name="0.59.0"></a>
 # 0.59.0 (2017-10-18)
 
diff --git a/package.json b/package.json
index 982f49e057b..6aa4ad19c5d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0",
+	"version": "0.59.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 2f070e4b5af..2d2da1c0aa7 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0"
+	"version": "0.59.1"
 }

From 24496b610b4f262f85a8b5041fd1d39efd6771be Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 20 Oct 2017 13:07:35 -0200
Subject: [PATCH 174/244] Fix guest pool inquiry taking

---
 packages/rocketchat-livechat/client/views/sideNav/livechat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/packages/rocketchat-livechat/client/views/sideNav/livechat.js
index 26b7af6b240..79497acf377 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechat.js
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechat.js
@@ -96,7 +96,7 @@ Template.livechat.events({
 		});
 	},
 
-	'click .inquiries .open-room'(event) {
+	'click .inquiries .sidebar-item'(event) {
 		event.preventDefault();
 		event.stopPropagation();
 

From d30f8016522efff180c26357f107178c0a5f4cd0 Mon Sep 17 00:00:00 2001
From: Michael Goodwin <xenithorb@users.noreply.github.com>
Date: Sun, 22 Oct 2017 14:31:45 -0400
Subject: [PATCH 175/244] AmazonS3: Quote file.name for ContentDisposition for
 files with commas

Adds quotes around the filename attribute.

See:
 - https://github.com/RocketChat/Rocket.Chat/issues/8584
 - https://stackoverflow.com/questions/38320996/s3-downloading-images-with-comma-in-filename-results-in-neterr-response-heade

Fixes #8584
---
 packages/rocketchat-file-upload/ufs/AmazonS3/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
index 048732e8838..aa7343d7e42 100644
--- a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
+++ b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
@@ -138,7 +138,7 @@ export class AmazonS3Store extends UploadFS.Store {
 				Key: this.getPath(file),
 				Body: writeStream,
 				ContentType: file.type,
-				ContentDisposition: `inline; filename=${ file.name }`
+				ContentDisposition: `inline; filename="${ file.name }"`
 
 			}, (error) => {
 				if (error) {

From 63560b10e7305fae338d2505c128b25e155f169b Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Mon, 23 Oct 2017 13:51:15 -0500
Subject: [PATCH 176/244] Fix community links in readme (#8589)

* Fix community links in readme

* move community link
---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 71c298c9974..24922603b05 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # The Ultimate Open Source WebChat Platform
 
-[![Rocket.Chat](https://demo.rocket.chat/images/join-chat.svg)](https://demo.rocket.chat/)
+[![Rocket.Chat](https://open.rocket.chat/images/join-chat.svg)](https://open.rocket.chat/)
 [![Build Status](https://img.shields.io/travis/RocketChat/Rocket.Chat/master.svg)](https://travis-ci.org/RocketChat/Rocket.Chat)
 [![Project Dependencies](https://david-dm.org/RocketChat/Rocket.Chat.svg)](https://david-dm.org/RocketChat/Rocket.Chat)
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/8580571ba024426d9649e9ab389bd5dd)](https://www.codacy.com/app/RocketChat/Rocket-Chat)
@@ -11,7 +11,7 @@
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/RocketChat/Rocket.Chat/raw/master/LICENSE)
 
 
-* [Live Demo](#live-demo)
+* [Community](#community)
 * [Mobile apps](#mobile-apps)
 * [Desktop apps](#desktop-apps)
 * [Deployment](#deployment)
@@ -51,15 +51,19 @@
  * [Quick Start](#quick-start-for-code-developers)
   * [Branching Model](#branching-model)
   * [Translations](#translations)
-  * [Community](#community)
   * [How to Contribute](#how-to-contribute)
 * [Credits](#credits)
 * [Donate](#donate)
 
 
-# Live Demo
-Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.chat)
+# Community
+Join thousands of members world-wide 24 x 7 in our [community server](https://open.rocket.chat). 
 
+[![Rocket.Chat](https://open.rocket.chat/api/v1/shield.svg?type=channel&name=Rocket.Chat&channel=support)](https://open.rocket.chat/channel/support) for help from our community with general Rocket.Chat questions.
+
+[![Rocket.Chat](https://open.rocket.chat/api/v1/shield.svg?type=channel&name=Rocket.Chat&channel=dev)](https://open.rocket.chat/channel/dev) for developers needing help from the community to developing new features
+
+You can also join the conversation at [Twitter](https://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
 
 # Desktop Apps
 Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
@@ -302,7 +306,7 @@ It is a great solution for communities and companies wanting to privately host t
 - Multi-users Audio Conference
 - Screensharing
 - Drupal 7.x and 8.x Plug-in (both stable and development flavours) ([download](https://www.drupal.org/project/rocket_chat)  and [source code](https://git.drupal.org/project/rocket_chat.git) )
-- XMPP bridge ([try it](https://demo.rocket.chat/channel/general))
+- XMPP bridge ([try it](https://open.rocket.chat/channel/general))
 - REST APIs
 - Remote Locations Video Monitoring
 - Native real-time APIs for Microsoft C#, Visual Basic, F# and other .NET supported languages ([Get it!](https://www.nuget.org/packages/Rocket.Chat.Net/0.0.12-pre))
@@ -417,10 +421,6 @@ See also this [Git Workflows Comparison](https://www.atlassian.com/git/tutorials
 We are experimenting [Lingohub](https://translate.lingohub.com/engelgabriel/rocket-dot-chat/dashboard).
 If you want to help, send an email to support at rocket.chat to be invited to the translation project.
 
-## Community
-
-Join thousands of members  world-wide 24 x 7 in our [community server](https://demo.rocket.chat).  Join the conversation at [Twitter](https://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
-
 ## How to Contribute
 
 Already a JavaScript developer?  Familiar with Meteor?  [Pick an issue](https://github.com/RocketChat/Rocket.Chat/labels/contrib%3A%20easy), push a PR and instantly become a member of Rocket.Chat's international contributors community.

From e036fb0b45a852ff9fe6ea967a66fa0e81f7dbef Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 23 Oct 2017 18:20:20 -0200
Subject: [PATCH 177/244] [FIX] LDAP not mergint existent users && Wrong id
 link generation

---
 packages/rocketchat-ldap/server/ldap.js         |  2 +-
 packages/rocketchat-ldap/server/loginHandler.js |  8 +++++++-
 packages/rocketchat-ldap/server/sync.js         | 15 ++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 2a8d7e07d5a..dee24df094a 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -353,7 +353,7 @@ export default class LDAP {
 		Object.keys(values).forEach((key) => {
 			const value = values[key];
 			if (!['thumbnailPhoto', 'jpegPhoto'].includes(key) && value instanceof Buffer) {
-				values[key] = value.toString();
+				values[key] = value.toString('binary');
 			}
 		});
 
diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js
index 8121381befa..85fbdd87fe0 100644
--- a/packages/rocketchat-ldap/server/loginHandler.js
+++ b/packages/rocketchat-ldap/server/loginHandler.js
@@ -147,5 +147,11 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 	}
 
 	// Create new user
-	return addLdapUser(ldapUser, username, loginRequest.ldapPass);
+	const result = addLdapUser(ldapUser, username, loginRequest.ldapPass);
+
+	if (result instanceof Error) {
+		throw result;
+	}
+
+	return result;
 });
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 27bf6422607..1245403dad7 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -52,7 +52,7 @@ export function getLdapUserUniqueID(ldapUser) {
 		if (Unique_Identifier_Field) {
 			Unique_Identifier_Field = {
 				attribute: Unique_Identifier_Field,
-				value: new Buffer(ldapUser[Unique_Identifier_Field]).toString('hex')
+				value: new Buffer(ldapUser[Unique_Identifier_Field], 'binary').toString('hex')
 			};
 		}
 		return Unique_Identifier_Field;
@@ -213,7 +213,7 @@ export function addLdapUser(ldapUser, username, password) {
 		userObject._id = Accounts.createUser(userObject);
 	} catch (error) {
 		logger.error('Error creating user', error);
-		throw error;
+		return error;
 	}
 
 	syncUserData(userObject, ldapUser);
@@ -257,10 +257,7 @@ export function importNewUsers(ldap) {
 			}
 
 			// Add user if it was not added before
-			const user = Meteor.users.findOne(userQuery);
-			if (!user) {
-				addLdapUser(ldapUser, username);
-			}
+			let user = Meteor.users.findOne(userQuery);
 
 			if (!user && username && RocketChat.settings.get('LDAP_Merge_Existing_Users') === true) {
 				const userQuery = {
@@ -269,12 +266,16 @@ export function importNewUsers(ldap) {
 
 				logger.debug('userQuery merge', userQuery);
 
-				const user = Meteor.users.findOne(userQuery);
+				user = Meteor.users.findOne(userQuery);
 				if (user) {
 					syncUserData(user, ldapUser);
 				}
 			}
 
+			if (!user) {
+				addLdapUser(ldapUser, username);
+			}
+
 			if (count % 100 === 0) {
 				logger.info('Import running. Users imported until now:', count);
 			}

From dda6c3b8181fdf72cbca41081e630b14c991f0df Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 24 Oct 2017 16:17:07 -0200
Subject: [PATCH 178/244] Fix message popup menu on mobile/cordova

---
 .../client/imports/components/messages.css    |  22 +-
 .../client/imports/components/popover.css     |   2 +-
 .../client/views/app/mobileMessageMenu.js     |  74 ------
 .../rocketchat-ui/client/views/app/room.js    | 251 ++++++++----------
 packages/rocketchat-ui/package.js             |   1 -
 5 files changed, 132 insertions(+), 218 deletions(-)
 delete mode 100644 packages/rocketchat-ui/client/views/app/mobileMessageMenu.js

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index f2ecefaca29..0d22af91ec8 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -37,15 +37,6 @@
 }
 
 .message {
-	&:hover,
-	&.active {
-		background-color: rgba(0, 0, 0, 0.05);
-
-		& .message-actions {
-			display: flex;
-		}
-	}
-
 	&.active {
 		& .message-actions__label {
 			color: var(--rc-color-button-primary);
@@ -96,3 +87,16 @@
 	right: auto;
 	left: 2px;
 }
+
+@media (width >= 500px) {
+	.message {
+		&:hover,
+		&.active {
+			background-color: rgba(0, 0, 0, 0.05);
+
+			& .message-actions {
+				display: flex;
+			}
+		}
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index fc1011b3b5c..2cf63f88865 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -140,7 +140,7 @@
 	fill: currentColor;
 }
 
-@media (width <= 400px) {
+@media (width <= 500px) {
 	.rc-popover {
 		& .rc-popover__content {
 			top: initial !important;
diff --git a/packages/rocketchat-ui/client/views/app/mobileMessageMenu.js b/packages/rocketchat-ui/client/views/app/mobileMessageMenu.js
deleted file mode 100644
index c29754d5768..00000000000
--- a/packages/rocketchat-ui/client/views/app/mobileMessageMenu.js
+++ /dev/null
@@ -1,74 +0,0 @@
-const mobileMessageMenu = {
-	show(message, template, e, scope) {
-		if (!window.plugins.actionsheet) {
-			return false;
-		}
-
-		const options = {
-			'androidTheme': window.plugins.actionsheet.ANDROID_THEMES.THEME_HOLO_LIGHT,
-			'buttonLabels': [
-				TAPi18n.__('Report Abuse')
-			],
-			androidEnableCancelButton: true,
-			addCancelButtonWithLabel: TAPi18n.__('Cancel')
-		};
-
-		const buttonActions = [
-			mobileMessageMenu.reportAbuse
-		];
-
-		const buttons = RocketChat.MessageAction.getButtons(message, message.customClass || 'message-mobile');
-
-		for (let i = 0, len = buttons.length; i < len; i++) {
-			if (buttons[i].id === 'delete-message') {
-				options.addDestructiveButtonWithLabel = TAPi18n.__(buttons[i].i18nLabel);
-				buttonActions.unshift(buttons[i].action);
-			} else {
-				buttonActions.push(buttons[i].action);
-				options.buttonLabels.push(TAPi18n.__(buttons[i].i18nLabel));
-			}
-		}
-
-		window.plugins.actionsheet.show(options, (buttonIndex) => {
-			if (buttonActions[buttonIndex - 1] != null) {
-				return buttonActions[buttonIndex - 1].call(scope, e, template, message);
-			}
-		});
-
-	},
-	reportAbuse: (e, t, message) => {
-		swal({
-			title: TAPi18n.__('Report_this_message_question_mark'),
-			text: message.msg,
-			inputPlaceholder: TAPi18n.__('Why_do_you_want_to_report_question_mark'),
-			type: 'input',
-			showCancelButton: true,
-			confirmButtonColor: '#DD6B55',
-			confirmButtonText: TAPi18n.__('Report_exclamation_mark'),
-			cancelButtonText: TAPi18n.__('Cancel'),
-			closeOnConfirm: false,
-			html: false
-		}, (inputValue) => {
-			if (inputValue === false) {
-				return false;
-			}
-
-			if (inputValue === '') {
-				swal.showInputError(TAPi18n.__('You_need_to_write_something'));
-				return false;
-			}
-
-			Meteor.call('reportMessage', message._id, inputValue);
-
-			swal({
-				title: TAPi18n.__('Report_sent'),
-				text: TAPi18n.__('Thank_you_exclamation_mark '),
-				type: 'success',
-				timer: 1000,
-				showConfirmButton: false
-			});
-		});
-	}
-};
-
-this.mobileMessageMenu = mobileMessageMenu;
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 6fa33dab578..3fff62b9534 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -1,4 +1,4 @@
-/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , mobileMessageMenu , cordova , readMessage , RoomRoles, popover */
+/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover */
 import moment from 'moment';
 import mime from 'mime-type/with-db';
 import Clipboard from 'clipboard';
@@ -27,22 +27,22 @@ const openProfileTab = (e, instance, username) => {
 	}
 
 	instance.tabBar.setTemplate('membersList');
-	return instance.tabBar.open();
+	instance.tabBar.open();
 };
 
 const openProfileTabOrOpenDM = (e, instance, username) => {
 	if (RocketChat.settings.get('UI_Click_Direct_Message')) {
-		return Meteor.call('createDirectMessage', username, (error, result) => {
+		Meteor.call('createDirectMessage', username, (error, result) => {
 			if (error) {
 				if (error.isClientSafe) {
 					openProfileTab(e, instance, username);
 				} else {
-					return handleError(error);
+					handleError(error);
 				}
 			}
 
 			if ((result != null ? result.rid : undefined) != null) {
-				return FlowRouter.go('direct', { username }, FlowRouter.current().queryParams);
+				FlowRouter.go('direct', { username }, FlowRouter.current().queryParams);
 			}
 		});
 	} else {
@@ -50,14 +50,71 @@ const openProfileTabOrOpenDM = (e, instance, username) => {
 	}
 };
 
+const mountPopover = (e, i, outerContext) => {
+	let context = $(e.target).parents('.message').data('context');
+	if (!context) {
+		context = 'message';
+	}
+
+	const [, message] = outerContext._arguments;
+	let menuItems = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
+		return {
+			icon: item.icon,
+			name: t(item.label),
+			type: 'message-action',
+			id: item.id,
+			modifier: item.color
+		};
+	});
+
+	if (window.matchMedia('(max-width: 500px)').matches) {
+		const messageItems = RocketChat.MessageAction.getButtons(message, context, 'message').map(item => {
+			return {
+				icon: item.icon,
+				name: t(item.label),
+				type: 'message-action',
+				id: item.id,
+				modifier: item.color
+			};
+		});
+
+		menuItems = menuItems.concat(messageItems);
+	}
+
+	const [items, deleteItem] = menuItems.reduce((result, value) => (result[value.id === 'delete-message' ? 1 : 0].push(value), result), [[], []]);
+	const groups = [{ items }];
+
+	if (deleteItem.length) {
+		groups.push({ items: deleteItem });
+	}
+
+	const config = {
+		columns: [
+			{
+				groups
+			}
+		],
+		instance: i,
+		data: outerContext,
+		mousePosition: {
+			x: e.clientX,
+			y: e.clientY
+		},
+		activeElement: $(e.currentTarget).parents('.message')[0],
+		onRendered: () => new Clipboard('.rc-popover__item')
+	};
+
+	popover.open(config);
+};
+
 Template.room.helpers({
 	isTranslated() {
 		const sub = ChatSubscription.findOne({ rid: this._id }, { fields: { autoTranslate: 1, autoTranslateLanguage: 1 } });
-		return RocketChat.settings.get('AutoTranslate_Enabled') && ((sub != null ? sub.autoTranslate : undefined) === true) && (sub.autoTranslateLanguage != null);
+		RocketChat.settings.get('AutoTranslate_Enabled') && ((sub != null ? sub.autoTranslate : undefined) === true) && (sub.autoTranslateLanguage != null);
 	},
 
 	embeddedVersion() {
-		return RocketChat.Layout.isEmbedded();
+		RocketChat.Layout.isEmbedded();
 	},
 
 	favorite() {
@@ -92,9 +149,9 @@ Template.room.helpers({
 				const index = hideMessagesOfType.indexOf(type);
 
 				if ((record.value === true) && (index === -1)) {
-					return hideMessagesOfType.push(type);
+					hideMessagesOfType.push(type);
 				} else if (index > -1) {
-					return hideMessagesOfType.splice(index, 1);
+					hideMessagesOfType.splice(index, 1);
 				}
 			});
 		});
@@ -333,14 +390,14 @@ Template.room.events({
 	},
 
 	'click, touchend'(e, t) {
-		return Meteor.setTimeout(() => t.sendToBottomIfNecessaryDebounced(), 100);
+		Meteor.setTimeout(() => t.sendToBottomIfNecessaryDebounced(), 100);
 	},
 
 	'click .messages-container-main'() {
 		const user = Meteor.user();
 
 		if ((Template.instance().tabBar.getState() === 'opened') && user && user.settings && user.settings.preferences && user.settings.preferences.hideFlexTab) {
-			return Template.instance().tabBar.close();
+			Template.instance().tabBar.close();
 		}
 	},
 
@@ -369,54 +426,20 @@ Template.room.events({
 			e.stopPropagation();
 		}
 
-		const message = this._arguments[1];
 		const doLongTouch = () => {
-
-			if ((window.plugins != null ? window.plugins.socialsharing : undefined) != null) {
-				isSocialSharingOpen = true;
-
-				if (e.target && (e.target.nodeName === 'A') && /^https?:\/\/.+/.test(e.target.getAttribute('href'))) {
-					if (message.attachments != null) {
-						const attachment = _.find(message.attachments, item => item.title === e.target.innerText);
-						if (attachment != null) {
-							socialSharing({
-								file: e.target.href,
-								subject: e.target.innerText,
-								message: message.msg
-							});
-							return;
-						}
-					}
-
-					socialSharing({
-						link: e.target.href,
-						subject: e.target.innerText,
-						message: message.msg
-					});
-					return;
-				}
-
-				if (e.target && (e.target.nodeName === 'IMG')) {
-					socialSharing({
-						file: e.target.src,
-						message: message.msg
-					});
-					return;
-				}
-			}
-
-			return mobileMessageMenu.show(message, t, e, this);
+			console.log('long press');
+			mountPopover(e, t, this);
 		};
 
 		Meteor.clearTimeout(t.touchtime);
-		return t.touchtime = Meteor.setTimeout(doLongTouch, 500);
+		t.touchtime = Meteor.setTimeout(doLongTouch, 500);
 	},
 
 	'click .message img'(e, t) {
 		Meteor.clearTimeout(t.touchtime);
 		if ((isSocialSharingOpen === true) || (touchMoved === true)) {
 			e.preventDefault();
-			return e.stopPropagation();
+			e.stopPropagation();
 		}
 	},
 
@@ -436,9 +459,9 @@ Template.room.events({
 			}
 
 			if ((typeof cordova !== 'undefined' && cordova !== null ? cordova.InAppBrowser : undefined) != null) {
-				return cordova.InAppBrowser.open(e.target.href, '_system');
+				cordova.InAppBrowser.open(e.target.href, '_system');
 			} else {
-				return window.open(e.target.href);
+				window.open(e.target.href);
 			}
 		}
 	},
@@ -452,20 +475,20 @@ Template.room.events({
 				touchMoved = true;
 			}
 		}
-		return Meteor.clearTimeout(t.touchtime);
+		Meteor.clearTimeout(t.touchtime);
 	},
 
 	'touchcancel .message'(e, t) {
-		return Meteor.clearTimeout(t.touchtime);
+		Meteor.clearTimeout(t.touchtime);
 	},
 
 	'click .upload-progress-text > button'(e) {
 		e.preventDefault();
-		return Session.set(`uploading-cancel-${ this.id }`, true);
+		Session.set(`uploading-cancel-${ this.id }`, true);
 	},
 
 	'click .unread-bar > button.mark-read'() {
-		return readMessage.readNow(true);
+		readMessage.readNow(true);
 	},
 
 	'click .unread-bar > button.jump-to'(e, t) {
@@ -473,20 +496,20 @@ Template.room.events({
 		const room = RoomHistoryManager.getRoom(_id);
 		let message = room && room.firstUnread.get();
 		if (message) {
-			return RoomHistoryManager.getSurroundingMessages(message, 50);
+			RoomHistoryManager.getSurroundingMessages(message, 50);
 		} else {
 			const subscription = ChatSubscription.findOne({ rid: _id });
 			message = ChatMessage.find({ rid: _id, ts: { $gt: (subscription != null ? subscription.ls : undefined) } }, { sort: { ts: 1 }, limit: 1 }).fetch()[0];
-			return RoomHistoryManager.getSurroundingMessages(message, 50);
+			RoomHistoryManager.getSurroundingMessages(message, 50);
 		}
 	},
 
 	'click .toggle-favorite'(event) {
 		event.stopPropagation();
 		event.preventDefault();
-		return Meteor.call('toggleFavorite', this._id, !$('i', event.currentTarget).hasClass('favorite-room'), function(err) {
+		Meteor.call('toggleFavorite', this._id, !$('i', event.currentTarget).hasClass('favorite-room'), function(err) {
 			if (err) {
-				return handleError(err);
+				handleError(err);
 			}
 		});
 	},
@@ -495,7 +518,7 @@ Template.room.events({
 		event.preventDefault();
 		Session.set('editRoomTitle', true);
 		$('.fixed-title').addClass('visible');
-		return Meteor.setTimeout(() => $('#room-title-field').focus().select(), 10);
+		Meteor.setTimeout(() => $('#room-title-field').focus().select(), 10);
 	},
 
 	'click .flex-tab .user-image > button'(e, instance) {
@@ -529,57 +552,19 @@ Template.room.events({
 
 		if (RoomHistoryManager.isLoading(this._id) === false && RoomHistoryManager.hasMore(this._id) === true || RoomHistoryManager.hasMoreNext(this._id) === true) {
 			if (RoomHistoryManager.hasMore(this._id) === true && e.target.scrollTop === 0) {
-				return RoomHistoryManager.getMore(this._id);
+				RoomHistoryManager.getMore(this._id);
 			} else if (RoomHistoryManager.hasMoreNext(this._id) === true && e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight) {
-				return RoomHistoryManager.getMoreNext(this._id);
+				RoomHistoryManager.getMoreNext(this._id);
 			}
 		}
 	}, 200),
 
 	'click .new-message'() {
 		Template.instance().atBottom = true;
-		return chatMessages[RocketChat.openedRoom].input.focus();
+		chatMessages[RocketChat.openedRoom].input.focus();
 	},
 	'click .message-actions__menu'(e, i) {
-		let context = $(e.target).parents('.message').data('context');
-		if (!context) {
-			context = 'message';
-		}
-
-		const [, message] = this._arguments;
-		const allItems = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
-			return {
-				icon: item.icon,
-				name: t(item.label),
-				type: 'message-action',
-				id: item.id,
-				modifier: item.color
-			};
-		});
-		const [items, deleteItem] = allItems.reduce((result, value) => (result[value.id === 'delete-message' ? 1 : 0].push(value), result), [[], []]);
-		const groups = [{ items }];
-
-		if (deleteItem.length) {
-			groups.push({ items: deleteItem });
-		}
-
-		const config = {
-			columns: [
-				{
-					groups
-				}
-			],
-			instance: i,
-			data: this,
-			mousePosition: {
-				x: e.clientX,
-				y: e.clientY
-			},
-			activeElement: $(e.currentTarget).parents('.message')[0],
-			onRendered: () => new Clipboard('.rc-popover__item')
-		};
-
-		popover.open(config);
+		mountPopover(e, i, this);
 	},
 
 	'click .mention-link'(e, instance) {
@@ -589,7 +574,7 @@ Template.room.events({
 		const channel = $(e.currentTarget).data('channel');
 		if (channel != null) {
 			if (RocketChat.Layout.isEmbedded()) {
-				return fireGlobalEvent('click-mention-link', { path: FlowRouter.path('channel', { name: channel }), channel });
+				fireGlobalEvent('click-mention-link', { path: FlowRouter.path('channel', { name: channel }), channel });
 			}
 
 			FlowRouter.go('channel', { name: channel }, FlowRouter.current().queryParams);
@@ -603,7 +588,7 @@ Template.room.events({
 
 	'click .image-to-download'(event) {
 		ChatMessage.update({ _id: this._arguments[1]._id, 'urls.url': $(event.currentTarget).data('url') }, { $set: { 'urls.$.downloadImages': true } });
-		return ChatMessage.update({ _id: this._arguments[1]._id, 'attachments.image_url': $(event.currentTarget).data('url') }, { $set: { 'attachments.$.downloadImages': true } });
+		ChatMessage.update({ _id: this._arguments[1]._id, 'attachments.image_url': $(event.currentTarget).data('url') }, { $set: { 'attachments.$.downloadImages': true } });
 	},
 
 	'click .collapse-switch'(e) {
@@ -616,27 +601,27 @@ Template.room.events({
 		}
 
 		if ((this._arguments[1] != null ? this._arguments[1].urls : undefined) != null) {
-			return ChatMessage.update({ _id: id }, { $set: { [`urls.${ index }.collapsed`]: !collapsed } });
+			ChatMessage.update({ _id: id }, { $set: { [`urls.${ index }.collapsed`]: !collapsed } });
 		}
 	},
 
 	'dragenter .dropzone'(e) {
 		const types = e.originalEvent && e.originalEvent.dataTransfer && e.originalEvent.dataTransfer.types;
 		if (types != null && types.length > 0 && _.every(types, type => type.indexOf('text/') === -1 || type.indexOf('text/uri-list') !== -1) && userCanDrop(this._id)) {
-			return e.currentTarget.classList.add('over');
+			e.currentTarget.classList.add('over');
 		}
 	},
 
 	'dragleave .dropzone-overlay'(e) {
-		return e.currentTarget.parentNode.classList.remove('over');
+		e.currentTarget.parentNode.classList.remove('over');
 	},
 
 	'dragover .dropzone-overlay'(e) {
 		e = e.originalEvent || e;
 		if (['move', 'linkMove'].includes(e.dataTransfer.effectAllowed)) {
-			return e.dataTransfer.dropEffect = 'move';
+			e.dataTransfer.dropEffect = 'move';
 		} else {
-			return e.dataTransfer.dropEffect = 'copy';
+			e.dataTransfer.dropEffect = 'copy';
 		}
 	},
 
@@ -656,7 +641,7 @@ Template.room.events({
 			});
 		}
 
-		return fileUpload(filesToUpload);
+		fileUpload(filesToUpload);
 	},
 
 	'load img'(e, template) {
@@ -666,7 +651,7 @@ Template.room.events({
 	'click .jump-recent button'(e, template) {
 		e.preventDefault();
 		template.atBottom = true;
-		return RoomHistoryManager.clear(template && template.data && template.data._id);
+		RoomHistoryManager.clear(template && template.data && template.data._id);
 	},
 
 	'click .message'(e, template) {
@@ -723,12 +708,12 @@ Template.room.onCreated(function() {
 		$('.messages-box .message.selected').removeClass('selected');
 		this.selectedMessages = [];
 		this.selectedRange = [];
-		return this.selectablePointer = null;
+		this.selectablePointer = null;
 	};
 
 	this.selectMessages = to => {
 		if ((this.selectablePointer === to) && (this.selectedRange.length > 0)) {
-			return this.selectedRange = [];
+			this.selectedRange = [];
 		} else {
 			const message1 = ChatMessage.findOne(this.selectablePointer);
 			const message2 = ChatMessage.findOne(to);
@@ -736,7 +721,7 @@ Template.room.onCreated(function() {
 			const minTs = _.min([message1.ts, message2.ts]);
 			const maxTs = _.max([message1.ts, message2.ts]);
 
-			return this.selectedRange = _.pluck(ChatMessage.find({ rid: message1.rid, ts: { $gte: minTs, $lte: maxTs } }).fetch(), '_id');
+			this.selectedRange = _.pluck(ChatMessage.find({ rid: message1.rid, ts: { $gte: minTs, $lte: maxTs } }).fetch(), '_id');
 		}
 	};
 
@@ -761,16 +746,16 @@ Template.room.onCreated(function() {
 	};
 
 	this.setUserDetail = username => {
-		return this.userDetail.set(username);
+		this.userDetail.set(username);
 	};
 
 	this.clearUserDetail = () => {
-		return this.userDetail.set(null);
+		this.userDetail.set(null);
 	};
 
 	Meteor.call('getRoomRoles', this.data._id, function(error, results) {
 		if (error) {
-			return handleError(error);
+			handleError(error);
 		}
 
 		return Array.from(results).map((record) => {
@@ -778,30 +763,30 @@ Template.room.onCreated(function() {
 			RoomRoles.upsert({ rid: record.rid, 'u._id': record.u._id }, record);
 		});
 	});
-	return RoomRoles.find({ rid: this.data._id }).observe({
+	RoomRoles.find({ rid: this.data._id }).observe({
 		added: role => {
 			if (!role.u || !role.u._id) {
 				return;
 			}
-			return ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
+			ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
 		}, // Update message to re-render DOM
 		changed: (role) => {
 			if (!role.u || !role.u._id) {
 				return;
 			}
-			return ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $inc: { rerender: 1 } }, { multi: true });
+			ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $inc: { rerender: 1 } }, { multi: true });
 		}, // Update message to re-render DOM
 		removed: role => {
 			if (!role.u || !role.u._id) {
 				return;
 			}
-			return ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
+			ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
 		}
 	});
 }); // Update message to re-render DOM
 
 Template.room.onDestroyed(function() {
-	return window.removeEventListener('resize', this.onWindowResize);
+	window.removeEventListener('resize', this.onWindowResize);
 });
 
 Template.room.onRendered(function() {
@@ -834,18 +819,18 @@ Template.room.onRendered(function() {
 
 	template.sendToBottom = function() {
 		wrapper.scrollTop = wrapper.scrollHeight - wrapper.clientHeight;
-		return newMessage.className = 'new-message background-primary-action-color color-content-background-color not';
+		newMessage.className = 'new-message background-primary-action-color color-content-background-color not';
 	};
 
 	template.checkIfScrollIsAtBottom = function() {
 		template.atBottom = template.isAtBottom(100);
 		readMessage.enable();
-		return readMessage.read();
+		readMessage.read();
 	};
 
 	template.sendToBottomIfNecessary = function() {
 		if (template.atBottom === true && template.isAtBottom() !== true) {
-			return template.sendToBottom();
+			template.sendToBottom();
 		}
 	};
 
@@ -870,12 +855,12 @@ Template.room.onRendered(function() {
 
 	wrapper.addEventListener('mousewheel', function() {
 		template.atBottom = false;
-		return Meteor.defer(() => template.checkIfScrollIsAtBottom());
+		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 	});
 
 	wrapper.addEventListener('wheel', function() {
 		template.atBottom = false;
-		return Meteor.defer(() => template.checkIfScrollIsAtBottom());
+		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 	});
 
 	wrapper.addEventListener('touchstart', () => template.atBottom = false);
@@ -883,12 +868,12 @@ Template.room.onRendered(function() {
 	wrapper.addEventListener('touchend', function() {
 		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 		Meteor.setTimeout(() => template.checkIfScrollIsAtBottom(), 1000);
-		return Meteor.setTimeout(() => template.checkIfScrollIsAtBottom(), 2000);
+		Meteor.setTimeout(() => template.checkIfScrollIsAtBottom(), 2000);
 	});
 
 	wrapper.addEventListener('scroll', function() {
 		template.atBottom = false;
-		return Meteor.defer(() => template.checkIfScrollIsAtBottom());
+		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 	});
 
 	$('.flex-tab-bar').on('click', (/*e, t*/) =>
@@ -913,16 +898,16 @@ Template.room.onRendered(function() {
 			if (lastMessage != null) {
 				const subscription = ChatSubscription.findOne({ rid: template.data._id });
 				const count = ChatMessage.find({ rid: template.data._id, ts: { $lte: lastMessage.ts, $gt: (subscription != null ? subscription.ls : undefined) } }).count();
-				return template.unreadCount.set(count);
+				template.unreadCount.set(count);
 			} else {
-				return template.unreadCount.set(0);
+				template.unreadCount.set(0);
 			}
 		}
 	}, 300);
 
 	readMessage.onRead(function(rid) {
 		if (rid === template.data._id) {
-			return template.unreadCount.set(0);
+			template.unreadCount.set(0);
 		}
 	});
 
@@ -942,7 +927,7 @@ Template.room.onRendered(function() {
 
 			if (webrtc.localUrl.get() != null) {
 				this.tabBar.setTemplate('membersList');
-				return this.tabBar.open();
+				this.tabBar.open();
 			}
 		});
 	}
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 2547ed44148..3c192cedd2b 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -109,7 +109,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/createChannel.js', 'client');
 	api.addFiles('client/views/app/fullModal.js', 'client');
 	api.addFiles('client/views/app/home.js', 'client');
-	api.addFiles('client/views/app/mobileMessageMenu.js', 'client');
 	api.addFiles('client/views/app/privateHistory.js', 'client');
 	api.addFiles('client/views/app/room.js', 'client');
 	api.addFiles('client/views/app/roomSearch.js', 'client');

From 1b92f3c37894003b576825babdd945f895dc00f7 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 24 Oct 2017 16:38:27 -0200
Subject: [PATCH 179/244] fix lint

---
 packages/rocketchat-ui/client/views/app/room.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 3fff62b9534..b58061be09e 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -4,8 +4,6 @@ import mime from 'mime-type/with-db';
 import Clipboard from 'clipboard';
 
 window.chatMessages = window.chatMessages || {};
-const socialSharing = (options = {}) => window.plugins.socialsharing.share(options.message, options.subject, options.file, options.link);
-
 const isSubscribed = _id => ChatSubscription.find({ rid: _id }).count() > 0;
 
 const favoritesEnabled = () => RocketChat.settings.get('Favorite_Rooms');

From 68188268c0c76e742734d497dd10e1d0e4761dd9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 24 Oct 2017 16:44:27 -0200
Subject: [PATCH 180/244] [FIX] API channel/group.members not sorting

---
 packages/rocketchat-api/server/v1/channels.js | 14 ++++++++++----
 packages/rocketchat-api/server/v1/groups.js   | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index 5952837facf..d3803284980 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -424,14 +424,20 @@ RocketChat.API.v1.addRoute('channels.members', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort } = this.parseJsonQuery();
 
-		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult.usernames), {
-			sort: sort ? sort : -1,
+		let sortFn = (a, b) => a > b;
+		if (Match.test(sort, Object) && Match.test(sort.username, Number) && sort.username === -1) {
+			sortFn = (a, b) => b < a;
+		}
+
+		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult.usernames).sort(sortFn), {
 			skip: offset,
 			limit: count
 		});
 
-		const users = RocketChat.models.Users.find({ username: { $in: members } },
-			{ fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 } }).fetch();
+		const users = RocketChat.models.Users.find({ username: { $in: members } }, {
+			fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 },
+			sort: sort ? sort : { username: 1 }
+		}).fetch();
 
 		return RocketChat.API.v1.success({
 			members: users,
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index 29d5bdb4b7a..4a98d11e9be 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -368,14 +368,20 @@ RocketChat.API.v1.addRoute('groups.members', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort } = this.parseJsonQuery();
 
-		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult._room.usernames), {
-			sort: sort ? sort : -1,
+		let sortFn = (a, b) => a > b;
+		if (Match.test(sort, Object) && Match.test(sort.username, Number) && sort.username === -1) {
+			sortFn = (a, b) => b < a;
+		}
+
+		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult._room.usernames).sort(sortFn), {
 			skip: offset,
 			limit: count
 		});
 
-		const users = RocketChat.models.Users.find({ username: { $in: members } },
-			{ fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 } }).fetch();
+		const users = RocketChat.models.Users.find({ username: { $in: members } }, {
+			fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 },
+			sort: sort ? sort : { username: 1 }
+		}).fetch();
 
 		return RocketChat.API.v1.success({
 			members: users,

From cbdde6e06968540a5cb522cb00b20daf38ebeebe Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 24 Oct 2017 18:16:39 -0200
Subject: [PATCH 181/244] Add scroll to create channel page

---
 .../client/imports/components/modal/create-channel.css     | 7 +++++++
 .../client/imports/components/modal/full-modal.css         | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
index 12672ef1335..39700c4d9b9 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
@@ -1,4 +1,7 @@
 .create-channel {
+	display: flex;
+	flex-direction: column;
+
 	animation-name: fadeIn;
 	animation-duration: 1s;
 
@@ -25,6 +28,10 @@
 		font-size: var(--create-channel-description-text-size);
 	}
 
+	&__content {
+		overflow-y: auto;
+	}
+
 	&__switches {
 		display: flex;
 		flex-wrap: wrap;
diff --git a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
index 1eb2a86ac72..af893a63853 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
@@ -12,6 +12,8 @@
 	&__wrapper {
 		position: relative;
 
+		display: flex;
+
 		width: var(--modal-wrapper-width);
 		margin: var(--modal-wrapper-margin) 0;
 	}

From 7d724bd84e02521d5c4444426890f81794061b92 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 24 Oct 2017 19:24:15 -0200
Subject: [PATCH 182/244] add report abuse on ios

---
 .../rocketchat-ui/client/views/app/popover.js | 37 +++++++++++++++++++
 .../rocketchat-ui/client/views/app/room.js    | 17 ++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 85180094ca7..58a947bbaca 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -92,6 +92,43 @@ Template.popover.events({
 		if ((button != null ? button.action : undefined) != null) {
 			button.action.call(t.data.data, e, t.data.instance);
 			popover.close();
+			return false;
+		}
+
+		if (e.currentTarget.dataset.id === 'report-abuse') {
+			const message = t.data.data._arguments[1];
+			swal({
+				title: TAPi18n.__('Report_this_message_question_mark'),
+				text: message.msg,
+				inputPlaceholder: TAPi18n.__('Why_do_you_want_to_report_question_mark'),
+				type: 'input',
+				showCancelButton: true,
+				confirmButtonColor: '#DD6B55',
+				confirmButtonText: TAPi18n.__('Report_exclamation_mark'),
+				cancelButtonText: TAPi18n.__('Cancel'),
+				closeOnConfirm: false,
+				html: false
+			}, (inputValue) => {
+				if (inputValue === false) {
+					return false;
+				}
+
+				if (inputValue === '') {
+					swal.showInputError(TAPi18n.__('You_need_to_write_something'));
+					return false;
+				}
+
+				Meteor.call('reportMessage', message._id, inputValue);
+
+				swal({
+					title: TAPi18n.__('Report_sent'),
+					text: TAPi18n.__('Thank_you_exclamation_mark '),
+					type: 'success',
+					timer: 1000,
+					showConfirmButton: false
+				});
+			});
+			popover.close();
 		}
 	},
 	'click [data-type="set-state"]'(e) {
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index b58061be09e..2a78e136304 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -1,4 +1,4 @@
-/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover */
+/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover , device */
 import moment from 'moment';
 import mime from 'mime-type/with-db';
 import Clipboard from 'clipboard';
@@ -55,6 +55,7 @@ const mountPopover = (e, i, outerContext) => {
 	}
 
 	const [, message] = outerContext._arguments;
+
 	let menuItems = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
 		return {
 			icon: item.icon,
@@ -86,6 +87,20 @@ const mountPopover = (e, i, outerContext) => {
 		groups.push({ items: deleteItem });
 	}
 
+	if (typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios') {
+		groups.push({
+			items: [
+				{
+					icon: 'warning',
+					name: t('Report_Abuse'),
+					type: 'message-action',
+					id: 'report-abuse',
+					modifier: 'alert'
+				}
+			]
+		});
+	}
+
 	const config = {
 		columns: [
 			{

From 111a53d74fe78e26ee7bb9f87366fec91cd474d9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 23 Oct 2017 18:27:21 -0200
Subject: [PATCH 183/244] Merge pull request #8577 from
 RocketChat/fix-livechat-guest-pool

[FIX] Fix guest pool inquiry taking
---
 packages/rocketchat-livechat/client/views/sideNav/livechat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/packages/rocketchat-livechat/client/views/sideNav/livechat.js
index 26b7af6b240..79497acf377 100644
--- a/packages/rocketchat-livechat/client/views/sideNav/livechat.js
+++ b/packages/rocketchat-livechat/client/views/sideNav/livechat.js
@@ -96,7 +96,7 @@ Template.livechat.events({
 		});
 	},
 
-	'click .inquiries .open-room'(event) {
+	'click .inquiries .sidebar-item'(event) {
 		event.preventDefault();
 		event.stopPropagation();
 

From 1e99e7b9c5c6bfc8ae6700cfc269a5b59d6c65c2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 23 Oct 2017 18:42:07 -0200
Subject: [PATCH 184/244] Merge pull request #8551 from
 joesitton/fix-upload-uri-error

[FIX] encode filename in url to prevent links breaking
---
 .../rocketchat-file-upload/server/methods/sendFileMessage.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js b/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
index 59bf7d82b56..9e739986043 100644
--- a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
+++ b/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
@@ -20,7 +20,7 @@ Meteor.methods({
 
 		RocketChat.models.Uploads.updateFileComplete(file._id, Meteor.userId(), _.omit(file, '_id'));
 
-		const fileUrl = `/file-upload/${ file._id }/${ file.name }`;
+		const fileUrl = `/file-upload/${ file._id }/${ encodeURI(file.name) }`;
 
 		const attachment = {
 			title: file.name,

From 16fde7b8469ccecb2dbf81f5202c73bb42acd170 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 23 Oct 2017 18:52:38 -0200
Subject: [PATCH 185/244] Merge pull request #8613 from
 RocketChat/hotifx/ldap-merge-users

[FIX] LDAP not merging existent users && Wrong id link generation
---
 packages/rocketchat-ldap/server/ldap.js         |  2 +-
 packages/rocketchat-ldap/server/loginHandler.js |  8 +++++++-
 packages/rocketchat-ldap/server/sync.js         | 15 ++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 2a8d7e07d5a..dee24df094a 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -353,7 +353,7 @@ export default class LDAP {
 		Object.keys(values).forEach((key) => {
 			const value = values[key];
 			if (!['thumbnailPhoto', 'jpegPhoto'].includes(key) && value instanceof Buffer) {
-				values[key] = value.toString();
+				values[key] = value.toString('binary');
 			}
 		});
 
diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js
index 8121381befa..85fbdd87fe0 100644
--- a/packages/rocketchat-ldap/server/loginHandler.js
+++ b/packages/rocketchat-ldap/server/loginHandler.js
@@ -147,5 +147,11 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 	}
 
 	// Create new user
-	return addLdapUser(ldapUser, username, loginRequest.ldapPass);
+	const result = addLdapUser(ldapUser, username, loginRequest.ldapPass);
+
+	if (result instanceof Error) {
+		throw result;
+	}
+
+	return result;
 });
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 27bf6422607..1245403dad7 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -52,7 +52,7 @@ export function getLdapUserUniqueID(ldapUser) {
 		if (Unique_Identifier_Field) {
 			Unique_Identifier_Field = {
 				attribute: Unique_Identifier_Field,
-				value: new Buffer(ldapUser[Unique_Identifier_Field]).toString('hex')
+				value: new Buffer(ldapUser[Unique_Identifier_Field], 'binary').toString('hex')
 			};
 		}
 		return Unique_Identifier_Field;
@@ -213,7 +213,7 @@ export function addLdapUser(ldapUser, username, password) {
 		userObject._id = Accounts.createUser(userObject);
 	} catch (error) {
 		logger.error('Error creating user', error);
-		throw error;
+		return error;
 	}
 
 	syncUserData(userObject, ldapUser);
@@ -257,10 +257,7 @@ export function importNewUsers(ldap) {
 			}
 
 			// Add user if it was not added before
-			const user = Meteor.users.findOne(userQuery);
-			if (!user) {
-				addLdapUser(ldapUser, username);
-			}
+			let user = Meteor.users.findOne(userQuery);
 
 			if (!user && username && RocketChat.settings.get('LDAP_Merge_Existing_Users') === true) {
 				const userQuery = {
@@ -269,12 +266,16 @@ export function importNewUsers(ldap) {
 
 				logger.debug('userQuery merge', userQuery);
 
-				const user = Meteor.users.findOne(userQuery);
+				user = Meteor.users.findOne(userQuery);
 				if (user) {
 					syncUserData(user, ldapUser);
 				}
 			}
 
+			if (!user) {
+				addLdapUser(ldapUser, username);
+			}
+
 			if (count % 100 === 0) {
 				logger.info('Import running. Users imported until now:', count);
 			}

From 308d937e54a0ae7a1a62c9f1900a2f30240ddfe6 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 25 Oct 2017 11:24:16 -0200
Subject: [PATCH 186/244] [FIX] Fix e-mail message forward

Closes #6179
---
 .../server/methods/mailMessages.js                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
index b3f782d74f4..8ac275a16db 100644
--- a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
+++ b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
@@ -55,7 +55,7 @@ Meteor.methods({
 		if (data.language !== 'en') {
 			const localeFn = Meteor.call('loadLocale', data.language);
 			if (localeFn) {
-				Function(localeFn)({moment});
+				Function(localeFn).call({moment});
 				moment.locale(data.language);
 			}
 		}

From d758ca6985b7c08300519095fe461268a4869e19 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 24 Oct 2017 17:48:43 -0200
Subject: [PATCH 187/244] Merge pull request #8635 from
 RocketChat/hotfix/channel-members-sort

[FIX] API channel/group.members not sorting
---
 packages/rocketchat-api/server/v1/channels.js | 14 ++++++++++----
 packages/rocketchat-api/server/v1/groups.js   | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index 5952837facf..d3803284980 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -424,14 +424,20 @@ RocketChat.API.v1.addRoute('channels.members', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort } = this.parseJsonQuery();
 
-		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult.usernames), {
-			sort: sort ? sort : -1,
+		let sortFn = (a, b) => a > b;
+		if (Match.test(sort, Object) && Match.test(sort.username, Number) && sort.username === -1) {
+			sortFn = (a, b) => b < a;
+		}
+
+		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult.usernames).sort(sortFn), {
 			skip: offset,
 			limit: count
 		});
 
-		const users = RocketChat.models.Users.find({ username: { $in: members } },
-			{ fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 } }).fetch();
+		const users = RocketChat.models.Users.find({ username: { $in: members } }, {
+			fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 },
+			sort: sort ? sort : { username: 1 }
+		}).fetch();
 
 		return RocketChat.API.v1.success({
 			members: users,
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index 29d5bdb4b7a..4a98d11e9be 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -368,14 +368,20 @@ RocketChat.API.v1.addRoute('groups.members', { authRequired: true }, {
 		const { offset, count } = this.getPaginationItems();
 		const { sort } = this.parseJsonQuery();
 
-		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult._room.usernames), {
-			sort: sort ? sort : -1,
+		let sortFn = (a, b) => a > b;
+		if (Match.test(sort, Object) && Match.test(sort.username, Number) && sort.username === -1) {
+			sortFn = (a, b) => b < a;
+		}
+
+		const members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult._room.usernames).sort(sortFn), {
 			skip: offset,
 			limit: count
 		});
 
-		const users = RocketChat.models.Users.find({ username: { $in: members } },
-			{ fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 } }).fetch();
+		const users = RocketChat.models.Users.find({ username: { $in: members } }, {
+			fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 },
+			sort: sort ? sort : { username: 1 }
+		}).fetch();
 
 		return RocketChat.API.v1.success({
 			members: users,

From 724fdf59a5d602d25c0a0fb528f0db9a7a5513c7 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 25 Oct 2017 11:00:21 -0200
Subject: [PATCH 188/244] Merge pull request #8634 from
 RocketChat/message-popup-menu-mobile

[FIX] Message popup menu on mobile/cordova
---
 .../client/imports/components/messages.css    |  22 +-
 .../client/imports/components/popover.css     |   2 +-
 .../client/views/app/mobileMessageMenu.js     |  74 -----
 .../rocketchat-ui/client/views/app/popover.js |  37 +++
 .../rocketchat-ui/client/views/app/room.js    | 268 +++++++++---------
 packages/rocketchat-ui/package.js             |   1 -
 6 files changed, 184 insertions(+), 220 deletions(-)
 delete mode 100644 packages/rocketchat-ui/client/views/app/mobileMessageMenu.js

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index f2ecefaca29..0d22af91ec8 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -37,15 +37,6 @@
 }
 
 .message {
-	&:hover,
-	&.active {
-		background-color: rgba(0, 0, 0, 0.05);
-
-		& .message-actions {
-			display: flex;
-		}
-	}
-
 	&.active {
 		& .message-actions__label {
 			color: var(--rc-color-button-primary);
@@ -96,3 +87,16 @@
 	right: auto;
 	left: 2px;
 }
+
+@media (width >= 500px) {
+	.message {
+		&:hover,
+		&.active {
+			background-color: rgba(0, 0, 0, 0.05);
+
+			& .message-actions {
+				display: flex;
+			}
+		}
+	}
+}
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index fc1011b3b5c..2cf63f88865 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -140,7 +140,7 @@
 	fill: currentColor;
 }
 
-@media (width <= 400px) {
+@media (width <= 500px) {
 	.rc-popover {
 		& .rc-popover__content {
 			top: initial !important;
diff --git a/packages/rocketchat-ui/client/views/app/mobileMessageMenu.js b/packages/rocketchat-ui/client/views/app/mobileMessageMenu.js
deleted file mode 100644
index c29754d5768..00000000000
--- a/packages/rocketchat-ui/client/views/app/mobileMessageMenu.js
+++ /dev/null
@@ -1,74 +0,0 @@
-const mobileMessageMenu = {
-	show(message, template, e, scope) {
-		if (!window.plugins.actionsheet) {
-			return false;
-		}
-
-		const options = {
-			'androidTheme': window.plugins.actionsheet.ANDROID_THEMES.THEME_HOLO_LIGHT,
-			'buttonLabels': [
-				TAPi18n.__('Report Abuse')
-			],
-			androidEnableCancelButton: true,
-			addCancelButtonWithLabel: TAPi18n.__('Cancel')
-		};
-
-		const buttonActions = [
-			mobileMessageMenu.reportAbuse
-		];
-
-		const buttons = RocketChat.MessageAction.getButtons(message, message.customClass || 'message-mobile');
-
-		for (let i = 0, len = buttons.length; i < len; i++) {
-			if (buttons[i].id === 'delete-message') {
-				options.addDestructiveButtonWithLabel = TAPi18n.__(buttons[i].i18nLabel);
-				buttonActions.unshift(buttons[i].action);
-			} else {
-				buttonActions.push(buttons[i].action);
-				options.buttonLabels.push(TAPi18n.__(buttons[i].i18nLabel));
-			}
-		}
-
-		window.plugins.actionsheet.show(options, (buttonIndex) => {
-			if (buttonActions[buttonIndex - 1] != null) {
-				return buttonActions[buttonIndex - 1].call(scope, e, template, message);
-			}
-		});
-
-	},
-	reportAbuse: (e, t, message) => {
-		swal({
-			title: TAPi18n.__('Report_this_message_question_mark'),
-			text: message.msg,
-			inputPlaceholder: TAPi18n.__('Why_do_you_want_to_report_question_mark'),
-			type: 'input',
-			showCancelButton: true,
-			confirmButtonColor: '#DD6B55',
-			confirmButtonText: TAPi18n.__('Report_exclamation_mark'),
-			cancelButtonText: TAPi18n.__('Cancel'),
-			closeOnConfirm: false,
-			html: false
-		}, (inputValue) => {
-			if (inputValue === false) {
-				return false;
-			}
-
-			if (inputValue === '') {
-				swal.showInputError(TAPi18n.__('You_need_to_write_something'));
-				return false;
-			}
-
-			Meteor.call('reportMessage', message._id, inputValue);
-
-			swal({
-				title: TAPi18n.__('Report_sent'),
-				text: TAPi18n.__('Thank_you_exclamation_mark '),
-				type: 'success',
-				timer: 1000,
-				showConfirmButton: false
-			});
-		});
-	}
-};
-
-this.mobileMessageMenu = mobileMessageMenu;
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 85180094ca7..58a947bbaca 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -92,6 +92,43 @@ Template.popover.events({
 		if ((button != null ? button.action : undefined) != null) {
 			button.action.call(t.data.data, e, t.data.instance);
 			popover.close();
+			return false;
+		}
+
+		if (e.currentTarget.dataset.id === 'report-abuse') {
+			const message = t.data.data._arguments[1];
+			swal({
+				title: TAPi18n.__('Report_this_message_question_mark'),
+				text: message.msg,
+				inputPlaceholder: TAPi18n.__('Why_do_you_want_to_report_question_mark'),
+				type: 'input',
+				showCancelButton: true,
+				confirmButtonColor: '#DD6B55',
+				confirmButtonText: TAPi18n.__('Report_exclamation_mark'),
+				cancelButtonText: TAPi18n.__('Cancel'),
+				closeOnConfirm: false,
+				html: false
+			}, (inputValue) => {
+				if (inputValue === false) {
+					return false;
+				}
+
+				if (inputValue === '') {
+					swal.showInputError(TAPi18n.__('You_need_to_write_something'));
+					return false;
+				}
+
+				Meteor.call('reportMessage', message._id, inputValue);
+
+				swal({
+					title: TAPi18n.__('Report_sent'),
+					text: TAPi18n.__('Thank_you_exclamation_mark '),
+					type: 'success',
+					timer: 1000,
+					showConfirmButton: false
+				});
+			});
+			popover.close();
 		}
 	},
 	'click [data-type="set-state"]'(e) {
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 6fa33dab578..2a78e136304 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -1,11 +1,9 @@
-/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , mobileMessageMenu , cordova , readMessage , RoomRoles, popover */
+/* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover , device */
 import moment from 'moment';
 import mime from 'mime-type/with-db';
 import Clipboard from 'clipboard';
 
 window.chatMessages = window.chatMessages || {};
-const socialSharing = (options = {}) => window.plugins.socialsharing.share(options.message, options.subject, options.file, options.link);
-
 const isSubscribed = _id => ChatSubscription.find({ rid: _id }).count() > 0;
 
 const favoritesEnabled = () => RocketChat.settings.get('Favorite_Rooms');
@@ -27,22 +25,22 @@ const openProfileTab = (e, instance, username) => {
 	}
 
 	instance.tabBar.setTemplate('membersList');
-	return instance.tabBar.open();
+	instance.tabBar.open();
 };
 
 const openProfileTabOrOpenDM = (e, instance, username) => {
 	if (RocketChat.settings.get('UI_Click_Direct_Message')) {
-		return Meteor.call('createDirectMessage', username, (error, result) => {
+		Meteor.call('createDirectMessage', username, (error, result) => {
 			if (error) {
 				if (error.isClientSafe) {
 					openProfileTab(e, instance, username);
 				} else {
-					return handleError(error);
+					handleError(error);
 				}
 			}
 
 			if ((result != null ? result.rid : undefined) != null) {
-				return FlowRouter.go('direct', { username }, FlowRouter.current().queryParams);
+				FlowRouter.go('direct', { username }, FlowRouter.current().queryParams);
 			}
 		});
 	} else {
@@ -50,14 +48,86 @@ const openProfileTabOrOpenDM = (e, instance, username) => {
 	}
 };
 
+const mountPopover = (e, i, outerContext) => {
+	let context = $(e.target).parents('.message').data('context');
+	if (!context) {
+		context = 'message';
+	}
+
+	const [, message] = outerContext._arguments;
+
+	let menuItems = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
+		return {
+			icon: item.icon,
+			name: t(item.label),
+			type: 'message-action',
+			id: item.id,
+			modifier: item.color
+		};
+	});
+
+	if (window.matchMedia('(max-width: 500px)').matches) {
+		const messageItems = RocketChat.MessageAction.getButtons(message, context, 'message').map(item => {
+			return {
+				icon: item.icon,
+				name: t(item.label),
+				type: 'message-action',
+				id: item.id,
+				modifier: item.color
+			};
+		});
+
+		menuItems = menuItems.concat(messageItems);
+	}
+
+	const [items, deleteItem] = menuItems.reduce((result, value) => (result[value.id === 'delete-message' ? 1 : 0].push(value), result), [[], []]);
+	const groups = [{ items }];
+
+	if (deleteItem.length) {
+		groups.push({ items: deleteItem });
+	}
+
+	if (typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios') {
+		groups.push({
+			items: [
+				{
+					icon: 'warning',
+					name: t('Report_Abuse'),
+					type: 'message-action',
+					id: 'report-abuse',
+					modifier: 'alert'
+				}
+			]
+		});
+	}
+
+	const config = {
+		columns: [
+			{
+				groups
+			}
+		],
+		instance: i,
+		data: outerContext,
+		mousePosition: {
+			x: e.clientX,
+			y: e.clientY
+		},
+		activeElement: $(e.currentTarget).parents('.message')[0],
+		onRendered: () => new Clipboard('.rc-popover__item')
+	};
+
+	popover.open(config);
+};
+
 Template.room.helpers({
 	isTranslated() {
 		const sub = ChatSubscription.findOne({ rid: this._id }, { fields: { autoTranslate: 1, autoTranslateLanguage: 1 } });
-		return RocketChat.settings.get('AutoTranslate_Enabled') && ((sub != null ? sub.autoTranslate : undefined) === true) && (sub.autoTranslateLanguage != null);
+		RocketChat.settings.get('AutoTranslate_Enabled') && ((sub != null ? sub.autoTranslate : undefined) === true) && (sub.autoTranslateLanguage != null);
 	},
 
 	embeddedVersion() {
-		return RocketChat.Layout.isEmbedded();
+		RocketChat.Layout.isEmbedded();
 	},
 
 	favorite() {
@@ -92,9 +162,9 @@ Template.room.helpers({
 				const index = hideMessagesOfType.indexOf(type);
 
 				if ((record.value === true) && (index === -1)) {
-					return hideMessagesOfType.push(type);
+					hideMessagesOfType.push(type);
 				} else if (index > -1) {
-					return hideMessagesOfType.splice(index, 1);
+					hideMessagesOfType.splice(index, 1);
 				}
 			});
 		});
@@ -333,14 +403,14 @@ Template.room.events({
 	},
 
 	'click, touchend'(e, t) {
-		return Meteor.setTimeout(() => t.sendToBottomIfNecessaryDebounced(), 100);
+		Meteor.setTimeout(() => t.sendToBottomIfNecessaryDebounced(), 100);
 	},
 
 	'click .messages-container-main'() {
 		const user = Meteor.user();
 
 		if ((Template.instance().tabBar.getState() === 'opened') && user && user.settings && user.settings.preferences && user.settings.preferences.hideFlexTab) {
-			return Template.instance().tabBar.close();
+			Template.instance().tabBar.close();
 		}
 	},
 
@@ -369,54 +439,20 @@ Template.room.events({
 			e.stopPropagation();
 		}
 
-		const message = this._arguments[1];
 		const doLongTouch = () => {
-
-			if ((window.plugins != null ? window.plugins.socialsharing : undefined) != null) {
-				isSocialSharingOpen = true;
-
-				if (e.target && (e.target.nodeName === 'A') && /^https?:\/\/.+/.test(e.target.getAttribute('href'))) {
-					if (message.attachments != null) {
-						const attachment = _.find(message.attachments, item => item.title === e.target.innerText);
-						if (attachment != null) {
-							socialSharing({
-								file: e.target.href,
-								subject: e.target.innerText,
-								message: message.msg
-							});
-							return;
-						}
-					}
-
-					socialSharing({
-						link: e.target.href,
-						subject: e.target.innerText,
-						message: message.msg
-					});
-					return;
-				}
-
-				if (e.target && (e.target.nodeName === 'IMG')) {
-					socialSharing({
-						file: e.target.src,
-						message: message.msg
-					});
-					return;
-				}
-			}
-
-			return mobileMessageMenu.show(message, t, e, this);
+			console.log('long press');
+			mountPopover(e, t, this);
 		};
 
 		Meteor.clearTimeout(t.touchtime);
-		return t.touchtime = Meteor.setTimeout(doLongTouch, 500);
+		t.touchtime = Meteor.setTimeout(doLongTouch, 500);
 	},
 
 	'click .message img'(e, t) {
 		Meteor.clearTimeout(t.touchtime);
 		if ((isSocialSharingOpen === true) || (touchMoved === true)) {
 			e.preventDefault();
-			return e.stopPropagation();
+			e.stopPropagation();
 		}
 	},
 
@@ -436,9 +472,9 @@ Template.room.events({
 			}
 
 			if ((typeof cordova !== 'undefined' && cordova !== null ? cordova.InAppBrowser : undefined) != null) {
-				return cordova.InAppBrowser.open(e.target.href, '_system');
+				cordova.InAppBrowser.open(e.target.href, '_system');
 			} else {
-				return window.open(e.target.href);
+				window.open(e.target.href);
 			}
 		}
 	},
@@ -452,20 +488,20 @@ Template.room.events({
 				touchMoved = true;
 			}
 		}
-		return Meteor.clearTimeout(t.touchtime);
+		Meteor.clearTimeout(t.touchtime);
 	},
 
 	'touchcancel .message'(e, t) {
-		return Meteor.clearTimeout(t.touchtime);
+		Meteor.clearTimeout(t.touchtime);
 	},
 
 	'click .upload-progress-text > button'(e) {
 		e.preventDefault();
-		return Session.set(`uploading-cancel-${ this.id }`, true);
+		Session.set(`uploading-cancel-${ this.id }`, true);
 	},
 
 	'click .unread-bar > button.mark-read'() {
-		return readMessage.readNow(true);
+		readMessage.readNow(true);
 	},
 
 	'click .unread-bar > button.jump-to'(e, t) {
@@ -473,20 +509,20 @@ Template.room.events({
 		const room = RoomHistoryManager.getRoom(_id);
 		let message = room && room.firstUnread.get();
 		if (message) {
-			return RoomHistoryManager.getSurroundingMessages(message, 50);
+			RoomHistoryManager.getSurroundingMessages(message, 50);
 		} else {
 			const subscription = ChatSubscription.findOne({ rid: _id });
 			message = ChatMessage.find({ rid: _id, ts: { $gt: (subscription != null ? subscription.ls : undefined) } }, { sort: { ts: 1 }, limit: 1 }).fetch()[0];
-			return RoomHistoryManager.getSurroundingMessages(message, 50);
+			RoomHistoryManager.getSurroundingMessages(message, 50);
 		}
 	},
 
 	'click .toggle-favorite'(event) {
 		event.stopPropagation();
 		event.preventDefault();
-		return Meteor.call('toggleFavorite', this._id, !$('i', event.currentTarget).hasClass('favorite-room'), function(err) {
+		Meteor.call('toggleFavorite', this._id, !$('i', event.currentTarget).hasClass('favorite-room'), function(err) {
 			if (err) {
-				return handleError(err);
+				handleError(err);
 			}
 		});
 	},
@@ -495,7 +531,7 @@ Template.room.events({
 		event.preventDefault();
 		Session.set('editRoomTitle', true);
 		$('.fixed-title').addClass('visible');
-		return Meteor.setTimeout(() => $('#room-title-field').focus().select(), 10);
+		Meteor.setTimeout(() => $('#room-title-field').focus().select(), 10);
 	},
 
 	'click .flex-tab .user-image > button'(e, instance) {
@@ -529,57 +565,19 @@ Template.room.events({
 
 		if (RoomHistoryManager.isLoading(this._id) === false && RoomHistoryManager.hasMore(this._id) === true || RoomHistoryManager.hasMoreNext(this._id) === true) {
 			if (RoomHistoryManager.hasMore(this._id) === true && e.target.scrollTop === 0) {
-				return RoomHistoryManager.getMore(this._id);
+				RoomHistoryManager.getMore(this._id);
 			} else if (RoomHistoryManager.hasMoreNext(this._id) === true && e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight) {
-				return RoomHistoryManager.getMoreNext(this._id);
+				RoomHistoryManager.getMoreNext(this._id);
 			}
 		}
 	}, 200),
 
 	'click .new-message'() {
 		Template.instance().atBottom = true;
-		return chatMessages[RocketChat.openedRoom].input.focus();
+		chatMessages[RocketChat.openedRoom].input.focus();
 	},
 	'click .message-actions__menu'(e, i) {
-		let context = $(e.target).parents('.message').data('context');
-		if (!context) {
-			context = 'message';
-		}
-
-		const [, message] = this._arguments;
-		const allItems = RocketChat.MessageAction.getButtons(message, context, 'menu').map(item => {
-			return {
-				icon: item.icon,
-				name: t(item.label),
-				type: 'message-action',
-				id: item.id,
-				modifier: item.color
-			};
-		});
-		const [items, deleteItem] = allItems.reduce((result, value) => (result[value.id === 'delete-message' ? 1 : 0].push(value), result), [[], []]);
-		const groups = [{ items }];
-
-		if (deleteItem.length) {
-			groups.push({ items: deleteItem });
-		}
-
-		const config = {
-			columns: [
-				{
-					groups
-				}
-			],
-			instance: i,
-			data: this,
-			mousePosition: {
-				x: e.clientX,
-				y: e.clientY
-			},
-			activeElement: $(e.currentTarget).parents('.message')[0],
-			onRendered: () => new Clipboard('.rc-popover__item')
-		};
-
-		popover.open(config);
+		mountPopover(e, i, this);
 	},
 
 	'click .mention-link'(e, instance) {
@@ -589,7 +587,7 @@ Template.room.events({
 		const channel = $(e.currentTarget).data('channel');
 		if (channel != null) {
 			if (RocketChat.Layout.isEmbedded()) {
-				return fireGlobalEvent('click-mention-link', { path: FlowRouter.path('channel', { name: channel }), channel });
+				fireGlobalEvent('click-mention-link', { path: FlowRouter.path('channel', { name: channel }), channel });
 			}
 
 			FlowRouter.go('channel', { name: channel }, FlowRouter.current().queryParams);
@@ -603,7 +601,7 @@ Template.room.events({
 
 	'click .image-to-download'(event) {
 		ChatMessage.update({ _id: this._arguments[1]._id, 'urls.url': $(event.currentTarget).data('url') }, { $set: { 'urls.$.downloadImages': true } });
-		return ChatMessage.update({ _id: this._arguments[1]._id, 'attachments.image_url': $(event.currentTarget).data('url') }, { $set: { 'attachments.$.downloadImages': true } });
+		ChatMessage.update({ _id: this._arguments[1]._id, 'attachments.image_url': $(event.currentTarget).data('url') }, { $set: { 'attachments.$.downloadImages': true } });
 	},
 
 	'click .collapse-switch'(e) {
@@ -616,27 +614,27 @@ Template.room.events({
 		}
 
 		if ((this._arguments[1] != null ? this._arguments[1].urls : undefined) != null) {
-			return ChatMessage.update({ _id: id }, { $set: { [`urls.${ index }.collapsed`]: !collapsed } });
+			ChatMessage.update({ _id: id }, { $set: { [`urls.${ index }.collapsed`]: !collapsed } });
 		}
 	},
 
 	'dragenter .dropzone'(e) {
 		const types = e.originalEvent && e.originalEvent.dataTransfer && e.originalEvent.dataTransfer.types;
 		if (types != null && types.length > 0 && _.every(types, type => type.indexOf('text/') === -1 || type.indexOf('text/uri-list') !== -1) && userCanDrop(this._id)) {
-			return e.currentTarget.classList.add('over');
+			e.currentTarget.classList.add('over');
 		}
 	},
 
 	'dragleave .dropzone-overlay'(e) {
-		return e.currentTarget.parentNode.classList.remove('over');
+		e.currentTarget.parentNode.classList.remove('over');
 	},
 
 	'dragover .dropzone-overlay'(e) {
 		e = e.originalEvent || e;
 		if (['move', 'linkMove'].includes(e.dataTransfer.effectAllowed)) {
-			return e.dataTransfer.dropEffect = 'move';
+			e.dataTransfer.dropEffect = 'move';
 		} else {
-			return e.dataTransfer.dropEffect = 'copy';
+			e.dataTransfer.dropEffect = 'copy';
 		}
 	},
 
@@ -656,7 +654,7 @@ Template.room.events({
 			});
 		}
 
-		return fileUpload(filesToUpload);
+		fileUpload(filesToUpload);
 	},
 
 	'load img'(e, template) {
@@ -666,7 +664,7 @@ Template.room.events({
 	'click .jump-recent button'(e, template) {
 		e.preventDefault();
 		template.atBottom = true;
-		return RoomHistoryManager.clear(template && template.data && template.data._id);
+		RoomHistoryManager.clear(template && template.data && template.data._id);
 	},
 
 	'click .message'(e, template) {
@@ -723,12 +721,12 @@ Template.room.onCreated(function() {
 		$('.messages-box .message.selected').removeClass('selected');
 		this.selectedMessages = [];
 		this.selectedRange = [];
-		return this.selectablePointer = null;
+		this.selectablePointer = null;
 	};
 
 	this.selectMessages = to => {
 		if ((this.selectablePointer === to) && (this.selectedRange.length > 0)) {
-			return this.selectedRange = [];
+			this.selectedRange = [];
 		} else {
 			const message1 = ChatMessage.findOne(this.selectablePointer);
 			const message2 = ChatMessage.findOne(to);
@@ -736,7 +734,7 @@ Template.room.onCreated(function() {
 			const minTs = _.min([message1.ts, message2.ts]);
 			const maxTs = _.max([message1.ts, message2.ts]);
 
-			return this.selectedRange = _.pluck(ChatMessage.find({ rid: message1.rid, ts: { $gte: minTs, $lte: maxTs } }).fetch(), '_id');
+			this.selectedRange = _.pluck(ChatMessage.find({ rid: message1.rid, ts: { $gte: minTs, $lte: maxTs } }).fetch(), '_id');
 		}
 	};
 
@@ -761,16 +759,16 @@ Template.room.onCreated(function() {
 	};
 
 	this.setUserDetail = username => {
-		return this.userDetail.set(username);
+		this.userDetail.set(username);
 	};
 
 	this.clearUserDetail = () => {
-		return this.userDetail.set(null);
+		this.userDetail.set(null);
 	};
 
 	Meteor.call('getRoomRoles', this.data._id, function(error, results) {
 		if (error) {
-			return handleError(error);
+			handleError(error);
 		}
 
 		return Array.from(results).map((record) => {
@@ -778,30 +776,30 @@ Template.room.onCreated(function() {
 			RoomRoles.upsert({ rid: record.rid, 'u._id': record.u._id }, record);
 		});
 	});
-	return RoomRoles.find({ rid: this.data._id }).observe({
+	RoomRoles.find({ rid: this.data._id }).observe({
 		added: role => {
 			if (!role.u || !role.u._id) {
 				return;
 			}
-			return ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
+			ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
 		}, // Update message to re-render DOM
 		changed: (role) => {
 			if (!role.u || !role.u._id) {
 				return;
 			}
-			return ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $inc: { rerender: 1 } }, { multi: true });
+			ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $inc: { rerender: 1 } }, { multi: true });
 		}, // Update message to re-render DOM
 		removed: role => {
 			if (!role.u || !role.u._id) {
 				return;
 			}
-			return ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
+			ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
 		}
 	});
 }); // Update message to re-render DOM
 
 Template.room.onDestroyed(function() {
-	return window.removeEventListener('resize', this.onWindowResize);
+	window.removeEventListener('resize', this.onWindowResize);
 });
 
 Template.room.onRendered(function() {
@@ -834,18 +832,18 @@ Template.room.onRendered(function() {
 
 	template.sendToBottom = function() {
 		wrapper.scrollTop = wrapper.scrollHeight - wrapper.clientHeight;
-		return newMessage.className = 'new-message background-primary-action-color color-content-background-color not';
+		newMessage.className = 'new-message background-primary-action-color color-content-background-color not';
 	};
 
 	template.checkIfScrollIsAtBottom = function() {
 		template.atBottom = template.isAtBottom(100);
 		readMessage.enable();
-		return readMessage.read();
+		readMessage.read();
 	};
 
 	template.sendToBottomIfNecessary = function() {
 		if (template.atBottom === true && template.isAtBottom() !== true) {
-			return template.sendToBottom();
+			template.sendToBottom();
 		}
 	};
 
@@ -870,12 +868,12 @@ Template.room.onRendered(function() {
 
 	wrapper.addEventListener('mousewheel', function() {
 		template.atBottom = false;
-		return Meteor.defer(() => template.checkIfScrollIsAtBottom());
+		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 	});
 
 	wrapper.addEventListener('wheel', function() {
 		template.atBottom = false;
-		return Meteor.defer(() => template.checkIfScrollIsAtBottom());
+		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 	});
 
 	wrapper.addEventListener('touchstart', () => template.atBottom = false);
@@ -883,12 +881,12 @@ Template.room.onRendered(function() {
 	wrapper.addEventListener('touchend', function() {
 		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 		Meteor.setTimeout(() => template.checkIfScrollIsAtBottom(), 1000);
-		return Meteor.setTimeout(() => template.checkIfScrollIsAtBottom(), 2000);
+		Meteor.setTimeout(() => template.checkIfScrollIsAtBottom(), 2000);
 	});
 
 	wrapper.addEventListener('scroll', function() {
 		template.atBottom = false;
-		return Meteor.defer(() => template.checkIfScrollIsAtBottom());
+		Meteor.defer(() => template.checkIfScrollIsAtBottom());
 	});
 
 	$('.flex-tab-bar').on('click', (/*e, t*/) =>
@@ -913,16 +911,16 @@ Template.room.onRendered(function() {
 			if (lastMessage != null) {
 				const subscription = ChatSubscription.findOne({ rid: template.data._id });
 				const count = ChatMessage.find({ rid: template.data._id, ts: { $lte: lastMessage.ts, $gt: (subscription != null ? subscription.ls : undefined) } }).count();
-				return template.unreadCount.set(count);
+				template.unreadCount.set(count);
 			} else {
-				return template.unreadCount.set(0);
+				template.unreadCount.set(0);
 			}
 		}
 	}, 300);
 
 	readMessage.onRead(function(rid) {
 		if (rid === template.data._id) {
-			return template.unreadCount.set(0);
+			template.unreadCount.set(0);
 		}
 	});
 
@@ -942,7 +940,7 @@ Template.room.onRendered(function() {
 
 			if (webrtc.localUrl.get() != null) {
 				this.tabBar.setTemplate('membersList');
-				return this.tabBar.open();
+				this.tabBar.open();
 			}
 		});
 	}
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 2547ed44148..3c192cedd2b 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -109,7 +109,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/createChannel.js', 'client');
 	api.addFiles('client/views/app/fullModal.js', 'client');
 	api.addFiles('client/views/app/home.js', 'client');
-	api.addFiles('client/views/app/mobileMessageMenu.js', 'client');
 	api.addFiles('client/views/app/privateHistory.js', 'client');
 	api.addFiles('client/views/app/room.js', 'client');
 	api.addFiles('client/views/app/roomSearch.js', 'client');

From 206d4130e7580cae56f5a323b683b35a2382ce57 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 25 Oct 2017 11:01:41 -0200
Subject: [PATCH 189/244] Merge pull request #8637 from
 RocketChat/create-channel-scroll

[FIX] Missing scroll at create channel page
---
 .../client/imports/components/modal/create-channel.css     | 7 +++++++
 .../client/imports/components/modal/full-modal.css         | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
index 12672ef1335..39700c4d9b9 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
@@ -1,4 +1,7 @@
 .create-channel {
+	display: flex;
+	flex-direction: column;
+
 	animation-name: fadeIn;
 	animation-duration: 1s;
 
@@ -25,6 +28,10 @@
 		font-size: var(--create-channel-description-text-size);
 	}
 
+	&__content {
+		overflow-y: auto;
+	}
+
 	&__switches {
 		display: flex;
 		flex-wrap: wrap;
diff --git a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
index 1eb2a86ac72..af893a63853 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/full-modal.css
@@ -12,6 +12,8 @@
 	&__wrapper {
 		position: relative;
 
+		display: flex;
+
 		width: var(--modal-wrapper-width);
 		margin: var(--modal-wrapper-margin) 0;
 	}

From 69df20541842f984e7513b719712f6fc805a5831 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 25 Oct 2017 11:25:44 -0200
Subject: [PATCH 190/244] Bump version to 0.59.2

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 15 +++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index fc754a6c030..6295a7399e6 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.1
+ENV RC_VERSION 0.59.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index ea4bc05c15a..eb1ecd402ec 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.1"),
+		appMarketingVersion = (defaultText = "0.59.2"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 945baf5120e..c3a41684ebd 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.1
+    RC_VERSION=0.59.2
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index ddda71f043f..b14730b4b24 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,18 @@
+<a name="0.59.2"></a>
+## 0.59.2 (2017-10-25)
+
+
+### Bug Fixes
+
+- [#8635](https://github.com/RocketChat/Rocket.Chat/pull/8635) API channel/group.members not sorting
+- [#8551](https://github.com/RocketChat/Rocket.Chat/pull/8551) encode filename in url to prevent links breaking
+- [#8577](https://github.com/RocketChat/Rocket.Chat/pull/8577) Fix guest pool inquiry taking
+- [#8613](https://github.com/RocketChat/Rocket.Chat/pull/8613) LDAP not merging existent users && Wrong id link generation
+- [#8634](https://github.com/RocketChat/Rocket.Chat/pull/8634) Message popup menu on mobile/cordova
+- [#8637](https://github.com/RocketChat/Rocket.Chat/pull/8637) Missing scroll at create channel page
+
+
+
 <a name="0.59.1"></a>
 ## 0.59.1 (2017-10-19)
 
diff --git a/package.json b/package.json
index 6aa4ad19c5d..b3840ac63b0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.1",
+	"version": "0.59.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 2d2da1c0aa7..3245a1d1252 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.1"
+	"version": "0.59.2"
 }

From 1dc7f721f85464a67c3b86c7ce274e52ca50f7df Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Wed, 25 Oct 2017 14:27:22 -0200
Subject: [PATCH 191/244] fix audio message icon

---
 .../startup/messageBoxActions.js              | 20 +++++++++++--------
 .../rocketchat-ui/client/views/app/popover.js | 11 ++++++++--
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-ui-message/startup/messageBoxActions.js b/packages/rocketchat-ui-message/startup/messageBoxActions.js
index 878dd2207ed..d10e17f5d32 100644
--- a/packages/rocketchat-ui-message/startup/messageBoxActions.js
+++ b/packages/rocketchat-ui-message/startup/messageBoxActions.js
@@ -1,4 +1,4 @@
-/* globals fileUpload chatMessages AudioRecorder device */
+/* globals fileUpload chatMessages AudioRecorder device popover */
 
 import mime from 'mime-type/with-db';
 import {VRecDialog} from 'meteor/rocketchat:ui-vrecord';
@@ -18,13 +18,15 @@ RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
 	condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/wav|audio\/\*/i)),
 	action({event, element}) {
 		event.preventDefault();
-		const icon = element;
+		const icon = element.querySelector('.rc-icon');
+
 		if (chatMessages[RocketChat.openedRoom].recording) {
-			return AudioRecorder.stop(function(blob) {
+			AudioRecorder.stop(function(blob) {
+				popover.close();
 				icon.style.color = '';
 				icon.classList.remove('pulse');
 				chatMessages[RocketChat.openedRoom].recording = false;
-				return fileUpload([
+				fileUpload([
 					{
 						file: blob,
 						type: 'audio',
@@ -32,9 +34,11 @@ RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
 					}
 				]);
 			});
+			return false;
 		}
+
 		chatMessages[RocketChat.openedRoom].recording = true;
-		return AudioRecorder.start(function() {
+		AudioRecorder.start(function() {
 			icon.classList.add('pulse');
 			icon.style.color = 'red';
 		});
@@ -71,7 +75,7 @@ RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
 					name: file.name
 				};
 			});
-			return fileUpload(filesToUpload);
+			fileUpload(filesToUpload);
 		}, {once: true});
 
 		input.remove();
@@ -87,7 +91,7 @@ RocketChat.messageBox.actions.add('Share', 'My_location', {
 		const latitude = position.coords.latitude;
 		const longitude = position.coords.longitude;
 		const text = `<div class="location-preview"><img style="height: 250px; width: 250px;" src="https://maps.googleapis.com/maps/api/staticmap?zoom=14&size=250x250&markers=color:gray%7Clabel:%7C${ latitude },${ longitude }&key=${ RocketChat.settings.get('MapView_GMapsAPIKey') }" /></div>`;
-		return swal({
+		swal({
 			title: t('Share_Location_Title'),
 			text,
 			showCancelButton: true,
@@ -98,7 +102,7 @@ RocketChat.messageBox.actions.add('Share', 'My_location', {
 			if (isConfirm !== true) {
 				return;
 			}
-			return Meteor.call('sendMessage', {
+			Meteor.call('sendMessage', {
 				_id: Random.id(),
 				rid,
 				msg: '',
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 58a947bbaca..3be489255b8 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -6,6 +6,10 @@ this.popover = {
 		this.renderedPopover = Blaze.renderWithData(Template.popover, config, document.body);
 	},
 	close() {
+		if (!this.renderedPopover) {
+			return false;
+		}
+
 		Blaze.remove(this.renderedPopover);
 
 		const activeElement = this.renderedPopover.dataVar.curValue.activeElement;
@@ -81,10 +85,13 @@ Template.popover.onRendered(function() {
 
 Template.popover.events({
 	'click [data-type="messagebox-action"]'(event, t) {
-		const action = RocketChat.messageBox.actions.getById(event.currentTarget.dataset.id);
+		const id = event.currentTarget.dataset.id;
+		const action = RocketChat.messageBox.actions.getById(id);
 		if ((action[0] != null ? action[0].action : undefined) != null) {
 			action[0].action({rid: t.data.data.rid, messageBox: document.querySelector('.rc-message-box'), element: event.currentTarget, event});
-			popover.close();
+			if (id !== 'audio-message') {
+				popover.close();
+			}
 		}
 	},
 	'click [data-type="message-action"]'(e, t) {

From ce9b8bb6ca75a21e13b9857eb75c18e06987f58e Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Wed, 25 Oct 2017 15:43:13 -0500
Subject: [PATCH 192/244] install grpc package manually to fix armhf build

---
 .snapcraft/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index 4c0e0808ba2..bc1b90aafb5 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -47,7 +47,7 @@ parts:
             - nodejs
     rocketchat-server:
         plugin: dump
-        prepare: cd programs/server; npm install
+        prepare: cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc
         after: [node]
         source: https://download.rocket.chat/build/#{RC_VERSION}.tgz
         source-type: tar

From e206d00db173a74d165028fb429c9fb537afaf7e Mon Sep 17 00:00:00 2001
From: Rodrigo Orem <orem.rodrigo@gmail.com>
Date: Thu, 26 Oct 2017 00:06:43 -0200
Subject: [PATCH 193/244] Update pt-BR translation

---
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index f172d3b5fc8..55f3ac2d106 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -15,7 +15,7 @@
   "Access_not_authorized": "Acesso não autorizado",
   "Access_Token_URL": "URL do Token de Acesso",
   "Accessing_permissions": "Acessando permissões",
-  "Account_SID": "Account SID",
+  "Account_SID": "SID da Conta",
   "Accounts": "Contas",
   "Accounts_AllowDeleteOwnAccount": "Permitir que usuários apaguem a própria conta",
   "Accounts_AllowedDomainsList": "Lista de domínios permitidos",
@@ -177,7 +177,7 @@
   "Are_you_sure_you_want_to_delete_your_account": "Tem certeza de que deseja excluir a sua conta?",
   "Assign_admin": "Atribuindo administrador",
   "at": "em",
-  "AtlassianCrowd": "Multidão Atlassian",
+  "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Arquivo Carregado",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
@@ -561,6 +561,7 @@
   "InternalHubot": "Hubot interno",
   "InternalHubot_ScriptsToLoad": "Scripts para carregar",
   "InternalHubot_ScriptsToLoad_Description": "Por favor insira uma lista separada por vírgula de scripts para carregar a partir de https://github.com/github/hubot-scripts/tree/master/src/scripts",
+  "InternalHubot_PathToLoadCustomScripts": "Pasta para carregar os scripts",
   "InternalHubot_Username_Description": "Este deve ser um nome de usuário válido de um bot registrado em seu servidor.",
   "Invalid_confirm_pass": "A confirmação de senha não é igual à senha",
   "Invalid_email": "O e-mail informado é inválido",
@@ -580,6 +581,19 @@
   "Invitation_Subject_Default": "Você foi convidado para [Site_Name]",
   "Invite_user_to_join_channel": "Convidar um usuário para este canal",
   "Invite_Users": "Convidar Usuários",
+  "IRC_Channel_Join": "Saída do comando JOIN.",
+  "IRC_Channel_Leave": "Saída do comando PART.",
+  "IRC_Channel_Users": "Saída do comando NAMES.",
+  "IRC_Channel_Users_End": "Fim da saída do comando NAMES.",
+  "IRC_Description": "Internet Relay Chat (IRC) é uma ferramenta de comunicação em grupo baseada em texto. Usuários entram em canais com nome único, ou salas, para discussões abertas. O IRC também suporta mensagens privadas e compartilhamento de arquivos. Esse pacote integra esses pacotes de funcionalidade com o Rocket.Chat.",
+  "IRC_Enabled": "Tenta integrar suport IRC. Alterar esse valor requer reiniciar o Rocket.Chat.",
+  "IRC_Hostname": "O servidor IRC para se conectar",
+  "IRC_Login_Fail": "Resposta a uma conexão com falha ao servidor IRC.",
+  "IRC_Login_Success": "Resposta a uma conexão bem sucedida ao servidor IRC.",
+  "IRC_Message_Cache_Size": "O limite cache para manipulação de mensagens de saída.",
+  "IRC_Port": "A porta para se conectar ao servidor IRC.",
+  "IRC_Private_Message": "Saída do comando PRIVMSG.",
+  "IRC_Quit": "Saída do encerramento de uma sessão IRC.",
   "is_also_typing": "também está digitando",
   "is_also_typing_female": "também está digitando",
   "is_also_typing_male": "também está digitando",
@@ -677,6 +691,8 @@
   "Loading_more_from_history": "Carregando mais a partir do histórico",
   "Loading_suggestion": "Buscando sugestões...",
   "Localization": "Localização",
+  "Log_Exceptions_to_Channel": "Log de Exceções no Canal",
+  "Log_Exceptions_to_Channel_Description": "Um canal que irá receber todas as exceções capturadas. Deixe em branco para ignorar exceções.",
   "Log_File": "Mostrar Arquivo e Linha",
   "Log_Level": "Nível de Log",
   "Log_Package": "Mostrar Pacote",
@@ -747,6 +763,7 @@
   "Messages": "Mensagens",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "As mensagens que são enviadas para o WebHook de Entrada serão publicadas aqui.",
   "Meta": "Meta",
+  "Meta_custom": "Meta Tags Personalizadas",
   "Meta_fb_app_id": "Facebook APP ID",
   "Meta_google-site-verification": "Verificação de Site do Google",
   "Meta_language": "Idioma",
@@ -941,6 +958,7 @@
   "Resend_verification_email": "Reenviar email de verificação",
   "Reset": "Resetar",
   "Reset_password": "Resetar senha",
+  "Reset_section_settings": "Redefinir configurações da seção",
   "Restart": "Reiniciar",
   "Restart_the_server": "Reiniciar o servidor",
   "Role": "Papel",
@@ -1298,4 +1316,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
\ No newline at end of file
+}

From ed8179784f5fbaa25f36d3db667aaafb3d683f75 Mon Sep 17 00:00:00 2001
From: Rodrigo Orem <orem.rodrigo@gmail.com>
Date: Thu, 26 Oct 2017 00:29:54 -0200
Subject: [PATCH 194/244] Product names shouldn't be translated

---
 packages/rocketchat-i18n/i18n/pt.i18n.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index ba9ac682068..eae8c278465 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -193,7 +193,7 @@
   "Are_you_sure_you_want_to_delete_your_account": "Tem certeza de que deseja excluir a sua conta?",
   "Assign_admin": "Atribuindo administrador",
   "at": "em",
-  "AtlassianCrowd": "Multidão Atlassian",
+  "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Arquivo Carregado",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
@@ -1341,4 +1341,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
\ No newline at end of file
+}

From 8c301ce590991c1bafdf39e078fa91edb36b5651 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 27 Oct 2017 10:14:03 -0200
Subject: [PATCH 195/244] [FIX] Fix typos

---
 packages/rocketchat-i18n/i18n/en.i18n.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 0965a258000..da4d5b12fa3 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1022,7 +1022,7 @@
   "LDAP_Host": "Host",
   "LDAP_Host_Description": "The LDAP host, e.g. `ldap.example.com` or `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Idle Timeout (ms)",
-  "LDAP_Idle_Timeout_Description": "How many mileseconds wait after the latest LDAP opration until close the connection. (Each opreation will open a new connection)",
+  "LDAP_Idle_Timeout_Description": "How many milliseconds wait after the latest LDAP operation until close the connection. (Each operation will open a new connection)",
   "LDAP_Import_Users_Description": "It True sync process will be import all LDAP users <br/> *Caution!* Specify search filter to not import excess users.",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "If the login on LDAP is not successful try to login in default/local account system. Helps when the LDAP is down for some reason.",
@@ -1720,7 +1720,7 @@
   "Survey_instructions": "Rate each question according to your satisfaction, 1 meaning you are completely unsatisfied and 5 meaning you are completely satisfied.",
   "Symbols": "Symbols",
   "Sync_success": "Sync success",
-  "Sync_in_progress": "Syncronization in progress",
+  "Sync_in_progress": "Synchronization in progress",
   "Sync_Users": "Sync Users",
   "System_messages": "System Messages",
   "Tag": "Tag",

From fa034c2303708900785fa74083abdf9b941f78d0 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 27 Oct 2017 18:02:07 -0200
Subject: [PATCH 196/244] [FIX] LDAP not respecting UTF8 characters & Sync
 Interval not working

---
 packages/rocketchat-ldap/server/ldap.js | 18 +++++++++++++-----
 packages/rocketchat-ldap/server/sync.js | 11 ++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index dee24df094a..5c9bfe25bb6 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -349,11 +349,19 @@ export default class LDAP {
 	}
 
 	extractLdapEntryData(entry) {
-		const values = entry.raw;
-		Object.keys(values).forEach((key) => {
-			const value = values[key];
-			if (!['thumbnailPhoto', 'jpegPhoto'].includes(key) && value instanceof Buffer) {
-				values[key] = value.toString('binary');
+		const values = {
+			_raw: entry.raw
+		};
+
+		Object.keys(values._raw).forEach((key) => {
+			const value = values._raw[key];
+
+			if (!['thumbnailPhoto', 'jpegPhoto'].includes(key)) {
+				if (value instanceof Buffer) {
+					values[key] = value.toString();
+				} else {
+					values[key] = value;
+				}
 			}
 		});
 
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 1245403dad7..8abf47353b5 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -47,12 +47,12 @@ export function getLdapUserUniqueID(ldapUser) {
 
 	if (Unique_Identifier_Field.length > 0) {
 		Unique_Identifier_Field = Unique_Identifier_Field.find((field) => {
-			return !_.isEmpty(ldapUser[field]);
+			return !_.isEmpty(ldapUser._raw[field]);
 		});
 		if (Unique_Identifier_Field) {
 			Unique_Identifier_Field = {
 				attribute: Unique_Identifier_Field,
-				value: new Buffer(ldapUser[Unique_Identifier_Field], 'binary').toString('hex')
+				value: ldapUser._raw[Unique_Identifier_Field].toString('hex')
 			};
 		}
 		return Unique_Identifier_Field;
@@ -151,7 +151,7 @@ export function syncUserData(user, ldapUser) {
 	}
 
 	if (user && user._id && RocketChat.settings.get('LDAP_Sync_User_Avatar') === true) {
-		const avatar = ldapUser.thumbnailPhoto || ldapUser.jpegPhoto;
+		const avatar = ldapUser._raw.thumbnailPhoto || ldapUser._raw.jpegPhoto;
 		if (avatar) {
 			logger.info('Syncing user avatar');
 
@@ -343,15 +343,16 @@ const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounce
 		return;
 	}
 
-	if (RocketChat.settings.get('LDAP_Sync_Interval')) {
+	if (RocketChat.settings.get('LDAP_Background_Sync_Interval')) {
 		logger.info('Enabling LDAP Background Sync');
 		SyncedCron.add({
 			name: jobName,
-			schedule: (parser) => parser.text(RocketChat.settings.get('LDAP_Sync_Interval')),
+			schedule: (parser) => parser.text(RocketChat.settings.get('LDAP_Background_Sync_Interval')),
 			job() {
 				sync();
 			}
 		});
+		SyncedCron.start();
 	}
 }), 500);
 

From 178c659a5d2e5509b7d7815fe06813a6d85f85d3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 17:48:07 -0200
Subject: [PATCH 197/244] Merge pull request #8691 from
 RocketChat/hotfix/ldap-utf8

[FIX] LDAP not respecting UTF8 characters & Sync Interval not working
---
 packages/rocketchat-ldap/server/ldap.js | 18 +++++++++++++-----
 packages/rocketchat-ldap/server/sync.js | 11 ++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index dee24df094a..5c9bfe25bb6 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -349,11 +349,19 @@ export default class LDAP {
 	}
 
 	extractLdapEntryData(entry) {
-		const values = entry.raw;
-		Object.keys(values).forEach((key) => {
-			const value = values[key];
-			if (!['thumbnailPhoto', 'jpegPhoto'].includes(key) && value instanceof Buffer) {
-				values[key] = value.toString('binary');
+		const values = {
+			_raw: entry.raw
+		};
+
+		Object.keys(values._raw).forEach((key) => {
+			const value = values._raw[key];
+
+			if (!['thumbnailPhoto', 'jpegPhoto'].includes(key)) {
+				if (value instanceof Buffer) {
+					values[key] = value.toString();
+				} else {
+					values[key] = value;
+				}
 			}
 		});
 
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 1245403dad7..8abf47353b5 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -47,12 +47,12 @@ export function getLdapUserUniqueID(ldapUser) {
 
 	if (Unique_Identifier_Field.length > 0) {
 		Unique_Identifier_Field = Unique_Identifier_Field.find((field) => {
-			return !_.isEmpty(ldapUser[field]);
+			return !_.isEmpty(ldapUser._raw[field]);
 		});
 		if (Unique_Identifier_Field) {
 			Unique_Identifier_Field = {
 				attribute: Unique_Identifier_Field,
-				value: new Buffer(ldapUser[Unique_Identifier_Field], 'binary').toString('hex')
+				value: ldapUser._raw[Unique_Identifier_Field].toString('hex')
 			};
 		}
 		return Unique_Identifier_Field;
@@ -151,7 +151,7 @@ export function syncUserData(user, ldapUser) {
 	}
 
 	if (user && user._id && RocketChat.settings.get('LDAP_Sync_User_Avatar') === true) {
-		const avatar = ldapUser.thumbnailPhoto || ldapUser.jpegPhoto;
+		const avatar = ldapUser._raw.thumbnailPhoto || ldapUser._raw.jpegPhoto;
 		if (avatar) {
 			logger.info('Syncing user avatar');
 
@@ -343,15 +343,16 @@ const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounce
 		return;
 	}
 
-	if (RocketChat.settings.get('LDAP_Sync_Interval')) {
+	if (RocketChat.settings.get('LDAP_Background_Sync_Interval')) {
 		logger.info('Enabling LDAP Background Sync');
 		SyncedCron.add({
 			name: jobName,
-			schedule: (parser) => parser.text(RocketChat.settings.get('LDAP_Sync_Interval')),
+			schedule: (parser) => parser.text(RocketChat.settings.get('LDAP_Background_Sync_Interval')),
 			job() {
 				sync();
 			}
 		});
+		SyncedCron.start();
 	}
 }), 500);
 

From 9b8b5affc030e25575486f60fd8165b5671cd8b2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 17:50:46 -0200
Subject: [PATCH 198/244] Merge pull request #8653 from
 RocketChat/fix-armhf-snap

install grpc package manually to fix snap armhf build
---
 .snapcraft/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index c085a3910b0..6484563839c 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -47,7 +47,7 @@ parts:
             - nodejs
     rocketchat-server:
         plugin: dump
-        prepare: cd programs/server; npm install
+        prepare: cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc
         after: [node]
         source: https://download.rocket.chat/build/rocket.chat-#{RC_VERSION}.tgz
         source-type: tar

From b3fcd6cfb1dca54a80dc2d1a2ae88787e40b1734 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 17:51:57 -0200
Subject: [PATCH 199/244] Merge pull request #8679 from
 RocketChat/sampaiodiego-patch-2

[FIX] Fix typos
---
 packages/rocketchat-i18n/i18n/en.i18n.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 9a2c48bcacd..f24aac1101d 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1022,7 +1022,7 @@
   "LDAP_Host": "Host",
   "LDAP_Host_Description": "The LDAP host, e.g. `ldap.example.com` or `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Idle Timeout (ms)",
-  "LDAP_Idle_Timeout_Description": "How many mileseconds wait after the latest LDAP opration until close the connection. (Each opreation will open a new connection)",
+  "LDAP_Idle_Timeout_Description": "How many milliseconds wait after the latest LDAP operation until close the connection. (Each operation will open a new connection)",
   "LDAP_Import_Users_Description": "It True sync process will be import all LDAP users <br/> *Caution!* Specify search filter to not import excess users.",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "If the login on LDAP is not successful try to login in default/local account system. Helps when the LDAP is down for some reason.",
@@ -1717,7 +1717,7 @@
   "Survey_instructions": "Rate each question according to your satisfaction, 1 meaning you are completely unsatisfied and 5 meaning you are completely satisfied.",
   "Symbols": "Symbols",
   "Sync_success": "Sync success",
-  "Sync_in_progress": "Syncronization in progress",
+  "Sync_in_progress": "Synchronization in progress",
   "Sync_Users": "Sync Users",
   "System_messages": "System Messages",
   "Tag": "Tag",

From 5eb068fee98bb9046176b8e86e1b2efabce21128 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 17:56:18 -0200
Subject: [PATCH 200/244] Merge pull request #8655 from rodorgas/develop

[FIX] Update pt-BR translation
---
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 24 ++++++++++++++++---
 packages/rocketchat-i18n/i18n/pt.i18n.json    |  4 ++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index f87e98ddbf8..c6ade2256c6 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -15,7 +15,7 @@
   "Access_not_authorized": "Acesso não autorizado",
   "Access_Token_URL": "URL do Token de Acesso",
   "Accessing_permissions": "Acessando permissões",
-  "Account_SID": "Account SID",
+  "Account_SID": "SID da Conta",
   "Accounts": "Contas",
   "Accounts_AllowDeleteOwnAccount": "Permitir que usuários apaguem a própria conta",
   "Accounts_AllowedDomainsList": "Lista de domínios permitidos",
@@ -177,7 +177,7 @@
   "Are_you_sure_you_want_to_delete_your_account": "Tem certeza de que deseja excluir a sua conta?",
   "Assign_admin": "Atribuindo administrador",
   "at": "em",
-  "AtlassianCrowd": "Multidão Atlassian",
+  "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Arquivo Carregado",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
@@ -561,6 +561,7 @@
   "InternalHubot": "Hubot interno",
   "InternalHubot_ScriptsToLoad": "Scripts para carregar",
   "InternalHubot_ScriptsToLoad_Description": "Por favor insira uma lista separada por vírgula de scripts para carregar a partir de https://github.com/github/hubot-scripts/tree/master/src/scripts",
+  "InternalHubot_PathToLoadCustomScripts": "Pasta para carregar os scripts",
   "InternalHubot_Username_Description": "Este deve ser um nome de usuário válido de um bot registrado em seu servidor.",
   "Invalid_confirm_pass": "A confirmação de senha não é igual à senha",
   "Invalid_email": "O e-mail informado é inválido",
@@ -580,6 +581,19 @@
   "Invitation_Subject_Default": "Você foi convidado para [Site_Name]",
   "Invite_user_to_join_channel": "Convidar um usuário para este canal",
   "Invite_Users": "Convidar Usuários",
+  "IRC_Channel_Join": "Saída do comando JOIN.",
+  "IRC_Channel_Leave": "Saída do comando PART.",
+  "IRC_Channel_Users": "Saída do comando NAMES.",
+  "IRC_Channel_Users_End": "Fim da saída do comando NAMES.",
+  "IRC_Description": "Internet Relay Chat (IRC) é uma ferramenta de comunicação em grupo baseada em texto. Usuários entram em canais com nome único, ou salas, para discussões abertas. O IRC também suporta mensagens privadas e compartilhamento de arquivos. Esse pacote integra esses pacotes de funcionalidade com o Rocket.Chat.",
+  "IRC_Enabled": "Tenta integrar suport IRC. Alterar esse valor requer reiniciar o Rocket.Chat.",
+  "IRC_Hostname": "O servidor IRC para se conectar",
+  "IRC_Login_Fail": "Resposta a uma conexão com falha ao servidor IRC.",
+  "IRC_Login_Success": "Resposta a uma conexão bem sucedida ao servidor IRC.",
+  "IRC_Message_Cache_Size": "O limite cache para manipulação de mensagens de saída.",
+  "IRC_Port": "A porta para se conectar ao servidor IRC.",
+  "IRC_Private_Message": "Saída do comando PRIVMSG.",
+  "IRC_Quit": "Saída do encerramento de uma sessão IRC.",
   "is_also_typing": "também está digitando",
   "is_also_typing_female": "também está digitando",
   "is_also_typing_male": "também está digitando",
@@ -677,6 +691,8 @@
   "Loading_more_from_history": "Carregando mais a partir do histórico",
   "Loading_suggestion": "Buscando sugestões...",
   "Localization": "Localização",
+  "Log_Exceptions_to_Channel": "Log de Exceções no Canal",
+  "Log_Exceptions_to_Channel_Description": "Um canal que irá receber todas as exceções capturadas. Deixe em branco para ignorar exceções.",
   "Log_File": "Mostrar Arquivo e Linha",
   "Log_Level": "Nível de Log",
   "Log_Package": "Mostrar Pacote",
@@ -746,6 +762,7 @@
   "Messages": "Mensagens",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "As mensagens que são enviadas para o WebHook de Entrada serão publicadas aqui.",
   "Meta": "Meta",
+  "Meta_custom": "Meta Tags Personalizadas",
   "Meta_fb_app_id": "Facebook APP ID",
   "Meta_google-site-verification": "Verificação de Site do Google",
   "Meta_language": "Idioma",
@@ -940,6 +957,7 @@
   "Resend_verification_email": "Reenviar email de verificação",
   "Reset": "Resetar",
   "Reset_password": "Resetar senha",
+  "Reset_section_settings": "Redefinir configurações da seção",
   "Restart": "Reiniciar",
   "Restart_the_server": "Reiniciar o servidor",
   "Role": "Papel",
@@ -1297,4 +1315,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index d0d507ee96c..46aeb332d53 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -193,7 +193,7 @@
   "Are_you_sure_you_want_to_delete_your_account": "Tem certeza de que deseja excluir a sua conta?",
   "Assign_admin": "Atribuindo administrador",
   "at": "em",
-  "AtlassianCrowd": "Multidão Atlassian",
+  "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Arquivo Carregado",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
@@ -1340,4 +1340,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
\ No newline at end of file
+}

From 9c75b7044f373316a21226b34e2aaaa6300190b4 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 18:02:02 -0200
Subject: [PATCH 201/244] Merge pull request #8431 from intwarehq/fix-8385

[FIX] Highlighted color height issue
---
 .../rocketchat-theme/client/imports/general/base_old.css    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 69055d64d9c..59c9a35863c 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3227,10 +3227,6 @@
 			list-style-type: decimal;
 		}
 
-		& > * + * {
-			padding-top: 10px;
-		}
-
 		& > table {
 			display: block;
 			overflow: auto;
@@ -3757,7 +3753,7 @@ body:not(.is-cordova) {
 			margin-bottom: 10px;
 		  }
 		}
-		
+
 		& .file-name {
 			display: block;
 

From 4c0f57a640503fc043d9d0049265fcfcb4a9c8b0 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 18:18:45 -0200
Subject: [PATCH 202/244] Merge pull request #8648 from
 RocketChat/fix-audio-message-icon

[FIX] Audio message icon
---
 .../startup/messageBoxActions.js              | 20 +++++++++++--------
 .../rocketchat-ui/client/views/app/popover.js | 11 ++++++++--
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-ui-message/startup/messageBoxActions.js b/packages/rocketchat-ui-message/startup/messageBoxActions.js
index 878dd2207ed..d10e17f5d32 100644
--- a/packages/rocketchat-ui-message/startup/messageBoxActions.js
+++ b/packages/rocketchat-ui-message/startup/messageBoxActions.js
@@ -1,4 +1,4 @@
-/* globals fileUpload chatMessages AudioRecorder device */
+/* globals fileUpload chatMessages AudioRecorder device popover */
 
 import mime from 'mime-type/with-db';
 import {VRecDialog} from 'meteor/rocketchat:ui-vrecord';
@@ -18,13 +18,15 @@ RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
 	condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/wav|audio\/\*/i)),
 	action({event, element}) {
 		event.preventDefault();
-		const icon = element;
+		const icon = element.querySelector('.rc-icon');
+
 		if (chatMessages[RocketChat.openedRoom].recording) {
-			return AudioRecorder.stop(function(blob) {
+			AudioRecorder.stop(function(blob) {
+				popover.close();
 				icon.style.color = '';
 				icon.classList.remove('pulse');
 				chatMessages[RocketChat.openedRoom].recording = false;
-				return fileUpload([
+				fileUpload([
 					{
 						file: blob,
 						type: 'audio',
@@ -32,9 +34,11 @@ RocketChat.messageBox.actions.add('Create_new', 'Audio_message', {
 					}
 				]);
 			});
+			return false;
 		}
+
 		chatMessages[RocketChat.openedRoom].recording = true;
-		return AudioRecorder.start(function() {
+		AudioRecorder.start(function() {
 			icon.classList.add('pulse');
 			icon.style.color = 'red';
 		});
@@ -71,7 +75,7 @@ RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
 					name: file.name
 				};
 			});
-			return fileUpload(filesToUpload);
+			fileUpload(filesToUpload);
 		}, {once: true});
 
 		input.remove();
@@ -87,7 +91,7 @@ RocketChat.messageBox.actions.add('Share', 'My_location', {
 		const latitude = position.coords.latitude;
 		const longitude = position.coords.longitude;
 		const text = `<div class="location-preview"><img style="height: 250px; width: 250px;" src="https://maps.googleapis.com/maps/api/staticmap?zoom=14&size=250x250&markers=color:gray%7Clabel:%7C${ latitude },${ longitude }&key=${ RocketChat.settings.get('MapView_GMapsAPIKey') }" /></div>`;
-		return swal({
+		swal({
 			title: t('Share_Location_Title'),
 			text,
 			showCancelButton: true,
@@ -98,7 +102,7 @@ RocketChat.messageBox.actions.add('Share', 'My_location', {
 			if (isConfirm !== true) {
 				return;
 			}
-			return Meteor.call('sendMessage', {
+			Meteor.call('sendMessage', {
 				_id: Random.id(),
 				rid,
 				msg: '',
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index 58a947bbaca..3be489255b8 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -6,6 +6,10 @@ this.popover = {
 		this.renderedPopover = Blaze.renderWithData(Template.popover, config, document.body);
 	},
 	close() {
+		if (!this.renderedPopover) {
+			return false;
+		}
+
 		Blaze.remove(this.renderedPopover);
 
 		const activeElement = this.renderedPopover.dataVar.curValue.activeElement;
@@ -81,10 +85,13 @@ Template.popover.onRendered(function() {
 
 Template.popover.events({
 	'click [data-type="messagebox-action"]'(event, t) {
-		const action = RocketChat.messageBox.actions.getById(event.currentTarget.dataset.id);
+		const id = event.currentTarget.dataset.id;
+		const action = RocketChat.messageBox.actions.getById(id);
 		if ((action[0] != null ? action[0].action : undefined) != null) {
 			action[0].action({rid: t.data.data.rid, messageBox: document.querySelector('.rc-message-box'), element: event.currentTarget, event});
-			popover.close();
+			if (id !== 'audio-message') {
+				popover.close();
+			}
 		}
 	},
 	'click [data-type="message-action"]'(e, t) {

From 4645ed3bbf9157ed8a73e3936e5c2a1644607e30 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 18:19:08 -0200
Subject: [PATCH 203/244] Merge pull request #8645 from
 RocketChat/sampaiodiego-patch-1

[FIX] Fix e-mail message forward
---
 .../server/methods/mailMessages.js                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
index b3f782d74f4..8ac275a16db 100644
--- a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
+++ b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
@@ -55,7 +55,7 @@ Meteor.methods({
 		if (data.language !== 'en') {
 			const localeFn = Meteor.call('loadLocale', data.language);
 			if (localeFn) {
-				Function(localeFn)({moment});
+				Function(localeFn).call({moment});
 				moment.locale(data.language);
 			}
 		}

From c7d45d41dc98c9a8ffcc0465225a8cc82c3b0f10 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 18:49:15 -0200
Subject: [PATCH 204/244] Merge pull request #8434 from vikaskedia/patch-1

removing a duplicate line
# Conflicts:
#	.docker/Dockerfile
---
 .docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 18f263eff54..bde4b061e37 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,7 +7,6 @@ MAINTAINER buildmaster@rocket.chat
 RUN set -x \
  && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz" -o rocket.chat.tgz \
  && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
- && mkdir /app \
  && gpg --verify rocket.chat.tgz.asc \
  && mkdir -p /app \
  && tar -zxf rocket.chat.tgz -C /app \

From 45b3cf7eadad253b0b7e39b0e6e44298a8b9ad3a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Oct 2017 17:58:54 -0200
Subject: [PATCH 205/244] Merge pull request #8593 from
 xenithorb/s3_contentdist_quote_fix

[FIX] AmazonS3: Quote file.name for ContentDisposition for files with commas
---
 packages/rocketchat-file-upload/ufs/AmazonS3/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
index 048732e8838..aa7343d7e42 100644
--- a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
+++ b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
@@ -138,7 +138,7 @@ export class AmazonS3Store extends UploadFS.Store {
 				Key: this.getPath(file),
 				Body: writeStream,
 				ContentType: file.type,
-				ContentDisposition: `inline; filename=${ file.name }`
+				ContentDisposition: `inline; filename="${ file.name }"`
 
 			}, (error) => {
 				if (error) {

From 21c4efa08a2854de8d2cccae3018e4bad58bbb85 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 29 Oct 2017 10:52:47 -0200
Subject: [PATCH 206/244] Bump version to 0.59.3

---
 .docker/Dockerfile                      |  2 +-
 .sandstorm/sandstorm-pkgdef.capnp       |  2 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 24 ++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index ed78d09215d..1e3ae0e864d 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:4
 
-ENV RC_VERSION 0.59.2
+ENV RC_VERSION 0.59.3
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index eb1ecd402ec..65091cf26af 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.2"),
+		appMarketingVersion = (defaultText = "0.59.3"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index c3a41684ebd..18f64517bd0 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.2
+    RC_VERSION=0.59.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index b14730b4b24..dbdf81d3277 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,27 @@
+<a name="0.59.3"></a>
+## 0.59.3 (2017-10-29)
+
+
+### Bug Fixes
+
+- [#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) AmazonS3: Quote file.name for ContentDisposition for files with commas
+- [#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648) Audio message icon
+- [#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645) Fix e-mail message forward
+- [#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679) Fix typos
+- [#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) Highlighted color height issue
+- [#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691) LDAP not respecting UTF8 characters & Sync Interval not working
+- [#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) Update pt-BR translation
+
+
+<details>
+<summary>Others</summary>
+
+- [#8653](https://github.com/RocketChat/Rocket.Chat/pull/8653) install grpc package manually to fix snap armhf build
+- [#8434](https://github.com/RocketChat/Rocket.Chat/pull/8434) removing a duplicate line
+</details>
+
+
+
 <a name="0.59.2"></a>
 ## 0.59.2 (2017-10-25)
 
diff --git a/package.json b/package.json
index b3840ac63b0..a24bd267011 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.2",
+	"version": "0.59.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 3245a1d1252..ebaf46b0c23 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.2"
+	"version": "0.59.3"
 }

From 13776a560aee601b89d9d0229b67e931ee00d2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20J=C3=A4gle?= <github@beimir.net>
Date: Mon, 30 Oct 2017 12:02:41 +0100
Subject: [PATCH 207/244] add historic chats icon - fixes 8703

---
 packages/rocketchat-ui-master/public/icons.svg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index c0bb0485187..1a7ac0eb282 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -4,6 +4,7 @@
     <symbol viewBox="0 0 20 20" id="icon-back"><g stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><path d="M7.5 15.06L2.44 10 7.5 4.94" /><path d="M3.333 10h11.67c.918 0 1.664.74 1.664 1.667v2.916" /><</symbol>
     <symbol viewBox="0 0 20 20" id="icon-bell"><path d="M18.19 15.552a.646.646 0 0 0-.212-.718c-.059-.047-1.454-1.169-1.454-3.353V8.154a6.57 6.57 0 0 0-6.563-6.563 6.57 6.57 0 0 0-6.563 6.563v3.537c0 1.862-1.399 3.161-1.412 3.172a.644.644 0 0 0 .431 1.123h15.165a.642.642 0 0 0 .608-.434zm-14.425-.854c.461-.721.922-1.755.922-3.007V8.154a5.281 5.281 0 0 1 5.275-5.275 5.28 5.28 0 0 1 5.275 5.275v3.327c0 1.412.464 2.487.94 3.217H3.765zm4.824 2.422a.644.644 0 1 0 0 1.288h2.824a.644.644 0 1 0 0-1.288H8.589z" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-bold"><path d="M10.627 16.25H6.16V4.8h4.38c1.052 0 1.88.257 2.483.77.603.513.905 1.209.905 2.087a2.49 2.49 0 0 1-.576 1.603c-.383.476-.85.764-1.4.865v.126c.783.101 1.404.401 1.865.901.46.5.69 1.128.69 1.884 0 1.006-.343 1.792-1.028 2.361-.685.569-1.636.853-2.852.853zM7.587 6.062v3.674h2.286c.868 0 1.52-.154 1.956-.46.436-.307.655-.765.655-1.373 0-.582-.198-1.034-.592-1.357-.394-.323-.945-.484-1.654-.484h-2.65zm0 8.926h2.826c.862 0 1.515-.172 1.96-.515.444-.344.666-.847.666-1.508s-.231-1.16-.694-1.496c-.463-.335-1.152-.503-2.067-.503h-2.69v4.022z" fill-rule="evenodd" /></symbol>
+    <symbol viewBox="0 0 28 28" id="icon-chat"><path d="M11 6c-4.875 0-9 2.75-9 6 0 1.719 1.156 3.375 3.156 4.531l1.516 0.875-0.547 1.313c0.328-0.187 0.656-0.391 0.969-0.609l0.688-0.484 0.828 0.156c0.781 0.141 1.578 0.219 2.391 0.219 4.875 0 9-2.75 9-6s-4.125-6-9-6zM11 4c6.078 0 11 3.578 11 8s-4.922 8-11 8c-0.953 0-1.875-0.094-2.75-0.25-1.297 0.922-2.766 1.594-4.344 2-0.422 0.109-0.875 0.187-1.344 0.25h-0.047c-0.234 0-0.453-0.187-0.5-0.453v0c-0.063-0.297 0.141-0.484 0.313-0.688 0.609-0.688 1.297-1.297 1.828-2.594-2.531-1.469-4.156-3.734-4.156-6.266 0-4.422 4.922-8 11-8zM23.844 22.266c0.531 1.297 1.219 1.906 1.828 2.594 0.172 0.203 0.375 0.391 0.313 0.688v0c-0.063 0.281-0.297 0.484-0.547 0.453-0.469-0.063-0.922-0.141-1.344-0.25-1.578-0.406-3.047-1.078-4.344-2-0.875 0.156-1.797 0.25-2.75 0.25-2.828 0-5.422-0.781-7.375-2.063 0.453 0.031 0.922 0.063 1.375 0.063 3.359 0 6.531-0.969 8.953-2.719 2.609-1.906 4.047-4.484 4.047-7.281 0-0.812-0.125-1.609-0.359-2.375 2.641 1.453 4.359 3.766 4.359 6.375 0 2.547-1.625 4.797-4.156 6.266z"></path></symbol>
     <symbol viewBox="0 0 20 20" id="icon-clip"><path d="M4.819 12.659l6.48-6.48a2.499 2.499 0 0 1 3.534-.005l-.583-.584a2.502 2.502 0 0 1 0 3.53l-6.017 6.017a3.997 3.997 0 0 1-5.654.006l.934.934a3.998 3.998 0 0 1 .007-5.655l6.902-6.902a4.586 4.586 0 0 1 6.481 0 4.586 4.586 0 0 1 0 6.483l-7.37 7.37" stroke-width="1.5" stroke="currentColor" fill="none" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-code"><g stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><path d="M5.833 13.88L1.953 10l3.88-3.88" /><path d="M11.661 3.8l-3.37 12.576L11.662 3.8z" stroke-linecap="square" /><path d="M14.167 6.12l3.88 3.88-3.88 3.88" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-cog"><g transform="translate(1.667 2.5)" stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><circle cx="8.333" cy="7.5" r="2.083" /><path d="M6.47 14.883l1.863-1.966 1.864 1.966a7.568 7.568 0 0 0 2.04-.845l-.074-2.708 2.708.073a7.568 7.568 0 0 0 .846-2.04L13.75 7.5l1.967-1.864a7.568 7.568 0 0 0-.846-2.04l-2.708.074.073-2.708a7.568 7.568 0 0 0-2.04-.845L8.334 2.083 6.47.117a7.568 7.568 0 0 0-2.04.845l.073 2.708-2.707-.073a7.568 7.568 0 0 0-.846 2.04L2.917 7.5.95 9.364a7.56 7.56 0 0 0 .846 2.04l2.707-.074-.073 2.708a7.568 7.568 0 0 0 2.04.845z" /></g></symbol>
@@ -66,4 +67,4 @@
     <symbol viewBox="0 0 20 20" id="icon-post"><g fill="none" fill-rule="evenodd"><path d="M0 0h20v20H0z"/><path stroke="currentColor" stroke-width="1.5" d="M5 3h6l4 4v10H5z"/><path d="M8.5 10.5h3M8.5 13.5h3" stroke="currentColor" stroke-width="1.5" stroke-linecap="square"/></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-discover"><g transform="translate(1 1)" fill="none" fill-rule="evenodd"><path d="M0 0h18v18H0z"/><circle stroke="currentColor" stroke-width="1.5" cx="9" cy="9" r="6.75"/><path d="M9 15.75c1.5 0 3-3.022 3-6.75s-1.5-6.75-3-6.75S6 5.272 6 9s1.5 6.75 3 6.75z" stroke="currentColor" stroke-width="1.5"/><path d="M2.25 9c0 1.5 3.022 3 6.75 3s6.75-1.5 6.75-3S12.728 6 9 6 2.25 7.5 2.25 9z" stroke="currentColor" stroke-width="1.5"/></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-import"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M10 7.5v9.583" stroke-linecap="square"/><path d="M13.333 14.581l-3.291 3.292L6.75 14.58m.75-2.913H5V2.5h10v9.167h-2.5"/></g></symbol>
-</svg>
\ No newline at end of file
+</svg>

From b83d6bdc754867a041bd1027c9df0c1c343d605d Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Mon, 30 Oct 2017 15:07:45 -0200
Subject: [PATCH 208/244] Fix username clipping on firefox

---
 .../client/imports/components/sidebar/sidebar-account.css        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index 3a2b3b64c5a..a6c1c08786d 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -61,6 +61,7 @@
 
 		font-size: var(--sidebar-account-username-size);
 		font-weight: var(--sidebar-account-username-weight);
+		line-height: calc(var(--sidebar-account-username-size) + 0.1rem);
 	}
 
 	&-visual-status {

From 4d25bead25c9f840f3b0593b12f804b5dc35ebbc Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 30 Oct 2017 15:03:13 -0200
Subject: [PATCH 209/244] [NEW] Upgrade Meteor to 1.6

---
 .eslintrc                                     |     4 +-
 .meteor/packages                              |    35 +-
 .meteor/release                               |     2 +-
 .meteor/versions                              |    93 +-
 .travis.yml                                   |     2 +-
 client/lib/handleError.js                     |     7 +-
 client/methods/deleteMessage.js               |     1 +
 client/methods/updateMessage.js               |     1 +
 client/routes/router.js                       |     3 +-
 lib/underscore.string.js                      |    16 -
 package-lock.json                             | 15622 ++++++++++++++--
 package.json                                  |    33 +-
 packages/autoupdate/package.js                |     3 +-
 .../.npm/package/npm-shrinkwrap.json          |    70 +-
 packages/meteor-accounts-saml/package.js      |     2 +-
 packages/meteor-accounts-saml/saml_server.js  |     1 +
 .../client/autocomplete-client.js             |     1 +
 .../meteor-autocomplete/client/templates.js   |     2 +
 packages/meteor-autocomplete/package.js       |     2 +-
 packages/meteor-timesync/package.js           |     2 +-
 .../.npm/package/npm-shrinkwrap.json          |     7 +-
 .../.npm/package/npm-shrinkwrap.json          |    17 +-
 packages/rocketchat-api/package.js            |     1 -
 packages/rocketchat-api/server/api.js         |     2 +
 packages/rocketchat-api/server/v1/channels.js |     2 +
 packages/rocketchat-api/server/v1/groups.js   |     2 +
 packages/rocketchat-api/server/v1/im.js       |     2 +
 packages/rocketchat-api/server/v1/misc.js     |     2 +
 packages/rocketchat-api/server/v1/settings.js |     2 +
 packages/rocketchat-api/server/v1/users.js    |     2 +
 .../.npm/package/npm-shrinkwrap.json          |    13 +-
 packages/rocketchat-assets/package.js         |     1 -
 packages/rocketchat-assets/server/assets.js   |     1 +
 .../client/lib/models/Subscriptions.js        |     2 +
 .../client/lib/models/Users.js                |     2 +
 packages/rocketchat-authorization/package.js  |     1 -
 .../server/functions/addUserRoles.js          |     2 +
 .../server/functions/removeUserFromRoles.js   |     2 +
 .../server/methods/addUserToRole.js           |     2 +
 .../server/methods/removeUserFromRole.js      |     2 +
 .../server/models/Base.js                     |     2 +
 .../server/models/Subscriptions.js            |     2 +
 .../.npm/package/npm-shrinkwrap.json          |     3 +-
 .../rocketchat-autolinker/client/client.js    |     4 +-
 .../client/lib/autotranslate.js               |     2 +
 .../client/views/autoTranslateFlexTab.js      |     1 +
 .../server/autotranslate.js                   |     3 +
 packages/rocketchat-bot-helpers/package.js    |     1 -
 .../rocketchat-bot-helpers/server/index.js    |     2 +
 .../.npm/package/npm-shrinkwrap.json          |    46 +-
 packages/rocketchat-cas/package.js            |     1 -
 packages/rocketchat-cas/server/cas_server.js  |     1 +
 .../client/views/mailMessagesInstructions.js  |     2 +
 .../server/methods/mailMessages.js            |     1 +
 .../client/lib/ChannelSettings.js             |     1 +
 .../client/views/channelSettings.js           |     1 +
 .../server/functions/saveRoomAnnouncement.js  |     2 +
 .../server/functions/saveRoomDescription.js   |     2 +
 .../server/functions/saveRoomTopic.js         |     2 +
 packages/rocketchat-colors/client/client.js   |     4 +-
 packages/rocketchat-cors/cors.js              |     1 +
 .../.npm/package/npm-shrinkwrap.json          |     3 +-
 .../client/custom_oauth_client.js             |     2 +
 packages/rocketchat-custom-oauth/package.js   |     2 -
 .../server/custom_oauth_server.js             |     1 +
 .../client/admin/adminSounds.js               |     4 +-
 .../client/admin/soundEdit.js                 |     1 +
 .../client/lib/CustomSounds.js                |     2 +
 packages/rocketchat-custom-sounds/package.js  |     1 -
 .../server/methods/insertOrUpdateSound.js     |     2 +
 .../server/publications/customSounds.js       |     2 +
 .../server/startup/custom-sounds.js           |     2 +
 .../admin/adminEmoji.js                       |     4 +-
 .../admin/emojiEdit.js                        |     1 +
 packages/rocketchat-emoji-custom/package.js   |     1 -
 .../server/methods/insertOrUpdateEmoji.js     |     3 +
 .../server/publications/fullEmojiData.js      |     2 +
 .../server/startup/emoji-custom.js            |     2 +
 .../rocketchat-emoji/client/emojiParser.js    |     6 +-
 .../client/lib/EmojiPicker.js                 |     2 +
 packages/rocketchat-emoji/package.js          |     1 -
 .../.npm/package/npm-shrinkwrap.json          |    13 +-
 .../lib/FileUploadBase.js                     |     1 +
 packages/rocketchat-file-upload/package.js    |     1 -
 .../server/config/AmazonS3.js                 |     1 +
 .../server/config/FileSystem.js               |     1 +
 .../server/config/GoogleStorage.js            |     1 +
 .../server/config/Slingshot_DEPRECATED.js     |     1 +
 .../server/config/_configUploadStorage.js     |     1 +
 .../server/methods/sendFileMessage.js         |     2 +
 .../ufs/AmazonS3/server.js                    |     2 +-
 .../.npm/package/npm-shrinkwrap.json          |    31 +-
 .../.npm/package/npm-shrinkwrap.json          |   591 +-
 .../client/client.js                          |     6 +-
 .../rocketchat-iframe-login/iframe_client.js  |     2 +
 packages/rocketchat-iframe-login/package.js   |     1 -
 .../.npm/package/npm-shrinkwrap.json          |     3 +-
 .../.npm/package/npm-shrinkwrap.json          |    31 +-
 .../rocketchat-importer-hipchat/server.js     |     6 +-
 packages/rocketchat-importer-slack/server.js  |     2 +
 .../.npm/package/npm-shrinkwrap.json          |    10 +-
 .../client/admin/adminImport.js               |     2 +
 .../client/admin/adminImportPrepare.js        |     2 +
 .../views/integrationsOutgoingHistory.js      |     1 +
 packages/rocketchat-integrations/package.js   |     1 -
 .../rocketchat-integrations/server/api/api.js |     3 +
 .../server/lib/triggerHandler.js              |     2 +
 .../server/lib/validation.js                  |     2 +
 .../incoming/addIncomingIntegration.js        |     2 +
 .../incoming/updateIncomingIntegration.js     |     2 +
 .../server/processWebhookMessage.js           |     7 +-
 .../.npm/package/npm-shrinkwrap.json          |   279 +-
 packages/rocketchat-internal-hubot/hubot.js   |     3 +
 packages/rocketchat-internal-hubot/package.js |     2 -
 .../.npm/package/npm-shrinkwrap.json          |     5 +-
 packages/rocketchat-irc/package.js            |     1 -
 packages/rocketchat-irc/server/server.js      |     1 +
 packages/rocketchat-issuelinks/client.js      |     4 +-
 packages/rocketchat-katex/katex.js            |     5 +-
 packages/rocketchat-katex/package-lock.json   |     6 +-
 packages/rocketchat-katex/package.js          |     2 -
 packages/rocketchat-ldap/package.js           |     1 -
 packages/rocketchat-ldap/server/sync.js       |     1 +
 .../.npm/package/npm-shrinkwrap.json          |   209 +-
 packages/rocketchat-lib/client/AdminBox.js    |     2 +
 .../rocketchat-lib/client/MessageAction.js    |     1 +
 packages/rocketchat-lib/client/OAuthProxy.js  |     1 +
 packages/rocketchat-lib/client/lib/TabBar.js  |     2 +
 .../client/lib/cachedCollection.js            |     1 +
 .../rocketchat-lib/client/lib/openRoom.js     |     2 +
 .../rocketchat-lib/client/lib/roomTypes.js    |     2 +
 .../client/methods/sendMessage.js             |     4 +-
 packages/rocketchat-lib/lib/Message.js        |     6 +-
 packages/rocketchat-lib/lib/callbacks.js      |     2 +
 .../lib/fileUploadRestrictions.js             |     2 +
 packages/rocketchat-lib/lib/getURL.js         |     8 +-
 .../rocketchat-lib/lib/getValidRoomName.js    |     2 +
 packages/rocketchat-lib/lib/placeholders.js   |     6 +-
 packages/rocketchat-lib/lib/promises.js       |     1 +
 packages/rocketchat-lib/lib/settings.js       |     1 +
 packages/rocketchat-lib/package.js            |     2 -
 .../functions/checkEmailAvailability.js       |     2 +
 .../functions/checkUsernameAvailability.js    |     3 +
 .../server/functions/createRoom.js            |     3 +
 .../server/functions/getFullUserData.js       |     3 +
 .../getRoomByNameOrIdWithOptionToJoin.js      |     2 +
 .../server/functions/saveCustomFields.js      |     2 +
 .../saveCustomFieldsWithoutValidation.js      |     2 +
 .../server/functions/saveUser.js              |     3 +
 .../server/functions/sendMessage.js           |     2 +
 .../server/functions/setEmail.js              |     2 +
 .../server/functions/setRealName.js           |     2 +
 .../server/functions/setUsername.js           |     1 +
 .../server/functions/settings.js              |     2 +
 .../server/functions/validateCustomFields.js  |     2 +
 .../rocketchat-lib/server/lib/RateLimiter.js  |     2 +
 packages/rocketchat-lib/server/lib/debug.js   |     2 +
 .../server/lib/notifyUsersOnMessage.js        |     2 +
 .../server/lib/sendEmailOnMessage.js          |     1 +
 .../server/lib/sendNotificationsOnMessage.js  |     2 +
 .../server/lib/validateEmailDomain.js         |     1 +
 .../server/methods/addOAuthService.js         |     1 +
 .../server/methods/deleteUserOwnAccount.js    |     2 +
 .../server/methods/filterATAllTag.js          |     2 +
 .../server/methods/getChannelHistory.js       |     2 +
 .../server/methods/getRoomRoles.js            |     2 +
 .../server/methods/getUserRoles.js            |     2 +
 .../server/methods/removeOAuthService.js      |     2 +
 .../server/methods/robotMethods.js            |     2 +
 .../server/methods/sendInvitationEmail.js     |     1 +
 .../server/methods/setUsername.js             |     2 +
 .../rocketchat-lib/server/models/Avatars.js   |     2 +
 .../rocketchat-lib/server/models/Messages.js  |     2 +
 .../rocketchat-lib/server/models/Reports.js   |     2 +
 .../rocketchat-lib/server/models/Rooms.js     |     3 +
 .../server/models/Subscriptions.js            |     2 +
 .../rocketchat-lib/server/models/Uploads.js   |     2 +
 .../rocketchat-lib/server/models/Users.js     |     3 +
 .../server/models/_BaseCache.js               |     2 +-
 .../rocketchat-lib/server/models/_BaseDb.js   |     1 +
 .../rocketchat-lib/server/oauth/google.js     |     1 +
 packages/rocketchat-lib/server/oauth/oauth.js |     2 +
 packages/rocketchat-lib/server/oauth/proxy.js |     1 +
 .../server/publications/settings.js           |     2 +
 .../server/startup/oAuthServicesUpdate.js     |     2 +
 .../server/startup/settingsOnLoadCdnPrefix.js |     2 +
 .../startup/settingsOnLoadDirectReply.js      |     1 +
 .../server/startup/settingsOnLoadSMTP.js      |     2 +
 .../rocketchat-livechat/app/.meteor/packages  |    26 +-
 .../rocketchat-livechat/app/.meteor/release   |     2 +-
 .../rocketchat-livechat/app/.meteor/versions  |    73 +-
 .../app/client/lib/chatMessages.js            |     2 +
 .../client/lib/fromApp/RoomHistoryManager.js  |     2 +
 .../app/client/lib/msgTyping.js               |     2 +
 .../app/client/lib/tapi18n.js                 |     2 +
 .../app/client/methods/sendMessageExternal.js |     2 +
 .../app/client/views/message.js               |     1 +
 .../app/client/views/messages.js              |     1 +
 .../app/client/views/offlineForm.js           |     3 +
 .../app/client/views/register.js              |     1 +
 .../rocketchat-livechat/app/package-lock.json |    43 +-
 packages/rocketchat-livechat/app/package.json |     6 +-
 .../client/views/app/livechatAppearance.js    |    11 +-
 .../client/views/app/livechatCurrentChats.js  |     1 +
 .../views/app/livechatDepartmentForm.js       |     2 +
 .../client/views/app/livechatInstallation.js  |     2 +
 .../client/views/app/livechatIntegrations.js  |     5 +-
 .../client/views/app/livechatUsers.js         |     1 +
 .../client/views/app/tabbar/visitorInfo.js    |     2 +
 .../imports/server/rest/users.js              |     2 +
 packages/rocketchat-livechat/livechat.js      |     1 +
 packages/rocketchat-livechat/package.js       |     1 -
 packages/rocketchat-livechat/permissions.js   |     2 +
 .../server/hooks/externalMessage.js           |     1 +
 .../server/lib/Livechat.js                    |     2 +
 .../server/lib/QueueMethods.js                |     2 +
 .../server/methods/getInitialData.js          |     2 +
 .../server/methods/saveIntegration.js         |     2 +
 .../server/methods/saveSurveyFeedback.js      |     1 +
 .../server/methods/searchAgent.js             |     2 +
 .../server/models/LivechatCustomField.js      |     2 +
 .../server/models/LivechatDepartment.js       |     2 +
 .../server/models/LivechatDepartmentAgents.js |     1 +
 .../server/models/Rooms.js                    |     2 +
 .../server/models/Users.js                    |     2 +
 .../server/publications/customFields.js       |     2 +
 .../rocketchat-livechat/server/rest/users.js  |     2 +
 packages/rocketchat-logger/client/logger.js   |     2 +
 .../client/views/viewLogs.js                  |     1 +
 packages/rocketchat-logger/package.js         |     1 -
 packages/rocketchat-logger/server/server.js   |     2 +
 .../.npm/package/npm-shrinkwrap.json          |     8 +-
 packages/rocketchat-markdown/markdown.js      |     5 +-
 packages/rocketchat-markdown/package.js       |     1 -
 .../parser/marked/marked.js                   |     9 +-
 .../parser/original/code.js                   |     8 +-
 .../parser/original/markdown.js               |     8 +-
 .../rocketchat-markdown/tests/client.mocks.js |     2 -
 .../client/views/mentionsFlexTab.js           |     2 +
 .../rocketchat-mentions-flextab/package.js    |     1 -
 packages/rocketchat-mentions/package.js       |     3 +-
 packages/rocketchat-mentions/server.js        |     2 +
 .../rocketchat-message-attachments/package.js |     1 -
 .../client/views/pinnedMessages.js            |     2 +
 packages/rocketchat-message-pin/package.js    |     1 -
 .../client/messageType.js                     |     4 +-
 .../client/tabBar/views/snippetMessage.js     |     4 +-
 .../client/tabBar/views/snippetedMessages.js  |     2 +
 .../rocketchat-message-snippet/package.js     |     1 -
 .../client/actionButton.js                    |     2 +
 .../client/views/starredMessages.js           |     2 +
 packages/rocketchat-message-star/package.js   |     1 -
 packages/rocketchat-migrations/migrations.js  |     1 +
 packages/rocketchat-migrations/package.js     |     1 -
 .../admin/server/methods/addOAuthApp.js       |     2 +
 .../admin/server/methods/updateOAuthApp.js    |     2 +
 .../oauth/server/oauth2-server.js             |     1 +
 .../.npm/package/npm-shrinkwrap.json          |    11 +-
 .../client/oembedUrlWidget.js                 |     2 +
 packages/rocketchat-oembed/package.js         |     1 -
 .../rocketchat-oembed/server/jumpToMessage.js |     1 +
 .../rocketchat-oembed/server/providers.js     |     2 +-
 packages/rocketchat-oembed/server/server.js   |     2 +
 .../client/rocketchat.otr.room.js             |     1 +
 .../minifier-postcss/npm-shrinkwrap.json      |    38 +-
 .../rocketchat-push-notifications/package.js  |     1 -
 .../client/methods/setReaction.js             |     2 +
 packages/rocketchat-reactions/setReaction.js  |     2 +
 .../rocketchat-sandstorm/server/events.js     |     2 +
 .../.npm/package/npm-shrinkwrap.json          |   169 +-
 .../server/slackbridge.js                     |     1 +
 packages/rocketchat-slashcommands-me/me.js    |     3 +-
 .../rocketchat-smarsh-connector/package.js    |     3 +-
 .../server/functions/generateEml.js           |     1 +
 .../server/functions/sendEmail.js             |     2 +
 .../server/startup.js                         |     2 +
 .../.npm/package/npm-shrinkwrap.json          |   161 +-
 packages/rocketchat-spotify/lib/spotify.js    |     4 +-
 packages/rocketchat-spotify/package.js        |     1 -
 .../server/functions/get.js                   |     2 +
 .../.npm/package/npm-shrinkwrap.json          |   172 +-
 packages/rocketchat-theme/package.js          |     1 -
 packages/rocketchat-theme/server/server.js    |     1 +
 .../.npm/package/npm-shrinkwrap.json          |     5 +-
 .../client/accountPreferences.js              |     4 +-
 .../client/accountProfile.js                  |    23 +-
 .../client/avatar/prompt.js                   |     7 +-
 packages/rocketchat-ui-account/package.js     |     1 -
 packages/rocketchat-ui-admin/client/admin.js  |     7 +-
 .../rocketchat-ui-admin/client/adminFlex.js   |     5 +-
 .../rocketchat-ui-admin/client/adminInfo.js   |     7 +-
 .../client/rooms/adminRooms.js                |     6 +-
 .../client/users/adminInviteUser.js           |     2 +
 .../client/users/adminUsers.js                |     5 +-
 packages/rocketchat-ui-admin/package.js       |     1 -
 .../publications/adminRooms.js                |     5 +-
 .../client/tabs/membersList.js                |     1 +
 .../client/tabs/messageSearch.js              |     2 +
 .../client/tabs/uploadedFilesList.js          |     3 +
 .../client/tabs/userEdit.js                   |     1 +
 .../client/tabs/userInfo.js                   |     2 +
 packages/rocketchat-ui-flextab/package.js     |     1 -
 .../rocketchat-ui-login/client/login/form.js  |     2 +
 .../client/login/services.js                  |     5 +-
 packages/rocketchat-ui-login/package.js       |     1 -
 .../.npm/package/npm-shrinkwrap.json          |    11 +-
 packages/rocketchat-ui-master/client/main.js  |     5 +-
 packages/rocketchat-ui-master/package.js      |     1 -
 .../rocketchat-ui-master/server/inject.js     |     2 +
 .../rocketchat-ui-message/client/message.js   |     1 +
 .../client/popup/messagePopup.js              |     3 +
 .../client/popup/messagePopupConfig.js        |     2 +
 .../client/renderMessageBody.js               |     5 +-
 packages/rocketchat-ui-message/package.js     |     1 -
 .../client/createCombinedFlex.js              |     2 +
 .../client/listChannelsFlex.js                |     5 +-
 .../client/listCombinedFlex.js                |     7 +-
 .../client/listPrivateGroupsFlex.js           |     5 +-
 .../rocketchat-ui-sidenav/client/roomList.js  |     2 +
 .../rocketchat-ui-sidenav/client/toolbar.js   |     2 +
 packages/rocketchat-ui-sidenav/package.js     |     1 -
 packages/rocketchat-ui-vrecord/package.js     |     1 -
 .../.npm/package/npm-shrinkwrap.json          |    11 +-
 .../client/lib/RoomHistoryManager.js          |     2 +
 .../rocketchat-ui/client/lib/RoomManager.js   |     2 +
 .../rocketchat-ui/client/lib/accountBox.js    |     2 +
 .../rocketchat-ui/client/lib/chatMessages.js  |     7 +-
 .../rocketchat-ui/client/lib/collections.js   |     2 +
 .../client/lib/cordova/user-state.js          |     1 +
 .../rocketchat-ui/client/lib/fileUpload.js    |     2 +
 .../client/lib/iframeCommands.js              |     4 +-
 packages/rocketchat-ui/client/lib/menu.js     |     1 +
 .../rocketchat-ui/client/lib/msgTyping.js     |     2 +
 .../rocketchat-ui/client/lib/notification.js  |     5 +-
 .../rocketchat-ui/client/lib/readMessages.js  |     2 +
 packages/rocketchat-ui/client/lib/tapi18n.js  |     2 +
 .../client/views/app/createChannel.js         |     2 +
 .../rocketchat-ui/client/views/app/room.js    |     1 +
 packages/rocketchat-ui/package.js             |     1 -
 packages/rocketchat-videobridge/package.js    |     1 -
 server/configuration/accounts_meld.js         |     2 +
 server/lib/accounts.js                        |     3 +
 server/lib/cordova/facebook-login.js          |     2 +
 server/methods/afterVerifyEmail.js            |     2 +
 server/methods/channelsList.js                |     5 +-
 server/methods/getUsernameSuggestion.js       |     1 +
 server/methods/groupsList.js                  |     5 +-
 server/methods/loadHistory.js                 |     2 +
 server/methods/loadNextMessages.js            |     2 +
 server/methods/loadSurroundingMessages.js     |     2 +
 server/methods/messageSearch.js               |     2 +
 server/methods/registerUser.js                |     2 +
 server/methods/sendForgotPasswordEmail.js     |     2 +
 server/publications/messages.js               |     2 +
 server/publications/room.js                   |     2 +
 server/publications/spotlight.js              |     2 +
 server/publications/userAutocomplete.js       |     2 +
 server/startup/avatar.js                      |     1 +
 server/startup/i18n-validation.js             |     3 +
 server/startup/initialData.js                 |     2 +
 server/startup/migrations/v007.js             |     1 +
 server/startup/migrations/v010.js             |     2 +
 server/startup/migrations/v019.js             |     2 +
 server/startup/migrations/v055.js             |     2 +
 server/startup/migrations/v060.js             |     2 +
 server/startup/migrations/v064.js             |     2 +
 server/startup/migrations/xrun.js             |     2 +
 server/stream/streamBroadcast.js              |     1 +
 368 files changed, 15508 insertions(+), 3128 deletions(-)
 delete mode 100644 lib/underscore.string.js

diff --git a/.eslintrc b/.eslintrc
index 6e652c53b84..c44576ad176 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,7 @@
 		"sourceType": "module",
 		"ecmaVersion": 2017,
 		"ecmaFeatures": {
-				"experimentalObjectRestSpread" : true,
+				"experimentalObjectRestSpread" : true
 		}
 	},
 	"env": {
@@ -89,7 +89,6 @@
 		"object-shorthand": 2
 	},
 	"globals": {
-		"_"                           : false,
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
 		"Accounts"                    : false,
@@ -135,7 +134,6 @@
 		"RocketChatFile"              : false,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
-		"s"                           : false,
 		"ServiceConfiguration"        : false,
 		"Session"                     : false,
 		"Settings"                    : false,
diff --git a/.meteor/packages b/.meteor/packages
index 75080384110..f0837a936ed 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -4,36 +4,36 @@
 # but you can also edit it by hand.
 
 rocketchat:cors
-accounts-facebook@1.2.1
-accounts-github@1.3.0
-accounts-google@1.2.0
-accounts-meteor-developer@1.3.0
-accounts-password@1.4.0
-accounts-twitter@1.3.0
+accounts-facebook@1.3.0
+accounts-github@1.4.0
+accounts-google@1.3.0
+accounts-meteor-developer@1.4.0
+accounts-password@1.5.0
+accounts-twitter@1.4.0
 blaze-html-templates
 check@1.2.5
 ddp-rate-limiter@1.0.7
-ecmascript@0.8.3
-ejson@1.0.14
+ecmascript@0.9.0
+ejson@1.1.0
 email@1.2.3
 fastclick@1.0.13
-http@1.2.12
+http@1.3.0
 jquery@1.11.10
-less@2.7.9
-logging@1.1.17
-meteor-base@1.1.0
+less@2.7.11
+logging@1.1.19
+meteor-base@1.2.0
 mobile-experience@1.0.5
-mongo@1.2.2
+mongo@1.3.0
 random@1.0.10
 rate-limit@1.0.8
-reactive-dict@1.1.9
+reactive-dict@1.2.0
 reactive-var@1.0.11
 reload@1.1.11
 service-configuration@1.0.11
 session@1.1.7
-shell-server@0.2.4
+shell-server@0.3.0
 spacebars
-standard-minifier-js@2.1.2
+standard-minifier-js@2.2.0
 tracker@1.1.3
 
 rocketchat:2fa
@@ -170,10 +170,9 @@ smoral:sweetalert
 steffo:meteor-accounts-saml
 tmeasday:crypto-md5
 todda00:friendly-slugs
-underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
 rocketchat:postcss
-dynamic-import@0.1.3
+dynamic-import@0.2.0
 keepnox:perfect-scrollbar
diff --git a/.meteor/release b/.meteor/release
index 099d5b9c0e8..0fa8d22ddad 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2.2
+METEOR@1.6
diff --git a/.meteor/versions b/.meteor/versions
index ceda5fa8cbb..9f0d470bede 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,49 +1,49 @@
-accounts-base@1.3.4
-accounts-facebook@1.2.1
-accounts-github@1.3.0
-accounts-google@1.2.0
-accounts-meteor-developer@1.3.0
+accounts-base@1.4.0
+accounts-facebook@1.3.0
+accounts-github@1.4.0
+accounts-google@1.3.0
+accounts-meteor-developer@1.4.0
 accounts-oauth@1.1.15
-accounts-password@1.4.0
-accounts-twitter@1.3.0
+accounts-password@1.5.0
+accounts-twitter@1.4.0
 aldeed:simple-schema@1.5.3
-allow-deny@1.0.9
+allow-deny@1.1.0
 autoupdate@1.3.12
-babel-compiler@6.20.0
-babel-runtime@1.0.1
+babel-compiler@6.24.7
+babel-runtime@1.1.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.2.0
+boilerplate-generator@1.3.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
 cfs:http-methods@0.0.32
 check@1.2.5
-coffeescript@1.12.7_1
-coffeescript-compiler@1.12.7_1
+coffeescript@1.12.7_3
+coffeescript-compiler@1.12.7_3
 dandv:caret-position@2.1.1
-ddp@1.3.1
-ddp-client@2.1.3
-ddp-common@1.2.9
+ddp@1.4.0
+ddp-client@2.2.0
+ddp-common@1.3.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.2
+ddp-server@2.1.0
 deepwell:bootstrap-datepicker2@1.3.0
 deps@1.0.12
 diff-sequence@1.0.7
 dispatch:run-as-user@1.1.1
-dynamic-import@0.1.3
-ecmascript@0.8.3
-ecmascript-runtime@0.4.1
-ecmascript-runtime-client@0.4.3
-ecmascript-runtime-server@0.4.1
+dynamic-import@0.2.0
+ecmascript@0.9.0
+ecmascript-runtime@0.5.0
+ecmascript-runtime-client@0.5.0
+ecmascript-runtime-server@0.5.0
 edgee:slingshot@0.7.1
-ejson@1.0.14
+ejson@1.1.0
 email@1.2.3
 emojione:emojione@2.2.6
-facebook-oauth@1.3.2
+facebook-oauth@1.4.0
 fastclick@1.0.13
 francocatena:status@1.5.3
 geojson-utils@1.0.10
@@ -52,7 +52,7 @@ google-oauth@1.2.4
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.2.12
+http@1.3.0
 id-map@1.0.9
 jalik:ufs@0.7.4_1
 jalik:ufs-gridfs@0.2.1
@@ -71,29 +71,29 @@ konecty:multiple-instances-status@1.0.6_1
 konecty:nrr@2.0.2
 konecty:user-presence@1.2.9
 launch-screen@1.1.1
-less@2.7.9
+less@2.7.11
 livedata@1.0.18
-localstorage@1.1.1
-logging@1.1.17
+localstorage@1.2.0
+logging@1.1.19
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.7.2
-meteor-base@1.1.0
+meteor@1.8.0
+meteor-base@1.2.0
 meteor-developer-oauth@1.2.0
 meteorhacks:inject-initial@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.4
-minimongo@1.3.2
+minifier-js@2.2.0
+minimongo@1.4.0
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.10.0
-modules-runtime@0.8.0
-mongo@1.2.2
-mongo-dev-server@1.0.1
+modules@0.11.0
+modules-runtime@0.9.0
+mongo@1.3.0
+mongo-dev-server@1.1.0
 mongo-id@1.0.6
 mongo-livedata@1.0.12
 mrt:reactive-store@0.0.1
@@ -101,17 +101,17 @@ mystor:device-detection@0.2.0
 nimble:restivus@0.8.12
 nooitaf:colors@1.1.2_1
 npm-bcrypt@0.9.3
-npm-mongo@2.2.30
-oauth@1.1.13
-oauth1@1.1.11
-oauth2@1.1.11
+npm-mongo@2.2.33
+oauth@1.2.0
+oauth1@1.2.0
+oauth2@1.2.0
 observe-sequence@1.0.16
 ordered-dict@1.0.9
-ostrio:cookies@2.2.2
+ostrio:cookies@2.2.3
 pauli:accounts-linkedin@2.1.3
 pauli:linkedin-oauth@1.2.0
 percolate:synced-cron@1.3.2
-promise@0.9.0
+promise@0.10.0
 raix:eventemitter@0.1.3
 raix:eventstate@0.0.4
 raix:handlebar-helpers@0.2.5
@@ -119,7 +119,7 @@ raix:push@3.0.3-rc.7
 raix:ui-dropped-event@0.0.7
 random@1.0.10
 rate-limit@1.0.8
-reactive-dict@1.1.9
+reactive-dict@1.2.0
 reactive-var@1.0.11
 reload@1.1.11
 retry@1.0.9
@@ -232,13 +232,13 @@ routepolicy@1.0.12
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
-shell-server@0.2.4
+shell-server@0.3.0
 simple:json-routes@2.1.0
 smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-js@2.1.2
+standard-minifier-js@2.2.0
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.2
@@ -252,9 +252,8 @@ tracker@1.1.3
 twitter-oauth@1.2.0
 ui@1.0.13
 underscore@1.0.10
-underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.19
+webapp@1.4.0
 webapp-hashing@1.0.9
 yasaricli:slugify@0.0.7
 yasinuslu:blaze-meta@0.3.3
diff --git a/.travis.yml b/.travis.yml
index b273a174da2..9f2d6677b39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ branches:
 git:
   depth: 1
 node_js:
-- '4'
+- '8'
 addons:
   apt:
     sources:
diff --git a/client/lib/handleError.js b/client/lib/handleError.js
index 821d7e7cb0d..9fdd054cd43 100644
--- a/client/lib/handleError.js
+++ b/client/lib/handleError.js
@@ -1,4 +1,7 @@
+import _ from 'underscore';
+import s from 'underscore.string';
 import toastr from 'toastr';
+
 this.handleError = function(error, useToastr = true) {
 	if (_.isObject(error.details)) {
 		for (const key in error.details) {
@@ -9,8 +12,8 @@ this.handleError = function(error, useToastr = true) {
 	}
 
 	if (useToastr) {
-		return toastr.error(_.escapeHTML(TAPi18n.__(error.error, error.details)), error.details && error.details.errorTitle ? _.escapeHTML(TAPi18n.__(error.details.errorTitle)) : null);
+		return toastr.error(s.escapeHTML(TAPi18n.__(error.error, error.details)), error.details && error.details.errorTitle ? s.escapeHTML(TAPi18n.__(error.details.errorTitle)) : null);
 	}
 
-	return _.escapeHTML(TAPi18n.__(error.error, error.details));
+	return s.escapeHTML(TAPi18n.__(error.error, error.details));
 };
diff --git a/client/methods/deleteMessage.js b/client/methods/deleteMessage.js
index 1827726fb85..b57f5c412bb 100644
--- a/client/methods/deleteMessage.js
+++ b/client/methods/deleteMessage.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import moment from 'moment';
 
 Meteor.methods({
diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js
index a87954f32b1..8e4d6986e14 100644
--- a/client/methods/updateMessage.js
+++ b/client/methods/updateMessage.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';
 
diff --git a/client/routes/router.js b/client/routes/router.js
index beea6092bee..1167e8384d8 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -1,4 +1,5 @@
 /* globals KonchatNotification */
+import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {
 	return FlowRouter.path(path, kw.hash);
@@ -75,7 +76,7 @@ FlowRouter.route('/account/:group?', {
 		if (!params.group) {
 			params.group = 'Preferences';
 		}
-		params.group = _.capitalize(params.group, true);
+		params.group = s.capitalize(params.group, true);
 		BlazeLayout.render('main', { center: `account${ params.group }` });
 	},
 	triggersExit: [function() {
diff --git a/lib/underscore.string.js b/lib/underscore.string.js
deleted file mode 100644
index f92095c585c..00000000000
--- a/lib/underscore.string.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* globals mixin */
-
-// This will add underscore.string methods to Underscore.js
-// except for include, contains, reverse and join that are
-// dropped because they collide with the functions already
-// defined by Underscore.js.
-
-mixin = function(obj) {
-	_.each(_.functions(obj), function(name) {
-		if (!_[name] && !_.prototype[name]) {
-			_[name] = obj[name];
-		}
-	});
-};
-
-mixin(s.exports());
diff --git a/package-lock.json b/package-lock.json
index aa93fee7efc..7e43abf5031 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,16 +4,153 @@
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
+		"@google-cloud/common": {
+			"version": "0.13.6",
+			"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
+			"integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
+			"requires": {
+				"array-uniq": "1.0.3",
+				"arrify": "1.0.1",
+				"concat-stream": "1.6.0",
+				"create-error-class": "3.0.2",
+				"duplexify": "3.5.1",
+				"ent": "2.2.0",
+				"extend": "3.0.1",
+				"google-auto-auth": "0.7.2",
+				"is": "3.2.1",
+				"log-driver": "1.2.5",
+				"methmeth": "1.1.0",
+				"modelo": "4.2.0",
+				"request": "2.81.0",
+				"retry-request": "3.1.0",
+				"split-array-stream": "1.0.3",
+				"stream-events": "1.0.2",
+				"string-format-obj": "1.1.0",
+				"through2": "2.0.3"
+			},
+			"dependencies": {
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+				}
+			}
+		},
+		"@google-cloud/storage": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.4.0.tgz",
+			"integrity": "sha512-vt1NU7D12OGYPhWfwBD1Q2qFS6Suykorlp3NLaES2W9CW6sEBWLwScxElXt8nPvonYBCFt99jP4g1AqY+0hefw==",
+			"requires": {
+				"@google-cloud/common": "0.13.6",
+				"arrify": "1.0.1",
+				"async": "2.5.0",
+				"concat-stream": "1.6.0",
+				"create-error-class": "3.0.2",
+				"duplexify": "3.5.1",
+				"extend": "3.0.1",
+				"gcs-resumable-upload": "0.8.2",
+				"hash-stream-validation": "0.2.1",
+				"is": "3.2.1",
+				"mime-types": "2.1.17",
+				"once": "1.4.0",
+				"pumpify": "1.3.5",
+				"safe-buffer": "5.1.1",
+				"snakeize": "0.1.0",
+				"stream-events": "1.0.2",
+				"string-format-obj": "1.1.0",
+				"through2": "2.0.3"
+			},
+			"dependencies": {
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+				},
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo="
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
+			}
+		},
+		"JSONStream": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+			"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
+			"dev": true,
+			"requires": {
+				"jsonparse": "1.3.1",
+				"through": "2.3.8"
+			}
+		},
 		"abbrev": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
 			"integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
 		},
+		"acorn": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
+			"integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
+			"dev": true
+		},
+		"acorn-jsx": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+			"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+			"dev": true,
+			"requires": {
+				"acorn": "3.3.0"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+					"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+					"dev": true
+				}
+			}
+		},
+		"add-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
+			"integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
+			"dev": true
+		},
 		"addressparser": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
 			"integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
 		},
+		"agent-base": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+			"integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+			"dev": true,
+			"requires": {
+				"extend": "3.0.1",
+				"semver": "5.0.3"
+			},
+			"dependencies": {
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+					"dev": true
+				},
+				"semver": {
+					"version": "5.0.3",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+					"integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+					"dev": true
+				}
+			}
+		},
 		"ajv": {
 			"version": "4.11.8",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
@@ -23,20 +160,227 @@
 				"json-stable-stringify": "1.0.1"
 			}
 		},
+		"ajv-keywords": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+			"integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+			"dev": true
+		},
+		"align-text": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+			"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+			"dev": true,
+			"requires": {
+				"kind-of": "3.2.2",
+				"longest": "1.0.1",
+				"repeat-string": "1.6.1"
+			}
+		},
+		"amdefine": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+			"dev": true
+		},
+		"ansi-escapes": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+			"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+			"dev": true
+		},
 		"ansi-regex": {
 			"version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
 			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
 		},
-		"ansi-styles": {
-			"version": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+		"any-promise": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz",
+			"integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=",
 			"dev": true
 		},
+		"anymatch": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+			"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+			"dev": true,
+			"requires": {
+				"micromatch": "2.3.11",
+				"normalize-path": "2.1.1"
+			}
+		},
 		"aproba": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
 			"integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw=="
 		},
+		"archiver": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz",
+			"integrity": "sha1-TyGU1tj5nfP1MeaIHxTxXVX6ryI=",
+			"dev": true,
+			"requires": {
+				"archiver-utils": "1.3.0",
+				"async": "2.5.0",
+				"buffer-crc32": "0.2.13",
+				"glob": "7.1.2",
+				"lodash": "4.17.4",
+				"readable-stream": "2.3.3",
+				"tar-stream": "1.5.2",
+				"walkdir": "0.0.11",
+				"zip-stream": "1.2.0"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
+			}
+		},
+		"archiver-utils": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+			"integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+			"dev": true,
+			"requires": {
+				"glob": "7.1.2",
+				"graceful-fs": "4.1.11",
+				"lazystream": "1.0.0",
+				"lodash": "4.17.4",
+				"normalize-path": "2.1.1",
+				"readable-stream": "2.3.3"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
+			}
+		},
 		"are-we-there-yet": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
@@ -75,6 +419,50 @@
 				}
 			}
 		},
+		"argparse": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+			"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "1.0.3"
+			},
+			"dependencies": {
+				"sprintf-js": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+					"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+					"dev": true
+				}
+			}
+		},
+		"arr-diff": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+			"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+			"dev": true,
+			"requires": {
+				"arr-flatten": "1.1.0"
+			}
+		},
+		"arr-flatten": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+			"dev": true
+		},
+		"array-find-index": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+			"dev": true
+		},
+		"array-ify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
+			"integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
+			"dev": true
+		},
 		"array-includes": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
@@ -84,6 +472,31 @@
 				"es-abstract": "1.7.0"
 			}
 		},
+		"array-union": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+			"dev": true,
+			"requires": {
+				"array-uniq": "1.0.3"
+			}
+		},
+		"array-uniq": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+		},
+		"array-unique": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+			"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+			"dev": true
+		},
+		"arrify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+		},
 		"asn1": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -94,10 +507,74 @@
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
 			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
 		},
+		"assertion-error": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
+			"integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
+			"dev": true
+		},
+		"async": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+			"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+			"requires": {
+				"lodash": "4.17.4"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+				}
+			}
+		},
+		"async-each": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+			"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+			"dev": true
+		},
 		"asynckit": {
 			"version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
 			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
 		},
+		"atob": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
+			"integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
+			"dev": true
+		},
+		"autoprefixer": {
+			"version": "6.7.7",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
+			"integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+			"dev": true,
+			"requires": {
+				"browserslist": "1.7.7",
+				"caniuse-db": "1.0.30000756",
+				"normalize-range": "0.1.2",
+				"num2fraction": "1.2.2",
+				"postcss": "5.2.18",
+				"postcss-value-parser": "3.3.0"
+			}
+		},
+		"aws-sdk": {
+			"version": "2.141.0",
+			"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz",
+			"integrity": "sha1-PZallw/Z9UDOq8wdS66zO3FYOqc=",
+			"requires": {
+				"buffer": "4.9.1",
+				"crypto-browserify": "1.0.9",
+				"events": "1.1.1",
+				"jmespath": "0.15.0",
+				"querystring": "0.2.0",
+				"sax": "1.2.1",
+				"url": "0.10.3",
+				"uuid": "3.1.0",
+				"xml2js": "0.4.17",
+				"xmlbuilder": "4.2.1"
+			}
+		},
 		"aws-sign2": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
@@ -108,995 +585,11871 @@
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
 			"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
 		},
-		"babel-code-frame": {
-			"version": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-			"integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
-			"dev": true,
-			"requires": {
-				"chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-				"esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-				"js-tokens": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
-			}
-		},
-		"babel-core": {
-			"version": "https://registry.npmjs.org/babel-core/-/babel-core-6.9.1.tgz",
-			"integrity": "sha1-SNRx7r9N5GngqUL+RW3MlLGL6A0=",
+		"babel-mocha-es6-compiler": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/babel-mocha-es6-compiler/-/babel-mocha-es6-compiler-0.1.0.tgz",
+			"integrity": "sha1-QMnkBoCvRhWP7usntJQUtrgOxDg=",
 			"dev": true,
 			"requires": {
-				"babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-				"babel-generator": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz",
-				"babel-helpers": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-register": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
-				"convert-source-map": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-				"json5": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-				"path-exists": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
-				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-				"private": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-				"shebang-regex": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-				"slash": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+				"babel-core": "6.9.1",
+				"babel-plugin-add-module-exports": "0.2.1",
+				"babel-preset-es2015": "6.3.13",
+				"babel-preset-react": "6.3.13",
+				"babel-preset-stage-0": "6.3.13"
 			},
 			"dependencies": {
-				"minimatch": {
-					"version": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-					"integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"babel-code-frame": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
 					"dev": true,
 					"requires": {
-						"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
+						"chalk": "1.1.3",
+						"esutils": "2.0.2",
+						"js-tokens": "3.0.2"
 					}
-				}
-			}
-		},
-		"babel-generator": {
-			"version": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz",
-			"integrity": "sha1-5xX0hsWN7SVknYiJRNUqoHxdlJc=",
-			"dev": true,
-			"requires": {
-				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"detect-indent": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-				"jsesc": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"trim-right": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
-			}
-		},
-		"babel-helper-bindify-decorators": {
-			"version": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
-			"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
-			}
-		},
-		"babel-helper-builder-binary-assignment-operator-visitor": {
-			"version": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-			"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-			"dev": true,
-			"requires": {
-				"babel-helper-explode-assignable-expression": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
-			}
-		},
-		"babel-helper-builder-react-jsx": {
-			"version": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz",
-			"integrity": "sha1-CteRfjPI11HmRtrKTnfMGTd9LLw=",
-			"dev": true,
-			"requires": {
+				},
+				"babel-core": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.9.1.tgz",
+					"integrity": "sha1-SNRx7r9N5GngqUL+RW3MlLGL6A0=",
+					"dev": true,
+					"requires": {
+						"babel-code-frame": "6.26.0",
+						"babel-generator": "6.26.0",
+						"babel-helpers": "6.24.1",
+						"babel-messages": "6.23.0",
+						"babel-register": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"convert-source-map": "1.5.0",
+						"debug": "2.6.9",
+						"json5": "0.4.0",
+						"lodash": "4.17.4",
+						"minimatch": "2.0.10",
+						"path-exists": "1.0.0",
+						"path-is-absolute": "1.0.1",
+						"private": "0.1.8",
+						"shebang-regex": "1.0.0",
+						"slash": "1.0.0",
+						"source-map": "0.5.7"
+					}
+				},
+				"babel-generator": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
+					"integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
+					"dev": true,
+					"requires": {
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"detect-indent": "4.0.0",
+						"jsesc": "1.3.0",
+						"lodash": "4.17.4",
+						"source-map": "0.5.7",
+						"trim-right": "1.0.1"
+					}
+				},
+				"babel-helper-bindify-decorators": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+					"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-builder-binary-assignment-operator-visitor": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+					"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+					"dev": true,
+					"requires": {
+						"babel-helper-explode-assignable-expression": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-builder-react-jsx": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
+					"integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"esutils": "2.0.2"
+					}
+				},
+				"babel-helper-call-delegate": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+					"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+					"dev": true,
+					"requires": {
+						"babel-helper-hoist-variables": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-define-map": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+					"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-helper-explode-assignable-expression": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+					"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-explode-class": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+					"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+					"dev": true,
+					"requires": {
+						"babel-helper-bindify-decorators": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-function-name": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+					"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+					"dev": true,
+					"requires": {
+						"babel-helper-get-function-arity": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-get-function-arity": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+					"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-hoist-variables": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+					"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-optimise-call-expression": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+					"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-regex": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+					"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-helper-remap-async-to-generator": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+					"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-replace-supers": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+					"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+					"dev": true,
+					"requires": {
+						"babel-helper-optimise-call-expression": "6.24.1",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helpers": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+					"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0"
+					}
+				},
+				"babel-messages": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-add-module-exports": {
+					"version": "0.2.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
+					"integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
+					"dev": true
+				},
+				"babel-plugin-check-es2015-constants": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+					"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-syntax-async-functions": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+					"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+					"dev": true
+				},
+				"babel-plugin-syntax-async-generators": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+					"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+					"dev": true
+				},
+				"babel-plugin-syntax-class-constructor-call": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+					"integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
+					"dev": true
+				},
+				"babel-plugin-syntax-class-properties": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+					"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+					"dev": true
+				},
+				"babel-plugin-syntax-decorators": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+					"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+					"dev": true
+				},
+				"babel-plugin-syntax-do-expressions": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
+					"integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
+					"dev": true
+				},
+				"babel-plugin-syntax-dynamic-import": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+					"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+					"dev": true
+				},
+				"babel-plugin-syntax-exponentiation-operator": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+					"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+					"dev": true
+				},
+				"babel-plugin-syntax-export-extensions": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+					"integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
+					"dev": true
+				},
+				"babel-plugin-syntax-flow": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+					"integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+					"dev": true
+				},
+				"babel-plugin-syntax-function-bind": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
+					"integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
+					"dev": true
+				},
+				"babel-plugin-syntax-jsx": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+					"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+					"dev": true
+				},
+				"babel-plugin-syntax-object-rest-spread": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+					"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+					"dev": true
+				},
+				"babel-plugin-syntax-trailing-function-commas": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+					"integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+					"dev": true
+				},
+				"babel-plugin-transform-async-generator-functions": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+					"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+					"dev": true,
+					"requires": {
+						"babel-helper-remap-async-to-generator": "6.24.1",
+						"babel-plugin-syntax-async-generators": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-async-to-generator": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+					"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+					"dev": true,
+					"requires": {
+						"babel-helper-remap-async-to-generator": "6.24.1",
+						"babel-plugin-syntax-async-functions": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-class-constructor-call": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
+					"integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-class-constructor-call": "6.18.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-class-properties": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+					"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-plugin-syntax-class-properties": "6.13.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-decorators": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+					"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+					"dev": true,
+					"requires": {
+						"babel-helper-explode-class": "6.24.1",
+						"babel-plugin-syntax-decorators": "6.13.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-do-expressions": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
+					"integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-do-expressions": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-arrow-functions": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+					"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-block-scoped-functions": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+					"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-block-scoping": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+					"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-plugin-transform-es2015-classes": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+					"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+					"dev": true,
+					"requires": {
+						"babel-helper-define-map": "6.26.0",
+						"babel-helper-function-name": "6.24.1",
+						"babel-helper-optimise-call-expression": "6.24.1",
+						"babel-helper-replace-supers": "6.24.1",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-computed-properties": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+					"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-destructuring": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+					"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-for-of": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+					"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-function-name": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+					"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-literals": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+					"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-modules-commonjs": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
+					"integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-transform-strict-mode": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-object-super": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+					"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+					"dev": true,
+					"requires": {
+						"babel-helper-replace-supers": "6.24.1",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-parameters": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+					"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+					"dev": true,
+					"requires": {
+						"babel-helper-call-delegate": "6.24.1",
+						"babel-helper-get-function-arity": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-shorthand-properties": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+					"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-spread": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+					"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-sticky-regex": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+					"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+					"dev": true,
+					"requires": {
+						"babel-helper-regex": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-template-literals": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+					"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-typeof-symbol": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+					"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-unicode-regex": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+					"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+					"dev": true,
+					"requires": {
+						"babel-helper-regex": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"regexpu-core": "2.0.0"
+					}
+				},
+				"babel-plugin-transform-exponentiation-operator": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+					"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+					"dev": true,
+					"requires": {
+						"babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+						"babel-plugin-syntax-exponentiation-operator": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-export-extensions": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
+					"integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-export-extensions": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-flow-strip-types": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+					"integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-flow": "6.18.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-function-bind": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
+					"integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-function-bind": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-object-rest-spread": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+					"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-object-rest-spread": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-react-display-name": {
+					"version": "6.25.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
+					"integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-react-jsx": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
+					"integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+					"dev": true,
+					"requires": {
+						"babel-helper-builder-react-jsx": "6.26.0",
+						"babel-plugin-syntax-jsx": "6.18.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-react-jsx-source": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
+					"integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-jsx": "6.18.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-regenerator": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+					"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+					"dev": true,
+					"requires": {
+						"regenerator-transform": "0.10.1"
+					}
+				},
+				"babel-plugin-transform-strict-mode": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+					"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-preset-es2015": {
+					"version": "6.3.13",
+					"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
+					"integrity": "sha1-l9zn7ykuGMubK3VF2AxZPCjZUX8=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-check-es2015-constants": "6.22.0",
+						"babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+						"babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+						"babel-plugin-transform-es2015-block-scoping": "6.26.0",
+						"babel-plugin-transform-es2015-classes": "6.24.1",
+						"babel-plugin-transform-es2015-computed-properties": "6.24.1",
+						"babel-plugin-transform-es2015-destructuring": "6.23.0",
+						"babel-plugin-transform-es2015-for-of": "6.23.0",
+						"babel-plugin-transform-es2015-function-name": "6.24.1",
+						"babel-plugin-transform-es2015-literals": "6.22.0",
+						"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+						"babel-plugin-transform-es2015-object-super": "6.24.1",
+						"babel-plugin-transform-es2015-parameters": "6.24.1",
+						"babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+						"babel-plugin-transform-es2015-spread": "6.22.0",
+						"babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+						"babel-plugin-transform-es2015-template-literals": "6.22.0",
+						"babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+						"babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+						"babel-plugin-transform-regenerator": "6.26.0"
+					}
+				},
+				"babel-preset-react": {
+					"version": "6.3.13",
+					"resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.3.13.tgz",
+					"integrity": "sha1-E9VeBqZfqqoHw5v2Op2DbgMhFvo=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-flow": "6.18.0",
+						"babel-plugin-syntax-jsx": "6.18.0",
+						"babel-plugin-transform-flow-strip-types": "6.22.0",
+						"babel-plugin-transform-react-display-name": "6.25.0",
+						"babel-plugin-transform-react-jsx": "6.24.1",
+						"babel-plugin-transform-react-jsx-source": "6.22.0"
+					}
+				},
+				"babel-preset-stage-0": {
+					"version": "6.3.13",
+					"resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.3.13.tgz",
+					"integrity": "sha1-eKN8VvCzmI8qeZMtywzrj/N3sNE=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-transform-do-expressions": "6.22.0",
+						"babel-plugin-transform-function-bind": "6.22.0",
+						"babel-preset-stage-1": "6.24.1"
+					}
+				},
+				"babel-preset-stage-1": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
+					"integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-transform-class-constructor-call": "6.24.1",
+						"babel-plugin-transform-export-extensions": "6.22.0",
+						"babel-preset-stage-2": "6.24.1"
+					}
+				},
+				"babel-preset-stage-2": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+					"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-dynamic-import": "6.18.0",
+						"babel-plugin-transform-class-properties": "6.24.1",
+						"babel-plugin-transform-decorators": "6.24.1",
+						"babel-preset-stage-3": "6.24.1"
+					}
+				},
+				"babel-preset-stage-3": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+					"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-trailing-function-commas": "6.22.0",
+						"babel-plugin-transform-async-generator-functions": "6.24.1",
+						"babel-plugin-transform-async-to-generator": "6.24.1",
+						"babel-plugin-transform-exponentiation-operator": "6.24.1",
+						"babel-plugin-transform-object-rest-spread": "6.26.0"
+					}
+				},
+				"babel-register": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+					"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+					"dev": true,
+					"requires": {
+						"babel-core": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"core-js": "2.5.1",
+						"home-or-tmp": "2.0.0",
+						"lodash": "4.17.4",
+						"mkdirp": "0.5.1",
+						"source-map-support": "0.4.18"
+					},
+					"dependencies": {
+						"babel-core": {
+							"version": "6.26.0",
+							"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
+							"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+							"dev": true,
+							"requires": {
+								"babel-code-frame": "6.26.0",
+								"babel-generator": "6.26.0",
+								"babel-helpers": "6.24.1",
+								"babel-messages": "6.23.0",
+								"babel-register": "6.26.0",
+								"babel-runtime": "6.26.0",
+								"babel-template": "6.26.0",
+								"babel-traverse": "6.26.0",
+								"babel-types": "6.26.0",
+								"babylon": "6.18.0",
+								"convert-source-map": "1.5.0",
+								"debug": "2.6.9",
+								"json5": "0.5.1",
+								"lodash": "4.17.4",
+								"minimatch": "3.0.4",
+								"path-is-absolute": "1.0.1",
+								"private": "0.1.8",
+								"slash": "1.0.0",
+								"source-map": "0.5.7"
+							}
+						},
+						"json5": {
+							"version": "0.5.1",
+							"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+							"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+							"dev": true
+						},
+						"minimatch": {
+							"version": "3.0.4",
+							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+							"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+							"dev": true,
+							"requires": {
+								"brace-expansion": "1.1.8"
+							}
+						}
+					}
+				},
+				"babel-template": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-traverse": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+					"dev": true,
+					"requires": {
+						"babel-code-frame": "6.26.0",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"debug": "2.6.9",
+						"globals": "9.18.0",
+						"invariant": "2.2.2",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-types": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"esutils": "2.0.2",
+						"lodash": "4.17.4",
+						"to-fast-properties": "1.0.3"
+					}
+				},
+				"babylon": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+					"dev": true
+				},
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"brace-expansion": {
+					"version": "1.1.8",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+					"dev": true,
+					"requires": {
+						"balanced-match": "1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"dev": true
+				},
+				"convert-source-map": {
+					"version": "1.5.0",
+					"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+					"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+					"dev": true
+				},
+				"core-js": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
+					"dev": true
+				},
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"detect-indent": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+					"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+					"dev": true,
+					"requires": {
+						"repeating": "2.0.1"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"globals": {
+					"version": "9.18.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+					"dev": true
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"home-or-tmp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+					"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+					"dev": true,
+					"requires": {
+						"os-homedir": "1.0.2",
+						"os-tmpdir": "1.0.2"
+					}
+				},
+				"invariant": {
+					"version": "2.2.2",
+					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+					"dev": true,
+					"requires": {
+						"loose-envify": "1.3.1"
+					}
+				},
+				"is-finite": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+					"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+					"dev": true,
+					"requires": {
+						"number-is-nan": "1.0.1"
+					}
+				},
+				"js-tokens": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+					"dev": true
+				},
+				"jsesc": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+					"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+					"dev": true
+				},
+				"json5": {
+					"version": "0.4.0",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
+					"integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"loose-envify": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+					"dev": true,
+					"requires": {
+						"js-tokens": "3.0.2"
+					}
+				},
+				"minimatch": {
+					"version": "2.0.10",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+					"integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "1.1.8"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"dev": true
+				},
+				"os-homedir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+					"dev": true
+				},
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"dev": true
+				},
+				"path-exists": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
+					"integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
+					"dev": true
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"dev": true
+				},
+				"private": {
+					"version": "0.1.8",
+					"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+					"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+					"dev": true
+				},
+				"regenerate": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
+					"integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
+					"dev": true
+				},
+				"regenerator-transform": {
+					"version": "0.10.1",
+					"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+					"integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"private": "0.1.8"
+					}
+				},
+				"regexpu-core": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+					"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+					"dev": true,
+					"requires": {
+						"regenerate": "1.3.3",
+						"regjsgen": "0.2.0",
+						"regjsparser": "0.1.5"
+					}
+				},
+				"regjsgen": {
+					"version": "0.2.0",
+					"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+					"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+					"dev": true
+				},
+				"regjsparser": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+					"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+					"dev": true,
+					"requires": {
+						"jsesc": "0.5.0"
+					},
+					"dependencies": {
+						"jsesc": {
+							"version": "0.5.0",
+							"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+							"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+							"dev": true
+						}
+					}
+				},
+				"repeating": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+					"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+					"dev": true,
+					"requires": {
+						"is-finite": "1.0.2"
+					}
+				},
+				"shebang-regex": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+					"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+					"dev": true
+				},
+				"slash": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				},
+				"source-map-support": {
+					"version": "0.4.18",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+					"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+					"dev": true,
+					"requires": {
+						"source-map": "0.5.7"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				},
+				"to-fast-properties": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+					"dev": true
+				},
+				"trim-right": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+					"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-array-includes": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz",
+			"integrity": "sha1-z1RS6Bx7gD+3lZ8QRayI4uwo/3Y=",
+			"dev": true
+		},
+		"babel-plugin-transform-es2015-duplicate-keys": {
+			"version": "6.24.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+			"integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "6.26.0",
+				"babel-types": "6.26.0"
+			},
+			"dependencies": {
+				"babel-types": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"esutils": "2.0.2",
+						"lodash": "4.17.4",
+						"to-fast-properties": "1.0.3"
+					}
+				},
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"to-fast-properties": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-transform-es2015-modules-amd": {
+			"version": "6.24.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+			"integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+			"dev": true,
+			"requires": {
+				"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+				"babel-runtime": "6.26.0",
+				"babel-template": "6.26.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"babel-code-frame": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+					"dev": true,
+					"requires": {
+						"chalk": "1.1.3",
+						"esutils": "2.0.2",
+						"js-tokens": "3.0.2"
+					}
+				},
+				"babel-messages": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-modules-commonjs": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
+					"integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-transform-strict-mode": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-strict-mode": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+					"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-template": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-traverse": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+					"dev": true,
+					"requires": {
+						"babel-code-frame": "6.26.0",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"debug": "2.6.9",
+						"globals": "9.18.0",
+						"invariant": "2.2.2",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-types": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"esutils": "2.0.2",
+						"lodash": "4.17.4",
+						"to-fast-properties": "1.0.3"
+					}
+				},
+				"babylon": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"globals": {
+					"version": "9.18.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+					"dev": true
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"invariant": {
+					"version": "2.2.2",
+					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+					"dev": true,
+					"requires": {
+						"loose-envify": "1.3.1"
+					}
+				},
+				"js-tokens": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"loose-envify": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+					"dev": true,
+					"requires": {
+						"js-tokens": "3.0.2"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				},
+				"to-fast-properties": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-transform-es2015-modules-systemjs": {
+			"version": "6.24.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+			"integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+			"dev": true,
+			"requires": {
+				"babel-helper-hoist-variables": "6.24.1",
+				"babel-runtime": "6.26.0",
+				"babel-template": "6.26.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"babel-code-frame": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+					"dev": true,
+					"requires": {
+						"chalk": "1.1.3",
+						"esutils": "2.0.2",
+						"js-tokens": "3.0.2"
+					}
+				},
+				"babel-helper-hoist-variables": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+					"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-messages": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-template": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-traverse": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+					"dev": true,
+					"requires": {
+						"babel-code-frame": "6.26.0",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"debug": "2.6.9",
+						"globals": "9.18.0",
+						"invariant": "2.2.2",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-types": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"esutils": "2.0.2",
+						"lodash": "4.17.4",
+						"to-fast-properties": "1.0.3"
+					}
+				},
+				"babylon": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"globals": {
+					"version": "9.18.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+					"dev": true
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"invariant": {
+					"version": "2.2.2",
+					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+					"dev": true,
+					"requires": {
+						"loose-envify": "1.3.1"
+					}
+				},
+				"js-tokens": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"loose-envify": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+					"dev": true,
+					"requires": {
+						"js-tokens": "3.0.2"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				},
+				"to-fast-properties": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-transform-es2015-modules-umd": {
+			"version": "6.24.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+			"integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+			"dev": true,
+			"requires": {
+				"babel-plugin-transform-es2015-modules-amd": "6.24.1",
+				"babel-runtime": "6.26.0",
+				"babel-template": "6.26.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"babel-code-frame": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+					"dev": true,
+					"requires": {
+						"chalk": "1.1.3",
+						"esutils": "2.0.2",
+						"js-tokens": "3.0.2"
+					}
+				},
+				"babel-messages": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-template": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-traverse": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+					"dev": true,
+					"requires": {
+						"babel-code-frame": "6.26.0",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"debug": "2.6.9",
+						"globals": "9.18.0",
+						"invariant": "2.2.2",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-types": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"esutils": "2.0.2",
+						"lodash": "4.17.4",
+						"to-fast-properties": "1.0.3"
+					}
+				},
+				"babylon": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"globals": {
+					"version": "9.18.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+					"dev": true
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"invariant": {
+					"version": "2.2.2",
+					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+					"dev": true,
+					"requires": {
+						"loose-envify": "1.3.1"
+					}
+				},
+				"js-tokens": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"loose-envify": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+					"dev": true,
+					"requires": {
+						"js-tokens": "3.0.2"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				},
+				"to-fast-properties": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-transform-runtime": {
+			"version": "6.23.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+			"integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "6.26.0"
+			}
+		},
+		"babel-polyfill": {
+			"version": "6.26.0",
+			"resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+			"integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "6.26.0",
+				"core-js": "2.5.1",
+				"regenerator-runtime": "0.10.5"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
+					"dev": true
+				}
+			}
+		},
+		"babel-runtime": {
+			"version": "6.26.0",
+			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+			"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+			"requires": {
+				"core-js": "2.5.1",
+				"regenerator-runtime": "0.11.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+				},
+				"regenerator-runtime": {
+					"version": "0.11.0",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+					"integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
+				}
+			}
+		},
+		"backoff": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
+			"integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=",
+			"requires": {
+				"precond": "0.2.3"
+			}
+		},
+		"balanced-match": {
+			"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+			"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+		},
+		"base64-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
+			"integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
+		},
+		"base64url": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+			"integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
+		},
+		"bcrypt": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
+			"integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
+			"requires": {
+				"nan": "2.6.2",
+				"node-pre-gyp": "0.6.36"
+			}
+		},
+		"bcrypt-pbkdf": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+			"optional": true,
+			"requires": {
+				"tweetnacl": "0.14.5"
+			}
+		},
+		"binary-extensions": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+			"integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+			"dev": true
+		},
+		"bintrees": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
+			"integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
+		},
+		"bl": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+			"integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
+			"dev": true,
+			"requires": {
+				"readable-stream": "2.0.6"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.0.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+					"integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"string_decoder": "0.10.31",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
+			}
+		},
+		"block-stream": {
+			"version": "0.0.9",
+			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+			"requires": {
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+			}
+		},
+		"bluebird": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+			"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+			"dev": true
+		},
+		"boom": {
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+			"requires": {
+				"hoek": "2.16.3"
+			}
+		},
+		"brace-expansion": {
+			"version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
+			"integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
+			"requires": {
+				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+				"concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+			}
+		},
+		"braces": {
+			"version": "1.8.5",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+			"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+			"dev": true,
+			"requires": {
+				"expand-range": "1.8.2",
+				"preserve": "0.2.0",
+				"repeat-element": "1.1.2"
+			}
+		},
+		"browser-stdout": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+			"dev": true
+		},
+		"browserslist": {
+			"version": "1.7.7",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+			"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+			"dev": true,
+			"requires": {
+				"caniuse-db": "1.0.30000756",
+				"electron-to-chromium": "1.3.27"
+			}
+		},
+		"buffer": {
+			"version": "4.9.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+			"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+			"requires": {
+				"base64-js": "1.2.1",
+				"ieee754": "1.1.8",
+				"isarray": "1.0.0"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+				}
+			}
+		},
+		"buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+			"dev": true
+		},
+		"buffer-equal": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+			"integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
+		},
+		"buffer-equal-constant-time": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+			"integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+		},
+		"buffer-shims": {
+			"version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+			"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+		},
+		"builtin-modules": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+			"dev": true
+		},
+		"bunyan": {
+			"version": "1.8.12",
+			"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
+			"integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
+			"requires": {
+				"dtrace-provider": "0.8.5",
+				"moment": "2.19.1",
+				"mv": "2.1.1",
+				"safe-json-stringify": "1.0.4"
+			}
+		},
+		"caller-id": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz",
+			"integrity": "sha1-Wb2sCJPRLDhxQIJ5Ix+XRYNk8Hs=",
+			"dev": true,
+			"requires": {
+				"stack-trace": "0.0.10"
+			}
+		},
+		"caller-path": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+			"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+			"dev": true,
+			"requires": {
+				"callsites": "0.2.0"
+			}
+		},
+		"callsites": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+			"integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+			"dev": true
+		},
+		"camel-case": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+			"integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+			"dev": true,
+			"requires": {
+				"no-case": "2.3.2",
+				"upper-case": "1.1.3"
+			}
+		},
+		"camelcase": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+			"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+			"dev": true
+		},
+		"camelcase-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+			"dev": true,
+			"requires": {
+				"camelcase": "2.1.1",
+				"map-obj": "1.0.1"
+			}
+		},
+		"caniuse-api": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
+			"integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
+			"dev": true,
+			"requires": {
+				"browserslist": "1.7.7",
+				"caniuse-db": "1.0.30000756",
+				"lodash.memoize": "4.1.2",
+				"lodash.uniq": "4.5.0"
+			}
+		},
+		"caniuse-db": {
+			"version": "1.0.30000756",
+			"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000756.tgz",
+			"integrity": "sha1-6TimuZFjDzDSJj3TRYvrZdNiJos=",
+			"dev": true
+		},
+		"caniuse-lite": {
+			"version": "1.0.30000756",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz",
+			"integrity": "sha1-PacBwVIbn6uHAExt58l/pH2+qtI=",
+			"dev": true
+		},
+		"capture-stack-trace": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+			"integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
+		},
+		"caseless": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+		},
+		"center-align": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+			"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"align-text": "0.1.4",
+				"lazy-cache": "1.0.4"
+			}
+		},
+		"chai": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+			"integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
+			"dev": true,
+			"requires": {
+				"assertion-error": "1.0.2",
+				"deep-eql": "0.1.3",
+				"type-detect": "1.0.0"
+			}
+		},
+		"chai-as-promised": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-6.0.0.tgz",
+			"integrity": "sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY=",
+			"dev": true,
+			"requires": {
+				"check-error": "1.0.2"
+			}
+		},
+		"check-error": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+			"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+			"dev": true
+		},
+		"child-process-debug": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/child-process-debug/-/child-process-debug-0.0.7.tgz",
+			"integrity": "sha1-VOEfuBw7b5Spa2MfrKk+0a9/itA=",
+			"dev": true
+		},
+		"chimp": {
+			"version": "0.50.2",
+			"resolved": "https://registry.npmjs.org/chimp/-/chimp-0.50.2.tgz",
+			"integrity": "sha1-XI2JnVbdOls1TlH0MoDjkVXnpZI=",
+			"dev": true,
+			"requires": {
+				"async": "0.9.2",
+				"babel-core": "6.26.0",
+				"babel-plugin-transform-runtime": "6.23.0",
+				"babel-polyfill": "6.26.0",
+				"babel-preset-es2015": "6.24.1",
+				"babel-preset-stage-2": "6.24.1",
+				"babel-register": "6.26.0",
 				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
+				"bluebird": "3.5.1",
+				"chai": "3.5.0",
+				"chai-as-promised": "6.0.0",
+				"child-process-debug": "0.0.7",
+				"chokidar": "1.6.1",
+				"chromedriver": "2.33.2",
+				"colors": "1.1.2",
+				"commander": "2.11.0",
+				"cucumber": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
+				"deep-extend": "0.4.2",
+				"exit": "0.1.2",
+				"fibers": "1.0.15",
+				"freeport": "1.0.5",
+				"fs-extra": "1.0.0",
+				"glob": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+				"hapi": "8.8.0",
+				"jasmine": "2.8.0",
+				"loglevel": "1.4.1",
+				"minimist": "1.2.0",
+				"mocha": "3.5.3",
+				"phantomjs-prebuilt": "2.1.13",
+				"progress": "1.1.8",
+				"request": "2.81.0",
+				"requestretry": "1.5.0",
+				"saucelabs": "1.4.0",
+				"selenium-standalone": "6.11.0",
+				"underscore": "1.8.3",
+				"xolvio-ddp": "0.12.3",
+				"xolvio-jasmine-expect": "1.1.0",
+				"xolvio-sync-webdriverio": "9.0.1"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"async": {
+					"version": "0.9.2",
+					"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+					"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+					"dev": true
+				},
+				"babel-code-frame": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+					"dev": true,
+					"requires": {
+						"chalk": "1.1.3",
+						"esutils": "2.0.2",
+						"js-tokens": "3.0.2"
+					}
+				},
+				"babel-core": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
+					"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+					"dev": true,
+					"requires": {
+						"babel-code-frame": "6.26.0",
+						"babel-generator": "6.26.0",
+						"babel-helpers": "6.24.1",
+						"babel-messages": "6.23.0",
+						"babel-register": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"convert-source-map": "1.5.0",
+						"debug": "2.6.9",
+						"json5": "0.5.1",
+						"lodash": "4.17.4",
+						"minimatch": "3.0.4",
+						"path-is-absolute": "1.0.1",
+						"private": "0.1.8",
+						"slash": "1.0.0",
+						"source-map": "0.5.7"
+					}
+				},
+				"babel-generator": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
+					"integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
+					"dev": true,
+					"requires": {
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"detect-indent": "4.0.0",
+						"jsesc": "1.3.0",
+						"lodash": "4.17.4",
+						"source-map": "0.5.7",
+						"trim-right": "1.0.1"
+					}
+				},
+				"babel-helper-bindify-decorators": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+					"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-builder-binary-assignment-operator-visitor": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+					"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+					"dev": true,
+					"requires": {
+						"babel-helper-explode-assignable-expression": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-call-delegate": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+					"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+					"dev": true,
+					"requires": {
+						"babel-helper-hoist-variables": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-define-map": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+					"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-helper-explode-assignable-expression": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+					"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-explode-class": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+					"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+					"dev": true,
+					"requires": {
+						"babel-helper-bindify-decorators": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-function-name": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+					"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+					"dev": true,
+					"requires": {
+						"babel-helper-get-function-arity": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-get-function-arity": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+					"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-hoist-variables": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+					"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-optimise-call-expression": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+					"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-regex": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+					"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-helper-remap-async-to-generator": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+					"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helper-replace-supers": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+					"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+					"dev": true,
+					"requires": {
+						"babel-helper-optimise-call-expression": "6.24.1",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-helpers": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+					"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0"
+					}
+				},
+				"babel-messages": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-check-es2015-constants": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+					"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-syntax-async-functions": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+					"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+					"dev": true
+				},
+				"babel-plugin-syntax-async-generators": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+					"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+					"dev": true
+				},
+				"babel-plugin-syntax-class-properties": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+					"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+					"dev": true
+				},
+				"babel-plugin-syntax-decorators": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+					"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+					"dev": true
+				},
+				"babel-plugin-syntax-dynamic-import": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+					"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+					"dev": true
+				},
+				"babel-plugin-syntax-exponentiation-operator": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+					"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+					"dev": true
+				},
+				"babel-plugin-syntax-object-rest-spread": {
+					"version": "6.13.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+					"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+					"dev": true
+				},
+				"babel-plugin-syntax-trailing-function-commas": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+					"integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+					"dev": true
+				},
+				"babel-plugin-transform-async-generator-functions": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+					"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+					"dev": true,
+					"requires": {
+						"babel-helper-remap-async-to-generator": "6.24.1",
+						"babel-plugin-syntax-async-generators": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-async-to-generator": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+					"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+					"dev": true,
+					"requires": {
+						"babel-helper-remap-async-to-generator": "6.24.1",
+						"babel-plugin-syntax-async-functions": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-class-properties": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+					"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-plugin-syntax-class-properties": "6.13.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-decorators": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+					"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+					"dev": true,
+					"requires": {
+						"babel-helper-explode-class": "6.24.1",
+						"babel-plugin-syntax-decorators": "6.13.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-arrow-functions": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+					"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-block-scoped-functions": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+					"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-block-scoping": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+					"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-plugin-transform-es2015-classes": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+					"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+					"dev": true,
+					"requires": {
+						"babel-helper-define-map": "6.26.0",
+						"babel-helper-function-name": "6.24.1",
+						"babel-helper-optimise-call-expression": "6.24.1",
+						"babel-helper-replace-supers": "6.24.1",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-computed-properties": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+					"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-destructuring": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+					"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-for-of": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+					"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-function-name": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+					"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+					"dev": true,
+					"requires": {
+						"babel-helper-function-name": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-literals": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+					"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-modules-commonjs": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
+					"integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-transform-strict-mode": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-object-super": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+					"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+					"dev": true,
+					"requires": {
+						"babel-helper-replace-supers": "6.24.1",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-parameters": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+					"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+					"dev": true,
+					"requires": {
+						"babel-helper-call-delegate": "6.24.1",
+						"babel-helper-get-function-arity": "6.24.1",
+						"babel-runtime": "6.26.0",
+						"babel-template": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-shorthand-properties": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+					"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-spread": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+					"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-sticky-regex": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+					"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+					"dev": true,
+					"requires": {
+						"babel-helper-regex": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-template-literals": {
+					"version": "6.22.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+					"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-typeof-symbol": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+					"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-es2015-unicode-regex": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+					"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+					"dev": true,
+					"requires": {
+						"babel-helper-regex": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"regexpu-core": "2.0.0"
+					}
+				},
+				"babel-plugin-transform-exponentiation-operator": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+					"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+					"dev": true,
+					"requires": {
+						"babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+						"babel-plugin-syntax-exponentiation-operator": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-object-rest-spread": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+					"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-object-rest-spread": "6.13.0",
+						"babel-runtime": "6.26.0"
+					}
+				},
+				"babel-plugin-transform-regenerator": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+					"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+					"dev": true,
+					"requires": {
+						"regenerator-transform": "0.10.1"
+					}
+				},
+				"babel-plugin-transform-strict-mode": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+					"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0"
+					}
+				},
+				"babel-preset-es2015": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+					"integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-check-es2015-constants": "6.22.0",
+						"babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+						"babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+						"babel-plugin-transform-es2015-block-scoping": "6.26.0",
+						"babel-plugin-transform-es2015-classes": "6.24.1",
+						"babel-plugin-transform-es2015-computed-properties": "6.24.1",
+						"babel-plugin-transform-es2015-destructuring": "6.23.0",
+						"babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+						"babel-plugin-transform-es2015-for-of": "6.23.0",
+						"babel-plugin-transform-es2015-function-name": "6.24.1",
+						"babel-plugin-transform-es2015-literals": "6.22.0",
+						"babel-plugin-transform-es2015-modules-amd": "6.24.1",
+						"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+						"babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+						"babel-plugin-transform-es2015-modules-umd": "6.24.1",
+						"babel-plugin-transform-es2015-object-super": "6.24.1",
+						"babel-plugin-transform-es2015-parameters": "6.24.1",
+						"babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+						"babel-plugin-transform-es2015-spread": "6.22.0",
+						"babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+						"babel-plugin-transform-es2015-template-literals": "6.22.0",
+						"babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+						"babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+						"babel-plugin-transform-regenerator": "6.26.0"
+					}
+				},
+				"babel-preset-stage-2": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+					"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-dynamic-import": "6.18.0",
+						"babel-plugin-transform-class-properties": "6.24.1",
+						"babel-plugin-transform-decorators": "6.24.1",
+						"babel-preset-stage-3": "6.24.1"
+					}
+				},
+				"babel-preset-stage-3": {
+					"version": "6.24.1",
+					"resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+					"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+					"dev": true,
+					"requires": {
+						"babel-plugin-syntax-trailing-function-commas": "6.22.0",
+						"babel-plugin-transform-async-generator-functions": "6.24.1",
+						"babel-plugin-transform-async-to-generator": "6.24.1",
+						"babel-plugin-transform-exponentiation-operator": "6.24.1",
+						"babel-plugin-transform-object-rest-spread": "6.26.0"
+					}
+				},
+				"babel-register": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+					"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+					"dev": true,
+					"requires": {
+						"babel-core": "6.26.0",
+						"babel-runtime": "6.26.0",
+						"core-js": "2.5.1",
+						"home-or-tmp": "2.0.0",
+						"lodash": "4.17.4",
+						"mkdirp": "0.5.1",
+						"source-map-support": "0.4.18"
+					}
+				},
+				"babel-template": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-traverse": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-traverse": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+					"dev": true,
+					"requires": {
+						"babel-code-frame": "6.26.0",
+						"babel-messages": "6.23.0",
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"babylon": "6.18.0",
+						"debug": "2.6.9",
+						"globals": "9.18.0",
+						"invariant": "2.2.2",
+						"lodash": "4.17.4"
+					}
+				},
+				"babel-types": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"esutils": "2.0.2",
+						"lodash": "4.17.4",
+						"to-fast-properties": "1.0.3"
+					}
+				},
+				"babylon": {
+					"version": "6.18.0",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+					"dev": true
+				},
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"brace-expansion": {
+					"version": "1.1.8",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+					"dev": true,
+					"requires": {
+						"balanced-match": "1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"dev": true
+				},
+				"convert-source-map": {
+					"version": "1.5.0",
+					"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+					"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+					"dev": true
+				},
+				"core-js": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
+					"dev": true
+				},
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"detect-indent": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+					"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+					"dev": true,
+					"requires": {
+						"repeating": "2.0.1"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"glob": {
+					"version": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "1.0.0",
+						"inflight": "1.0.6",
+						"inherits": "2.0.3",
+						"minimatch": "3.0.4",
+						"once": "1.3.0",
+						"path-is-absolute": "1.0.1"
+					}
+				},
+				"globals": {
+					"version": "9.18.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+					"dev": true
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"home-or-tmp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+					"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+					"dev": true,
+					"requires": {
+						"os-homedir": "1.0.2",
+						"os-tmpdir": "1.0.2"
+					}
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"invariant": {
+					"version": "2.2.2",
+					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+					"dev": true,
+					"requires": {
+						"loose-envify": "1.3.1"
+					}
+				},
+				"is-finite": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+					"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+					"dev": true,
+					"requires": {
+						"number-is-nan": "1.0.1"
+					}
+				},
+				"js-tokens": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+					"dev": true
+				},
+				"jsesc": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+					"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+					"dev": true
+				},
+				"json5": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"loose-envify": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+					"dev": true,
+					"requires": {
+						"js-tokens": "3.0.2"
+					}
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "1.1.8"
+					}
+				},
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "0.0.8",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+							"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+							"dev": true
+						}
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"dev": true
+				},
+				"once": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz",
+					"integrity": "sha1-FRr4a/wfCMS58H0GqyUP/L61ZYE=",
+					"dev": true
+				},
+				"os-homedir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+					"dev": true
+				},
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"dev": true
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"dev": true
+				},
+				"private": {
+					"version": "0.1.8",
+					"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+					"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+					"dev": true
+				},
+				"regenerate": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
+					"integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
+					"dev": true
+				},
+				"regenerator-transform": {
+					"version": "0.10.1",
+					"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+					"integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+					"dev": true,
+					"requires": {
+						"babel-runtime": "6.26.0",
+						"babel-types": "6.26.0",
+						"private": "0.1.8"
+					}
+				},
+				"regexpu-core": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+					"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+					"dev": true,
+					"requires": {
+						"regenerate": "1.3.3",
+						"regjsgen": "0.2.0",
+						"regjsparser": "0.1.5"
+					}
+				},
+				"regjsgen": {
+					"version": "0.2.0",
+					"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+					"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+					"dev": true
+				},
+				"regjsparser": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+					"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+					"dev": true,
+					"requires": {
+						"jsesc": "0.5.0"
+					},
+					"dependencies": {
+						"jsesc": {
+							"version": "0.5.0",
+							"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+							"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+							"dev": true
+						}
+					}
+				},
+				"repeating": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+					"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+					"dev": true,
+					"requires": {
+						"is-finite": "1.0.2"
+					}
+				},
+				"slash": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				},
+				"source-map-support": {
+					"version": "0.4.18",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+					"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+					"dev": true,
+					"requires": {
+						"source-map": "0.5.7"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				},
+				"to-fast-properties": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+					"dev": true
+				},
+				"trim-right": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+					"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+					"dev": true
+				}
+			}
+		},
+		"chokidar": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
+			"integrity": "sha1-L0RHq16W5Q+z14n9kNTHLg5McMI=",
+			"dev": true,
+			"requires": {
+				"anymatch": "1.3.2",
+				"async-each": "1.0.1",
+				"fsevents": "1.1.2",
+				"glob-parent": "2.0.0",
+				"inherits": "2.0.3",
+				"is-binary-path": "1.0.1",
+				"is-glob": "2.0.1",
+				"path-is-absolute": "1.0.1",
+				"readdirp": "2.1.0"
+			},
+			"dependencies": {
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"dev": true
+				}
+			}
+		},
+		"chromedriver": {
+			"version": "2.33.2",
+			"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.33.2.tgz",
+			"integrity": "sha512-etnQeM8Mqiys50ZB4IiuNqeB1WS2/EKFhVXwkPQ1qjzKMMAJUyrLjaRUcoZoHrbjGscnhBrWkRR+p3zcTGMhDg==",
+			"dev": true,
+			"requires": {
+				"del": "3.0.0",
+				"extract-zip": "1.6.5",
+				"kew": "0.7.0",
+				"mkdirp": "0.5.1",
+				"request": "2.83.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+					"integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
+					"dev": true,
+					"requires": {
+						"co": "4.6.0",
+						"fast-deep-equal": "1.0.0",
+						"fast-json-stable-stringify": "2.0.0",
+						"json-schema-traverse": "0.3.1"
+					}
+				},
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+					"dev": true
+				},
+				"asynckit": {
+					"version": "0.4.0",
+					"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+					"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+					"dev": true
+				},
+				"aws-sign2": {
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+					"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+					"dev": true
+				},
+				"boom": {
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+					"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+					"dev": true,
+					"requires": {
+						"hoek": "4.2.0"
+					}
+				},
+				"combined-stream": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+					"dev": true,
+					"requires": {
+						"delayed-stream": "1.0.0"
+					}
+				},
+				"cryptiles": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+					"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+					"dev": true,
+					"requires": {
+						"boom": "5.2.0"
+					},
+					"dependencies": {
+						"boom": {
+							"version": "5.2.0",
+							"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+							"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+							"dev": true,
+							"requires": {
+								"hoek": "4.2.0"
+							}
+						}
+					}
+				},
+				"delayed-stream": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+					"dev": true
+				},
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+					"dev": true
+				},
+				"form-data": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+					"integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+					"dev": true,
+					"requires": {
+						"asynckit": "0.4.0",
+						"combined-stream": "1.0.5",
+						"mime-types": "2.1.17"
+					}
+				},
+				"har-schema": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+					"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+					"dev": true
+				},
+				"har-validator": {
+					"version": "5.0.3",
+					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+					"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+					"dev": true,
+					"requires": {
+						"ajv": "5.3.0",
+						"har-schema": "2.0.0"
+					}
+				},
+				"hawk": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+					"integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+					"dev": true,
+					"requires": {
+						"boom": "4.3.1",
+						"cryptiles": "3.1.2",
+						"hoek": "4.2.0",
+						"sntp": "2.1.0"
+					}
+				},
+				"hoek": {
+					"version": "4.2.0",
+					"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+					"integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
+					"dev": true
+				},
+				"http-signature": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+					"dev": true,
+					"requires": {
+						"assert-plus": "1.0.0",
+						"jsprim": "1.4.1",
+						"sshpk": "1.13.1"
+					}
+				},
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+					"dev": true
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"performance-now": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+					"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.5.1",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+					"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+					"dev": true
+				},
+				"request": {
+					"version": "2.83.0",
+					"resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+					"integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+					"dev": true,
+					"requires": {
+						"aws-sign2": "0.7.0",
+						"aws4": "1.6.0",
+						"caseless": "0.12.0",
+						"combined-stream": "1.0.5",
+						"extend": "3.0.1",
+						"forever-agent": "0.6.1",
+						"form-data": "2.3.1",
+						"har-validator": "5.0.3",
+						"hawk": "6.0.2",
+						"http-signature": "1.2.0",
+						"is-typedarray": "1.0.0",
+						"isstream": "0.1.2",
+						"json-stringify-safe": "5.0.1",
+						"mime-types": "2.1.17",
+						"oauth-sign": "0.8.2",
+						"performance-now": "2.1.0",
+						"qs": "6.5.1",
+						"safe-buffer": "5.1.1",
+						"stringstream": "0.0.5",
+						"tough-cookie": "2.3.3",
+						"tunnel-agent": "0.6.0",
+						"uuid": "3.1.0"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"sntp": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+					"integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+					"dev": true,
+					"requires": {
+						"hoek": "4.2.0"
+					}
+				},
+				"tough-cookie": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+					"integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+					"dev": true,
+					"requires": {
+						"punycode": "1.4.1"
+					}
+				}
+			}
+		},
+		"circular-json": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+			"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+			"dev": true
+		},
+		"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=",
+			"dev": true,
+			"requires": {
+				"restore-cursor": "2.0.0"
+			}
+		},
+		"cli-table": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+			"integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+			"dev": true,
+			"requires": {
+				"colors": "1.0.3"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+					"integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+					"dev": true
+				}
+			}
+		},
+		"cli-width": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+			"dev": true
+		},
+		"cliui": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+			"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"center-align": "0.1.3",
+				"right-align": "0.1.3",
+				"wordwrap": "0.0.2"
+			},
+			"dependencies": {
+				"wordwrap": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
+		"clone": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+			"integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+			"dev": true
+		},
+		"clone-regexp": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
+			"integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
+			"dev": true,
+			"requires": {
+				"is-regexp": "1.0.0",
+				"is-supported-regexp-flag": "1.0.0"
+			}
+		},
+		"co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+		},
+		"code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+		},
+		"codemirror": {
+			"version": "5.31.0",
+			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.31.0.tgz",
+			"integrity": "sha512-LKbMZKoAz7pMmWuSEl253G6yyloSulj1kXfvYv+3n3I8wMiI7QwnCHwKM3Zw5S9ItNV28Layq0/ihQXWmn9T9w=="
+		},
+		"color": {
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
+			"integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+			"dev": true,
+			"requires": {
+				"clone": "1.0.2",
+				"color-convert": "1.9.0",
+				"color-string": "0.3.0"
+			}
+		},
+		"color-convert": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
+			"integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+			"dev": true,
+			"requires": {
+				"color-name": "1.1.3"
+			}
+		},
+		"color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"color-string": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
+			"integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+			"dev": true,
+			"requires": {
+				"color-name": "1.1.3"
+			}
+		},
+		"colors": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+			"dev": true
+		},
+		"combined-stream": {
+			"version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+			"requires": {
+				"delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+			}
+		},
+		"commander": {
+			"version": "2.11.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+			"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+			"dev": true
+		},
+		"compare-func": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
+			"integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
+			"dev": true,
+			"requires": {
+				"array-ify": "1.0.0",
+				"dot-prop": "3.0.0"
+			},
+			"dependencies": {
+				"dot-prop": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
+					"integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+					"dev": true,
+					"requires": {
+						"is-obj": "1.0.1"
+					}
+				}
+			}
+		},
+		"complex.js": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.4.tgz",
+			"integrity": "sha512-Syl95HpxUTS0QjwNxencZsKukgh1zdS9uXeXX2Us0pHaqBR6kiZZi0AkZ9VpZFwHJyVIUVzI4EumjWdXP3fy6w==",
+			"dev": true
+		},
+		"compress-commons": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+			"integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
+			"dev": true,
+			"requires": {
+				"buffer-crc32": "0.2.13",
+				"crc32-stream": "2.0.0",
+				"normalize-path": "2.1.1",
+				"readable-stream": "2.3.3"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
+			}
+		},
+		"concat-map": {
+			"version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+		},
+		"concat-stream": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+			"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+			"requires": {
+				"inherits": "2.0.3",
+				"readable-stream": "2.3.3",
+				"typedarray": "0.0.6"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+				}
+			}
+		},
+		"configstore": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+			"integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+			"requires": {
+				"dot-prop": "4.2.0",
+				"graceful-fs": "4.1.11",
+				"make-dir": "1.1.0",
+				"unique-string": "1.0.0",
+				"write-file-atomic": "2.3.0",
+				"xdg-basedir": "3.0.0"
+			}
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+		},
+		"conventional-changelog": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
+			"integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
+			"dev": true,
+			"requires": {
+				"conventional-changelog-angular": "1.5.1",
+				"conventional-changelog-atom": "0.1.1",
+				"conventional-changelog-codemirror": "0.2.0",
+				"conventional-changelog-core": "1.9.2",
+				"conventional-changelog-ember": "0.2.8",
+				"conventional-changelog-eslint": "0.2.0",
+				"conventional-changelog-express": "0.2.0",
+				"conventional-changelog-jquery": "0.1.0",
+				"conventional-changelog-jscs": "0.1.0",
+				"conventional-changelog-jshint": "0.2.0"
+			}
+		},
+		"conventional-changelog-angular": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
+			"integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
+			"dev": true,
+			"requires": {
+				"compare-func": "1.3.2",
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-atom": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
+			"integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
+			"dev": true,
+			"requires": {
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-cli": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz",
+			"integrity": "sha512-b8B1i01df+Lq5t16L3g8uoEGdzViChIKmIo7TComL4DqqrjrtasRaT+/4OPGcApEgX86JkBqb4KVt85ytQinUw==",
+			"dev": true,
+			"requires": {
+				"add-stream": "1.0.0",
+				"conventional-changelog": "1.1.6",
+				"lodash": "4.17.4",
+				"meow": "3.7.0",
+				"tempfile": "1.1.1"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				}
+			}
+		},
+		"conventional-changelog-codemirror": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
+			"integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
+			"dev": true,
+			"requires": {
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-core": {
+			"version": "1.9.2",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
+			"integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
+			"dev": true,
+			"requires": {
+				"conventional-changelog-writer": "2.0.1",
+				"conventional-commits-parser": "2.0.0",
+				"dateformat": "1.0.12",
+				"get-pkg-repo": "1.4.0",
+				"git-raw-commits": "1.2.0",
+				"git-remote-origin-url": "2.0.0",
+				"git-semver-tags": "1.2.2",
+				"lodash": "4.17.4",
+				"normalize-package-data": "2.4.0",
+				"q": "1.5.1",
+				"read-pkg": "1.1.0",
+				"read-pkg-up": "1.0.1",
+				"through2": "2.0.3"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				}
+			}
+		},
+		"conventional-changelog-ember": {
+			"version": "0.2.8",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
+			"integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
+			"dev": true,
+			"requires": {
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-eslint": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
+			"integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
+			"dev": true,
+			"requires": {
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-express": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
+			"integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
+			"dev": true,
+			"requires": {
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-jquery": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz",
+			"integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
+			"dev": true,
+			"requires": {
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-jscs": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz",
+			"integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
+			"dev": true,
+			"requires": {
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-jshint": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
+			"integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
+			"dev": true,
+			"requires": {
+				"compare-func": "1.3.2",
+				"q": "1.5.1"
+			}
+		},
+		"conventional-changelog-writer": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
+			"integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
+			"dev": true,
+			"requires": {
+				"compare-func": "1.3.2",
+				"conventional-commits-filter": "1.0.0",
+				"dateformat": "1.0.12",
+				"handlebars": "4.0.11",
+				"json-stringify-safe": "5.0.1",
+				"lodash": "4.17.4",
+				"meow": "3.7.0",
+				"semver": "5.4.1",
+				"split": "1.0.1",
+				"through2": "2.0.3"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				}
+			}
+		},
+		"conventional-commits-filter": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz",
+			"integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=",
+			"dev": true,
+			"requires": {
+				"is-subset": "0.1.1",
+				"modify-values": "1.0.0"
+			}
+		},
+		"conventional-commits-parser": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
+			"integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
+			"dev": true,
+			"requires": {
+				"JSONStream": "1.3.1",
+				"is-text-path": "1.0.1",
+				"lodash": "4.17.4",
+				"meow": "3.7.0",
+				"split2": "2.2.0",
+				"through2": "2.0.3",
+				"trim-off-newlines": "1.0.1"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				}
+			}
+		},
+		"core-js": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+			"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+		},
+		"core-util-is": {
+			"version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+		},
+		"cosmiconfig": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz",
+			"integrity": "sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==",
+			"dev": true,
+			"requires": {
+				"is-directory": "0.3.1",
+				"js-yaml": "3.10.0",
+				"parse-json": "3.0.0",
+				"require-from-string": "2.0.1"
+			},
+			"dependencies": {
+				"parse-json": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
+					"integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
+					"dev": true,
+					"requires": {
+						"error-ex": "1.3.1"
+					}
+				}
+			}
+		},
+		"crc": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+			"integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
+			"dev": true
+		},
+		"crc32-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
+			"integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
+			"dev": true,
+			"requires": {
+				"crc": "3.5.0",
+				"readable-stream": "2.3.3"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
+			}
+		},
+		"create-error-class": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+			"integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+			"requires": {
+				"capture-stack-trace": "1.0.0"
+			}
+		},
+		"cross-spawn": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+			"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+			"dev": true,
+			"requires": {
+				"lru-cache": "4.1.1",
+				"shebang-command": "1.2.0",
+				"which": "1.2.14"
+			}
+		},
+		"cryptiles": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+			"requires": {
+				"boom": "2.10.1"
+			}
+		},
+		"crypto-browserify": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz",
+			"integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA="
+		},
+		"crypto-random-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+			"integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+		},
+		"css": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
+			"integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
+			"dev": true,
+			"requires": {
+				"inherits": "2.0.3",
+				"source-map": "0.1.43",
+				"source-map-resolve": "0.3.1",
+				"urix": "0.1.0"
+			},
+			"dependencies": {
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"requires": {
+						"amdefine": "1.0.1"
+					}
+				}
+			}
+		},
+		"css-color-function": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
+			"integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
+			"dev": true,
+			"requires": {
+				"balanced-match": "0.1.0",
+				"color": "0.11.4",
+				"debug": "3.1.0",
+				"rgb": "0.1.0"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.1.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
+					"integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
+					"dev": true
+				},
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				}
+			}
+		},
+		"css-parse": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+			"integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+			"dev": true,
+			"requires": {
+				"css": "2.2.1"
+			}
+		},
+		"css-value": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
+			"integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
+			"dev": true
+		},
+		"ctype": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+			"integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
+			"dev": true
+		},
+		"cucumber": {
+			"version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
+			"dev": true,
+			"requires": {
+				"camel-case": "3.0.0",
+				"cli-table": "0.3.1",
+				"co": "4.6.0",
+				"colors": "1.1.2",
+				"commander": "2.11.0",
+				"duration": "0.2.0",
+				"fibers": "1.0.15",
+				"figures": "1.7.0",
+				"gherkin": "4.0.0",
+				"glob": "7.1.2",
+				"is-generator": "1.0.3",
+				"lodash": "4.17.4",
+				"meteor-promise": "0.8.6",
+				"stack-chain": "1.3.7",
+				"stacktrace-js": "1.3.1"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				}
+			}
+		},
+		"currently-unhandled": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+			"dev": true,
+			"requires": {
+				"array-find-index": "1.0.2"
+			}
+		},
+		"d": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+			"integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
+			"dev": true,
+			"requires": {
+				"es5-ext": "0.10.35"
+			}
+		},
+		"dargs": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
+			"integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
+			"dev": true,
+			"requires": {
+				"number-is-nan": "1.0.1"
+			},
+			"dependencies": {
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"dev": true
+				}
+			}
+		},
+		"dashdash": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+			"requires": {
+				"assert-plus": "1.0.0"
+			},
+			"dependencies": {
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+				}
+			}
+		},
+		"dateformat": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+			"integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+			"dev": true,
+			"requires": {
+				"get-stdin": "4.0.1",
+				"meow": "3.7.0"
+			}
+		},
+		"ddp-ejson": {
+			"version": "0.8.1-3",
+			"resolved": "https://registry.npmjs.org/ddp-ejson/-/ddp-ejson-0.8.1-3.tgz",
+			"integrity": "sha1-6dZ0Zqt4m9dOfZcHSjbiQGkO7sI=",
+			"dev": true,
+			"requires": {
+				"ddp-underscore-patched": "0.8.1-2"
+			}
+		},
+		"ddp-underscore-patched": {
+			"version": "0.8.1-2",
+			"resolved": "https://registry.npmjs.org/ddp-underscore-patched/-/ddp-underscore-patched-0.8.1-2.tgz",
+			"integrity": "sha1-ZaQU6fIuxagqoWOG40NmtI/Ozx0=",
+			"dev": true
+		},
+		"decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true
+		},
+		"decimal.js": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-7.2.3.tgz",
+			"integrity": "sha512-AoFI37QS0S87Ft0r3Bdz4q9xSpm1Paa9lSeKLXgMPk/u/+QPIM5Gy4DHcZQS1seqPJH4gHLauPGn347z0HbsrA==",
+			"dev": true
+		},
+		"deep-eql": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+			"integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
+			"dev": true,
+			"requires": {
+				"type-detect": "0.1.1"
+			},
+			"dependencies": {
+				"type-detect": {
+					"version": "0.1.1",
+					"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
+					"integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
+					"dev": true
+				}
+			}
+		},
+		"deep-extend": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+			"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+		},
+		"deep-is": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+			"dev": true
+		},
+		"deepmerge": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
+			"integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
+			"dev": true
+		},
+		"define-properties": {
+			"version": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+			"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+			"requires": {
+				"foreach": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+				"object-keys": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"
+			}
+		},
+		"del": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+			"dev": true,
+			"requires": {
+				"globby": "6.1.0",
+				"is-path-cwd": "1.0.0",
+				"is-path-in-cwd": "1.0.0",
+				"p-map": "1.2.0",
+				"pify": "3.0.0",
+				"rimraf": "2.6.1"
+			}
+		},
+		"delayed-stream": {
+			"version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+		},
+		"delegates": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+		},
+		"diff": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
+			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
+			"dev": true
+		},
+		"doctrine": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
+			"integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+			"dev": true,
+			"requires": {
+				"esutils": "2.0.2",
+				"isarray": "1.0.0"
+			},
+			"dependencies": {
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				}
+			}
+		},
+		"dom-serializer": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+			"requires": {
+				"domelementtype": "1.1.3",
+				"entities": "1.1.1"
+			},
+			"dependencies": {
+				"domelementtype": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
+				}
+			}
+		},
+		"domelementtype": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
+		},
+		"domhandler": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
+			"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
+			"requires": {
+				"domelementtype": "1.3.0"
+			}
+		},
+		"domutils": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
+			"integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
+			"requires": {
+				"dom-serializer": "0.1.0",
+				"domelementtype": "1.3.0"
+			}
+		},
+		"dot-prop": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+			"integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+			"requires": {
+				"is-obj": "1.0.1"
+			}
+		},
+		"dtrace-provider": {
+			"version": "0.8.5",
+			"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz",
+			"integrity": "sha1-mOu6Ihr6xG4cOf02hY2Pk2dSS5I=",
+			"optional": true,
+			"requires": {
+				"nan": "2.6.2"
+			}
+		},
+		"duplexify": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+			"integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+			"requires": {
+				"end-of-stream": "1.4.0",
+				"inherits": "2.0.3",
+				"readable-stream": "2.3.3",
+				"stream-shift": "1.0.0"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+				}
+			}
+		},
+		"duration": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/duration/-/duration-0.2.0.tgz",
+			"integrity": "sha1-X5xN+q//ZV3phhEu/iXFl43YUUY=",
+			"dev": true,
+			"requires": {
+				"d": "0.1.1",
+				"es5-ext": "0.10.35"
+			}
+		},
+		"ecc-jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+			"optional": true,
+			"requires": {
+				"jsbn": "0.1.1"
+			}
+		},
+		"ecdsa-sig-formatter": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+			"integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+			"requires": {
+				"base64url": "2.0.0",
+				"safe-buffer": "5.1.1"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
+			}
+		},
+		"ejs": {
+			"version": "2.5.7",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
+			"integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
+			"dev": true
+		},
+		"electron-to-chromium": {
+			"version": "1.3.27",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
+			"integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+			"dev": true
+		},
+		"emailreplyparser": {
+			"version": "0.0.5",
+			"resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
+			"integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
+		},
+		"end-of-stream": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+			"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+			"requires": {
+				"once": "1.4.0"
+			}
+		},
+		"ent": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+			"integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
+		},
+		"entities": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+		},
+		"error-ex": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+			"integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+			"dev": true,
+			"requires": {
+				"is-arrayish": "0.2.1"
+			}
+		},
+		"error-stack-parser": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
+			"integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
+			"dev": true,
+			"requires": {
+				"stackframe": "0.3.1"
+			}
+		},
+		"es-abstract": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
+			"integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
+			"requires": {
+				"es-to-primitive": "1.1.1",
+				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
+				"is-callable": "1.1.3",
+				"is-regex": "1.0.4"
+			}
+		},
+		"es-to-primitive": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+			"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+			"requires": {
+				"is-callable": "1.1.3",
+				"is-date-object": "1.0.1",
+				"is-symbol": "1.0.1"
+			}
+		},
+		"es5-ext": {
+			"version": "0.10.35",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
+			"integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
+			"dev": true,
+			"requires": {
+				"es6-iterator": "2.0.3",
+				"es6-symbol": "3.1.1"
+			}
+		},
+		"es6-iterator": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+			"dev": true,
+			"requires": {
+				"d": "1.0.0",
+				"es5-ext": "0.10.35",
+				"es6-symbol": "3.1.1"
+			},
+			"dependencies": {
+				"d": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+					"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+					"dev": true,
+					"requires": {
+						"es5-ext": "0.10.35"
+					}
+				}
+			}
+		},
+		"es6-promise": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
+			"integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI=",
+			"dev": true
+		},
+		"es6-symbol": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+			"dev": true,
+			"requires": {
+				"d": "1.0.0",
+				"es5-ext": "0.10.35"
+			},
+			"dependencies": {
+				"d": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+					"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+					"dev": true,
+					"requires": {
+						"es5-ext": "0.10.35"
+					}
+				}
+			}
+		},
+		"escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true
+		},
+		"eslint": {
+			"version": "4.10.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz",
+			"integrity": "sha512-MMVl8P/dYUFZEvolL8PYt7qc5LNdS2lwheq9BYa5Y07FblhcZqFyaUqlS8TW5QITGex21tV4Lk0a3fK8lsJIkA==",
+			"dev": true,
+			"requires": {
+				"ajv": "5.3.0",
+				"babel-code-frame": "6.26.0",
+				"chalk": "2.3.0",
+				"concat-stream": "1.6.0",
+				"cross-spawn": "5.1.0",
+				"debug": "3.1.0",
+				"doctrine": "2.0.0",
+				"eslint-scope": "3.7.1",
+				"espree": "3.5.1",
+				"esquery": "1.0.0",
+				"estraverse": "4.2.0",
+				"esutils": "2.0.2",
+				"file-entry-cache": "2.0.0",
+				"functional-red-black-tree": "1.0.1",
+				"glob": "7.1.2",
+				"globals": "9.18.0",
+				"ignore": "3.3.7",
+				"imurmurhash": "0.1.4",
+				"inquirer": "3.0.6",
+				"is-resolvable": "1.0.0",
+				"js-yaml": "3.10.0",
+				"json-stable-stringify": "1.0.1",
+				"levn": "0.3.0",
+				"lodash": "4.17.4",
+				"minimatch": "3.0.4",
+				"mkdirp": "0.5.1",
+				"natural-compare": "1.4.0",
+				"optionator": "0.8.2",
+				"path-is-inside": "1.0.2",
+				"pluralize": "7.0.0",
+				"progress": "2.0.0",
+				"require-uncached": "1.0.3",
+				"semver": "5.4.1",
+				"strip-ansi": "4.0.0",
+				"strip-json-comments": "2.0.1",
+				"table": "4.0.2",
+				"text-table": "0.2.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+					"integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
+					"dev": true,
+					"requires": {
+						"co": "4.6.0",
+						"fast-deep-equal": "1.0.0",
+						"fast-json-stable-stringify": "2.0.0",
+						"json-schema-traverse": "0.3.1"
+					}
+				},
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"babel-code-frame": {
+					"version": "6.26.0",
+					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+					"dev": true,
+					"requires": {
+						"chalk": "1.1.3",
+						"esutils": "2.0.2",
+						"js-tokens": "3.0.2"
+					},
+					"dependencies": {
+						"chalk": {
+							"version": "1.1.3",
+							"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+							"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+							"dev": true,
+							"requires": {
+								"ansi-styles": "2.2.1",
+								"escape-string-regexp": "1.0.5",
+								"has-ansi": "2.0.0",
+								"strip-ansi": "3.0.1",
+								"supports-color": "2.0.0"
+							}
+						},
+						"strip-ansi": {
+							"version": "3.0.1",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+							"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "2.1.1"
+							}
+						}
+					}
+				},
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"brace-expansion": {
+					"version": "1.1.8",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+					"dev": true,
+					"requires": {
+						"balanced-match": "1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					},
+					"dependencies": {
+						"ansi-styles": {
+							"version": "3.2.0",
+							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+							"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+							"dev": true,
+							"requires": {
+								"color-convert": "1.9.0"
+							}
+						},
+						"supports-color": {
+							"version": "4.5.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+							"dev": true,
+							"requires": {
+								"has-flag": "2.0.0"
+							}
+						}
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"dev": true
+				},
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+					"dev": true
+				},
+				"globals": {
+					"version": "9.18.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+					"dev": true
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"js-tokens": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "1.1.8"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"progress": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+					"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "3.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						}
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				}
+			}
+		},
+		"eslint-scope": {
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+			"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+			"dev": true,
+			"requires": {
+				"esrecurse": "4.2.0",
+				"estraverse": "4.2.0"
+			}
+		},
+		"espree": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
+			"integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
+			"dev": true,
+			"requires": {
+				"acorn": "5.2.1",
+				"acorn-jsx": "3.0.1"
+			}
+		},
+		"esprima": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+			"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+			"dev": true
+		},
+		"esquery": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
+			"integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+			"dev": true,
+			"requires": {
+				"estraverse": "4.2.0"
+			}
+		},
+		"esrecurse": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
+			"integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+			"dev": true,
+			"requires": {
+				"estraverse": "4.2.0",
+				"object-assign": "4.1.1"
+			}
+		},
+		"estraverse": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+			"dev": true
+		},
+		"events": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+		},
+		"execall": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
+			"integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
+			"dev": true,
+			"requires": {
+				"clone-regexp": "1.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expand-brackets": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+			"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+			"dev": true,
+			"requires": {
+				"is-posix-bracket": "0.1.1"
+			}
+		},
+		"expand-range": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+			"dev": true,
+			"requires": {
+				"fill-range": "2.2.3"
+			}
+		},
+		"extend": {
+			"version": "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==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "0.4.19",
+				"jschardet": "1.6.0",
+				"tmp": "0.0.33"
+			}
+		},
+		"extglob": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+			"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+			"dev": true,
+			"requires": {
+				"is-extglob": "1.0.0"
+			}
+		},
+		"extract-zip": {
+			"version": "1.6.5",
+			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz",
+			"integrity": "sha1-maBnNbbqIOqbcF13ms/8yHz/BEA=",
+			"dev": true,
+			"requires": {
+				"concat-stream": "1.6.0",
+				"debug": "2.2.0",
+				"mkdirp": "0.5.0",
+				"yauzl": "2.4.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.2.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+					"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+					"dev": true,
+					"requires": {
+						"ms": "0.7.1"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.0",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"ms": {
+					"version": "0.7.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+					"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+					"dev": true
+				}
+			}
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		},
+		"fast-deep-equal": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+			"integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+			"dev": true
+		},
+		"fast-json-stable-stringify": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+			"dev": true
+		},
+		"fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"faye-websocket": {
+			"version": "0.9.4",
+			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz",
+			"integrity": "sha1-iFk0x57/sECVSeDAo4Ae0XpAza0=",
+			"dev": true,
+			"requires": {
+				"websocket-driver": "0.7.0"
+			}
+		},
+		"fd-slicer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+			"dev": true,
+			"requires": {
+				"pend": "1.2.0"
+			}
+		},
+		"fg-lodash": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/fg-lodash/-/fg-lodash-0.0.2.tgz",
+			"integrity": "sha1-mINSU39CfaavIiEpu2OsyknmL6M=",
+			"dev": true,
+			"requires": {
+				"lodash": "2.4.2",
+				"underscore.string": "2.3.3"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+					"integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
+					"dev": true
+				},
+				"underscore.string": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
+					"integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=",
+					"dev": true
+				}
+			}
+		},
+		"fibers": {
+			"version": "1.0.15",
+			"resolved": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
+			"integrity": "sha1-IvA5yPGLhWGQ+75N7PBWFUwerpw=",
+			"dev": true
+		},
+		"figures": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+			"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "1.0.5",
+				"object-assign": "4.1.1"
+			},
+			"dependencies": {
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				}
+			}
+		},
+		"file-entry-cache": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+			"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+			"dev": true,
+			"requires": {
+				"flat-cache": "1.3.0",
+				"object-assign": "4.1.1"
+			}
+		},
+		"file-type": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-7.2.0.tgz",
+			"integrity": "sha1-ETz+1S4daVmrgCSJBuLyWozcy3Q="
+		},
+		"filename-regex": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+			"dev": true
+		},
+		"fill-keys": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+			"integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=",
+			"dev": true,
+			"requires": {
+				"is-object": "1.0.1",
+				"merge-descriptors": "1.0.1"
+			}
+		},
+		"fill-range": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+			"dev": true,
+			"requires": {
+				"is-number": "2.1.0",
+				"isobject": "2.1.0",
+				"randomatic": "1.1.7",
+				"repeat-element": "1.1.2",
+				"repeat-string": "1.6.1"
+			}
+		},
+		"find-up": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+			"dev": true,
+			"requires": {
+				"path-exists": "2.1.0",
+				"pinkie-promise": "2.0.1"
+			},
+			"dependencies": {
+				"path-exists": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+					"dev": true,
+					"requires": {
+						"pinkie-promise": "2.0.1"
+					}
+				}
+			}
+		},
+		"flat-cache": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+			"integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+			"dev": true,
+			"requires": {
+				"circular-json": "0.3.3",
+				"del": "2.2.2",
+				"graceful-fs": "4.1.11",
+				"write": "0.2.1"
+			},
+			"dependencies": {
+				"del": {
+					"version": "2.2.2",
+					"resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+					"integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+					"dev": true,
+					"requires": {
+						"globby": "5.0.0",
+						"is-path-cwd": "1.0.0",
+						"is-path-in-cwd": "1.0.0",
+						"object-assign": "4.1.1",
+						"pify": "2.3.0",
+						"pinkie-promise": "2.0.1",
+						"rimraf": "2.6.1"
+					}
+				},
+				"globby": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+					"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+					"dev": true,
+					"requires": {
+						"array-union": "1.0.2",
+						"arrify": "1.0.1",
+						"glob": "7.1.2",
+						"object-assign": "4.1.1",
+						"pify": "2.3.0",
+						"pinkie-promise": "2.0.1"
+					}
+				},
+				"pify": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+					"dev": true
+				}
+			}
+		},
+		"flatten": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+			"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+			"dev": true
+		},
+		"for-in": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+			"dev": true
+		},
+		"for-own": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+			"dev": true,
+			"requires": {
+				"for-in": "1.0.2"
+			}
+		},
+		"foreach": {
+			"version": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+		},
+		"forever-agent": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+		},
+		"form-data": {
+			"version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+			"requires": {
+				"asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
+			}
+		},
+		"fraction.js": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.2.tgz",
+			"integrity": "sha512-OswcigOSil3vYXgrPSx4NCaSyPikXqVNYN/4CyhS0ucVOJ4GVYr6KQQLLcAudvS/4bBOzxqJ3XIsFaaMjl98ZQ==",
+			"dev": true
+		},
+		"freeport": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/freeport/-/freeport-1.0.5.tgz",
+			"integrity": "sha1-JV6KuEFwwzuoXZkOghrl9KGpvF0=",
+			"dev": true
+		},
+		"fs-extra": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+			"integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "4.1.11",
+				"jsonfile": "2.4.0",
+				"klaw": "1.3.1"
+			}
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+		},
+		"fsevents": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+			"integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"nan": "2.6.2",
+				"node-pre-gyp": "0.6.36"
+			},
+			"dependencies": {
+				"abbrev": {
+					"version": "1.1.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"ajv": {
+					"version": "4.11.8",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"co": "4.6.0",
+						"json-stable-stringify": "1.0.1"
+					}
+				},
+				"ansi-regex": {
+					"version": "2.1.1",
+					"bundled": true,
+					"dev": true
+				},
+				"aproba": {
+					"version": "1.1.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"are-we-there-yet": {
+					"version": "1.1.4",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"delegates": "1.0.0",
+						"readable-stream": "2.2.9"
+					}
+				},
+				"asn1": {
+					"version": "0.2.3",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"assert-plus": {
+					"version": "0.2.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"asynckit": {
+					"version": "0.4.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"aws-sign2": {
+					"version": "0.6.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"aws4": {
+					"version": "1.6.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"balanced-match": {
+					"version": "0.4.2",
+					"bundled": true,
+					"dev": true
+				},
+				"bcrypt-pbkdf": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"tweetnacl": "0.14.5"
+					}
+				},
+				"block-stream": {
+					"version": "0.0.9",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"inherits": "2.0.3"
+					}
+				},
+				"boom": {
+					"version": "2.10.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"hoek": "2.16.3"
+					}
+				},
+				"brace-expansion": {
+					"version": "1.1.7",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"balanced-match": "0.4.2",
+						"concat-map": "0.0.1"
+					}
+				},
+				"buffer-shims": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"caseless": {
+					"version": "0.12.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"co": {
+					"version": "4.6.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"code-point-at": {
+					"version": "1.1.0",
+					"bundled": true,
+					"dev": true
+				},
+				"combined-stream": {
+					"version": "1.0.5",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"delayed-stream": "1.0.0"
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"console-control-strings": {
+					"version": "1.1.0",
+					"bundled": true,
+					"dev": true
+				},
+				"core-util-is": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"cryptiles": {
+					"version": "2.0.5",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"boom": "2.10.1"
+					}
+				},
+				"dashdash": {
+					"version": "1.14.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"assert-plus": "1.0.0"
+					},
+					"dependencies": {
+						"assert-plus": {
+							"version": "1.0.0",
+							"bundled": true,
+							"dev": true,
+							"optional": true
+						}
+					}
+				},
+				"debug": {
+					"version": "2.6.8",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"deep-extend": {
+					"version": "0.4.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"delayed-stream": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"delegates": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"ecc-jsbn": {
+					"version": "0.1.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"jsbn": "0.1.1"
+					}
+				},
+				"extend": {
+					"version": "3.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"extsprintf": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"forever-agent": {
+					"version": "0.6.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"form-data": {
+					"version": "2.1.4",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"asynckit": "0.4.0",
+						"combined-stream": "1.0.5",
+						"mime-types": "2.1.15"
+					}
+				},
+				"fs.realpath": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"fstream": {
+					"version": "1.0.11",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"graceful-fs": "4.1.11",
+						"inherits": "2.0.3",
+						"mkdirp": "0.5.1",
+						"rimraf": "2.6.1"
+					}
+				},
+				"fstream-ignore": {
+					"version": "1.0.5",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"fstream": "1.0.11",
+						"inherits": "2.0.3",
+						"minimatch": "3.0.4"
+					}
+				},
+				"gauge": {
+					"version": "2.7.4",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"aproba": "1.1.1",
+						"console-control-strings": "1.1.0",
+						"has-unicode": "2.0.1",
+						"object-assign": "4.1.1",
+						"signal-exit": "3.0.2",
+						"string-width": "1.0.2",
+						"strip-ansi": "3.0.1",
+						"wide-align": "1.1.2"
+					}
+				},
+				"getpass": {
+					"version": "0.1.7",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"assert-plus": "1.0.0"
+					},
+					"dependencies": {
+						"assert-plus": {
+							"version": "1.0.0",
+							"bundled": true,
+							"dev": true,
+							"optional": true
+						}
+					}
+				},
+				"glob": {
+					"version": "7.1.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"fs.realpath": "1.0.0",
+						"inflight": "1.0.6",
+						"inherits": "2.0.3",
+						"minimatch": "3.0.4",
+						"once": "1.4.0",
+						"path-is-absolute": "1.0.1"
+					}
+				},
+				"graceful-fs": {
+					"version": "4.1.11",
+					"bundled": true,
+					"dev": true
+				},
+				"har-schema": {
+					"version": "1.0.5",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"har-validator": {
+					"version": "4.2.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"ajv": "4.11.8",
+						"har-schema": "1.0.5"
+					}
+				},
+				"has-unicode": {
+					"version": "2.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"hawk": {
+					"version": "3.1.3",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"boom": "2.10.1",
+						"cryptiles": "2.0.5",
+						"hoek": "2.16.3",
+						"sntp": "1.0.9"
+					}
+				},
+				"hoek": {
+					"version": "2.16.3",
+					"bundled": true,
+					"dev": true
+				},
+				"http-signature": {
+					"version": "1.1.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"assert-plus": "0.2.0",
+						"jsprim": "1.4.0",
+						"sshpk": "1.13.0"
+					}
+				},
+				"inflight": {
+					"version": "1.0.6",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"once": "1.4.0",
+						"wrappy": "1.0.2"
+					}
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"bundled": true,
+					"dev": true
+				},
+				"ini": {
+					"version": "1.3.4",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"number-is-nan": "1.0.1"
+					}
+				},
+				"is-typedarray": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"isstream": {
+					"version": "0.1.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"jodid25519": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"jsbn": "0.1.1"
+					}
+				},
+				"jsbn": {
+					"version": "0.1.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"json-schema": {
+					"version": "0.2.3",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"json-stable-stringify": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"jsonify": "0.0.0"
+					}
+				},
+				"json-stringify-safe": {
+					"version": "5.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"jsonify": {
+					"version": "0.0.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"jsprim": {
+					"version": "1.4.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"assert-plus": "1.0.0",
+						"extsprintf": "1.0.2",
+						"json-schema": "0.2.3",
+						"verror": "1.3.6"
+					},
+					"dependencies": {
+						"assert-plus": {
+							"version": "1.0.0",
+							"bundled": true,
+							"dev": true,
+							"optional": true
+						}
+					}
+				},
+				"mime-db": {
+					"version": "1.27.0",
+					"bundled": true,
+					"dev": true
+				},
+				"mime-types": {
+					"version": "2.1.15",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"mime-db": "1.27.0"
+					}
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"brace-expansion": "1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"bundled": true,
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"node-pre-gyp": {
+					"version": "0.6.36",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"mkdirp": "0.5.1",
+						"nopt": "4.0.1",
+						"npmlog": "4.1.0",
+						"rc": "1.2.1",
+						"request": "2.81.0",
+						"rimraf": "2.6.1",
+						"semver": "5.3.0",
+						"tar": "2.2.1",
+						"tar-pack": "3.4.0"
+					}
+				},
+				"nopt": {
+					"version": "4.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"abbrev": "1.1.0",
+						"osenv": "0.1.4"
+					}
+				},
+				"npmlog": {
+					"version": "4.1.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"are-we-there-yet": "1.1.4",
+						"console-control-strings": "1.1.0",
+						"gauge": "2.7.4",
+						"set-blocking": "2.0.0"
+					}
+				},
+				"number-is-nan": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"oauth-sign": {
+					"version": "0.8.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"wrappy": "1.0.2"
+					}
+				},
+				"os-homedir": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"osenv": {
+					"version": "0.1.4",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"os-homedir": "1.0.2",
+						"os-tmpdir": "1.0.2"
+					}
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"performance-now": {
+					"version": "0.2.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"bundled": true,
+					"dev": true
+				},
+				"punycode": {
+					"version": "1.4.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"qs": {
+					"version": "6.4.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"rc": {
+					"version": "1.2.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"deep-extend": "0.4.2",
+						"ini": "1.3.4",
+						"minimist": "1.2.0",
+						"strip-json-comments": "2.0.1"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "1.2.0",
+							"bundled": true,
+							"dev": true,
+							"optional": true
+						}
+					}
+				},
+				"readable-stream": {
+					"version": "2.2.9",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"buffer-shims": "1.0.0",
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"string_decoder": "1.0.1",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"request": {
+					"version": "2.81.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"aws-sign2": "0.6.0",
+						"aws4": "1.6.0",
+						"caseless": "0.12.0",
+						"combined-stream": "1.0.5",
+						"extend": "3.0.1",
+						"forever-agent": "0.6.1",
+						"form-data": "2.1.4",
+						"har-validator": "4.2.1",
+						"hawk": "3.1.3",
+						"http-signature": "1.1.1",
+						"is-typedarray": "1.0.0",
+						"isstream": "0.1.2",
+						"json-stringify-safe": "5.0.1",
+						"mime-types": "2.1.15",
+						"oauth-sign": "0.8.2",
+						"performance-now": "0.2.0",
+						"qs": "6.4.0",
+						"safe-buffer": "5.0.1",
+						"stringstream": "0.0.5",
+						"tough-cookie": "2.3.2",
+						"tunnel-agent": "0.6.0",
+						"uuid": "3.0.1"
+					}
+				},
+				"rimraf": {
+					"version": "2.6.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"glob": "7.1.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.0.1",
+					"bundled": true,
+					"dev": true
+				},
+				"semver": {
+					"version": "5.3.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"sntp": {
+					"version": "1.0.9",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"hoek": "2.16.3"
+					}
+				},
+				"sshpk": {
+					"version": "1.13.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"asn1": "0.2.3",
+						"assert-plus": "1.0.0",
+						"bcrypt-pbkdf": "1.0.1",
+						"dashdash": "1.14.1",
+						"ecc-jsbn": "0.1.1",
+						"getpass": "0.1.7",
+						"jodid25519": "1.0.2",
+						"jsbn": "0.1.1",
+						"tweetnacl": "0.14.5"
+					},
+					"dependencies": {
+						"assert-plus": {
+							"version": "1.0.0",
+							"bundled": true,
+							"dev": true,
+							"optional": true
+						}
+					}
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"code-point-at": "1.1.0",
+						"is-fullwidth-code-point": "1.0.0",
+						"strip-ansi": "3.0.1"
+					}
+				},
+				"string_decoder": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.0.1"
+					}
+				},
+				"stringstream": {
+					"version": "0.0.5",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"tar": {
+					"version": "2.2.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"block-stream": "0.0.9",
+						"fstream": "1.0.11",
+						"inherits": "2.0.3"
+					}
+				},
+				"tar-pack": {
+					"version": "3.4.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"debug": "2.6.8",
+						"fstream": "1.0.11",
+						"fstream-ignore": "1.0.5",
+						"once": "1.4.0",
+						"readable-stream": "2.2.9",
+						"rimraf": "2.6.1",
+						"tar": "2.2.1",
+						"uid-number": "0.0.6"
+					}
+				},
+				"tough-cookie": {
+					"version": "2.3.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"punycode": "1.4.1"
+					}
+				},
+				"tunnel-agent": {
+					"version": "0.6.0",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"safe-buffer": "5.0.1"
+					}
+				},
+				"tweetnacl": {
+					"version": "0.14.5",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"uid-number": {
+					"version": "0.0.6",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"uuid": {
+					"version": "3.0.1",
+					"bundled": true,
+					"dev": true,
+					"optional": true
+				},
+				"verror": {
+					"version": "1.3.6",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"extsprintf": "1.0.2"
+					}
+				},
+				"wide-align": {
+					"version": "1.1.2",
+					"bundled": true,
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"string-width": "1.0.2"
+					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				}
+			}
+		},
+		"fstream": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+			"requires": {
+				"graceful-fs": "4.1.11",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+				"rimraf": "2.6.1"
+			}
+		},
+		"fstream-ignore": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+			"integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+			"requires": {
+				"fstream": "1.0.11",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+			}
+		},
+		"function-bind": {
+			"version": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
+			"integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E="
+		},
+		"functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+			"requires": {
+				"aproba": "1.1.2",
+				"console-control-strings": "1.1.0",
+				"has-unicode": "2.0.1",
+				"object-assign": "4.1.1",
+				"signal-exit": "3.0.2",
+				"string-width": "1.0.2",
+				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+				"wide-align": "1.1.2"
+			}
+		},
+		"gaze": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+			"integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+			"dev": true,
+			"requires": {
+				"globule": "1.2.0"
+			}
+		},
+		"gcp-metadata": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+			"integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+			"requires": {
+				"extend": "3.0.1",
+				"retry-request": "3.1.0"
+			},
+			"dependencies": {
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+				}
+			}
+		},
+		"gcs-resumable-upload": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+			"integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+			"requires": {
+				"buffer-equal": "1.0.0",
+				"configstore": "3.1.1",
+				"google-auto-auth": "0.7.2",
+				"pumpify": "1.3.5",
+				"request": "2.81.0",
+				"stream-events": "1.0.2",
+				"through2": "2.0.3"
+			}
+		},
+		"generate-function": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+			"integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+			"dev": true
+		},
+		"generate-object-property": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+			"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+			"dev": true,
+			"requires": {
+				"is-property": "1.0.2"
+			}
+		},
+		"get-pkg-repo": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
+			"integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "2.5.0",
+				"meow": "3.7.0",
+				"normalize-package-data": "2.4.0",
+				"parse-github-repo-url": "1.4.1",
+				"through2": "2.0.3"
+			}
+		},
+		"get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+			"dev": true
+		},
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+			"requires": {
+				"assert-plus": "1.0.0"
+			},
+			"dependencies": {
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+				}
+			}
+		},
+		"gherkin": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/gherkin/-/gherkin-4.0.0.tgz",
+			"integrity": "sha1-edzgTRIj6kO0hip2vlzo+JwSwyw=",
+			"dev": true
+		},
+		"git-raw-commits": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz",
+			"integrity": "sha1-DzqL/ZmuDy2LkiTViJKXXppS0Dw=",
+			"dev": true,
+			"requires": {
+				"dargs": "4.1.0",
+				"lodash.template": "4.4.0",
+				"meow": "3.7.0",
+				"split2": "2.2.0",
+				"through2": "2.0.3"
+			}
+		},
+		"git-remote-origin-url": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
+			"integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
+			"dev": true,
+			"requires": {
+				"gitconfiglocal": "1.0.0",
+				"pify": "2.3.0"
+			},
+			"dependencies": {
+				"pify": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+					"dev": true
+				}
+			}
+		},
+		"git-semver-tags": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
+			"integrity": "sha512-fhINopzKBQ8m6YlQt7gPf6T6hFnTF84O7U+8kYJmfjjKk7gbmKGj+BLcKNWi+japPbBwCeXXnfKwThpJpR9ZnQ==",
+			"dev": true,
+			"requires": {
+				"meow": "3.7.0",
+				"semver": "5.4.1"
+			}
+		},
+		"gitconfiglocal": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
+			"integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
+			"dev": true,
+			"requires": {
+				"ini": "1.3.4"
+			}
+		},
+		"glob": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+			"requires": {
+				"fs.realpath": "1.0.0",
+				"inflight": "1.0.6",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+				"once": "1.4.0",
+				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+			}
+		},
+		"glob-base": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+			"dev": true,
+			"requires": {
+				"glob-parent": "2.0.0",
+				"is-glob": "2.0.1"
+			}
+		},
+		"glob-parent": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+			"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+			"dev": true,
+			"requires": {
+				"is-glob": "2.0.1"
+			}
+		},
+		"globby": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+			"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+			"dev": true,
+			"requires": {
+				"array-union": "1.0.2",
+				"glob": "7.1.2",
+				"object-assign": "4.1.1",
+				"pify": "2.3.0",
+				"pinkie-promise": "2.0.1"
+			},
+			"dependencies": {
+				"pify": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+					"dev": true
+				}
+			}
+		},
+		"globjoin": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+			"integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+			"dev": true
+		},
+		"globule": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+			"integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+			"dev": true,
+			"requires": {
+				"glob": "7.1.2",
+				"lodash": "4.17.4",
+				"minimatch": "3.0.4"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"brace-expansion": {
+					"version": "1.1.8",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+					"dev": true,
+					"requires": {
+						"balanced-match": "1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "1.1.8"
+					}
+				}
+			}
+		},
+		"gonzales-pe": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.2.tgz",
+			"integrity": "sha512-jbQFnd6CD3iEuGtSKVhsh37tQIkkx+/eil3tufyYOHMouG89uqtkWGP03P4vxY+XGeJnCi3ewIY+BnBogyC61Q==",
+			"dev": true,
+			"requires": {
+				"minimist": "1.1.3"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+					"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+					"dev": true
+				}
+			}
+		},
+		"google-auth-library": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+			"integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+			"requires": {
+				"gtoken": "1.2.3",
+				"jws": "3.1.4",
+				"lodash.noop": "3.0.1",
+				"request": "2.81.0"
+			}
+		},
+		"google-auto-auth": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+			"integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+			"requires": {
+				"async": "2.5.0",
+				"gcp-metadata": "0.3.1",
+				"google-auth-library": "0.10.0",
+				"request": "2.81.0"
+			}
+		},
+		"google-p12-pem": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+			"integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+			"requires": {
+				"node-forge": "0.7.1"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.1.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+		},
+		"graceful-readlink": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+			"integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+			"dev": true
+		},
+		"growl": {
+			"version": "1.9.2",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+			"dev": true
+		},
+		"gtoken": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz",
+			"integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==",
+			"requires": {
+				"google-p12-pem": "0.1.2",
+				"jws": "3.1.4",
+				"mime": "1.4.1",
+				"request": "2.81.0"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+				}
+			}
+		},
+		"handlebars": {
+			"version": "4.0.11",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
+			"integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
+			"dev": true,
+			"requires": {
+				"async": "1.5.2",
+				"optimist": "0.6.1",
+				"source-map": "0.4.4",
+				"uglify-js": "2.8.29"
+			},
+			"dependencies": {
+				"async": {
+					"version": "1.5.2",
+					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+					"dev": true
+				},
+				"minimist": {
+					"version": "0.0.10",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+					"integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+					"dev": true
+				},
+				"optimist": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+					"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.10",
+						"wordwrap": "0.0.3"
+					}
+				},
+				"source-map": {
+					"version": "0.4.4",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+					"dev": true,
+					"requires": {
+						"amdefine": "1.0.1"
+					}
+				},
+				"wordwrap": {
+					"version": "0.0.3",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+					"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+					"dev": true
+				}
+			}
+		},
+		"hapi": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
+			"integrity": "sha1-h+N6Bum0meiXkOLcERqpZotuYX8=",
+			"dev": true,
+			"requires": {
+				"accept": "1.0.0",
+				"ammo": "1.0.0",
+				"boom": "2.7.2",
+				"call": "2.0.1",
+				"catbox": "4.3.0",
+				"catbox-memory": "1.1.1",
+				"cryptiles": "2.0.4",
+				"h2o2": "4.0.1",
+				"heavy": "3.0.0",
+				"hoek": "2.14.0",
+				"inert": "2.1.5",
+				"iron": "2.1.2",
+				"items": "1.1.0",
+				"joi": "6.4.1",
+				"kilt": "1.1.1",
+				"mimos": "2.0.2",
+				"peekaboo": "1.0.0",
+				"qs": "4.0.0",
+				"shot": "1.5.3",
+				"statehood": "2.1.1",
+				"subtext": "1.1.1",
+				"topo": "1.0.2",
+				"vision": "2.0.1"
+			},
+			"dependencies": {
+				"accept": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/accept/-/accept-1.0.0.tgz",
+					"integrity": "sha1-g++IOWi4WkDFARYEKCoiD/AeYq0=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0"
+					}
+				},
+				"ammo": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/ammo/-/ammo-1.0.0.tgz",
+					"integrity": "sha1-4FlIG/aAhzj66G1GT3L6DBLWeoU=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0"
+					}
+				},
+				"boom": {
+					"version": "2.7.2",
+					"resolved": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
+					"integrity": "sha1-2tYo2Jf3/S4yzIIZfxMweXHPg1Q=",
+					"dev": true,
+					"requires": {
+						"hoek": "2.14.0"
+					}
+				},
+				"call": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/call/-/call-2.0.1.tgz",
+					"integrity": "sha1-SbQnCZQ96JoyJYqpEbWHUeI3eg4=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0"
+					}
+				},
+				"catbox": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/catbox/-/catbox-4.3.0.tgz",
+					"integrity": "sha1-IiN3vWfxKRrA4l0AAC0GWp3385o=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0",
+						"joi": "6.4.1"
+					}
+				},
+				"catbox-memory": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-1.1.1.tgz",
+					"integrity": "sha1-QqUvgLye+nJmAeltQBYDNhJIGig=",
+					"dev": true,
+					"requires": {
+						"hoek": "2.14.0"
+					}
+				},
+				"cryptiles": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz",
+					"integrity": "sha1-CeoXdbnhx95+YKmdQqtvCM4aEoU=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2"
+					}
+				},
+				"h2o2": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/h2o2/-/h2o2-4.0.1.tgz",
+					"integrity": "sha1-eg4rztHZcXjsVs48ykjgxW3un40=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0",
+						"joi": "6.4.1",
+						"wreck": "6.0.0"
+					}
+				},
+				"heavy": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/heavy/-/heavy-3.0.0.tgz",
+					"integrity": "sha1-/QEIdiExYy+IVIontVQSws9SKwA=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0",
+						"joi": "6.4.1"
+					}
+				},
+				"hoek": {
+					"version": "2.14.0",
+					"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
+					"integrity": "sha1-gSEWkfUqWoNa5J7b8eickANHaqQ=",
+					"dev": true
+				},
+				"inert": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/inert/-/inert-2.1.5.tgz",
+					"integrity": "sha1-eybZTEHGLAPsHU726LRe1WuDSFk=",
+					"dev": true,
+					"requires": {
+						"ammo": "1.0.0",
+						"boom": "2.7.2",
+						"hoek": "2.14.0",
+						"items": "1.1.0",
+						"joi": "6.4.1",
+						"lru-cache": "2.6.4"
+					},
+					"dependencies": {
+						"lru-cache": {
+							"version": "2.6.4",
+							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
+							"integrity": "sha1-JnUZDM0bBwHsL2UqTQ09QA12wN0=",
+							"dev": true
+						}
+					}
+				},
+				"iron": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/iron/-/iron-2.1.2.tgz",
+					"integrity": "sha1-WR2RiiVAdTxEbY5DfNzwz6gBEU8=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"cryptiles": "2.0.4",
+						"hoek": "2.14.0"
+					}
+				},
+				"items": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
+					"integrity": "sha1-rZ1VhAsimGDLPRYLMidMLUvZ4mI=",
+					"dev": true
+				},
+				"joi": {
+					"version": "6.4.1",
+					"resolved": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
+					"integrity": "sha1-9Q9CRTVgBo5jg9oVrC0w3Xzra24=",
+					"dev": true,
+					"requires": {
+						"hoek": "2.14.0",
+						"isemail": "1.1.1",
+						"moment": "2.10.3",
+						"topo": "1.0.2"
+					},
+					"dependencies": {
+						"isemail": {
+							"version": "1.1.1",
+							"resolved": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz",
+							"integrity": "sha1-4Mj23D9HCX53dzlcaJYnGqJWw7U=",
+							"dev": true
+						},
+						"moment": {
+							"version": "2.10.3",
+							"resolved": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz",
+							"integrity": "sha1-CruZ8wf2UhgwjGk17+KcV7Ggon8=",
+							"dev": true
+						}
+					}
+				},
+				"kilt": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/kilt/-/kilt-1.1.1.tgz",
+					"integrity": "sha1-d7SmFjyn+lshN6iMFzNCFuwj1ds=",
+					"dev": true,
+					"requires": {
+						"hoek": "2.14.0"
+					}
+				},
+				"mimos": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/mimos/-/mimos-2.0.2.tgz",
+					"integrity": "sha1-wyQXF+dblZkr54esfdbbGptTmx4=",
+					"dev": true,
+					"requires": {
+						"hoek": "2.14.0",
+						"mime-db": "1.14.0"
+					},
+					"dependencies": {
+						"mime-db": {
+							"version": "1.14.0",
+							"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz",
+							"integrity": "sha1-1WHxC27mbbUflK5leilRp0IX7YM=",
+							"dev": true
+						}
+					}
+				},
+				"peekaboo": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/peekaboo/-/peekaboo-1.0.0.tgz",
+					"integrity": "sha1-wNspJq1lTSygH3ymUKtFkadk/EI=",
+					"dev": true
+				},
+				"qs": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
+					"integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=",
+					"dev": true
+				},
+				"shot": {
+					"version": "1.5.3",
+					"resolved": "https://registry.npmjs.org/shot/-/shot-1.5.3.tgz",
+					"integrity": "sha1-SGEHREO8VHLCNRthpGtOrsAH9Xo=",
+					"dev": true,
+					"requires": {
+						"hoek": "2.14.0"
+					}
+				},
+				"statehood": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/statehood/-/statehood-2.1.1.tgz",
+					"integrity": "sha1-AfFwtmxeklqvZ5qdMiulkYb8AAk=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"cryptiles": "2.0.4",
+						"hoek": "2.14.0",
+						"iron": "2.1.2",
+						"items": "1.1.0",
+						"joi": "6.4.1"
+					}
+				},
+				"subtext": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/subtext/-/subtext-1.1.1.tgz",
+					"integrity": "sha1-DJGCWuZdUXhVWT2DHjPvdaKEFWs=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"content": "1.0.1",
+						"hoek": "2.14.0",
+						"pez": "1.0.0",
+						"qs": "4.0.0",
+						"wreck": "6.0.0"
+					},
+					"dependencies": {
+						"content": {
+							"version": "1.0.1",
+							"resolved": "https://registry.npmjs.org/content/-/content-1.0.1.tgz",
+							"integrity": "sha1-gD60s7eJVGD9jGnGhMd1RmmvG6E=",
+							"dev": true,
+							"requires": {
+								"boom": "2.7.2",
+								"hoek": "2.14.0"
+							}
+						},
+						"pez": {
+							"version": "1.0.0",
+							"resolved": "https://registry.npmjs.org/pez/-/pez-1.0.0.tgz",
+							"integrity": "sha1-hEMYpc5wku7d/6KV4YB5rHefoBg=",
+							"dev": true,
+							"requires": {
+								"b64": "2.0.0",
+								"boom": "2.7.2",
+								"content": "1.0.1",
+								"hoek": "2.14.0",
+								"nigel": "1.0.1"
+							},
+							"dependencies": {
+								"b64": {
+									"version": "2.0.0",
+									"resolved": "https://registry.npmjs.org/b64/-/b64-2.0.0.tgz",
+									"integrity": "sha1-tZlbJPR+v9nxMQF6bntdZHVvtvM=",
+									"dev": true,
+									"requires": {
+										"hoek": "2.14.0"
+									}
+								},
+								"nigel": {
+									"version": "1.0.1",
+									"resolved": "https://registry.npmjs.org/nigel/-/nigel-1.0.1.tgz",
+									"integrity": "sha1-RjmJr4gSePuqHTzJOCPb0XtDYKE=",
+									"dev": true,
+									"requires": {
+										"hoek": "2.14.0",
+										"vise": "1.0.0"
+									},
+									"dependencies": {
+										"vise": {
+											"version": "1.0.0",
+											"resolved": "https://registry.npmjs.org/vise/-/vise-1.0.0.tgz",
+											"integrity": "sha1-KDRb5N5aNB4V/SgW/Z6j5zA+jfM=",
+											"dev": true,
+											"requires": {
+												"hoek": "2.14.0"
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				},
+				"topo": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz",
+					"integrity": "sha1-QhV8N8HeTTeIPM3R1skChHqGDbk=",
+					"dev": true,
+					"requires": {
+						"hoek": "2.14.0"
+					}
+				},
+				"vision": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/vision/-/vision-2.0.1.tgz",
+					"integrity": "sha1-0BIlW6buQm0GlqNOHfMy/sVeZzw=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0",
+						"items": "1.1.0",
+						"joi": "6.4.1"
+					}
+				},
+				"wreck": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/wreck/-/wreck-6.0.0.tgz",
+					"integrity": "sha1-T0CGaWHl14rOBPMqa38x8/PFFjg=",
+					"dev": true,
+					"requires": {
+						"boom": "2.7.2",
+						"hoek": "2.14.0"
+					}
+				}
+			}
+		},
+		"har-schema": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+			"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+		},
+		"har-validator": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+			"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+			"requires": {
+				"ajv": "4.11.8",
+				"har-schema": "1.0.5"
+			}
+		},
+		"has": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+			"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+			"requires": {
+				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"
+			}
+		},
+		"has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "2.1.1"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				}
+			}
+		},
+		"has-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+			"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+			"dev": true
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		},
+		"hash-stream-validation": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+			"integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+			"requires": {
+				"through2": "2.0.3"
+			}
+		},
+		"hasha": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+			"integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
+			"dev": true,
+			"requires": {
+				"is-stream": "1.1.0",
+				"pinkie-promise": "2.0.1"
+			}
+		},
+		"hawk": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+			"requires": {
+				"boom": "2.10.1",
+				"cryptiles": "2.0.5",
+				"hoek": "2.16.3",
+				"sntp": "1.0.9"
+			}
+		},
+		"he": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
+		},
+		"highlight.js": {
+			"version": "9.12.0",
+			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+			"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
+		},
+		"hoek": {
+			"version": "2.16.3",
+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+		},
+		"hosted-git-info": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+			"integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+			"dev": true
+		},
+		"html-tags": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+			"integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
+			"dev": true
+		},
+		"html-to-text": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.1.0.tgz",
+			"integrity": "sha1-fwfvIXPloEQecxXBkgE6AKUtXko=",
+			"requires": {
+				"he": "1.1.1",
+				"htmlparser2": "3.9.2",
+				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+				"underscore": "1.8.3",
+				"underscore.string": "3.3.4"
+			},
+			"dependencies": {
+				"underscore.string": {
+					"version": "3.3.4",
+					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
+					"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
+					"requires": {
+						"sprintf-js": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+					}
+				}
+			}
+		},
+		"htmlparser2": {
+			"version": "3.9.2",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+			"requires": {
+				"domelementtype": "1.3.0",
+				"domhandler": "2.4.1",
+				"domutils": "1.6.2",
+				"entities": "1.1.1",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+				"readable-stream": "2.3.3"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+					"requires": {
+						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				}
+			}
+		},
+		"http-parser-js": {
+			"version": "0.4.9",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+			"integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+			"dev": true
+		},
+		"http-signature": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+			"requires": {
+				"assert-plus": "0.2.0",
+				"jsprim": "1.4.1",
+				"sshpk": "1.13.1"
+			}
+		},
+		"https-proxy-agent": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+			"integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
+			"dev": true,
+			"requires": {
+				"agent-base": "2.1.1",
+				"debug": "2.6.9",
+				"extend": "3.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				}
+			}
+		},
+		"iconv-lite": {
+			"version": "0.4.19",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+			"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+			"dev": true
+		},
+		"ieee754": {
+			"version": "1.1.8",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+			"integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+		},
+		"ignore": {
+			"version": "3.3.7",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
+			"integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
+			"dev": true
+		},
+		"imap": {
+			"version": "0.8.19",
+			"resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
+			"integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
+			"requires": {
+				"readable-stream": "1.1.14",
+				"utf7": "1.0.2"
+			},
+			"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": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+						"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="
+				}
+			}
+		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+		},
+		"indent-string": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+			"dev": true,
+			"requires": {
+				"repeating": "2.0.1"
+			},
+			"dependencies": {
+				"is-finite": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+					"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+					"dev": true,
+					"requires": {
+						"number-is-nan": "1.0.1"
+					}
+				},
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"dev": true
+				},
+				"repeating": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+					"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+					"dev": true,
+					"requires": {
+						"is-finite": "1.0.2"
+					}
+				}
+			}
+		},
+		"indexes-of": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+			"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+			"dev": true
+		},
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"requires": {
+				"once": "1.4.0",
+				"wrappy": "1.0.2"
+			}
+		},
+		"inherits": {
+			"version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+		},
+		"ini": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+			"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+		},
+		"inquirer": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
+			"integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
+			"dev": true,
+			"requires": {
+				"ansi-escapes": "1.4.0",
+				"chalk": "1.1.3",
+				"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": "4.1.0",
+				"string-width": "2.1.1",
+				"strip-ansi": "3.0.1",
+				"through": "2.3.8"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"figures": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+					"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+					"dev": true,
+					"requires": {
+						"escape-string-regexp": "1.0.5"
+					}
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"is-fullwidth-code-point": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"string-width": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+					"dev": true,
+					"requires": {
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "4.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "3.0.0"
+							}
+						}
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				}
+			}
+		},
+		"is": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
+		},
+		"is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"dev": true
+		},
+		"is-binary-path": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+			"dev": true,
+			"requires": {
+				"binary-extensions": "1.10.0"
+			}
+		},
+		"is-buffer": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+			"dev": true
+		},
+		"is-builtin-module": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+			"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+			"dev": true,
+			"requires": {
+				"builtin-modules": "1.1.1"
+			}
+		},
+		"is-callable": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+			"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
+		},
+		"is-date-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+		},
+		"is-directory": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+			"dev": true
+		},
+		"is-dotfile": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+			"dev": true
+		},
+		"is-equal-shallow": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+			"dev": true,
+			"requires": {
+				"is-primitive": "2.0.0"
+			}
+		},
+		"is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+			"dev": true
+		},
+		"is-extglob": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+			"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+			"dev": true
+		},
+		"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": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+			}
+		},
+		"is-generator": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
+			"integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+			"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+			"dev": true,
+			"requires": {
+				"is-extglob": "1.0.0"
+			}
+		},
+		"is-my-json-valid": {
+			"version": "2.16.1",
+			"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
+			"integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+			"dev": true,
+			"requires": {
+				"generate-function": "2.0.0",
+				"generate-object-property": "1.2.0",
+				"jsonpointer": "4.0.1",
+				"xtend": "4.0.1"
+			},
+			"dependencies": {
+				"xtend": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+					"dev": true
+				}
+			}
+		},
+		"is-number": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+			"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+			"dev": true,
+			"requires": {
+				"kind-of": "3.2.2"
+			}
+		},
+		"is-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+		},
+		"is-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+			"integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+			"dev": true
+		},
+		"is-path-cwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+			"dev": true
+		},
+		"is-path-in-cwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+			"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+			"dev": true,
+			"requires": {
+				"is-path-inside": "1.0.0"
+			}
+		},
+		"is-path-inside": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
+			"integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+			"dev": true,
+			"requires": {
+				"path-is-inside": "1.0.2"
+			}
+		},
+		"is-posix-bracket": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+			"dev": true
+		},
+		"is-primitive": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+			"dev": true
+		},
+		"is-promise": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+			"dev": true
+		},
+		"is-property": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+			"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+			"dev": true
+		},
+		"is-regex": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+			"requires": {
+				"has": "1.0.1"
+			}
+		},
+		"is-regexp": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+			"integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
+			"dev": true
+		},
+		"is-resolvable": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
+			"integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
+			"dev": true,
+			"requires": {
+				"tryit": "1.0.3"
+			}
+		},
+		"is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+			"dev": true
+		},
+		"is-stream-ended": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
+			"integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
+		},
+		"is-subset": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
+			"integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
+			"dev": true
+		},
+		"is-supported-regexp-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz",
+			"integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=",
+			"dev": true
+		},
+		"is-symbol": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+			"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
+		},
+		"is-text-path": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
+			"integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
+			"dev": true,
+			"requires": {
+				"text-extensions": "1.7.0"
+			}
+		},
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+		},
+		"is-utf8": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+			"dev": true
+		},
+		"isarray": {
+			"version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"isnumeric": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
+			"integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ=",
+			"dev": true
+		},
+		"isobject": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+			"dev": true,
+			"requires": {
+				"isarray": "1.0.0"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				}
+			}
+		},
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+		},
+		"jasmine": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
+			"integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
+			"dev": true,
+			"requires": {
+				"exit": "0.1.2",
+				"glob": "7.1.2",
+				"jasmine-core": "2.8.0"
+			}
+		},
+		"jasmine-core": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+			"integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
+			"dev": true
+		},
+		"javascript-natural-sort": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+			"integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=",
+			"dev": true
+		},
+		"jmespath": {
+			"version": "0.15.0",
+			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+			"integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+		},
+		"jquery": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
+			"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
+		},
+		"js-base64": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
+			"integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.10.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+			"integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+			"dev": true,
+			"requires": {
+				"argparse": "1.0.9",
+				"esprima": "4.0.0"
+			}
+		},
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+			"optional": true
+		},
+		"jschardet": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz",
+			"integrity": "sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==",
+			"dev": true
+		},
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+		},
+		"json-schema-traverse": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+			"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+			"dev": true
+		},
+		"json-stable-stringify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+			"requires": {
+				"jsonify": "0.0.0"
+			}
+		},
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+		},
+		"json3": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+			"dev": true
+		},
+		"jsonfile": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+			"integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "4.1.11"
+			}
+		},
+		"jsonify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+		},
+		"jsonparse": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+			"dev": true
+		},
+		"jsonpointer": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+			"dev": true
+		},
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+			"requires": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
+			},
+			"dependencies": {
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+				}
+			}
+		},
+		"jwa": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+			"integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+			"requires": {
+				"base64url": "2.0.0",
+				"buffer-equal-constant-time": "1.0.1",
+				"ecdsa-sig-formatter": "1.0.9",
+				"safe-buffer": "5.1.1"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
+			}
+		},
+		"jws": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+			"integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+			"requires": {
+				"base64url": "2.0.0",
+				"jwa": "1.1.5",
+				"safe-buffer": "5.1.1"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				}
+			}
+		},
+		"kew": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+			"integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
+			"dev": true
+		},
+		"kind-of": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+			"dev": true,
+			"requires": {
+				"is-buffer": "1.1.6"
+			}
+		},
+		"klaw": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+			"integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "4.1.11"
+			}
+		},
+		"known-css-properties": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.4.1.tgz",
+			"integrity": "sha512-n+ThoCKhyMFKkMfksdLMP5ndp+VzwDRzQdH6JlmZ2GTpUenYB2EeEKjOue2SErAAG/MmBSUISpwvawDhydWQdQ==",
+			"dev": true
+		},
+		"lazy-cache": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+			"integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+			"dev": true,
+			"optional": true
+		},
+		"lazystream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+			"dev": true,
+			"requires": {
+				"readable-stream": "2.3.3"
+			},
+			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
+			}
+		},
+		"ldap-filter": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz",
+			"integrity": "sha1-8rhCvguG2jNSeYUFsx68rlkNd9A=",
+			"requires": {
+				"assert-plus": "0.1.5"
+			},
+			"dependencies": {
+				"assert-plus": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+					"integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA="
+				}
+			}
+		},
+		"ldapjs": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.1.tgz",
+			"integrity": "sha1-NSuBKudLCo6WVJpLiWBg7uG5pUY=",
+			"requires": {
+				"asn1": "0.2.3",
+				"assert-plus": "1.0.0",
+				"backoff": "2.5.0",
+				"bunyan": "1.8.12",
+				"dashdash": "1.14.1",
+				"dtrace-provider": "0.7.1",
+				"ldap-filter": "0.2.2",
+				"once": "1.4.0",
+				"vasync": "1.6.4",
+				"verror": "1.10.0"
+			},
+			"dependencies": {
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+				},
+				"dtrace-provider": {
+					"version": "0.7.1",
+					"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz",
+					"integrity": "sha1-wGswjy8Q1dWDiuycVx5dWI3HHQQ=",
+					"optional": true,
+					"requires": {
+						"nan": "2.6.2"
+					}
+				}
+			}
+		},
+		"levn": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "1.1.2",
+				"type-check": "0.3.2"
+			}
+		},
+		"libbase64": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
+			"integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
+		},
+		"libmime": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/libmime/-/libmime-3.1.0.tgz",
+			"integrity": "sha1-EVAS8WcgUa3IgJqPk5Vf/DZI7fk=",
+			"requires": {
+				"iconv-lite": "0.4.15",
+				"libbase64": "0.1.0",
+				"libqp": "1.1.0"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.15",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
+				}
+			}
+		},
+		"libqp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
+			"integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
+		},
+		"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=",
+			"dev": true,
+			"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"
+			},
+			"dependencies": {
+				"pify": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+					"dev": true
+				}
+			}
+		},
+		"lodash": {
+			"version": "4.17.4",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+			"dev": true
+		},
+		"lodash._baseassign": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+			"dev": true,
+			"requires": {
+				"lodash._basecopy": "3.0.1",
+				"lodash.keys": "3.1.2"
+			}
+		},
+		"lodash._basecopy": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+			"dev": true
+		},
+		"lodash._basecreate": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
+			"integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
+			"dev": true
+		},
+		"lodash._getnative": {
+			"version": "3.9.1",
+			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+			"dev": true
+		},
+		"lodash._isiterateecall": {
+			"version": "3.0.9",
+			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+			"dev": true
+		},
+		"lodash._reinterpolate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+			"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+			"dev": true
+		},
+		"lodash.create": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
+			"integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
+			"dev": true,
+			"requires": {
+				"lodash._baseassign": "3.2.0",
+				"lodash._basecreate": "3.0.3",
+				"lodash._isiterateecall": "3.0.9"
+			}
+		},
+		"lodash.isarguments": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+			"dev": true
+		},
+		"lodash.isarray": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+			"dev": true
+		},
+		"lodash.keys": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+			"dev": true,
+			"requires": {
+				"lodash._getnative": "3.9.1",
+				"lodash.isarguments": "3.1.0",
+				"lodash.isarray": "3.0.4"
+			}
+		},
+		"lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"dev": true
+		},
+		"lodash.noop": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
+			"integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
+		},
+		"lodash.template": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
+			"integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+			"dev": true,
+			"requires": {
+				"lodash._reinterpolate": "3.0.0",
+				"lodash.templatesettings": "4.1.0"
+			}
+		},
+		"lodash.templatesettings": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
+			"integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+			"dev": true,
+			"requires": {
+				"lodash._reinterpolate": "3.0.0"
+			}
+		},
+		"lodash.uniq": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+			"dev": true
+		},
+		"log-driver": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
+			"integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
+		},
+		"log-symbols": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
+			"integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
+			"dev": true,
+			"requires": {
+				"chalk": "2.3.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
+			}
+		},
+		"loglevel": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz",
+			"integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80=",
+			"dev": true
+		},
+		"longest": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+			"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+			"dev": true
+		},
+		"loud-rejection": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+			"dev": true,
+			"requires": {
+				"currently-unhandled": "0.4.1",
+				"signal-exit": "3.0.2"
+			}
+		},
+		"lower-case": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+			"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+			"dev": true
+		},
+		"lru-cache": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+			"integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+			"dev": true,
+			"requires": {
+				"pseudomap": "1.0.2",
+				"yallist": "2.1.2"
+			}
+		},
+		"mailparser-node4": {
+			"version": "2.0.2-2",
+			"resolved": "https://registry.npmjs.org/mailparser-node4/-/mailparser-node4-2.0.2-2.tgz",
+			"integrity": "sha1-IK4hESKWWldb3a6bTADTwtgkR/U=",
+			"requires": {
+				"addressparser": "1.0.1",
+				"array-includes": "3.0.3",
+				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+				"he": "1.1.1",
+				"html-to-text": "3.1.0",
+				"iconv-lite": "0.4.15",
+				"libmime": "3.1.0",
+				"mailsplit-node4": "4.0.1",
+				"marked": "0.3.6"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.15",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
+				}
+			}
+		},
+		"mailsplit-node4": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/mailsplit-node4/-/mailsplit-node4-4.0.1.tgz",
+			"integrity": "sha1-XVEiiDVA/Ac/fQcWwv9ntlDP1oI=",
+			"requires": {
+				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+				"libbase64": "0.1.0",
+				"libmime": "3.1.0",
+				"libqp": "1.1.0"
+			}
+		},
+		"make-dir": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
+			"integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
+			"requires": {
+				"pify": "3.0.0"
+			}
+		},
+		"map-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+			"dev": true
+		},
+		"marked": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+			"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
+		},
+		"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=",
+			"dev": true
+		},
+		"mathjs": {
+			"version": "3.16.5",
+			"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-3.16.5.tgz",
+			"integrity": "sha1-11pSZUNdKCSwZ7N6R4dx3uv2qsw=",
+			"dev": true,
+			"requires": {
+				"complex.js": "2.0.4",
+				"decimal.js": "7.2.3",
+				"fraction.js": "4.0.2",
+				"javascript-natural-sort": "0.7.1",
+				"seed-random": "2.2.0",
+				"tiny-emitter": "2.0.0",
+				"typed-function": "0.10.5"
+			}
+		},
+		"mathml-tag-names": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz",
+			"integrity": "sha1-jUEmgWi/htEQK5gQnijlMeejRXg=",
+			"dev": true
+		},
+		"meow": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+			"dev": true,
+			"requires": {
+				"camelcase-keys": "2.1.0",
+				"decamelize": "1.2.0",
+				"loud-rejection": "1.6.0",
+				"map-obj": "1.0.1",
+				"minimist": "1.2.0",
+				"normalize-package-data": "2.4.0",
+				"object-assign": "4.1.1",
+				"read-pkg-up": "1.0.1",
+				"redent": "1.0.0",
+				"trim-newlines": "1.0.0"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"dev": true
+				}
+			}
+		},
+		"merge-descriptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+			"dev": true
+		},
+		"meteor-promise": {
+			"version": "0.8.6",
+			"resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.6.tgz",
+			"integrity": "sha512-HP6tOr67z/9XU2Dr0F2SSr8WRTuE23AG9Dj578DCJPEYHs67OLKBviU8A8rwvbwMD7Lu2+Of+yAMz2Wd8r4yxg==",
+			"dev": true
+		},
+		"methmeth": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
+			"integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
+		},
+		"micromatch": {
+			"version": "2.3.11",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+			"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+			"dev": true,
+			"requires": {
+				"arr-diff": "2.0.0",
+				"array-unique": "0.2.1",
+				"braces": "1.8.5",
+				"expand-brackets": "0.1.5",
+				"extglob": "0.3.2",
+				"filename-regex": "2.0.1",
+				"is-extglob": "1.0.0",
+				"is-glob": "2.0.1",
+				"kind-of": "3.2.2",
+				"normalize-path": "2.1.1",
+				"object.omit": "2.0.1",
+				"parse-glob": "3.0.4",
+				"regex-cache": "0.4.4"
+			}
+		},
+		"mime-db": {
+			"version": "1.31.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz",
+			"integrity": "sha512-oB3w9lx50CMd6nfonoV5rBRUbJtjMifUHaFb5MfzjC8ksAIfVjT0BsX46SjjqBz7n9JGTrTX3paIeLSK+rS5fQ=="
+		},
+		"mime-type": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/mime-type/-/mime-type-3.0.5.tgz",
+			"integrity": "sha1-ftKSan2oImifgSVPWYf+lQNiLpo=",
+			"requires": {
+				"media-typer": "0.3.0",
+				"minimatch": "3.0.4",
+				"path.js": "1.0.7",
+				"util-ex": "0.3.15"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+				},
+				"brace-expansion": {
+					"version": "1.1.8",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+					"requires": {
+						"balanced-match": "1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+				},
+				"inherits-ex": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.2.0.tgz",
+					"integrity": "sha1-MVlON25zgZjvdUD9V1lBCl1CQDg=",
+					"requires": {
+						"xtend": "4.0.1"
+					}
+				},
+				"media-typer": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+					"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"requires": {
+						"brace-expansion": "1.1.8"
+					}
+				},
+				"path.js": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
+					"integrity": "sha1-fRNrYH3hm/2YugaIdJJih+ZTSTk=",
+					"requires": {
+						"escape-string-regexp": "1.0.5",
+						"inherits-ex": "1.2.0",
+						"util-ex": "0.3.15"
+					}
+				},
+				"util-ex": {
+					"version": "0.3.15",
+					"resolved": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz",
+					"integrity": "sha1-+SYc2hPEMn0HQMvme+Eife2LAFg=",
+					"requires": {
+						"inherits-ex": "1.2.0",
+						"xtend": "4.0.1"
+					}
+				},
+				"xtend": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+				}
+			}
+		},
+		"mime-types": {
+			"version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
+			"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+			"requires": {
+				"mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
+			},
+			"dependencies": {
+				"mime-db": {
+					"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+					"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE="
+				}
+			}
+		},
+		"mimic-fn": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+			"integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+			"dev": true
+		},
+		"minimatch": {
+			"version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+			"requires": {
+				"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
+			}
+		},
+		"minimist": {
+			"version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+		},
+		"mkdirp": {
+			"version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+			"requires": {
+				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+			}
+		},
+		"mocha": {
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
+			"integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
+			"dev": true,
+			"requires": {
+				"browser-stdout": "1.3.0",
+				"commander": "2.9.0",
+				"debug": "2.6.8",
+				"diff": "3.2.0",
+				"escape-string-regexp": "1.0.5",
+				"glob": "7.1.1",
+				"growl": "1.9.2",
+				"he": "1.1.1",
+				"json3": "3.3.2",
+				"lodash.create": "3.1.1",
+				"mkdirp": "0.5.1",
+				"supports-color": "3.1.2"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"brace-expansion": {
+					"version": "1.1.8",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+					"dev": true,
+					"requires": {
+						"balanced-match": "1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"commander": {
+					"version": "2.9.0",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+					"integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+					"dev": true,
+					"requires": {
+						"graceful-readlink": "1.0.1"
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"dev": true
+				},
+				"debug": {
+					"version": "2.6.8",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"glob": {
+					"version": "7.1.1",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+					"integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "1.0.0",
+						"inflight": "1.0.6",
+						"inherits": "2.0.3",
+						"minimatch": "3.0.4",
+						"once": "1.4.0",
+						"path-is-absolute": "1.0.1"
+					}
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "1.1.8"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+					"integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
+					"dev": true,
+					"requires": {
+						"has-flag": "1.0.0"
+					}
+				}
+			}
+		},
+		"mock-require": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/mock-require/-/mock-require-2.0.2.tgz",
+			"integrity": "sha1-HqpxqtIwE3c9En3H6Ro/u0g31g0=",
+			"dev": true,
+			"requires": {
+				"caller-id": "0.1.0"
+			}
+		},
+		"modelo": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
+			"integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
+		},
+		"modify-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz",
+			"integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
+			"dev": true
+		},
+		"module-not-found-error": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+			"integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=",
+			"dev": true
+		},
+		"moment": {
+			"version": "2.19.1",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
+			"integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
+		},
+		"moment-timezone": {
+			"version": "0.5.13",
+			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
+			"integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
+			"requires": {
+				"moment": "2.19.1"
+			}
+		},
+		"mute-stream": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+			"dev": true
+		},
+		"mv": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+			"integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+			"optional": true,
+			"requires": {
+				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+				"ncp": "2.0.0",
+				"rimraf": "2.4.5"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "6.0.4",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+					"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+					"optional": true,
+					"requires": {
+						"inflight": "1.0.6",
+						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+						"once": "1.4.0",
+						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+					}
+				},
+				"rimraf": {
+					"version": "2.4.5",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+					"integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+					"optional": true,
+					"requires": {
+						"glob": "6.0.4"
+					}
+				}
+			}
+		},
+		"nan": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+			"integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
+		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"ncp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+			"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+			"optional": true
+		},
+		"no-case": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+			"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+			"dev": true,
+			"requires": {
+				"lower-case": "1.1.4"
+			}
+		},
+		"node-forge": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+			"integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
+		},
+		"node-pre-gyp": {
+			"version": "0.6.36",
+			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+			"integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
+			"requires": {
+				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+				"nopt": "4.0.1",
+				"npmlog": "4.1.2",
+				"rc": "1.2.1",
+				"request": "2.81.0",
+				"rimraf": "2.6.1",
+				"semver": "5.4.1",
+				"tar": "2.2.1",
+				"tar-pack": "3.4.0"
+			}
+		},
+		"node-uuid": {
+			"version": "1.4.8",
+			"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+			"integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+			"dev": true
+		},
+		"nopt": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+			"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+			"requires": {
+				"abbrev": "1.1.0",
+				"osenv": "0.1.4"
+			}
+		},
+		"normalize-package-data": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+			"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "2.5.0",
+				"is-builtin-module": "1.0.0",
+				"semver": "5.4.1",
+				"validate-npm-package-license": "3.0.1"
+			}
+		},
+		"normalize-path": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+			"dev": true,
+			"requires": {
+				"remove-trailing-separator": "1.1.0"
+			}
+		},
+		"normalize-range": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+			"dev": true
+		},
+		"normalize-selector": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
+			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+			"dev": true
+		},
+		"npm-install-package": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
+			"integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
+			"dev": true
+		},
+		"npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"requires": {
+				"are-we-there-yet": "1.1.4",
+				"console-control-strings": "1.1.0",
+				"gauge": "2.7.4",
+				"set-blocking": "2.0.0"
+			}
+		},
+		"num2fraction": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+			"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+			"dev": true
+		},
+		"number-is-nan": {
+			"version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+		},
+		"oauth-sign": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+		},
+		"object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+		},
+		"object-keys": {
+			"version": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+			"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+		},
+		"object.assign": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
+			"integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
+			"dev": true,
+			"requires": {
+				"define-properties": "1.1.2",
+				"function-bind": "1.1.1",
+				"object-keys": "1.0.11"
+			},
+			"dependencies": {
+				"define-properties": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+					"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+					"dev": true,
+					"requires": {
+						"foreach": "2.0.5",
+						"object-keys": "1.0.11"
+					}
+				},
+				"foreach": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+					"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+					"dev": true
+				},
+				"function-bind": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+					"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+					"dev": true
+				},
+				"object-keys": {
+					"version": "1.0.11",
+					"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+					"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+					"dev": true
+				}
+			}
+		},
+		"object.omit": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+			"dev": true,
+			"requires": {
+				"for-own": "0.1.5",
+				"is-extendable": "0.1.1"
+			}
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"requires": {
+				"wrappy": "1.0.2"
+			}
+		},
+		"onecolor": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/onecolor/-/onecolor-2.4.2.tgz",
+			"integrity": "sha1-pT7D/xccNEYBbdUhDRobVEv32HQ=",
+			"dev": true
+		},
+		"onetime": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+			"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+			"dev": true,
+			"requires": {
+				"mimic-fn": "1.1.0"
+			}
+		},
+		"optimist": {
+			"version": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+			"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+			"requires": {
+				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+				"wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+			}
+		},
+		"optionator": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+			"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+			"dev": true,
+			"requires": {
+				"deep-is": "0.1.3",
+				"fast-levenshtein": "2.0.6",
+				"levn": "0.3.0",
+				"prelude-ls": "1.1.2",
+				"type-check": "0.3.2",
+				"wordwrap": "1.0.0"
+			},
+			"dependencies": {
+				"wordwrap": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+					"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+					"dev": true
+				}
+			}
+		},
+		"os-homedir": {
+			"version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+		},
+		"os-tmpdir": {
+			"version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+		},
+		"osenv": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+			"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+			"requires": {
+				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+			}
+		},
+		"p-map": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+			"dev": true
+		},
+		"parse-github-repo-url": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
+			"integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
+			"dev": true
+		},
+		"parse-glob": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+			"dev": true,
+			"requires": {
+				"glob-base": "0.3.0",
+				"is-dotfile": "1.0.3",
+				"is-extglob": "1.0.0",
+				"is-glob": "2.0.1"
+			}
+		},
+		"parse-json": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+			"dev": true,
+			"requires": {
+				"error-ex": "1.3.1"
+			}
+		},
+		"path-is-absolute": {
+			"version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+		},
+		"path-is-inside": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+			"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+			"dev": true
+		},
+		"path-parse": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+			"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+			"dev": true
+		},
+		"path-type": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "4.1.11",
+				"pify": "2.3.0",
+				"pinkie-promise": "2.0.1"
+			},
+			"dependencies": {
+				"pify": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+					"dev": true
+				}
+			}
+		},
+		"pend": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+			"dev": true
+		},
+		"performance-now": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+			"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+		},
+		"phantomjs-prebuilt": {
+			"version": "2.1.13",
+			"resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz",
+			"integrity": "sha1-ZlVq2ell2JPKWn3J52PffoaX920=",
+			"dev": true,
+			"requires": {
+				"es6-promise": "4.0.5",
+				"extract-zip": "1.5.0",
+				"fs-extra": "0.30.0",
+				"hasha": "2.2.0",
+				"kew": "0.7.0",
+				"progress": "1.1.8",
+				"request": "2.74.0",
+				"request-progress": "2.0.1",
+				"which": "1.2.14"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"caseless": {
+					"version": "0.11.0",
+					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+					"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"combined-stream": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+					"dev": true,
+					"requires": {
+						"delayed-stream": "1.0.0"
+					}
+				},
+				"concat-stream": {
+					"version": "1.5.0",
+					"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+					"integrity": "sha1-U/fUPFHF5D+ByP3QMyHGMb5o1hE=",
+					"dev": true,
+					"requires": {
+						"inherits": "2.0.3",
+						"readable-stream": "2.0.6",
+						"typedarray": "0.0.6"
+					}
+				},
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"debug": {
+					"version": "0.7.4",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+					"integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=",
+					"dev": true
+				},
+				"delayed-stream": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+					"dev": true
+				},
+				"extract-zip": {
+					"version": "1.5.0",
+					"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
+					"integrity": "sha1-ksz22B73Cp+kwXRxFMzvbYaIpsQ=",
+					"dev": true,
+					"requires": {
+						"concat-stream": "1.5.0",
+						"debug": "0.7.4",
+						"mkdirp": "0.5.0",
+						"yauzl": "2.4.1"
+					}
+				},
+				"form-data": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
+					"integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
+					"dev": true,
+					"requires": {
+						"async": "2.5.0",
+						"combined-stream": "1.0.5",
+						"mime-types": "2.1.17"
+					}
+				},
+				"fs-extra": {
+					"version": "0.30.0",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+					"integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "4.1.11",
+						"jsonfile": "2.4.0",
+						"klaw": "1.3.1",
+						"path-is-absolute": "1.0.1",
+						"rimraf": "2.6.1"
+					}
+				},
+				"har-validator": {
+					"version": "2.0.6",
+					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+					"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+					"dev": true,
+					"requires": {
+						"chalk": "1.1.3",
+						"commander": "2.11.0",
+						"is-my-json-valid": "2.16.1",
+						"pinkie-promise": "2.0.1"
+					}
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+					"dev": true
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.0",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.2.3",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+					"integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.0.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+					"integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"string_decoder": "0.10.31",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"request": {
+					"version": "2.74.0",
+					"resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
+					"integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=",
+					"dev": true,
+					"requires": {
+						"aws-sign2": "0.6.0",
+						"aws4": "1.6.0",
+						"bl": "1.1.2",
+						"caseless": "0.11.0",
+						"combined-stream": "1.0.5",
+						"extend": "3.0.1",
+						"forever-agent": "0.6.1",
+						"form-data": "1.0.1",
+						"har-validator": "2.0.6",
+						"hawk": "3.1.3",
+						"http-signature": "1.1.1",
+						"is-typedarray": "1.0.0",
+						"isstream": "0.1.2",
+						"json-stringify-safe": "5.0.1",
+						"mime-types": "2.1.17",
+						"node-uuid": "1.4.8",
+						"oauth-sign": "0.8.2",
+						"qs": "6.2.3",
+						"stringstream": "0.0.5",
+						"tough-cookie": "2.3.2",
+						"tunnel-agent": "0.4.3"
+					}
+				},
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				},
+				"tunnel-agent": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+					"dev": true
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
 			}
 		},
-		"babel-helper-call-delegate": {
-			"version": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-			"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+		"photoswipe": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.2.tgz",
+			"integrity": "sha1-lcIKdc6iO3DWKZZBytguA8rn95c="
+		},
+		"pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+		},
+		"pinkie": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+			"dev": true
+		},
+		"pinkie-promise": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
 			"dev": true,
 			"requires": {
-				"babel-helper-hoist-variables": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"pinkie": "2.0.4"
 			}
 		},
-		"babel-helper-define-map": {
-			"version": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
-			"integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=",
+		"pixrem": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pixrem/-/pixrem-3.0.2.tgz",
+			"integrity": "sha1-MNG6+0w73Ojpu0vVahOYVhkyDDQ=",
 			"dev": true,
 			"requires": {
-				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+				"browserslist": "1.7.7",
+				"postcss": "5.2.18",
+				"reduce-css-calc": "1.3.0"
 			}
 		},
-		"babel-helper-explode-assignable-expression": {
-			"version": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-			"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+		"pleeease-filters": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-3.0.1.tgz",
+			"integrity": "sha1-Tf4OjxBGYTUXxktyi8gGCKfr8i8=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"onecolor": "2.4.2",
+				"postcss": "5.2.18"
 			}
 		},
-		"babel-helper-explode-class": {
-			"version": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
-			"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
-			"dev": true,
+		"pluralize": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+			"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+			"dev": true
+		},
+		"poplib": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
+			"integrity": "sha1-L0tYtVkpcjUM2X9IKrpo+OBVdLw=",
 			"requires": {
-				"babel-helper-bindify-decorators": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
 			}
 		},
-		"babel-helper-function-name": {
-			"version": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-			"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+		"postcss": {
+			"version": "5.2.18",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+			"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
 			"dev": true,
 			"requires": {
-				"babel-helper-get-function-arity": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"chalk": "1.1.3",
+				"js-base64": "2.3.2",
+				"source-map": "0.5.7",
+				"supports-color": "3.2.3"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					},
+					"dependencies": {
+						"supports-color": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+							"dev": true
+						}
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "3.2.3",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+					"dev": true,
+					"requires": {
+						"has-flag": "1.0.0"
+					}
+				}
 			}
 		},
-		"babel-helper-get-function-arity": {
-			"version": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-			"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+		"postcss-apply": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.3.0.tgz",
+			"integrity": "sha1-ovN8W9+ogeTBX08kXsDNlt0ucNU=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"balanced-match": "0.4.2",
+				"postcss": "5.2.18"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.4.2",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+					"dev": true
+				}
 			}
 		},
-		"babel-helper-hoist-variables": {
-			"version": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-			"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+		"postcss-attribute-case-insensitive": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-1.0.1.tgz",
+			"integrity": "sha1-zrc3d+EGFn6yM/GTjJvZ8uaXMI0=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"postcss": "5.2.18",
+				"postcss-selector-parser": "2.2.3"
 			}
 		},
-		"babel-helper-optimise-call-expression": {
-			"version": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-			"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+		"postcss-calc": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
+			"integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"postcss": "5.2.18",
+				"postcss-message-helpers": "2.0.0",
+				"reduce-css-calc": "1.3.0"
 			}
 		},
-		"babel-helper-regex": {
-			"version": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
-			"integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=",
+		"postcss-color-function": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-2.0.1.tgz",
+			"integrity": "sha1-mtIm9VDop8f4uKd4YFRbbdf1UkE=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+				"css-color-function": "1.3.3",
+				"postcss": "5.2.18",
+				"postcss-message-helpers": "2.0.0",
+				"postcss-value-parser": "3.3.0"
 			}
 		},
-		"babel-helper-remap-async-to-generator": {
-			"version": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-			"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+		"postcss-color-gray": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-3.0.1.tgz",
+			"integrity": "sha1-dEMu3mbdg7HRNjVlxos3bhj/Z3A=",
 			"dev": true,
 			"requires": {
-				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"color": "0.11.4",
+				"postcss": "5.2.18",
+				"postcss-message-helpers": "2.0.0",
+				"reduce-function-call": "1.0.2"
 			}
 		},
-		"babel-helper-replace-supers": {
-			"version": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-			"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+		"postcss-color-hex-alpha": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-2.0.0.tgz",
+			"integrity": "sha1-RP1uyt5mAoZIyIHLZQTNy/3GzQk=",
 			"dev": true,
 			"requires": {
-				"babel-helper-optimise-call-expression": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"color": "0.10.1",
+				"postcss": "5.2.18",
+				"postcss-message-helpers": "2.0.0"
+			},
+			"dependencies": {
+				"color": {
+					"version": "0.10.1",
+					"resolved": "https://registry.npmjs.org/color/-/color-0.10.1.tgz",
+					"integrity": "sha1-wEGI34KiCd3rzOzazT7DIPGTc58=",
+					"dev": true,
+					"requires": {
+						"color-convert": "0.5.3",
+						"color-string": "0.3.0"
+					}
+				},
+				"color-convert": {
+					"version": "0.5.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+					"integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
+					"dev": true
+				}
 			}
 		},
-		"babel-helpers": {
-			"version": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-			"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+		"postcss-color-hsl": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-1.0.5.tgz",
+			"integrity": "sha1-9Tuxw0gxDOMHrYnjGBqGRzi15oc=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+				"postcss": "5.2.18",
+				"postcss-value-parser": "3.3.0",
+				"units-css": "0.4.0"
 			}
 		},
-		"babel-messages": {
-			"version": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-			"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+		"postcss-color-hwb": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-2.0.1.tgz",
+			"integrity": "sha1-1jr6+bcMtZX5AKKcn+V78qMvq+w=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"color": "0.11.4",
+				"postcss": "5.2.18",
+				"postcss-message-helpers": "2.0.0",
+				"reduce-function-call": "1.0.2"
 			}
 		},
-		"babel-mocha-es6-compiler": {
-			"version": "https://registry.npmjs.org/babel-mocha-es6-compiler/-/babel-mocha-es6-compiler-0.1.0.tgz",
-			"integrity": "sha1-QMnkBoCvRhWP7usntJQUtrgOxDg=",
+		"postcss-color-rebeccapurple": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-2.0.1.tgz",
+			"integrity": "sha1-dMZETny7fYVhO19yht96SRYIRRw=",
 			"dev": true,
 			"requires": {
-				"babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.9.1.tgz",
-				"babel-plugin-add-module-exports": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
-				"babel-preset-es2015": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
-				"babel-preset-react": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.3.13.tgz",
-				"babel-preset-stage-0": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.3.13.tgz"
+				"color": "0.11.4",
+				"postcss": "5.2.18"
 			}
 		},
-		"babel-plugin-add-module-exports": {
-			"version": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
-			"integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
-			"dev": true
-		},
-		"babel-plugin-array-includes": {
-			"version": "https://registry.npmjs.org/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz",
-			"integrity": "sha1-z1RS6Bx7gD+3lZ8QRayI4uwo/3Y=",
-			"dev": true
-		},
-		"babel-plugin-check-es2015-constants": {
-			"version": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-			"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+		"postcss-color-rgb": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-1.1.4.tgz",
+			"integrity": "sha1-8pJD4i6OjBNDRHQJI3LUzmBb6Lw=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"postcss": "5.2.18",
+				"postcss-value-parser": "3.3.0"
 			}
 		},
-		"babel-plugin-syntax-async-functions": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-			"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-			"dev": true
-		},
-		"babel-plugin-syntax-async-generators": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-			"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
-			"dev": true
+		"postcss-color-rgba-fallback": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz",
+			"integrity": "sha1-bSlJG+WZCpMXPUfnx29YELCUAro=",
+			"dev": true,
+			"requires": {
+				"postcss": "5.2.18",
+				"postcss-value-parser": "3.3.0",
+				"rgb-hex": "1.0.0"
+			}
 		},
-		"babel-plugin-syntax-class-constructor-call": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-			"integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
-			"dev": true
+		"postcss-cssnext": {
+			"version": "2.11.0",
+			"resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-2.11.0.tgz",
+			"integrity": "sha1-MeaPAB5AlgTacDtm3hS4uMjJ8rE=",
+			"dev": true,
+			"requires": {
+				"autoprefixer": "6.7.7",
+				"caniuse-api": "1.6.1",
+				"chalk": "1.1.3",
+				"pixrem": "3.0.2",
+				"pleeease-filters": "3.0.1",
+				"postcss": "5.2.18",
+				"postcss-apply": "0.3.0",
+				"postcss-attribute-case-insensitive": "1.0.1",
+				"postcss-calc": "5.3.1",
+				"postcss-color-function": "2.0.1",
+				"postcss-color-gray": "3.0.1",
+				"postcss-color-hex-alpha": "2.0.0",
+				"postcss-color-hsl": "1.0.5",
+				"postcss-color-hwb": "2.0.1",
+				"postcss-color-rebeccapurple": "2.0.1",
+				"postcss-color-rgb": "1.1.4",
+				"postcss-color-rgba-fallback": "2.2.0",
+				"postcss-custom-media": "5.0.1",
+				"postcss-custom-properties": "5.0.2",
+				"postcss-custom-selectors": "3.0.0",
+				"postcss-font-family-system-ui": "1.0.2",
+				"postcss-font-variant": "2.0.1",
+				"postcss-image-set-polyfill": "0.3.5",
+				"postcss-initial": "1.5.3",
+				"postcss-media-minmax": "2.1.2",
+				"postcss-nesting": "2.3.1",
+				"postcss-pseudo-class-any-link": "1.0.0",
+				"postcss-pseudoelements": "3.0.0",
+				"postcss-replace-overflow-wrap": "1.0.0",
+				"postcss-selector-matches": "2.0.5",
+				"postcss-selector-not": "2.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				}
+			}
 		},
-		"babel-plugin-syntax-class-properties": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-			"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
-			"dev": true
+		"postcss-custom-media": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz",
+			"integrity": "sha1-E40loYS/LrVN4S1VpsAcMKnYvYE=",
+			"dev": true,
+			"requires": {
+				"postcss": "5.2.18"
+			}
 		},
-		"babel-plugin-syntax-decorators": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-			"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
-			"dev": true
+		"postcss-custom-properties": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-5.0.2.tgz",
+			"integrity": "sha1-lxnXjy2pz59TgQrrwj1GVhMKzrE=",
+			"dev": true,
+			"requires": {
+				"balanced-match": "0.4.2",
+				"postcss": "5.2.18"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.4.2",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+					"dev": true
+				}
+			}
 		},
-		"babel-plugin-syntax-do-expressions": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
-			"integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
-			"dev": true
+		"postcss-custom-selectors": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-3.0.0.tgz",
+			"integrity": "sha1-j4Ekn17Qeo0JF89qOf5bBWt/lqw=",
+			"dev": true,
+			"requires": {
+				"balanced-match": "0.2.1",
+				"postcss": "5.2.18",
+				"postcss-selector-matches": "2.0.5"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.2.1",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
+					"integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
+					"dev": true
+				}
+			}
 		},
-		"babel-plugin-syntax-dynamic-import": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-			"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-			"dev": true
+		"postcss-font-family-system-ui": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-1.0.2.tgz",
+			"integrity": "sha1-PhpeP7fjHl6ecUOcyw6AFFVpJ8c=",
+			"dev": true,
+			"requires": {
+				"lodash": "4.17.4",
+				"postcss": "5.2.18",
+				"postcss-value-parser": "3.3.0"
+			}
 		},
-		"babel-plugin-syntax-exponentiation-operator": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-			"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-			"dev": true
+		"postcss-font-variant": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-2.0.1.tgz",
+			"integrity": "sha1-fKKRA/WfoCyjrOLKIrL3VoU9Tvg=",
+			"dev": true,
+			"requires": {
+				"postcss": "5.2.18"
+			}
 		},
-		"babel-plugin-syntax-export-extensions": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-			"integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
-			"dev": true
+		"postcss-image-set-polyfill": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz",
+			"integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
+			"dev": true,
+			"requires": {
+				"postcss": "6.0.13",
+				"postcss-media-query-parser": "0.2.3"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
+			}
 		},
-		"babel-plugin-syntax-flow": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-			"integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
-			"dev": true
+		"postcss-initial": {
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-1.5.3.tgz",
+			"integrity": "sha1-IMPpHJaCLdsb7UlQjbltVrrDd9A=",
+			"dev": true,
+			"requires": {
+				"lodash.template": "4.4.0",
+				"postcss": "5.2.18"
+			}
 		},
-		"babel-plugin-syntax-function-bind": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
-			"integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
-			"dev": true
+		"postcss-less": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.1.tgz",
+			"integrity": "sha512-zl0EEqq8Urh37Ppdv9zzhpZpLHrgkxmt6e3O4ftRa7/b8Uq2LV+/KBVM8/KuzmHNu+mthhOArg1lxbfqQ3NUdg==",
+			"dev": true,
+			"requires": {
+				"postcss": "5.2.18"
+			}
 		},
-		"babel-plugin-syntax-jsx": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-			"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-			"dev": true
+		"postcss-media-minmax": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-2.1.2.tgz",
+			"integrity": "sha1-RExc+JJqteT9iiUJ6Sl+dRZJzfg=",
+			"dev": true,
+			"requires": {
+				"postcss": "5.2.18"
+			}
 		},
-		"babel-plugin-syntax-object-rest-spread": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-			"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+		"postcss-media-query-parser": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+			"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
 			"dev": true
 		},
-		"babel-plugin-syntax-trailing-function-commas": {
-			"version": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-			"integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+		"postcss-message-helpers": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
+			"integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
 			"dev": true
 		},
-		"babel-plugin-transform-async-generator-functions": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
-			"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+		"postcss-nesting": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-2.3.1.tgz",
+			"integrity": "sha1-lKa2pO9wf77CCof+5clXdZtOAc8=",
 			"dev": true,
 			"requires": {
-				"babel-helper-remap-async-to-generator": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-				"babel-plugin-syntax-async-generators": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-				"babel-runtime": "6.26.0"
+				"postcss": "5.2.18"
 			}
 		},
-		"babel-plugin-transform-async-to-generator": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-			"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+		"postcss-pseudo-class-any-link": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-1.0.0.tgz",
+			"integrity": "sha1-kDI5GWQB0zX+c6x1YYb6YuaTryY=",
 			"dev": true,
 			"requires": {
-				"babel-helper-remap-async-to-generator": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-				"babel-plugin-syntax-async-functions": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-				"babel-runtime": "6.26.0"
+				"postcss": "5.2.18",
+				"postcss-selector-parser": "1.3.3"
+			},
+			"dependencies": {
+				"postcss-selector-parser": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.3.tgz",
+					"integrity": "sha1-0u4Z33pk+O8hwacchvfUg1yIwoE=",
+					"dev": true,
+					"requires": {
+						"flatten": "1.0.2",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
+					}
+				}
 			}
 		},
-		"babel-plugin-transform-class-constructor-call": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
-			"integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+		"postcss-pseudoelements": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz",
+			"integrity": "sha1-bGghd8eQC6BTtt8X+MWQKEx7i7w=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-class-constructor-call": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+				"postcss": "5.2.18"
 			}
 		},
-		"babel-plugin-transform-class-properties": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
-			"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+		"postcss-replace-overflow-wrap": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-1.0.0.tgz",
+			"integrity": "sha1-8KA7Meq5Y2ppNr/SEOKu8bQ0pkM=",
 			"dev": true,
 			"requires": {
-				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-plugin-syntax-class-properties": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+				"postcss": "5.2.18"
 			}
 		},
-		"babel-plugin-transform-decorators": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
-			"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+		"postcss-reporter": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
+			"integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==",
 			"dev": true,
 			"requires": {
-				"babel-helper-explode-class": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
-				"babel-plugin-syntax-decorators": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"chalk": "2.3.0",
+				"lodash": "4.17.4",
+				"log-symbols": "2.1.0",
+				"postcss": "6.0.13"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"babel-plugin-transform-do-expressions": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
-			"integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+		"postcss-resolve-nested-selector": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+			"integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+			"dev": true
+		},
+		"postcss-safe-parser": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz",
+			"integrity": "sha1-t1Pv9sfArqXoN1++TN6L+QY/8UI=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-do-expressions": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
-				"babel-runtime": "6.26.0"
+				"postcss": "6.0.13"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-arrow-functions": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-			"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+		"postcss-sass": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.1.0.tgz",
+			"integrity": "sha1-DSplW10kHsj0Gbs9o43lyhF0bds=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"gonzales-pe": "4.2.2",
+				"mathjs": "3.16.5",
+				"postcss": "5.2.18"
 			}
 		},
-		"babel-plugin-transform-es2015-block-scoped-functions": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-			"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+		"postcss-scss": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz",
+			"integrity": "sha1-/0XPM1S4ee6JpOtoaA9GrJuxT5Q=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"postcss": "6.0.13"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-block-scoping": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
-			"integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=",
+		"postcss-selector-matches": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz",
+			"integrity": "sha1-+g9Dvle2jneqTNEYBwI0kqExAn8=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+				"balanced-match": "0.4.2",
+				"postcss": "5.2.18"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.4.2",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+					"dev": true
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-classes": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-			"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+		"postcss-selector-not": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-2.0.0.tgz",
+			"integrity": "sha1-xzrSGj91I0vuf+4mnhVP1qhpeY0=",
 			"dev": true,
 			"requires": {
-				"babel-helper-define-map": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
-				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-helper-optimise-call-expression": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-				"babel-helper-replace-supers": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"balanced-match": "0.2.1",
+				"postcss": "5.2.18"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.2.1",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
+					"integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
+					"dev": true
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-computed-properties": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-			"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+		"postcss-selector-parser": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+			"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+				"flatten": "1.0.2",
+				"indexes-of": "1.0.1",
+				"uniq": "1.0.1"
 			}
 		},
-		"babel-plugin-transform-es2015-destructuring": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-			"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+		"postcss-smart-import": {
+			"version": "0.7.5",
+			"resolved": "https://registry.npmjs.org/postcss-smart-import/-/postcss-smart-import-0.7.5.tgz",
+			"integrity": "sha512-Bs9wAFxH5irGpenBg9a65jTcydZLh7VBTX6NYwMXvVXO6y9CQ83kRmfpQDs5lHhl6IODeIeQfJep5HBMd9UVCQ==",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"babel-runtime": "6.26.0",
+				"lodash": "4.17.4",
+				"object-assign": "4.1.1",
+				"postcss": "6.0.13",
+				"postcss-sass": "0.1.0",
+				"postcss-scss": "1.0.2",
+				"postcss-value-parser": "3.3.0",
+				"promise-each": "2.2.0",
+				"read-cache": "1.0.0",
+				"resolve": "1.5.0",
+				"sugarss": "1.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-for-of": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-			"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+		"postcss-sorting": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-3.1.0.tgz",
+			"integrity": "sha512-YCPTcJwGIInF1LpMD1lIYvMHTGUL4s97o/OraA6eKvoauhhk6vjwOWDDjm6uRKqug/kyDPMKEzmYZ6FtW6RDgw==",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"lodash": "4.17.4",
+				"postcss": "6.0.13"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-function-name": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-			"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-			"dev": true,
-			"requires": {
-				"babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
-			}
+		"postcss-value-parser": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+			"integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+			"dev": true
 		},
-		"babel-plugin-transform-es2015-literals": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-			"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.26.0"
-			}
+		"precond": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
+			"integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw="
 		},
-		"babel-plugin-transform-es2015-modules-commonjs": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
-			"integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=",
-			"dev": true,
-			"requires": {
-				"babel-plugin-transform-strict-mode": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
-			}
+		"prelude-ls": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+			"dev": true
 		},
-		"babel-plugin-transform-es2015-object-super": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-			"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-			"dev": true,
-			"requires": {
-				"babel-helper-replace-supers": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-				"babel-runtime": "6.26.0"
-			}
+		"preserve": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+			"dev": true
 		},
-		"babel-plugin-transform-es2015-parameters": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-			"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-			"dev": true,
-			"requires": {
-				"babel-helper-call-delegate": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-				"babel-helper-get-function-arity": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
-			}
+		"process-nextick-args": {
+			"version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
 		},
-		"babel-plugin-transform-es2015-shorthand-properties": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-			"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-			"dev": true,
+		"progress": {
+			"version": "1.1.8",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+			"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+			"dev": true
+		},
+		"prom-client": {
+			"version": "10.2.1",
+			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.2.1.tgz",
+			"integrity": "sha512-avZAdOCg/fCVmB1gBJnlYDHsBBoj7Kf8Dlz47KD3w32d6SONbarnzflCNbgdBTM5XATiD3+oJ9RQsIFgAxOUag==",
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"tdigest": "0.1.1"
 			}
 		},
-		"babel-plugin-transform-es2015-spread": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-			"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+		"promise-each": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
+			"integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"any-promise": "0.1.0"
 			}
 		},
-		"babel-plugin-transform-es2015-sticky-regex": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-			"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+		"proxyquire": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
+			"integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=",
 			"dev": true,
 			"requires": {
-				"babel-helper-regex": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"fill-keys": "1.0.2",
+				"module-not-found-error": "1.0.1",
+				"resolve": "1.1.7"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.1.7",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+					"dev": true
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-template-literals": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-			"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-			"dev": true,
+		"pseudomap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+			"dev": true
+		},
+		"pump": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+			"integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"end-of-stream": "1.4.0",
+				"once": "1.4.0"
 			}
 		},
-		"babel-plugin-transform-es2015-typeof-symbol": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-			"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-			"dev": true,
+		"pumpify": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+			"integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"duplexify": "3.5.1",
+				"inherits": "2.0.3",
+				"pump": "1.0.2"
+			},
+			"dependencies": {
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+				}
 			}
 		},
-		"babel-plugin-transform-es2015-unicode-regex": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-			"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+		"punycode": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+		},
+		"q": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+			"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+			"dev": true
+		},
+		"qs": {
+			"version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+			"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+		},
+		"querystring": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+			"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+		},
+		"randomatic": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
+			"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
 			"dev": true,
 			"requires": {
-				"babel-helper-regex": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"regexpu-core": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz"
+				"is-number": "3.0.0",
+				"kind-of": "4.0.0"
+			},
+			"dependencies": {
+				"is-number": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+					"dev": true,
+					"requires": {
+						"kind-of": "3.2.2"
+					},
+					"dependencies": {
+						"kind-of": {
+							"version": "3.2.2",
+							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+							"dev": true,
+							"requires": {
+								"is-buffer": "1.1.6"
+							}
+						}
+					}
+				},
+				"kind-of": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "1.1.6"
+					}
+				}
 			}
 		},
-		"babel-plugin-transform-exponentiation-operator": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-			"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-			"dev": true,
+		"rc": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+			"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
 			"requires": {
-				"babel-helper-builder-binary-assignment-operator-visitor": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-				"babel-plugin-syntax-exponentiation-operator": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-				"babel-runtime": "6.26.0"
+				"deep-extend": "0.4.2",
+				"ini": "1.3.4",
+				"minimist": "1.2.0",
+				"strip-json-comments": "2.0.1"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+				}
 			}
 		},
-		"babel-plugin-transform-export-extensions": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
-			"integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+		"read-cache": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-export-extensions": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-				"babel-runtime": "6.26.0"
+				"pify": "2.3.0"
+			},
+			"dependencies": {
+				"pify": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+					"dev": true
+				}
 			}
 		},
-		"babel-plugin-transform-flow-strip-types": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
-			"integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+		"read-pkg": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-flow": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-				"babel-runtime": "6.26.0"
+				"load-json-file": "1.1.0",
+				"normalize-package-data": "2.4.0",
+				"path-type": "1.1.0"
 			}
 		},
-		"babel-plugin-transform-function-bind": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
-			"integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+		"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=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-function-bind": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
-				"babel-runtime": "6.26.0"
+				"find-up": "1.1.2",
+				"read-pkg": "1.1.0"
 			}
 		},
-		"babel-plugin-transform-object-rest-spread": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz",
-			"integrity": "sha1-h11ryb52HFiirj/u5dxIldjH+SE=",
+		"readdirp": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+			"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-object-rest-spread": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-				"babel-runtime": "6.26.0"
+				"graceful-fs": "4.1.11",
+				"minimatch": "3.0.4",
+				"readable-stream": "2.3.3",
+				"set-immediate-shim": "1.0.1"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"brace-expansion": {
+					"version": "1.1.8",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+					"dev": true,
+					"requires": {
+						"balanced-match": "1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"dev": true
+				},
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "1.1.8"
+					}
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
 			}
 		},
-		"babel-plugin-transform-react-display-name": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz",
-			"integrity": "sha1-Q5iRDDWEQdxM7xh4cmTQQS7Tazc=",
+		"redent": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0"
+				"indent-string": "2.1.0",
+				"strip-indent": "1.0.1"
 			}
 		},
-		"babel-plugin-transform-react-jsx": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
-			"integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+		"reduce-css-calc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+			"integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
 			"dev": true,
 			"requires": {
-				"babel-helper-builder-react-jsx": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz",
-				"babel-plugin-syntax-jsx": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-				"babel-runtime": "6.26.0"
+				"balanced-match": "0.4.2",
+				"math-expression-evaluator": "1.2.17",
+				"reduce-function-call": "1.0.2"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.4.2",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+					"dev": true
+				}
 			}
 		},
-		"babel-plugin-transform-react-jsx-source": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
-			"integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+		"reduce-function-call": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
+			"integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-jsx": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-				"babel-runtime": "6.26.0"
+				"balanced-match": "0.4.2"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "0.4.2",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+					"dev": true
+				}
 			}
 		},
-		"babel-plugin-transform-regenerator": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz",
-			"integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=",
+		"regenerator-runtime": {
+			"version": "0.10.5",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+			"integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+			"dev": true
+		},
+		"regex-cache": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
 			"dev": true,
 			"requires": {
-				"regenerator-transform": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz"
+				"is-equal-shallow": "0.1.3"
 			}
 		},
-		"babel-plugin-transform-strict-mode": {
-			"version": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-			"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-			"dev": true,
+		"remove-trailing-separator": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+			"dev": true
+		},
+		"repeat-element": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+			"dev": true
+		},
+		"repeat-string": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+			"dev": true
+		},
+		"request": {
+			"version": "2.81.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+			"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+				"aws-sign2": "0.6.0",
+				"aws4": "1.6.0",
+				"caseless": "0.12.0",
+				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+				"forever-agent": "0.6.1",
+				"form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+				"har-validator": "4.2.1",
+				"hawk": "3.1.3",
+				"http-signature": "1.1.1",
+				"is-typedarray": "1.0.0",
+				"isstream": "0.1.2",
+				"json-stringify-safe": "5.0.1",
+				"mime-types": "2.1.17",
+				"oauth-sign": "0.8.2",
+				"performance-now": "0.2.0",
+				"qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+				"safe-buffer": "5.1.1",
+				"stringstream": "0.0.5",
+				"tough-cookie": "2.3.2",
+				"tunnel-agent": "0.6.0",
+				"uuid": "3.1.0"
+			},
+			"dependencies": {
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo="
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+				}
 			}
 		},
-		"babel-preset-es2015": {
-			"version": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
-			"integrity": "sha1-l9zn7ykuGMubK3VF2AxZPCjZUX8=",
+		"request-progress": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+			"integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-check-es2015-constants": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-				"babel-plugin-transform-es2015-arrow-functions": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-				"babel-plugin-transform-es2015-block-scoped-functions": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-				"babel-plugin-transform-es2015-block-scoping": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
-				"babel-plugin-transform-es2015-classes": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-				"babel-plugin-transform-es2015-computed-properties": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-				"babel-plugin-transform-es2015-destructuring": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-				"babel-plugin-transform-es2015-for-of": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-				"babel-plugin-transform-es2015-function-name": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-				"babel-plugin-transform-es2015-literals": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-				"babel-plugin-transform-es2015-modules-commonjs": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
-				"babel-plugin-transform-es2015-object-super": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-				"babel-plugin-transform-es2015-parameters": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-				"babel-plugin-transform-es2015-shorthand-properties": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-				"babel-plugin-transform-es2015-spread": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-				"babel-plugin-transform-es2015-sticky-regex": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-				"babel-plugin-transform-es2015-template-literals": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-				"babel-plugin-transform-es2015-typeof-symbol": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-				"babel-plugin-transform-es2015-unicode-regex": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-				"babel-plugin-transform-regenerator": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz"
+				"throttleit": "1.0.0"
 			}
 		},
-		"babel-preset-react": {
-			"version": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.3.13.tgz",
-			"integrity": "sha1-E9VeBqZfqqoHw5v2Op2DbgMhFvo=",
+		"requestretry": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.5.0.tgz",
+			"integrity": "sha1-7RV7ulNSbt6z7DKo5wSkmYvs5ic=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-flow": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-				"babel-plugin-syntax-jsx": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-				"babel-plugin-transform-flow-strip-types": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
-				"babel-plugin-transform-react-display-name": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz",
-				"babel-plugin-transform-react-jsx": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
-				"babel-plugin-transform-react-jsx-source": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz"
+				"fg-lodash": "0.0.2",
+				"request": "2.81.0"
 			}
 		},
-		"babel-preset-stage-0": {
-			"version": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.3.13.tgz",
-			"integrity": "sha1-eKN8VvCzmI8qeZMtywzrj/N3sNE=",
+		"require-from-string": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.1.tgz",
+			"integrity": "sha1-xUUjPp19pmFunVmt+zn8n1iGdv8=",
+			"dev": true
+		},
+		"require-uncached": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+			"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-transform-do-expressions": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
-				"babel-plugin-transform-function-bind": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
-				"babel-preset-stage-1": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz"
+				"caller-path": "0.1.0",
+				"resolve-from": "1.0.1"
 			}
 		},
-		"babel-preset-stage-1": {
-			"version": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
-			"integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+		"resolve": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+			"integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
 			"dev": true,
 			"requires": {
-				"babel-plugin-transform-class-constructor-call": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
-				"babel-plugin-transform-export-extensions": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
-				"babel-preset-stage-2": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz"
+				"path-parse": "1.0.5"
 			}
 		},
-		"babel-preset-stage-2": {
-			"version": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
-			"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+		"resolve-from": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+			"integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+			"dev": true
+		},
+		"resolve-url": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+			"dev": true
+		},
+		"restore-cursor": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+			"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-dynamic-import": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-				"babel-plugin-transform-class-properties": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
-				"babel-plugin-transform-decorators": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
-				"babel-preset-stage-3": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz"
+				"onetime": "2.0.1",
+				"signal-exit": "3.0.2"
 			}
 		},
-		"babel-preset-stage-3": {
-			"version": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
-			"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
-			"dev": true,
+		"retry-request": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
+			"integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg==",
 			"requires": {
-				"babel-plugin-syntax-trailing-function-commas": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-				"babel-plugin-transform-async-generator-functions": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
-				"babel-plugin-transform-async-to-generator": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-				"babel-plugin-transform-exponentiation-operator": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-				"babel-plugin-transform-object-rest-spread": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz"
+				"request": "2.81.0",
+				"through2": "2.0.3"
 			}
 		},
-		"babel-register": {
-			"version": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-			"integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=",
+		"rgb": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
+			"integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
+			"dev": true
+		},
+		"rgb-hex": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz",
+			"integrity": "sha1-v6+M2c2RZLWibXHrTxWgllMks8E=",
+			"dev": true
+		},
+		"rgb2hex": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
+			"integrity": "sha1-zNVfhgrgxcTqN1BLlY5ELY0SMls=",
+			"dev": true
+		},
+		"right-align": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+			"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz",
-				"babel-runtime": "6.26.0",
-				"core-js": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-				"home-or-tmp": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"source-map-support": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz"
-			},
-			"dependencies": {
-				"babel-core": {
-					"version": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz",
-					"integrity": "sha1-jEKFZNzh4fQfszfsNPTDsCK1rYM=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-						"babel-generator": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz",
-						"babel-helpers": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-						"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-						"babel-register": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-						"babel-runtime": "6.26.0",
-						"babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-						"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-						"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-						"babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
-						"convert-source-map": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-						"debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-						"json5": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-						"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-						"private": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-						"slash": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-						"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
-					}
-				},
-				"json5": {
-					"version": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-					"dev": true
-				}
+				"align-text": "0.1.4"
 			}
 		},
-		"babel-runtime": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-			"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+		"rimraf": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+			"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
 			"requires": {
-				"core-js": "2.5.1",
-				"regenerator-runtime": "0.11.0"
-			},
-			"dependencies": {
-				"core-js": {
-					"version": "2.5.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
-				},
-				"regenerator-runtime": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-					"integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
-				}
+				"glob": "7.1.2"
 			}
 		},
-		"babel-template": {
-			"version": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-			"integrity": "sha1-BK5RTx+Ts6JTfyoPYKWkX7gwgzM=",
+		"run-async": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+			"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+				"is-promise": "2.1.0"
 			}
 		},
-		"babel-traverse": {
-			"version": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-			"integrity": "sha1-qzZnP9NW+aCUhlnnszjV/q2zFpU=",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-				"babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-				"globals": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
-				"invariant": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-			}
+		"rx": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+			"integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
+			"dev": true
+		},
+		"safe-json-stringify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz",
+			"integrity": "sha1-gaCY9Efku8P/MxKiQ1IbwGDvWRE=",
+			"optional": true
 		},
-		"babel-types": {
-			"version": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-			"integrity": "sha1-oTaHncFbNga9oNkMH8dDBML/CXU=",
+		"saucelabs": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.4.0.tgz",
+			"integrity": "sha1-uTSpr52ih0s/QKrh/N5QpEZvXzg=",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "6.26.0",
-				"esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-				"lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-				"to-fast-properties": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"
+				"https-proxy-agent": "1.0.0"
 			}
 		},
-		"babylon": {
-			"version": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
-			"integrity": "sha1-F/FP3fNhtpWYH+Z5OF5PHAHr2G8=",
-			"dev": true
+		"sax": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+			"integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
 		},
-		"balanced-match": {
-			"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-			"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+		"seed-random": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
+			"integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ=",
+			"dev": true
 		},
-		"bcrypt": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
-			"integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
+		"selenium-standalone": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.11.0.tgz",
+			"integrity": "sha512-MedSwbiyLkv/nxr7JpI9zFNSAmSDpcz+bCaVSJC1krXYeIzFuj6tKMMss57xwu4VHgfInTy3IIMM2HdjN87xXQ==",
+			"dev": true,
 			"requires": {
-				"nan": "2.6.2",
-				"node-pre-gyp": "0.6.36"
+				"async": "2.5.0",
+				"commander": "2.11.0",
+				"cross-spawn": "5.1.0",
+				"debug": "2.6.9",
+				"lodash": "4.17.4",
+				"minimist": "1.2.0",
+				"mkdirp": "0.5.1",
+				"progress": "1.1.8",
+				"request": "2.79.0",
+				"tar-stream": "1.5.2",
+				"urijs": "1.19.0",
+				"which": "1.2.14",
+				"yauzl": "2.9.1"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+					"dev": true
+				},
+				"asynckit": {
+					"version": "0.4.0",
+					"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+					"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+					"dev": true
+				},
+				"caseless": {
+					"version": "0.11.0",
+					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+					"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+					"dev": true
+				},
+				"chalk": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
+					}
+				},
+				"combined-stream": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+					"dev": true,
+					"requires": {
+						"delayed-stream": "1.0.0"
+					}
+				},
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"delayed-stream": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+					"dev": true
+				},
+				"form-data": {
+					"version": "2.1.4",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+					"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+					"dev": true,
+					"requires": {
+						"asynckit": "0.4.0",
+						"combined-stream": "1.0.5",
+						"mime-types": "2.1.17"
+					}
+				},
+				"har-validator": {
+					"version": "2.0.6",
+					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+					"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+					"dev": true,
+					"requires": {
+						"chalk": "1.1.3",
+						"commander": "2.11.0",
+						"is-my-json-valid": "2.16.1",
+						"pinkie-promise": "2.0.1"
+					}
+				},
+				"has-ansi": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+					"dev": true
+				},
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "0.0.8",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+							"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+							"dev": true
+						}
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.3.2",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
+					"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
+					"dev": true
+				},
+				"request": {
+					"version": "2.79.0",
+					"resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+					"integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
+					"dev": true,
+					"requires": {
+						"aws-sign2": "0.6.0",
+						"aws4": "1.6.0",
+						"caseless": "0.11.0",
+						"combined-stream": "1.0.5",
+						"extend": "3.0.1",
+						"forever-agent": "0.6.1",
+						"form-data": "2.1.4",
+						"har-validator": "2.0.6",
+						"hawk": "3.1.3",
+						"http-signature": "1.1.1",
+						"is-typedarray": "1.0.0",
+						"isstream": "0.1.2",
+						"json-stringify-safe": "5.0.1",
+						"mime-types": "2.1.17",
+						"oauth-sign": "0.8.2",
+						"qs": "6.3.2",
+						"stringstream": "0.0.5",
+						"tough-cookie": "2.3.2",
+						"tunnel-agent": "0.4.3",
+						"uuid": "3.1.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+					"dev": true
+				},
+				"tunnel-agent": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+					"dev": true
+				},
+				"yauzl": {
+					"version": "2.9.1",
+					"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+					"integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
+					"dev": true,
+					"requires": {
+						"buffer-crc32": "0.2.13",
+						"fd-slicer": "1.0.1"
+					}
+				}
 			}
 		},
-		"bcrypt-pbkdf": {
+		"semver": {
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+			"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
+		},
+		"set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+		},
+		"set-immediate-shim": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-			"optional": true,
-			"requires": {
-				"tweetnacl": "0.14.5"
-			}
+			"resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+			"integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+			"dev": true
 		},
-		"block-stream": {
-			"version": "0.0.9",
-			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+		"shebang-command": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+			"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+			"dev": true,
 			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+				"shebang-regex": "1.0.0"
+			},
+			"dependencies": {
+				"shebang-regex": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+					"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+					"dev": true
+				}
 			}
 		},
-		"boom": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+		"signal-exit": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+		},
+		"simple-git": {
+			"version": "1.80.1",
+			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.80.1.tgz",
+			"integrity": "sha1-SBBMtKxyV2k3hT4a/R7v/cl6yyk=",
+			"dev": true,
 			"requires": {
-				"hoek": "2.16.3"
+				"debug": "2.6.9"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				}
 			}
 		},
-		"brace-expansion": {
-			"version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-			"integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
+		"slice-ansi": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+			"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+			"dev": true,
 			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-				"concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+				"is-fullwidth-code-point": "2.0.0"
+			},
+			"dependencies": {
+				"is-fullwidth-code-point": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+					"dev": true
+				}
 			}
 		},
-		"buffer-shims": {
-			"version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-			"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+		"snakeize": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz",
+			"integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0="
 		},
-		"bunyan": {
-			"version": "1.8.12",
-			"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
-			"integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
+		"sntp": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
 			"requires": {
-				"dtrace-provider": "0.8.5",
-				"moment": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-				"mv": "2.1.1",
-				"safe-json-stringify": "1.0.4"
+				"hoek": "2.16.3"
 			}
 		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-		},
-		"chalk": {
-			"version": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+		"source-map-resolve": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
+			"integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-				"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-				"has-ansi": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-				"supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+				"atob": "1.1.3",
+				"resolve-url": "0.2.1",
+				"source-map-url": "0.3.0",
+				"urix": "0.1.0"
 			}
 		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+		"source-map-url": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
+			"integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
+			"dev": true
 		},
-		"combined-stream": {
-			"version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+		"spdx-correct": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+			"integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+			"dev": true,
 			"requires": {
-				"delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+				"spdx-license-ids": "1.2.2"
 			}
 		},
-		"component-emitter": {
-			"version": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+		"spdx-expression-parse": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+			"integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
 			"dev": true
 		},
-		"concat-map": {
-			"version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"convert-source-map": {
-			"version": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-			"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+		"spdx-license-ids": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+			"integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
 			"dev": true
 		},
-		"cookiejar": {
-			"version": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
-			"integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
+		"specificity": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz",
+			"integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==",
 			"dev": true
 		},
-		"core-js": {
-			"version": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-			"integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
-			"dev": true
+		"split": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+			"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+			"dev": true,
+			"requires": {
+				"through": "2.3.8"
+			}
 		},
-		"core-util-is": {
-			"version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+		"split-array-stream": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
+			"integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
+			"requires": {
+				"async": "2.5.0",
+				"is-stream-ended": "0.1.3"
+			}
 		},
-		"cryptiles": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+		"split2": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+			"integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+			"dev": true,
 			"requires": {
-				"boom": "2.10.1"
+				"through2": "2.0.3"
 			}
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+		"sprintf-js": {
+			"version": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+		},
+		"sshpk": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
 			"requires": {
-				"assert-plus": "1.0.0"
+				"asn1": "0.2.3",
+				"assert-plus": "1.0.0",
+				"bcrypt-pbkdf": "1.0.1",
+				"dashdash": "1.14.1",
+				"ecc-jsbn": "0.1.1",
+				"getpass": "0.1.7",
+				"jsbn": "0.1.1",
+				"tweetnacl": "0.14.5"
 			},
 			"dependencies": {
 				"assert-plus": {
@@ -1106,1403 +12459,1998 @@
 				}
 			}
 		},
-		"debug": {
-			"version": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-			"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-			"dev": true,
-			"requires": {
-				"ms": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-			}
-		},
-		"deep-extend": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-			"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
-		},
-		"define-properties": {
-			"version": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-			"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-			"requires": {
-				"foreach": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-				"object-keys": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"
-			}
-		},
-		"delayed-stream": {
-			"version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-		},
-		"delegates": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+		"stack-chain": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
+			"integrity": "sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=",
+			"dev": true
 		},
-		"detect-indent": {
-			"version": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-			"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+		"stack-generator": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-1.1.0.tgz",
+			"integrity": "sha1-NvapIHUabBD0maE8Msu19RoLiyU=",
 			"dev": true,
 			"requires": {
-				"repeating": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
-			}
-		},
-		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-			"requires": {
-				"domelementtype": "1.1.3",
-				"entities": "1.1.1"
+				"stackframe": "1.0.4"
 			},
 			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
+				"stackframe": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
+					"integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+					"dev": true
 				}
-			}
-		},
-		"domelementtype": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
-		},
-		"domhandler": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-			"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-			"requires": {
-				"domelementtype": "1.3.0"
-			}
-		},
-		"domutils": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
-			"integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
-			"requires": {
-				"dom-serializer": "0.1.0",
-				"domelementtype": "1.3.0"
-			}
-		},
-		"dtrace-provider": {
-			"version": "0.8.5",
-			"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz",
-			"integrity": "sha1-mOu6Ihr6xG4cOf02hY2Pk2dSS5I=",
-			"optional": true,
-			"requires": {
-				"nan": "2.6.2"
-			}
-		},
-		"ecc-jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-			"optional": true,
-			"requires": {
-				"jsbn": "0.1.1"
-			}
-		},
-		"emailreplyparser": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
-			"integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
-		},
-		"entities": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-		},
-		"es-abstract": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
-			"integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
-			"requires": {
-				"es-to-primitive": "1.1.1",
-				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-				"is-callable": "1.1.3",
-				"is-regex": "1.0.4"
-			}
-		},
-		"es-to-primitive": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-			"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-			"requires": {
-				"is-callable": "1.1.3",
-				"is-date-object": "1.0.1",
-				"is-symbol": "1.0.1"
-			}
-		},
-		"escape-string-regexp": {
-			"version": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-		},
-		"esutils": {
-			"version": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-			"dev": true
-		},
-		"extend": {
-			"version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+			}
 		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		"stack-trace": {
+			"version": "0.0.10",
+			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+			"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+			"dev": true
 		},
-		"foreach": {
-			"version": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+		"stackframe": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
+			"integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
+			"dev": true
 		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+		"stacktrace-gps": {
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-2.4.4.tgz",
+			"integrity": "sha1-acgn6dbW9Bz0ONfxleLjy/zyjEQ=",
+			"dev": true,
+			"requires": {
+				"source-map": "0.5.6",
+				"stackframe": "0.3.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.5.6",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+					"integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+					"dev": true
+				}
+			}
 		},
-		"form-data": {
-			"version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+		"stacktrace-js": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-1.3.1.tgz",
+			"integrity": "sha1-Z8qyWJr1xBe5Yvc2mUAne7O2oYs=",
+			"dev": true,
 			"requires": {
-				"asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
+				"error-stack-parser": "1.3.6",
+				"stack-generator": "1.1.0",
+				"stacktrace-gps": "2.4.4"
 			}
 		},
-		"formidable": {
-			"version": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
-			"integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
-			"dev": true
+		"stream-events": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
+			"integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+			"requires": {
+				"stubs": "3.0.0"
+			}
 		},
-		"fs.realpath": {
+		"stream-shift": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
 		},
-		"fstream": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"rimraf": "2.6.1"
-			}
+		"string-format-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+			"integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
 		},
-		"fstream-ignore": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-			"integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+		"string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 			"requires": {
-				"fstream": "1.0.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+				"code-point-at": "1.1.0",
+				"is-fullwidth-code-point": "1.0.0",
+				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
 			}
 		},
-		"function-bind": {
-			"version": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-			"integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E="
+		"stringstream": {
+			"version": "0.0.5",
+			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
 		},
-		"gauge": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+		"strip-ansi": {
+			"version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"requires": {
-				"aproba": "1.1.2",
-				"console-control-strings": "1.1.0",
-				"has-unicode": "2.0.1",
-				"object-assign": "4.1.1",
-				"signal-exit": "3.0.2",
-				"string-width": "1.0.2",
-				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-				"wide-align": "1.1.2"
+				"ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
 			}
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+		"strip-bom": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+			"dev": true,
 			"requires": {
-				"assert-plus": "1.0.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
+				"is-utf8": "0.2.1"
 			}
 		},
-		"glob": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+		"strip-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+			"dev": true,
 			"requires": {
-				"fs.realpath": "1.0.0",
-				"inflight": "1.0.6",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"once": "1.4.0",
-				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+				"get-stdin": "4.0.1"
 			}
 		},
-		"globals": {
-			"version": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
-			"integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY=",
-			"dev": true
+		"strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
 		},
-		"graceful-fs": {
-			"version": "4.1.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+		"stubs": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+			"integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
 		},
-		"har-schema": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-			"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+		"style-search": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+			"integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
+			"dev": true
 		},
-		"har-validator": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-			"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+		"stylelint": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-8.2.0.tgz",
+			"integrity": "sha512-57JWIz/1Uh9ehZMZyAqlFC0EDfQrMXCH8yqt8ZuJQQvV3LBKgAM/JYd+CWi1hC4eJtRODSPbIIBYKdGjkPZdMg==",
+			"dev": true,
 			"requires": {
-				"ajv": "4.11.8",
-				"har-schema": "1.0.5"
+				"autoprefixer": "7.1.6",
+				"balanced-match": "1.0.0",
+				"chalk": "2.3.0",
+				"cosmiconfig": "3.1.0",
+				"debug": "3.1.0",
+				"execall": "1.0.0",
+				"file-entry-cache": "2.0.0",
+				"get-stdin": "5.0.1",
+				"globby": "6.1.0",
+				"globjoin": "0.1.4",
+				"html-tags": "2.0.0",
+				"ignore": "3.3.7",
+				"imurmurhash": "0.1.4",
+				"known-css-properties": "0.4.1",
+				"lodash": "4.17.4",
+				"log-symbols": "2.1.0",
+				"mathml-tag-names": "2.0.1",
+				"meow": "3.7.0",
+				"micromatch": "2.3.11",
+				"normalize-selector": "0.2.0",
+				"pify": "3.0.0",
+				"postcss": "6.0.13",
+				"postcss-less": "1.1.1",
+				"postcss-media-query-parser": "0.2.3",
+				"postcss-reporter": "5.0.0",
+				"postcss-resolve-nested-selector": "0.1.1",
+				"postcss-safe-parser": "3.0.1",
+				"postcss-scss": "1.0.2",
+				"postcss-selector-parser": "2.2.3",
+				"postcss-value-parser": "3.3.0",
+				"resolve-from": "4.0.0",
+				"specificity": "0.3.2",
+				"string-width": "2.1.1",
+				"style-search": "0.1.0",
+				"sugarss": "1.0.0",
+				"svg-tags": "1.0.0",
+				"table": "4.0.2"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"autoprefixer": {
+					"version": "7.1.6",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
+					"integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==",
+					"dev": true,
+					"requires": {
+						"browserslist": "2.6.1",
+						"caniuse-lite": "1.0.30000756",
+						"normalize-range": "0.1.2",
+						"num2fraction": "1.2.2",
+						"postcss": "6.0.13",
+						"postcss-value-parser": "3.3.0"
+					}
+				},
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"browserslist": {
+					"version": "2.6.1",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz",
+					"integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "1.0.30000756",
+						"electron-to-chromium": "1.3.27"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"get-stdin": {
+					"version": "5.0.1",
+					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
+					"integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"resolve-from": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+					"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+					"dev": true,
+					"requires": {
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "4.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "3.0.0"
+					}
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"has": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-			"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+		"stylelint-order": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-0.7.0.tgz",
+			"integrity": "sha1-zqtcviSqM/pjWQAkmVOV9u38mrc=",
+			"dev": true,
 			"requires": {
-				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"
+				"lodash": "4.17.4",
+				"postcss": "6.0.13",
+				"postcss-sorting": "3.1.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
+			}
+		},
+		"sugarss": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.0.tgz",
+			"integrity": "sha1-ZeUbOVhDL7cNVFGmi7M+MtDPHvc=",
+			"dev": true,
+			"requires": {
+				"postcss": "6.0.13"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"has-ansi": {
-			"version": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+		"supertest": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz",
+			"integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+				"methods": "1.1.2",
+				"superagent": "3.8.0"
+			},
+			"dependencies": {
+				"asynckit": {
+					"version": "0.4.0",
+					"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+					"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+					"dev": true
+				},
+				"combined-stream": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+					"dev": true,
+					"requires": {
+						"delayed-stream": "1.0.0"
+					}
+				},
+				"component-emitter": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+					"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+					"dev": true
+				},
+				"cookiejar": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
+					"integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
+					"dev": true
+				},
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"delayed-stream": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+					"dev": true
+				},
+				"extend": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+					"dev": true
+				},
+				"form-data": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+					"integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+					"dev": true,
+					"requires": {
+						"asynckit": "0.4.0",
+						"combined-stream": "1.0.5",
+						"mime-types": "2.1.17"
+					}
+				},
+				"formidable": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
+					"integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"methods": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+					"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+					"dev": true
+				},
+				"mime": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+					"dev": true
+				},
+				"mime-types": {
+					"version": "2.1.17",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.5.1",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+					"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"superagent": {
+					"version": "3.8.0",
+					"resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.0.tgz",
+					"integrity": "sha512-71XGWgtn70TNwgmgYa69dPOYg55aU9FCahjUNY03rOrKvaTCaU3b9MeZmqonmf9Od96SCxr3vGfEAnhM7dtxCw==",
+					"dev": true,
+					"requires": {
+						"component-emitter": "1.2.1",
+						"cookiejar": "2.1.1",
+						"debug": "3.1.0",
+						"extend": "3.0.1",
+						"form-data": "2.3.1",
+						"formidable": "1.1.1",
+						"methods": "1.1.2",
+						"mime": "1.4.1",
+						"qs": "6.5.1",
+						"readable-stream": "2.3.3"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
 			}
 		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		"svg-tags": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+			"integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
+			"dev": true
 		},
-		"hawk": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+		"table": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+			"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+			"dev": true,
 			"requires": {
-				"boom": "2.10.1",
-				"cryptiles": "2.0.5",
-				"hoek": "2.16.3",
-				"sntp": "1.0.9"
+				"ajv": "5.3.0",
+				"ajv-keywords": "2.1.1",
+				"chalk": "2.3.0",
+				"lodash": "4.17.4",
+				"slice-ansi": "1.0.0",
+				"string-width": "2.1.1"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+					"integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
+					"dev": true,
+					"requires": {
+						"co": "4.6.0",
+						"fast-deep-equal": "1.0.0",
+						"fast-json-stable-stringify": "2.0.0",
+						"json-schema-traverse": "0.3.1"
+					}
+				},
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"dev": true
+				},
+				"ansi-styles": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"dev": true,
+					"requires": {
+						"color-convert": "1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "3.2.0",
+						"escape-string-regexp": "1.0.5",
+						"supports-color": "4.5.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"string-width": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+					"dev": true,
+					"requires": {
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "4.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "3.0.0"
+					}
+				},
+				"supports-color": {
+					"version": "4.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"dev": true,
+					"requires": {
+						"has-flag": "2.0.0"
+					}
+				}
 			}
 		},
-		"he": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
-		},
-		"highlight.js": {
-			"version": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
-			"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
-		},
-		"hoek": {
-			"version": "2.16.3",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-		},
-		"home-or-tmp": {
-			"version": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-			"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-			"dev": true,
+		"tar": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+			"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
 			"requires": {
-				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+				"block-stream": "0.0.9",
+				"fstream": "1.0.11",
+				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
 			}
 		},
-		"html-to-text": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.1.0.tgz",
-			"integrity": "sha1-fwfvIXPloEQecxXBkgE6AKUtXko=",
+		"tar-pack": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+			"integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
 			"requires": {
-				"he": "1.1.1",
-				"htmlparser2": "3.9.2",
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-				"underscore": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-				"underscore.string": "3.3.4"
+				"debug": "2.6.8",
+				"fstream": "1.0.11",
+				"fstream-ignore": "1.0.5",
+				"once": "1.4.0",
+				"readable-stream": "2.3.3",
+				"rimraf": "2.6.1",
+				"tar": "2.2.1",
+				"uid-number": "0.0.6"
 			},
 			"dependencies": {
-				"underscore.string": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
-					"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
+				"debug": {
+					"version": "2.6.8",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
 					"requires": {
-						"sprintf-js": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+						"ms": "2.0.0"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"requires": {
+						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
 						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
 					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
 				}
 			}
 		},
-		"htmlparser2": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+		"tar-stream": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
+			"integrity": "sha1-+8bG6DwaGdTLSMfZYXH8JI7/x78=",
+			"dev": true,
 			"requires": {
-				"domelementtype": "1.3.0",
-				"domhandler": "2.4.1",
-				"domutils": "1.6.2",
-				"entities": "1.1.1",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "2.3.3"
+				"bl": "1.1.2",
+				"end-of-stream": "1.4.0",
+				"readable-stream": "2.3.3",
+				"xtend": "4.0.1"
 			},
 			"dependencies": {
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
+				},
 				"readable-stream": {
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
 					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
 						"safe-buffer": "5.1.1",
 						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
 					"version": "5.1.1",
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
 				},
 				"string_decoder": {
 					"version": "1.0.3",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
 					"requires": {
 						"safe-buffer": "5.1.1"
 					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				},
+				"xtend": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+					"dev": true
 				}
 			}
 		},
-		"http-signature": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+		"tdigest": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
+			"integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=",
 			"requires": {
-				"assert-plus": "0.2.0",
-				"jsprim": "1.4.1",
-				"sshpk": "1.13.1"
+				"bintrees": "1.0.1"
 			}
 		},
-		"imap": {
-			"version": "0.8.19",
-			"resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
-			"integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
+		"tempfile": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
+			"integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
+			"dev": true,
 			"requires": {
-				"readable-stream": "1.1.14",
-				"utf7": "1.0.2"
+				"os-tmpdir": "1.0.2",
+				"uuid": "2.0.3"
 			},
 			"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": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"dev": true
 				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+				"uuid": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+					"integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+					"dev": true
 				}
 			}
 		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"requires": {
-				"once": "1.4.0",
-				"wrappy": "1.0.2"
-			}
-		},
-		"inherits": {
-			"version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-		},
-		"inherits-ex": {
-			"version": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.1.8.tgz",
-			"integrity": "sha1-9wmppZxYqT3f4B01MOZyR7rim+M=",
-			"requires": {
-				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-			}
-		},
-		"ini": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-			"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
-		},
-		"invariant": {
-			"version": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-			"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-			"dev": true,
-			"requires": {
-				"loose-envify": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"
-			}
-		},
-		"is-callable": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-			"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
-		},
-		"is-date-object": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-		},
-		"is-finite": {
-			"version": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-			"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-			"dev": true,
-			"requires": {
-				"number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-			}
-		},
-		"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": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-			}
-		},
-		"is-regex": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-			"requires": {
-				"has": "1.0.1"
-			}
-		},
-		"is-symbol": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-			"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"isarray": {
-			"version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"jquery": {
-			"version": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-			"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
-		},
-		"js-tokens": {
-			"version": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
-			"integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=",
+		"text-extensions": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
+			"integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
 			"dev": true
 		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"optional": true
-		},
-		"jsesc": {
-			"version": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+		"text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
 			"dev": true
 		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-stable-stringify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-			"requires": {
-				"jsonify": "0.0.0"
-			}
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-		},
-		"json5": {
-			"version": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
-			"integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
+		"throttleit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+			"integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
 			"dev": true
 		},
-		"jsonify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"libbase64": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
-			"integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
-		},
-		"libmime": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/libmime/-/libmime-3.1.0.tgz",
-			"integrity": "sha1-EVAS8WcgUa3IgJqPk5Vf/DZI7fk=",
-			"requires": {
-				"iconv-lite": "0.4.15",
-				"libbase64": "0.1.0",
-				"libqp": "1.1.0"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.15",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
-				}
-			}
-		},
-		"libqp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
-			"integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
-		},
-		"lodash": {
-			"version": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+		"through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
 			"dev": true
 		},
-		"loose-envify": {
-			"version": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-			"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-			"dev": true,
-			"requires": {
-				"js-tokens": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
-			}
-		},
-		"mailparser-node4": {
-			"version": "2.0.2-2",
-			"resolved": "https://registry.npmjs.org/mailparser-node4/-/mailparser-node4-2.0.2-2.tgz",
-			"integrity": "sha1-IK4hESKWWldb3a6bTADTwtgkR/U=",
+		"through2": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
 			"requires": {
-				"addressparser": "1.0.1",
-				"array-includes": "3.0.3",
-				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-				"he": "1.1.1",
-				"html-to-text": "3.1.0",
-				"iconv-lite": "0.4.15",
-				"libmime": "3.1.0",
-				"mailsplit-node4": "4.0.1",
-				"marked": "0.3.6"
+				"readable-stream": "2.3.3",
+				"xtend": "4.0.1"
 			},
 			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.15",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+				},
+				"readable-stream": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
+						"safe-buffer": "5.1.1",
+						"string_decoder": "1.0.3",
+						"util-deprecate": "1.0.2"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+				},
+				"string_decoder": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"requires": {
+						"safe-buffer": "5.1.1"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+				},
+				"xtend": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 				}
 			}
 		},
-		"mailsplit-node4": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/mailsplit-node4/-/mailsplit-node4-4.0.1.tgz",
-			"integrity": "sha1-XVEiiDVA/Ac/fQcWwv9ntlDP1oI=",
+		"tiny-emitter": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.0.tgz",
+			"integrity": "sha1-utMnrbGAS0KiMa+nQVMr2ITNCa0=",
+			"dev": true
+		},
+		"tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+			"dev": true,
 			"requires": {
-				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-				"libbase64": "0.1.0",
-				"libmime": "3.1.0",
-				"libqp": "1.1.0"
+				"os-tmpdir": "1.0.2"
+			},
+			"dependencies": {
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"dev": true
+				}
 			}
 		},
-		"marked": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
-			"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
+		"toastr": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
+			"integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
 		},
-		"media-typer": {
-			"version": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+		"tough-cookie": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+			"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+			"requires": {
+				"punycode": "1.4.1"
+			}
 		},
-		"methods": {
-			"version": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+		"trim-newlines": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
 			"dev": true
 		},
-		"mime": {
-			"version": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-			"integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
+		"trim-off-newlines": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
+			"integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
 			"dev": true
 		},
-		"mime-db": {
-			"version": "1.30.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-			"integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
-		},
-		"mime-type": {
-			"version": "https://registry.npmjs.org/mime-type/-/mime-type-3.0.5.tgz",
-			"integrity": "sha1-ftKSan2oImifgSVPWYf+lQNiLpo=",
-			"requires": {
-				"media-typer": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"path.js": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
-				"util-ex": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz"
-			}
+		"tryit": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+			"integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
+			"dev": true
 		},
-		"mime-types": {
-			"version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-			"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"requires": {
-				"mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
+				"safe-buffer": "5.1.1"
 			},
 			"dependencies": {
-				"mime-db": {
-					"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-					"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE="
+				"safe-buffer": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 				}
 			}
 		},
-		"minimatch": {
-			"version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-			"requires": {
-				"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
-			}
-		},
-		"minimist": {
-			"version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+		"tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+			"optional": true
 		},
-		"mkdirp": {
-			"version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+		"type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+			"dev": true,
 			"requires": {
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+				"prelude-ls": "1.1.2"
 			}
 		},
-		"moment": {
-			"version": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-			"integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
-		},
-		"moment-timezone": {
-			"version": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
-			"integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
-			"requires": {
-				"moment": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"
-			}
+		"type-detect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
+			"integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
+			"dev": true
 		},
-		"ms": {
-			"version": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-			"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+		"typed-function": {
+			"version": "0.10.5",
+			"resolved": "https://registry.npmjs.org/typed-function/-/typed-function-0.10.5.tgz",
+			"integrity": "sha1-Lg8Yq9BlIZ+raUpEamXG0ZgYMsA=",
 			"dev": true
 		},
-		"mv": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-			"integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+		"typedarray": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+		},
+		"uglify-js": {
+			"version": "2.8.29",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+			"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+			"dev": true,
 			"optional": true,
 			"requires": {
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"ncp": "2.0.0",
-				"rimraf": "2.4.5"
+				"source-map": "0.5.7",
+				"uglify-to-browserify": "1.0.2",
+				"yargs": "3.10.0"
 			},
 			"dependencies": {
-				"glob": {
-					"version": "6.0.4",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-					"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-					"optional": true,
-					"requires": {
-						"inflight": "1.0.6",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "1.4.0",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"rimraf": {
-					"version": "2.4.5",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-					"integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
-					"optional": true,
-					"requires": {
-						"glob": "6.0.4"
-					}
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true,
+					"optional": true
 				}
 			}
 		},
-		"nan": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-			"integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
-		},
-		"ncp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-			"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+		"uglify-to-browserify": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+			"dev": true,
 			"optional": true
 		},
-		"node-pre-gyp": {
-			"version": "0.6.36",
-			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-			"integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
-			"requires": {
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"nopt": "4.0.1",
-				"npmlog": "4.1.2",
-				"rc": "1.2.1",
-				"request": "2.81.0",
-				"rimraf": "2.6.1",
-				"semver": "5.4.1",
-				"tar": "2.2.1",
-				"tar-pack": "3.4.0"
-			}
+		"uid-number": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+			"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
 		},
-		"nopt": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-			"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-			"requires": {
-				"abbrev": "1.1.0",
-				"osenv": "0.1.4"
-			}
+		"underscore": {
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+			"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
 		},
-		"npmlog": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+		"underscore.string": {
+			"version": "3.3.4",
+			"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
+			"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
+			"dev": true,
 			"requires": {
-				"are-we-there-yet": "1.1.4",
-				"console-control-strings": "1.1.0",
-				"gauge": "2.7.4",
-				"set-blocking": "2.0.0"
+				"sprintf-js": "1.1.1",
+				"util-deprecate": "1.0.2"
+			},
+			"dependencies": {
+				"sprintf-js": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
+					"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=",
+					"dev": true
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
+				}
 			}
 		},
-		"number-is-nan": {
-			"version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-		},
-		"oauth-sign": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-		},
-		"object-keys": {
-			"version": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-			"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+		"uniq": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+			"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+			"dev": true
 		},
-		"once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+		"unique-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
 			"requires": {
-				"wrappy": "1.0.2"
+				"crypto-random-string": "1.0.0"
 			}
 		},
-		"optimist": {
-			"version": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-			"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+		"units-css": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
+			"integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
+			"dev": true,
 			"requires": {
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-				"wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+				"isnumeric": "0.2.0",
+				"viewport-dimensions": "0.2.0"
 			}
 		},
-		"os-homedir": {
-			"version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-		},
-		"os-tmpdir": {
-			"version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-		},
-		"osenv": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-			"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-			"requires": {
-				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-			}
+		"upper-case": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+			"integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+			"dev": true
 		},
-		"path-exists": {
-			"version": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
-			"integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
+		"urijs": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.0.tgz",
+			"integrity": "sha512-Qs2odXn0hST5VSPVjpi73CMqtbAoanahaqWBujGU+IyMrMqpWcIhDewxQRhCkmqYxuyvICDcSuLdv2O7ncWBGw==",
 			"dev": true
 		},
-		"path-is-absolute": {
-			"version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+		"urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+			"dev": true
 		},
-		"path.js": {
-			"version": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
-			"integrity": "sha1-fRNrYH3hm/2YugaIdJJih+ZTSTk=",
+		"url": {
+			"version": "0.10.3",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+			"integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
 			"requires": {
-				"escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-				"inherits-ex": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.1.8.tgz",
-				"util-ex": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz"
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+				}
 			}
 		},
-		"performance-now": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-			"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-		},
-		"photoswipe": {
-			"version": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.2.tgz",
-			"integrity": "sha1-lcIKdc6iO3DWKZZBytguA8rn95c="
-		},
-		"poplib": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
-			"integrity": "sha1-L0tYtVkpcjUM2X9IKrpo+OBVdLw=",
+		"utf7": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
+			"integrity": "sha1-lV9JCq5lO6IguUVqCod2wZk2CZE=",
 			"requires": {
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
+				"semver": "5.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+				}
 			}
 		},
-		"private": {
-			"version": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-			"integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
-			"dev": true
+		"util-deprecate": {
+			"version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 		},
-		"process-nextick-args": {
-			"version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+		"uuid": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+			"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
 		},
-		"punycode": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+		"validate-npm-package-license": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+			"integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+			"dev": true,
+			"requires": {
+				"spdx-correct": "1.0.2",
+				"spdx-expression-parse": "1.0.4"
+			}
 		},
-		"qs": {
-			"version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-			"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+		"validator": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-7.0.0.tgz",
+			"integrity": "sha1-x03rgGNRL6w1VHk45vCxUEooL9I=",
+			"dev": true
 		},
-		"rc": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-			"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+		"vasync": {
+			"version": "1.6.4",
+			"resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz",
+			"integrity": "sha1-3+k2Fq0OeugBszKp2Iv8XNyOHR8=",
 			"requires": {
-				"deep-extend": "0.4.2",
-				"ini": "1.3.4",
-				"minimist": "1.2.0",
-				"strip-json-comments": "2.0.1"
+				"verror": "1.6.0"
 			},
 			"dependencies": {
-				"minimist": {
+				"extsprintf": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+					"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz",
+					"integrity": "sha1-WtlGwi9bMrp/jNdCZxHG6KP8JSk="
+				},
+				"verror": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz",
+					"integrity": "sha1-fROyex+swuLakEBetepuW90lLqU=",
+					"requires": {
+						"extsprintf": "1.2.0"
+					}
 				}
 			}
 		},
-		"readable-stream": {
-			"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-			"integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
-			"dev": true,
+		"verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
 			"requires": {
-				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+				"assert-plus": "1.0.0",
 				"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-				"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-				"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-				"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+				"extsprintf": "1.3.0"
+			},
+			"dependencies": {
+				"assert-plus": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+				}
 			}
 		},
-		"regenerate": {
-			"version": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
-			"integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
+		"viewport-dimensions": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
+			"integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w=",
 			"dev": true
 		},
-		"regenerator-transform": {
-			"version": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz",
-			"integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-				"private": "https://registry.npmjs.org/private/-/private-0.1.7.tgz"
-			}
-		},
-		"regexpu-core": {
-			"version": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-			"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-			"dev": true,
-			"requires": {
-				"regenerate": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
-				"regjsgen": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-				"regjsparser": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz"
-			}
+		"walkdir": {
+			"version": "0.0.11",
+			"resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
+			"integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
+			"dev": true
 		},
-		"regjsgen": {
-			"version": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-			"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+		"wdio-dot-reporter": {
+			"version": "0.0.9",
+			"resolved": "https://registry.npmjs.org/wdio-dot-reporter/-/wdio-dot-reporter-0.0.9.tgz",
+			"integrity": "sha1-kpsq2v1J1rBTT9oGjocxm0fjj+U=",
 			"dev": true
 		},
-		"regjsparser": {
-			"version": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-			"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+		"wdio-sync": {
+			"version": "0.6.14",
+			"resolved": "https://registry.npmjs.org/wdio-sync/-/wdio-sync-0.6.14.tgz",
+			"integrity": "sha1-odzVkHuh0EFUquYXbGItkQw8qbM=",
 			"dev": true,
 			"requires": {
-				"jsesc": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+				"babel-runtime": "6.23.0",
+				"fibers": "1.0.15",
+				"object.assign": "4.0.4"
 			},
 			"dependencies": {
-				"jsesc": {
-					"version": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-					"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+				"babel-runtime": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+					"integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
+					"dev": true,
+					"requires": {
+						"core-js": "2.5.1",
+						"regenerator-runtime": "0.10.5"
+					}
+				},
+				"core-js": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
 					"dev": true
 				}
 			}
 		},
-		"repeating": {
-			"version": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-			"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+		"webdriverio": {
+			"version": "4.8.0",
+			"resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.8.0.tgz",
+			"integrity": "sha1-1Skpt0kID4mWf24WFAUcvIFy0TI=",
 			"dev": true,
 			"requires": {
-				"is-finite": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"
-			}
-		},
-		"request": {
-			"version": "2.81.0",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-			"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-			"requires": {
-				"aws-sign2": "0.6.0",
-				"aws4": "1.6.0",
-				"caseless": "0.12.0",
-				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"forever-agent": "0.6.1",
-				"form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-				"har-validator": "4.2.1",
-				"hawk": "3.1.3",
-				"http-signature": "1.1.1",
-				"is-typedarray": "1.0.0",
-				"isstream": "0.1.2",
+				"archiver": "1.3.0",
+				"babel-runtime": "6.23.0",
+				"css-parse": "2.0.0",
+				"css-value": "0.0.1",
+				"deepmerge": "1.3.2",
+				"ejs": "2.5.7",
+				"gaze": "1.1.2",
+				"glob": "7.1.2",
+				"inquirer": "3.0.6",
 				"json-stringify-safe": "5.0.1",
-				"mime-types": "2.1.17",
-				"oauth-sign": "0.8.2",
-				"performance-now": "0.2.0",
-				"qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-				"safe-buffer": "5.1.1",
-				"stringstream": "0.0.5",
-				"tough-cookie": "2.3.2",
-				"tunnel-agent": "0.6.0",
-				"uuid": "3.1.0"
+				"mkdirp": "0.5.1",
+				"npm-install-package": "2.1.0",
+				"optimist": "0.6.1",
+				"q": "1.5.1",
+				"request": "2.81.0",
+				"rgb2hex": "0.1.0",
+				"safe-buffer": "5.0.1",
+				"supports-color": "3.2.3",
+				"url": "0.11.0",
+				"validator": "7.0.0",
+				"wdio-dot-reporter": "0.0.9",
+				"wgxpath": "1.0.0"
 			},
 			"dependencies": {
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+				"babel-runtime": {
+					"version": "6.23.0",
+					"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+					"integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
+					"dev": true,
+					"requires": {
+						"core-js": "2.5.1",
+						"regenerator-runtime": "0.10.5"
+					}
+				},
+				"core-js": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
+					"dev": true
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"optimist": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+					"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+					"dev": true,
 					"requires": {
-						"mime-db": "1.30.0"
+						"minimist": "0.0.8",
+						"wordwrap": "0.0.3"
 					}
 				},
+				"punycode": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+					"dev": true
+				},
 				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+					"version": "5.0.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+					"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "3.2.3",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+					"dev": true,
+					"requires": {
+						"has-flag": "1.0.0"
+					}
+				},
+				"url": {
+					"version": "0.11.0",
+					"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+					"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+					"dev": true,
+					"requires": {
+						"punycode": "1.3.2",
+						"querystring": "0.2.0"
+					}
+				},
+				"wordwrap": {
+					"version": "0.0.3",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+					"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+					"dev": true
 				}
 			}
 		},
-		"rimraf": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-			"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+		"websocket-driver": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+			"integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+			"dev": true,
 			"requires": {
-				"glob": "7.1.2"
+				"http-parser-js": "0.4.9",
+				"websocket-extensions": "0.1.2"
 			}
 		},
-		"safe-buffer": {
-			"version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-			"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+		"websocket-extensions": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+			"integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
 			"dev": true
 		},
-		"safe-json-stringify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz",
-			"integrity": "sha1-gaCY9Efku8P/MxKiQ1IbwGDvWRE=",
-			"optional": true
+		"wgxpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz",
+			"integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
+			"dev": true
 		},
-		"semver": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-			"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
+		"which": {
+			"version": "1.2.14",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+			"integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+			"dev": true,
+			"requires": {
+				"isexe": "2.0.0"
+			}
 		},
-		"set-blocking": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+		"wide-align": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+			"integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+			"requires": {
+				"string-width": "1.0.2"
+			}
 		},
-		"shebang-regex": {
-			"version": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-			"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-			"dev": true
+		"window-size": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+			"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+			"dev": true,
+			"optional": true
 		},
-		"signal-exit": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+		"wolfy87-eventemitter": {
+			"version": "5.2.3",
+			"resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.3.tgz",
+			"integrity": "sha512-jCUVjlRkpuoU9vQa1cyynPJhvR8ymNLwfvdkGYjIWwR0STLc0LJQG+yFy1JlQ73vjbtlNiC8xNqZQMJDdpYMeA=="
 		},
-		"slash": {
-			"version": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-			"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-			"dev": true
+		"wordwrap": {
+			"version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+			"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
 		},
-		"sntp": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+		},
+		"write": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+			"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+			"dev": true,
 			"requires": {
-				"hoek": "2.16.3"
+				"mkdirp": "0.5.1"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+					"dev": true
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"dev": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				}
 			}
 		},
-		"source-map": {
-			"version": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-			"integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-			"dev": true
+		"write-file-atomic": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+			"integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+			"requires": {
+				"graceful-fs": "4.1.11",
+				"imurmurhash": "0.1.4",
+				"signal-exit": "3.0.2"
+			}
 		},
-		"source-map-support": {
-			"version": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
-			"integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
-			"dev": true,
+		"xdg-basedir": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+			"integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
+		},
+		"xml2js": {
+			"version": "0.4.17",
+			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
+			"integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
 			"requires": {
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+				"sax": "1.2.1",
+				"xmlbuilder": "4.2.1"
 			}
 		},
-		"sprintf-js": {
-			"version": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+		"xmlbuilder": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
+			"integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
+			"requires": {
+				"lodash": "4.17.4"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+				}
+			}
 		},
-		"sshpk": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+		"xolvio-ddp": {
+			"version": "0.12.3",
+			"resolved": "https://registry.npmjs.org/xolvio-ddp/-/xolvio-ddp-0.12.3.tgz",
+			"integrity": "sha1-NqarlhKyQLWg0cCoNJCK8XwLjwI=",
+			"dev": true,
 			"requires": {
-				"asn1": "0.2.3",
-				"assert-plus": "1.0.0",
-				"bcrypt-pbkdf": "1.0.1",
-				"dashdash": "1.14.1",
-				"ecc-jsbn": "0.1.1",
-				"getpass": "0.1.7",
-				"jsbn": "0.1.1",
-				"tweetnacl": "0.14.5"
+				"bluebird": "2.11.0",
+				"ddp-ejson": "0.8.1-3",
+				"ddp-underscore-patched": "0.8.1-2",
+				"faye-websocket": "0.9.4",
+				"request": "2.53.0"
 			},
 			"dependencies": {
+				"asn1": {
+					"version": "0.1.11",
+					"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+					"integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
+					"dev": true
+				},
 				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+					"integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
+					"dev": true
+				},
+				"async": {
+					"version": "0.9.2",
+					"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+					"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+					"dev": true
+				},
+				"aws-sign2": {
+					"version": "0.5.0",
+					"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+					"integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+					"dev": true
+				},
+				"bl": {
+					"version": "0.9.5",
+					"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
+					"integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+					"dev": true,
+					"requires": {
+						"readable-stream": "1.0.34"
+					}
+				},
+				"bluebird": {
+					"version": "2.11.0",
+					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
+					"integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
+					"dev": true
+				},
+				"caseless": {
+					"version": "0.9.0",
+					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
+					"integrity": "sha1-t7Zc5r8UE4hlOc/VM/CzDv+pz4g=",
+					"dev": true
+				},
+				"combined-stream": {
+					"version": "0.0.7",
+					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+					"integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+					"dev": true,
+					"requires": {
+						"delayed-stream": "0.0.5"
+					}
+				},
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
+				},
+				"delayed-stream": {
+					"version": "0.0.5",
+					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+					"integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+					"dev": true
+				},
+				"forever-agent": {
+					"version": "0.5.2",
+					"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+					"integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=",
+					"dev": true
+				},
+				"form-data": {
+					"version": "0.2.0",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+					"integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
+					"dev": true,
+					"requires": {
+						"async": "0.9.2",
+						"combined-stream": "0.0.7",
+						"mime-types": "2.0.14"
+					}
+				},
+				"hawk": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
+					"integrity": "sha1-HnMc45RH+h0PbXB/e87r7A/R7B8=",
+					"dev": true,
+					"requires": {
+						"boom": "2.10.1",
+						"cryptiles": "2.0.5",
+						"hoek": "2.16.3",
+						"sntp": "1.0.9"
+					}
+				},
+				"http-signature": {
+					"version": "0.10.1",
+					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+					"integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+					"dev": true,
+					"requires": {
+						"asn1": "0.1.11",
+						"assert-plus": "0.1.5",
+						"ctype": "0.5.3"
+					}
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
+				},
+				"mime-db": {
+					"version": "1.12.0",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
+					"integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
+					"dev": true
+				},
+				"mime-types": {
+					"version": "2.0.14",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+					"integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
+					"dev": true,
+					"requires": {
+						"mime-db": "1.12.0"
+					}
+				},
+				"oauth-sign": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
+					"integrity": "sha1-fb6uRPbKRU4fFoRR1jB0ZzWBPOM=",
+					"dev": true
+				},
+				"qs": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+					"integrity": "sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "1.0.34",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+					"dev": true,
+					"requires": {
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "0.0.1",
+						"string_decoder": "0.10.31"
+					}
+				},
+				"request": {
+					"version": "2.53.0",
+					"resolved": "https://registry.npmjs.org/request/-/request-2.53.0.tgz",
+					"integrity": "sha1-GAo66St7Y5gC5PlUXdj83rcddgw=",
+					"dev": true,
+					"requires": {
+						"aws-sign2": "0.5.0",
+						"bl": "0.9.5",
+						"caseless": "0.9.0",
+						"combined-stream": "0.0.7",
+						"forever-agent": "0.5.2",
+						"form-data": "0.2.0",
+						"hawk": "2.3.1",
+						"http-signature": "0.10.1",
+						"isstream": "0.1.2",
+						"json-stringify-safe": "5.0.1",
+						"mime-types": "2.0.14",
+						"node-uuid": "1.4.8",
+						"oauth-sign": "0.6.0",
+						"qs": "2.3.3",
+						"stringstream": "0.0.5",
+						"tough-cookie": "2.3.2",
+						"tunnel-agent": "0.4.3"
+					}
+				},
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
+				},
+				"tunnel-agent": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+					"dev": true
 				}
 			}
 		},
-		"string_decoder": {
-			"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-			"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+		"xolvio-fiber-utils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/xolvio-fiber-utils/-/xolvio-fiber-utils-2.0.3.tgz",
+			"integrity": "sha1-vsjXDHQGGjFjFbun0w0lyz6C3FA=",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
+				"fibers": "1.0.15",
+				"underscore": "1.8.3"
 			}
 		},
-		"string-width": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+		"xolvio-jasmine-expect": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/xolvio-jasmine-expect/-/xolvio-jasmine-expect-1.1.0.tgz",
+			"integrity": "sha1-vCud1ghCMR8EV59agtzqaisxnH0=",
+			"dev": true,
 			"requires": {
-				"code-point-at": "1.1.0",
-				"is-fullwidth-code-point": "1.0.0",
-				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+				"jasmine-core": "2.8.0"
 			}
 		},
-		"stringstream": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-		},
-		"strip-ansi": {
-			"version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+		"xolvio-sync-webdriverio": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/xolvio-sync-webdriverio/-/xolvio-sync-webdriverio-9.0.1.tgz",
+			"integrity": "sha1-WRri2MiqynQiZJWfzM+QtPndUWA=",
+			"dev": true,
 			"requires": {
-				"ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+				"fibers": "1.0.15",
+				"meteor-promise": "0.8.6",
+				"underscore": "1.8.3",
+				"wdio-sync": "0.6.14",
+				"webdriverio": "4.8.0",
+				"xolvio-fiber-utils": "2.0.3"
 			}
 		},
-		"strip-json-comments": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+		"yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+			"dev": true
 		},
-		"superagent": {
-			"version": "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz",
-			"integrity": "sha1-M2GjlxVnUEw1EGOr6q4PqiPb8/g=",
+		"yargs": {
+			"version": "3.10.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+			"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"component-emitter": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-				"cookiejar": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-				"formidable": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
-				"methods": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-				"mime": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-				"qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"
+				"camelcase": "1.2.1",
+				"cliui": "2.1.0",
+				"decamelize": "1.2.0",
+				"window-size": "0.1.0"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+					"dev": true,
+					"optional": true
+				}
 			}
 		},
-		"supertest": {
-			"version": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz",
-			"integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=",
+		"yauzl": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+			"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
 			"dev": true,
 			"requires": {
-				"methods": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-				"superagent": "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz"
-			}
-		},
-		"supports-color": {
-			"version": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-			"dev": true
-		},
-		"tar": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-			"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-			"requires": {
-				"block-stream": "0.0.9",
-				"fstream": "1.0.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+				"fd-slicer": "1.0.1"
 			}
 		},
-		"tar-pack": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-			"integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+		"zip-stream": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
+			"integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
+			"dev": true,
 			"requires": {
-				"debug": "2.6.8",
-				"fstream": "1.0.11",
-				"fstream-ignore": "1.0.5",
-				"once": "1.4.0",
-				"readable-stream": "2.3.3",
-				"rimraf": "2.6.1",
-				"tar": "2.2.1",
-				"uid-number": "0.0.6"
+				"archiver-utils": "1.3.0",
+				"compress-commons": "1.2.2",
+				"lodash": "4.17.4",
+				"readable-stream": "2.3.3"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "2.6.8",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-					"requires": {
-						"ms": "2.0.0"
-					}
+				"core-util-is": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+					"dev": true
 				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+				"inherits": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"dev": true
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+					"dev": true
+				},
+				"lodash": {
+					"version": "4.17.4",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+					"dev": true
+				},
+				"process-nextick-args": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+					"dev": true
 				},
 				"readable-stream": {
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
 					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+					"dev": true,
 					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.3",
+						"isarray": "1.0.0",
+						"process-nextick-args": "1.0.7",
 						"safe-buffer": "5.1.1",
 						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
 					"version": "5.1.1",
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+					"dev": true
 				},
 				"string_decoder": {
 					"version": "1.0.3",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
 					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+					"dev": true,
 					"requires": {
 						"safe-buffer": "5.1.1"
 					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"dev": true
 				}
 			}
-		},
-		"to-fast-properties": {
-			"version": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-			"dev": true
-		},
-		"toastr": {
-			"version": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
-			"integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
-		},
-		"tough-cookie": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-			"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-			"requires": {
-				"punycode": "1.4.1"
-			}
-		},
-		"trim-right": {
-			"version": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-			"dev": true
-		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"requires": {
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"optional": true
-		},
-		"uid-number": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-			"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
-		},
-		"underscore": {
-			"version": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-			"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
-		},
-		"utf7": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
-			"integrity": "sha1-lV9JCq5lO6IguUVqCod2wZk2CZE=",
-			"requires": {
-				"semver": "5.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-				}
-			}
-		},
-		"util-deprecate": {
-			"version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
-		"util-ex": {
-			"version": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz",
-			"integrity": "sha1-+SYc2hPEMn0HQMvme+Eife2LAFg=",
-			"requires": {
-				"inherits-ex": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.1.8.tgz",
-				"xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-			}
-		},
-		"uuid": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-			"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-				"extsprintf": "1.3.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"wide-align": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-			"integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
-			"requires": {
-				"string-width": "1.0.2"
-			}
-		},
-		"wolfy87-eventemitter": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.2.tgz",
-			"integrity": "sha1-nLjlj21TgUYCuREo3YHK0JAZek0="
-		},
-		"wordwrap": {
-			"version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-			"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-		},
-		"wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-		},
-		"xtend": {
-			"version": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 		}
 	}
 }
diff --git a/package.json b/package.json
index 368fe710485..65bd1e9314b 100644
--- a/package.json
+++ b/package.json
@@ -88,43 +88,44 @@
 	"devDependencies": {
 		"babel-mocha-es6-compiler": "^0.1.0",
 		"babel-plugin-array-includes": "^2.0.3",
-		"chimp": "^0.50.0",
-		"conventional-changelog-cli": "^1.3.3",
-		"eslint": "^4.8.0",
+		"chimp": "^0.50.2",
+		"conventional-changelog-cli": "^1.3.4",
+		"eslint": "^4.10.0",
 		"mock-require": "^2.0.2",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
 		"proxyquire": "^1.8.0",
-		"simple-git": "^1.77.0",
-		"stylelint": "^8.1.1",
+		"simple-git": "^1.80.1",
+		"stylelint": "^8.2.0",
 		"stylelint-order": "^0.7.0",
-		"supertest": "^3.0.0",
-		"underscore": "^1.8.3",
-		"underscore.string": "^3.3.4"
+		"supertest": "^3.0.0"
 	},
 	"dependencies": {
-		"@google-cloud/storage": "^1.3.1",
-		"aws-sdk": "^2.125.0",
+		"@google-cloud/storage": "^1.4.0",
+		"aws-sdk": "^2.141.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
 		"bunyan": "^1.8.12",
-		"codemirror": "^5.30.0",
+		"codemirror": "^5.31.0",
+		"core-js": "2.5.1",
 		"emailreplyparser": "0.0.5",
-		"file-type": "^6.2.0",
+		"file-type": "^7.2.0",
 		"highlight.js": "^9.12.0",
 		"imap": "^0.8.19",
 		"jquery": "^3.2.1",
 		"ldapjs": "^1.0.1",
 		"mailparser-node4": "^2.0.2-2",
-		"mime-db": "^1.30.0",
+		"mime-db": "^1.31.0",
 		"mime-type": "^3.0.5",
-		"moment": "^2.18.1",
+		"moment": "^2.19.1",
 		"moment-timezone": "^0.5.13",
 		"photoswipe": "^4.1.2",
 		"poplib": "^0.1.7",
-		"prom-client": "^10.1.1",
+		"prom-client": "^10.2.1",
 		"semver": "^5.4.1",
 		"toastr": "^2.1.2",
-		"wolfy87-eventemitter": "^5.2.2"
+		"underscore": "^1.8.3",
+		"underscore.string": "^3.3.4",
+		"wolfy87-eventemitter": "^5.2.3"
 	}
 }
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 642f3c2c1c9..1f5cdfa07be 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -16,8 +16,7 @@ Package.onUse(function (api) {
 
   api.use([
     'ddp',
-    'mongo',
-    'underscore'
+    'mongo'
   ], ['client', 'server']);
 
   api.use(['http', 'random'], 'web.cordova');
diff --git a/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json b/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json
index ffd0a190a6c..5b5db7b8eae 100644
--- a/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json
+++ b/packages/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json
@@ -1,139 +1,115 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
-    "async": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "from": "async@>=0.2.7 <0.3.0"
-    },
     "buffer-crc32": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz",
-      "from": "buffer-crc32@0.2.1"
+      "integrity": "sha1-vj5TgvwCttYySVasGvmKqYsIU0w="
     },
     "bytes": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz",
-      "from": "bytes@0.2.0"
+      "integrity": "sha1-qtM+wU49wsp06OfUUfm6BTrU96A="
     },
     "connect": {
       "version": "2.7.10",
       "resolved": "https://registry.npmjs.org/connect/-/connect-2.7.10.tgz",
-      "from": "connect@2.7.10"
+      "integrity": "sha1-oKxZRk1lJAedsCyXFRx5XBtN7mQ="
     },
     "cookie": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz",
-      "from": "cookie@0.0.5"
+      "integrity": "sha1-+az521frdWjJ/MWWJWt7si4wfIE="
     },
     "cookie-signature": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz",
-      "from": "cookie-signature@1.0.1"
+      "integrity": "sha1-ROByFIrwHm6OJK+/EmkNaK5pjss="
     },
     "debug": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-      "from": "debug@*"
-    },
-    "ejs": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-0.8.8.tgz",
-      "from": "ejs@>=0.8.3 <0.9.0"
+      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo="
     },
     "formidable": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz",
-      "from": "formidable@1.0.14"
+      "integrity": "sha1-Kz9MQRy7X91pXESEPiojUUpDIxo="
     },
     "fresh": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz",
-      "from": "fresh@0.1.0"
+      "integrity": "sha1-A+SwF4Qk5MLV0ZpU2IFM3JeTSFA="
     },
     "lodash": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-      "from": "lodash@>=3.5.0 <4.0.0"
+      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
     },
     "mime": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz",
-      "from": "mime@1.2.6"
+      "integrity": "sha1-sfhsdowCX6h7SAdfFwnyiuryA2U="
     },
     "ms": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "from": "ms@0.7.1"
-    },
-    "node-forge": {
-      "version": "0.2.24",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.2.24.tgz",
-      "from": "node-forge@0.2.24"
+      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
     },
     "pause": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
-      "from": "pause@0.0.1"
+      "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
     },
     "qs": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz",
-      "from": "qs@0.6.5"
+      "integrity": "sha1-KUsmjksNQlD23eGbO4s0k13/FO8="
     },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "from": "querystring@0.2.0"
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
     },
     "range-parser": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz",
-      "from": "range-parser@0.0.4"
+      "integrity": "sha1-wEJ//vUcEKy6B4KkbJYC50T/Ygs="
     },
     "sax": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "from": "sax@>=0.1.1"
+      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
     "send": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.1.0.tgz",
-      "from": "send@0.1.0"
+      "integrity": "sha1-z7COvTzsm3/Bo32f+eh1qXHPRkA="
     },
     "xml-crypto": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.6.0.tgz",
-      "from": "xml-crypto@0.6.0"
-    },
-    "xml-encryption": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.7.2.tgz",
-      "from": "xml-encryption@0.7.2"
+      "integrity": "sha1-RSKeACjLPultxTP6M4DCvzuGrbg="
     },
     "xml2js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.0.tgz",
-      "from": "xml2js@0.2.0"
+      "integrity": "sha1-99pSJ33rtkeYMFOtti2XLe5loaw="
     },
     "xmlbuilder": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz",
-      "from": "xmlbuilder@2.6.4"
+      "integrity": "sha1-gSOsFXbZxmkY9BBJbx/p8Ci4yj4="
     },
     "xmldom": {
       "version": "0.1.19",
       "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz",
-      "from": "xmldom@0.1.19"
-    },
-    "xpath": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz",
-      "from": "xpath@0.0.5"
+      "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw="
     },
     "xpath.js": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz",
-      "from": "xpath.js@>=0.0.3"
+      "integrity": "sha1-/kuBwbFS69jhOVJl/txbAPyim5A="
     }
   }
 }
diff --git a/packages/meteor-accounts-saml/package.js b/packages/meteor-accounts-saml/package.js
index 97066f419ba..1205b7a47e8 100644
--- a/packages/meteor-accounts-saml/package.js
+++ b/packages/meteor-accounts-saml/package.js
@@ -8,7 +8,7 @@ Package.describe({
 Package.on_use(function(api) {
 	api.use('rocketchat:lib', 'server');
 	api.use('ecmascript');
-	api.use(['routepolicy', 'webapp', 'underscore', 'service-configuration'], 'server');
+	api.use(['routepolicy', 'webapp', 'service-configuration'], 'server');
 	api.use(['http', 'accounts-base'], ['client', 'server']);
 
 	api.add_files(['saml_server.js', 'saml_utils.js'], 'server');
diff --git a/packages/meteor-accounts-saml/saml_server.js b/packages/meteor-accounts-saml/saml_server.js
index 49b15c806a9..63d0da83f51 100644
--- a/packages/meteor-accounts-saml/saml_server.js
+++ b/packages/meteor-accounts-saml/saml_server.js
@@ -1,5 +1,6 @@
 /* globals RoutePolicy, SAML */
 /* jshint newcap: false */
+import _ from 'underscore';
 
 if (!Accounts.saml) {
 	Accounts.saml = {
diff --git a/packages/meteor-autocomplete/client/autocomplete-client.js b/packages/meteor-autocomplete/client/autocomplete-client.js
index ae872d9ac5b..d65421a6ff9 100755
--- a/packages/meteor-autocomplete/client/autocomplete-client.js
+++ b/packages/meteor-autocomplete/client/autocomplete-client.js
@@ -1,4 +1,5 @@
 /* globals Deps, getCaretCoordinates*/
+import _ from 'underscore';
 import AutoCompleteRecords from './collection';
 
 const isServerSearch = function(rule) {
diff --git a/packages/meteor-autocomplete/client/templates.js b/packages/meteor-autocomplete/client/templates.js
index 5b69d1e69c1..ffce35eb749 100755
--- a/packages/meteor-autocomplete/client/templates.js
+++ b/packages/meteor-autocomplete/client/templates.js
@@ -1,4 +1,6 @@
 /* globals AutoComplete */
+import _ from 'underscore';
+
 //  Events on template instances, sent to the autocomplete class
 const acEvents = {
 	'keydown'(e, t) {
diff --git a/packages/meteor-autocomplete/package.js b/packages/meteor-autocomplete/package.js
index a8558288787..bd8abb2a0d8 100755
--- a/packages/meteor-autocomplete/package.js
+++ b/packages/meteor-autocomplete/package.js
@@ -7,7 +7,7 @@ Package.describe({
 
 Package.onUse(function(api) {
 	api.use(['blaze', 'templating', 'jquery'], 'client');
-	api.use(['underscore', 'ecmascript']); // both
+	api.use(['ecmascript']); // both
 	api.use(['mongo', 'ddp']);
 
 	api.use('dandv:caret-position@2.1.0-3', 'client');
diff --git a/packages/meteor-timesync/package.js b/packages/meteor-timesync/package.js
index cede77a0474..446d4e6e5ba 100644
--- a/packages/meteor-timesync/package.js
+++ b/packages/meteor-timesync/package.js
@@ -28,7 +28,7 @@ Package.onTest(function (api) {
     'test-helpers'
   ]);
 
-  api.use(['tracker', 'underscore'], 'client');
+  api.use(['tracker'], 'client');
 
   api.use('mizzao:timesync');
 
diff --git a/packages/rocketchat-2fa/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-2fa/.npm/package/npm-shrinkwrap.json
index df69ce869e8..4d36ae56e85 100644
--- a/packages/rocketchat-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-2fa/.npm/package/npm-shrinkwrap.json
@@ -1,19 +1,20 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "base32.js": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.0.1.tgz",
-      "from": "base32.js@0.0.1"
+      "integrity": "sha1-0EVzalex9sE58MffQlGKhOkbsro="
     },
     "speakeasy": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/speakeasy/-/speakeasy-2.0.0.tgz",
-      "from": "speakeasy@2.0.0"
+      "integrity": "sha1-hckaBxsJpcuGQlkNmDVmFl9XYTo="
     },
     "yaqrcode": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/yaqrcode/-/yaqrcode-0.2.1.tgz",
-      "from": "yaqrcode@0.2.1"
+      "integrity": "sha1-7xyzMgNJ9rO7MctoCjeouBS9itc="
     }
   }
 }
diff --git a/packages/rocketchat-api/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-api/.npm/package/npm-shrinkwrap.json
index d835af77707..965cade4dee 100644
--- a/packages/rocketchat-api/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-api/.npm/package/npm-shrinkwrap.json
@@ -1,44 +1,45 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "busboy": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz",
-      "from": "busboy@0.2.13"
+      "integrity": "sha1-kPxPajln2BVhb8l2v6jlau0MWLY="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "from": "core-util-is@>=1.0.0 <1.1.0"
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "dicer": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz",
-      "from": "dicer@0.2.5"
+      "integrity": "sha1-WZbAhrszIYyBLAkL3cCc0S+stw8="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.1 <2.1.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "from": "isarray@0.0.1"
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
     "readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "from": "readable-stream@>=1.1.0 <1.2.0"
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk="
     },
     "streamsearch": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
-      "from": "streamsearch@0.1.2"
+      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
     },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "from": "string_decoder@>=0.10.0 <0.11.0"
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     }
   }
 }
diff --git a/packages/rocketchat-api/package.js b/packages/rocketchat-api/package.js
index 16d34b94804..36a7d787154 100644
--- a/packages/rocketchat-api/package.js
+++ b/packages/rocketchat-api/package.js
@@ -7,7 +7,6 @@ Package.describe({
 
 Package.onUse(function(api) {
 	api.use([
-		'underscore',
 		'ecmascript',
 		'rocketchat:lib',
 		'nimble:restivus'
diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
index 1f0ee1a669e..0f8f04c4a85 100644
--- a/packages/rocketchat-api/server/api.js
+++ b/packages/rocketchat-api/server/api.js
@@ -1,4 +1,6 @@
 /* global Restivus */
+import _ from 'underscore';
+
 class API extends Restivus {
 	constructor(properties) {
 		super(properties);
diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index d3803284980..427e7d8a8a3 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 //Returns the channel IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
 function findChannelByIdOrName({ params, checkedArchived = true }) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
index 4a98d11e9be..ccc7790978c 100644
--- a/packages/rocketchat-api/server/v1/groups.js
+++ b/packages/rocketchat-api/server/v1/groups.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 //Returns the private group subscription IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
 function findPrivateGroupByIdOrName({ params, userId, checkedArchived = true }) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
index 44ba96588cc..42ddbad9c9c 100644
--- a/packages/rocketchat-api/server/v1/im.js
+++ b/packages/rocketchat-api/server/v1/im.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 function findDirectMessageRoom(params, user) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.username || !params.username.trim())) {
 		throw new Meteor.Error('error-room-param-not-provided', 'Body param "roomId" or "username" is required');
diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js
index 4a2f5359cc3..a9152d87433 100644
--- a/packages/rocketchat-api/server/v1/misc.js
+++ b/packages/rocketchat-api/server/v1/misc.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.API.v1.addRoute('info', { authRequired: false }, {
 	get() {
 		const user = this.getLoggedInUser();
diff --git a/packages/rocketchat-api/server/v1/settings.js b/packages/rocketchat-api/server/v1/settings.js
index 3f6af353d7a..b954ec1b9be 100644
--- a/packages/rocketchat-api/server/v1/settings.js
+++ b/packages/rocketchat-api/server/v1/settings.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 // settings endpoints
 RocketChat.API.v1.addRoute('settings', { authRequired: true }, {
 	get() {
diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index 70b71abbba6..cf1c83011e0 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.API.v1.addRoute('users.create', { authRequired: true }, {
 	post() {
 		check(this.bodyParams, {
diff --git a/packages/rocketchat-assets/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-assets/.npm/package/npm-shrinkwrap.json
index 9358d389da3..857193f2942 100644
--- a/packages/rocketchat-assets/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-assets/.npm/package/npm-shrinkwrap.json
@@ -1,19 +1,10 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "image-size": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.4.0.tgz",
-      "from": "image-size@0.4.0"
-    },
-    "mime-db": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz",
-      "from": "mime-db@>=1.21.0 <1.22.0"
-    },
-    "mime-types": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
-      "from": "mime-types@2.1.9"
+      "integrity": "sha1-1LTh9hlS5MvBzqmmsMkV/stwdRA="
     }
   }
 }
diff --git a/packages/rocketchat-assets/package.js b/packages/rocketchat-assets/package.js
index 7731b5d3137..c106b1b90b7 100644
--- a/packages/rocketchat-assets/package.js
+++ b/packages/rocketchat-assets/package.js
@@ -8,7 +8,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'webapp',
 		'rocketchat:file',
 		'rocketchat:lib',
diff --git a/packages/rocketchat-assets/server/assets.js b/packages/rocketchat-assets/server/assets.js
index 05778fc4422..69bce7af9e0 100644
--- a/packages/rocketchat-assets/server/assets.js
+++ b/packages/rocketchat-assets/server/assets.js
@@ -1,4 +1,5 @@
 /* global WebAppHashing, WebAppInternals */
+import _ from 'underscore';
 
 import sizeOf from 'image-size';
 import mime from 'mime-type/with-db';
diff --git a/packages/rocketchat-authorization/client/lib/models/Subscriptions.js b/packages/rocketchat-authorization/client/lib/models/Subscriptions.js
index 0f3d8a11003..aa384d412b5 100644
--- a/packages/rocketchat-authorization/client/lib/models/Subscriptions.js
+++ b/packages/rocketchat-authorization/client/lib/models/Subscriptions.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 if (_.isUndefined(RocketChat.models.Subscriptions)) {
 	RocketChat.models.Subscriptions = {};
 }
diff --git a/packages/rocketchat-authorization/client/lib/models/Users.js b/packages/rocketchat-authorization/client/lib/models/Users.js
index 880f3a866a6..627d97ef7e8 100644
--- a/packages/rocketchat-authorization/client/lib/models/Users.js
+++ b/packages/rocketchat-authorization/client/lib/models/Users.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 if (_.isUndefined(RocketChat.models.Users)) {
 	RocketChat.models.Users = {};
 }
diff --git a/packages/rocketchat-authorization/package.js b/packages/rocketchat-authorization/package.js
index cc368052e89..1f8de7d298e 100644
--- a/packages/rocketchat-authorization/package.js
+++ b/packages/rocketchat-authorization/package.js
@@ -9,7 +9,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-authorization/server/functions/addUserRoles.js b/packages/rocketchat-authorization/server/functions/addUserRoles.js
index 443c1e71bbd..7568f44e70e 100644
--- a/packages/rocketchat-authorization/server/functions/addUserRoles.js
+++ b/packages/rocketchat-authorization/server/functions/addUserRoles.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.authz.addUserRoles = function(userId, roleNames, scope) {
 	if (!userId || !roleNames) {
 		return false;
diff --git a/packages/rocketchat-authorization/server/functions/removeUserFromRoles.js b/packages/rocketchat-authorization/server/functions/removeUserFromRoles.js
index 74f1a5663bc..566d46a8190 100644
--- a/packages/rocketchat-authorization/server/functions/removeUserFromRoles.js
+++ b/packages/rocketchat-authorization/server/functions/removeUserFromRoles.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.authz.removeUserFromRoles = function(userId, roleNames, scope) {
 	if (!userId || !roleNames) {
 		return false;
diff --git a/packages/rocketchat-authorization/server/methods/addUserToRole.js b/packages/rocketchat-authorization/server/methods/addUserToRole.js
index 80305ee3cc0..21e7ddfdaad 100644
--- a/packages/rocketchat-authorization/server/methods/addUserToRole.js
+++ b/packages/rocketchat-authorization/server/methods/addUserToRole.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	'authorization:addUserToRole'(roleName, username, scope) {
 		if (!Meteor.userId() || !RocketChat.authz.hasPermission(Meteor.userId(), 'access-permissions')) {
diff --git a/packages/rocketchat-authorization/server/methods/removeUserFromRole.js b/packages/rocketchat-authorization/server/methods/removeUserFromRole.js
index cd62bf1b1c6..163c672ac39 100644
--- a/packages/rocketchat-authorization/server/methods/removeUserFromRole.js
+++ b/packages/rocketchat-authorization/server/methods/removeUserFromRole.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	'authorization:removeUserFromRole'(roleName, username, scope) {
 		if (!Meteor.userId() || !RocketChat.authz.hasPermission(Meteor.userId(), 'access-permissions')) {
diff --git a/packages/rocketchat-authorization/server/models/Base.js b/packages/rocketchat-authorization/server/models/Base.js
index b5abf1c0a8c..ea2da8071f2 100644
--- a/packages/rocketchat-authorization/server/models/Base.js
+++ b/packages/rocketchat-authorization/server/models/Base.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.models._Base.prototype.roleBaseQuery = function(/*userId, scope*/) {
 	return;
 };
diff --git a/packages/rocketchat-authorization/server/models/Subscriptions.js b/packages/rocketchat-authorization/server/models/Subscriptions.js
index 0b48783e165..2fc269e4e87 100644
--- a/packages/rocketchat-authorization/server/models/Subscriptions.js
+++ b/packages/rocketchat-authorization/server/models/Subscriptions.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.models.Subscriptions.roleBaseQuery = function(userId, scope) {
 	if (scope == null) {
 		return;
diff --git a/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json
index 469351e76fd..a4807702dee 100644
--- a/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,10 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "autolinker": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.4.0.tgz",
-      "from": "autolinker@1.4.0"
+      "integrity": "sha1-oVjpDIL8V/gSMv0ZwSsQ61ON6IE="
     }
   }
 }
diff --git a/packages/rocketchat-autolinker/client/client.js b/packages/rocketchat-autolinker/client/client.js
index a4ac42cb937..ef37d0f4b5f 100644
--- a/packages/rocketchat-autolinker/client/client.js
+++ b/packages/rocketchat-autolinker/client/client.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 //
 // AutoLinker is a named function that will replace links on messages
 // @param {Object} message - The message object
@@ -10,7 +12,7 @@ function AutoLinker(message) {
 		return message;
 	}
 
-	if (_.trim(message.html)) {
+	if (s.trim(message.html)) {
 		const regUrls = new RegExp(RocketChat.settings.get('AutoLinker_UrlsRegExp'));
 
 		const autolinker = new Autolinker({
diff --git a/packages/rocketchat-autotranslate/client/lib/autotranslate.js b/packages/rocketchat-autotranslate/client/lib/autotranslate.js
index 20458baebcb..3d8066eba05 100644
--- a/packages/rocketchat-autotranslate/client/lib/autotranslate.js
+++ b/packages/rocketchat-autotranslate/client/lib/autotranslate.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.AutoTranslate = {
 	messageIdsToWait: {},
 	supportedLanguages: [],
diff --git a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js b/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js
index 7dac9ab423c..7778b734563 100644
--- a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js
+++ b/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js
@@ -1,4 +1,5 @@
 /* globals ChatSubscription */
+import _ from 'underscore';
 import toastr from 'toastr';
 
 Template.autoTranslateFlexTab.helpers({
diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
index 093cd200508..9e163592314 100644
--- a/packages/rocketchat-autotranslate/server/autotranslate.js
+++ b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 class AutoTranslate {
 	constructor() {
 		this.languages = [];
diff --git a/packages/rocketchat-bot-helpers/package.js b/packages/rocketchat-bot-helpers/package.js
index cd57b74f651..560b7f9ff74 100644
--- a/packages/rocketchat-bot-helpers/package.js
+++ b/packages/rocketchat-bot-helpers/package.js
@@ -7,7 +7,6 @@ Package.describe({
 
 Package.onUse(function(api) {
 	api.use('ecmascript');
-	api.use('underscore');
 	api.use('rocketchat:lib');
 	api.use('accounts-base');
 	// api.mainModule('server/index.js', 'server'); // when 1.3
diff --git a/packages/rocketchat-bot-helpers/server/index.js b/packages/rocketchat-bot-helpers/server/index.js
index eca2c59cced..0c3a45b4d67 100644
--- a/packages/rocketchat-bot-helpers/server/index.js
+++ b/packages/rocketchat-bot-helpers/server/index.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 /**
  * BotHelpers helps bots
  * "private" properties use meteor collection cursors, so they stay reactive
diff --git a/packages/rocketchat-cas/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-cas/.npm/package/npm-shrinkwrap.json
index a309abf87b3..95a8ba7b83e 100644
--- a/packages/rocketchat-cas/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-cas/.npm/package/npm-shrinkwrap.json
@@ -1,113 +1,113 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "from": "boolbase@>=1.0.0 <1.1.0"
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
     },
     "cas": {
-      "version": "0.0.5",
-      "resolved": "https://github.com/kcbanner/node-cas/tarball/fcd27dad333223b3b75a048bce27973fb3ca0f62",
-      "from": "https://github.com/kcbanner/node-cas/tarball/fcd27dad333223b3b75a048bce27973fb3ca0f62"
+      "version": "https://github.com/kcbanner/node-cas/tarball/fcd27dad333223b3b75a048bce27973fb3ca0f62",
+      "integrity": "sha1-AL8m1JYV/7kMEdlJ0sKtJ18YXg4="
     },
     "cheerio": {
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
-      "from": "cheerio@0.19.0"
+      "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "from": "core-util-is@>=1.0.0 <1.1.0"
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "css-select": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
-      "from": "css-select@>=1.0.0 <1.1.0"
+      "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA="
     },
     "css-what": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
-      "from": "css-what@>=1.0.0 <1.1.0"
+      "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w="
     },
     "dom-serializer": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "from": "dom-serializer@>=0.1.0 <0.2.0",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dependencies": {
         "domelementtype": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "from": "domelementtype@>=1.1.1 <1.2.0"
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
         }
       }
     },
     "domelementtype": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-      "from": "domelementtype@>=1.0.0 <2.0.0"
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
     },
     "domhandler": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-      "from": "domhandler@>=2.3.0 <2.4.0"
+      "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg="
     },
     "domutils": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
-      "from": "domutils@>=1.4.0 <1.5.0"
+      "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8="
     },
     "entities": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "from": "entities@>=1.1.1 <1.2.0"
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
     },
     "htmlparser2": {
       "version": "3.8.3",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-      "from": "htmlparser2@>=3.8.1 <3.9.0",
+      "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
       "dependencies": {
         "domutils": {
           "version": "1.5.1",
           "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-          "from": "domutils@>=1.5.0 <1.6.0"
+          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8="
         },
         "entities": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-          "from": "entities@>=1.0.0 <1.1.0"
+          "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY="
         }
       }
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.1 <2.1.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "from": "isarray@0.0.1"
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
     "lodash": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-      "from": "lodash@>=3.2.0 <4.0.0"
+      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
     },
     "nth-check": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-      "from": "nth-check@>=1.0.0 <1.1.0"
+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ="
     },
     "readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "from": "readable-stream@>=1.1.0 <1.2.0"
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk="
     },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "from": "string_decoder@>=0.10.0 <0.11.0"
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     }
   }
 }
diff --git a/packages/rocketchat-cas/package.js b/packages/rocketchat-cas/package.js
index d8919bbbe9e..8520a0b0928 100644
--- a/packages/rocketchat-cas/package.js
+++ b/packages/rocketchat-cas/package.js
@@ -14,7 +14,6 @@ Package.onUse(function(api) {
 	api.use('webapp', 'server');
 	api.use('accounts-base', 'server');
 
-	api.use('underscore');
 	api.use('ecmascript');
 
 	// Server files
diff --git a/packages/rocketchat-cas/server/cas_server.js b/packages/rocketchat-cas/server/cas_server.js
index deeebb39806..9100fb47d83 100644
--- a/packages/rocketchat-cas/server/cas_server.js
+++ b/packages/rocketchat-cas/server/cas_server.js
@@ -1,5 +1,6 @@
 /* globals RoutePolicy, logger */
 /* jshint newcap: false */
+import _ from 'underscore';
 
 const fiber = Npm.require('fibers');
 const url = Npm.require('url');
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
index c0c01cd7731..a10db71ef54 100644
--- a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
+++ b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
@@ -1,5 +1,7 @@
+import _ from 'underscore';
 import toastr from 'toastr';
 import resetSelection from '../resetSelection';
+
 Template.mailMessagesInstructions.helpers({
 	name() {
 		return Meteor.user().name;
diff --git a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
index 8ac275a16db..5fd366f5bb9 100644
--- a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
+++ b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import moment from 'moment';
 
 Meteor.methods({
diff --git a/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js b/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js
index 5aaed532ae7..9c85dd44591 100644
--- a/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js
+++ b/packages/rocketchat-channel-settings/client/lib/ChannelSettings.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 RocketChat.ChannelSettings = new class {
 	constructor() {
 		this.options = new ReactiveVar({});
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
index 408cc7e41e9..bbcdd918f23 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.js
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -1,4 +1,5 @@
 import toastr from 'toastr';
+import s from 'underscore.string';
 
 Template.channelSettings.helpers({
 	toArray(obj) {
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js b/packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js
index e78663e9b6b..0ddf386030d 100644
--- a/packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js
+++ b/packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.saveRoomAnnouncement = function(rid, roomAnnouncement, user, sendMessage=true) {
 	if (!Match.test(rid, String)) {
 		throw new Meteor.Error('invalid-room', 'Invalid room', { function: 'RocketChat.saveRoomAnnouncement' });
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js b/packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js
index e0b5230b89c..cd0bd0bf124 100644
--- a/packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js
+++ b/packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.saveRoomDescription = function(rid, roomDescription, user) {
 
 	if (!Match.test(rid, String)) {
diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js b/packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js
index a92909a5c4b..0ba1b4894e5 100644
--- a/packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js
+++ b/packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.saveRoomTopic = function(rid, roomTopic, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {
 		throw new Meteor.Error('invalid-room', 'Invalid room', {
diff --git a/packages/rocketchat-colors/client/client.js b/packages/rocketchat-colors/client/client.js
index 6b80ee8ce20..608599ecf77 100644
--- a/packages/rocketchat-colors/client/client.js
+++ b/packages/rocketchat-colors/client/client.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 //
 // HexColorPreview is a named function that will process Colors
 // @param {Object} message - The message object
@@ -5,7 +7,7 @@
 
 function HexColorPreview(message) {
 	let msg;
-	if (_.trim(message.html) && RocketChat.settings.get('HexColorPreview_Enabled')) {
+	if (s.trim(message.html) && RocketChat.settings.get('HexColorPreview_Enabled')) {
 		msg = message.html;
 		msg = msg.replace(/(?:^|\s|\n)(#[A-Fa-f0-9]{3}([A-Fa-f0-9]{3})?)\b/g, function(match, completeColor) {
 			return match.replace(completeColor, `<div class="message-color"><div class="message-color-sample" style="background-color:${ completeColor }"></div>${ completeColor.toUpperCase() }</div>`);
diff --git a/packages/rocketchat-cors/cors.js b/packages/rocketchat-cors/cors.js
index 6af8bc10034..f458a73ca77 100644
--- a/packages/rocketchat-cors/cors.js
+++ b/packages/rocketchat-cors/cors.js
@@ -1,4 +1,5 @@
 /* globals WebAppInternals */
+import _ from 'underscore';
 
 import url from 'url';
 
diff --git a/packages/rocketchat-crowd/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-crowd/.npm/package/npm-shrinkwrap.json
index 40dc6b34ec5..fa0c02b6070 100644
--- a/packages/rocketchat-crowd/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-crowd/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,10 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "atlassian-crowd": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/atlassian-crowd/-/atlassian-crowd-0.5.0.tgz",
-      "from": "atlassian-crowd@0.5.0"
+      "integrity": "sha1-isdFqHg3mUkNF0H6Cc9HLn/zCTA="
     }
   }
 }
diff --git a/packages/rocketchat-custom-oauth/client/custom_oauth_client.js b/packages/rocketchat-custom-oauth/client/custom_oauth_client.js
index c9dbecf5f37..5a74495d4a6 100644
--- a/packages/rocketchat-custom-oauth/client/custom_oauth_client.js
+++ b/packages/rocketchat-custom-oauth/client/custom_oauth_client.js
@@ -1,4 +1,6 @@
 /*globals OAuth*/
+import s from 'underscore.string';
+
 // Request custom OAuth credentials for the user
 // @param options {optional}
 // @param credentialRequestCompleteCallback {Function} Callback function to call on
diff --git a/packages/rocketchat-custom-oauth/package.js b/packages/rocketchat-custom-oauth/package.js
index ce878e1295d..ded98241a8a 100644
--- a/packages/rocketchat-custom-oauth/package.js
+++ b/packages/rocketchat-custom-oauth/package.js
@@ -9,11 +9,9 @@ Package.onUse(function(api) {
 	api.use('check');
 	api.use('oauth');
 	api.use('oauth2');
-	api.use('underscore');
 	api.use('ecmascript');
 	api.use('accounts-oauth');
 	api.use('service-configuration');
-	api.use('underscorestring:underscore.string');
 
 	api.use('templating', 'client');
 
diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
index 9a61abe56d4..0e84a0664e3 100644
--- a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
+++ b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
@@ -1,4 +1,5 @@
 /*globals OAuth*/
+import _ from 'underscore';
 
 const logger = new Logger('CustomOAuth');
 
diff --git a/packages/rocketchat-custom-sounds/client/admin/adminSounds.js b/packages/rocketchat-custom-sounds/client/admin/adminSounds.js
index ec85ea2a7c4..d304ef42200 100644
--- a/packages/rocketchat-custom-sounds/client/admin/adminSounds.js
+++ b/packages/rocketchat-custom-sounds/client/admin/adminSounds.js
@@ -1,4 +1,6 @@
 /* globals RocketChatTabBar */
+import s from 'underscore.string';
+
 Template.adminSounds.helpers({
 	isReady() {
 		if (Template.instance().ready != null) {
@@ -71,7 +73,7 @@ Template.adminSounds.onCreated(function() {
 	});
 
 	this.customsounds = function() {
-		const filter = (instance.filter != null) ? _.trim(instance.filter.get()) : '';
+		const filter = (instance.filter != null) ? s.trim(instance.filter.get()) : '';
 
 		let query = {};
 
diff --git a/packages/rocketchat-custom-sounds/client/admin/soundEdit.js b/packages/rocketchat-custom-sounds/client/admin/soundEdit.js
index bda3f53e18d..4e431b187ac 100644
--- a/packages/rocketchat-custom-sounds/client/admin/soundEdit.js
+++ b/packages/rocketchat-custom-sounds/client/admin/soundEdit.js
@@ -1,4 +1,5 @@
 import toastr from 'toastr';
+import s from 'underscore.string';
 
 Template.soundEdit.helpers({
 	sound() {
diff --git a/packages/rocketchat-custom-sounds/client/lib/CustomSounds.js b/packages/rocketchat-custom-sounds/client/lib/CustomSounds.js
index a1e54b8e772..fd9f8ac2bdd 100644
--- a/packages/rocketchat-custom-sounds/client/lib/CustomSounds.js
+++ b/packages/rocketchat-custom-sounds/client/lib/CustomSounds.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 class CustomSounds {
 	constructor() {
 		this.list = new ReactiveVar({});
diff --git a/packages/rocketchat-custom-sounds/package.js b/packages/rocketchat-custom-sounds/package.js
index 4919c90771a..52adff9ee07 100644
--- a/packages/rocketchat-custom-sounds/package.js
+++ b/packages/rocketchat-custom-sounds/package.js
@@ -12,7 +12,6 @@ Package.onUse(function(api) {
 		'rocketchat:lib',
 		'templating',
 		'reactive-var',
-		'underscore',
 		'webapp'
 	]);
 
diff --git a/packages/rocketchat-custom-sounds/server/methods/insertOrUpdateSound.js b/packages/rocketchat-custom-sounds/server/methods/insertOrUpdateSound.js
index 3f4b4a2a4e0..f4deae43df9 100644
--- a/packages/rocketchat-custom-sounds/server/methods/insertOrUpdateSound.js
+++ b/packages/rocketchat-custom-sounds/server/methods/insertOrUpdateSound.js
@@ -1,4 +1,6 @@
 /* globals RocketChatFileCustomSoundsInstance */
+import s from 'underscore.string';
+
 Meteor.methods({
 	insertOrUpdateSound(soundData) {
 		if (!RocketChat.authz.hasPermission(this.userId, 'manage-sounds')) {
diff --git a/packages/rocketchat-custom-sounds/server/publications/customSounds.js b/packages/rocketchat-custom-sounds/server/publications/customSounds.js
index 1ecefc930c7..edbc5e5b358 100644
--- a/packages/rocketchat-custom-sounds/server/publications/customSounds.js
+++ b/packages/rocketchat-custom-sounds/server/publications/customSounds.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.publish('customSounds', function(filter, limit) {
 	if (!this.userId) {
 		return this.ready();
diff --git a/packages/rocketchat-custom-sounds/server/startup/custom-sounds.js b/packages/rocketchat-custom-sounds/server/startup/custom-sounds.js
index 7655a35435b..155d3434fee 100644
--- a/packages/rocketchat-custom-sounds/server/startup/custom-sounds.js
+++ b/packages/rocketchat-custom-sounds/server/startup/custom-sounds.js
@@ -1,4 +1,6 @@
 /* globals RocketChatFileCustomSoundsInstance */
+import _ from 'underscore';
+
 Meteor.startup(function() {
 	let storeType = 'GridFS';
 
diff --git a/packages/rocketchat-emoji-custom/admin/adminEmoji.js b/packages/rocketchat-emoji-custom/admin/adminEmoji.js
index 4b9f54d44e6..e80a61766a6 100644
--- a/packages/rocketchat-emoji-custom/admin/adminEmoji.js
+++ b/packages/rocketchat-emoji-custom/admin/adminEmoji.js
@@ -1,4 +1,6 @@
 /* globals RocketChatTabBar */
+import s from 'underscore.string';
+
 Template.adminEmoji.helpers({
 	isReady() {
 		if (Template.instance().ready != null) {
@@ -67,7 +69,7 @@ Template.adminEmoji.onCreated(function() {
 	});
 
 	this.customemoji = function() {
-		const filter = (instance.filter != null) ? _.trim(instance.filter.get()) : '';
+		const filter = (instance.filter != null) ? s.trim(instance.filter.get()) : '';
 
 		let query = {};
 
diff --git a/packages/rocketchat-emoji-custom/admin/emojiEdit.js b/packages/rocketchat-emoji-custom/admin/emojiEdit.js
index 22177814881..8f66b42e2b7 100644
--- a/packages/rocketchat-emoji-custom/admin/emojiEdit.js
+++ b/packages/rocketchat-emoji-custom/admin/emojiEdit.js
@@ -1,4 +1,5 @@
 import toastr from 'toastr';
+import s from 'underscore.string';
 
 Template.emojiEdit.helpers({
 	emoji() {
diff --git a/packages/rocketchat-emoji-custom/package.js b/packages/rocketchat-emoji-custom/package.js
index 1090771648b..aae39b27fcb 100644
--- a/packages/rocketchat-emoji-custom/package.js
+++ b/packages/rocketchat-emoji-custom/package.js
@@ -12,7 +12,6 @@ Package.onUse(function(api) {
 		'rocketchat:file',
 		'rocketchat:lib',
 		'templating',
-		'underscore',
 		'webapp'
 	]);
 
diff --git a/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js b/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
index ef7ad08401c..6a6d844fd26 100644
--- a/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
+++ b/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
@@ -1,4 +1,7 @@
 /* globals RocketChatFileEmojiCustomInstance */
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Meteor.methods({
 	insertOrUpdateEmoji(emojiData) {
 		if (!RocketChat.authz.hasPermission(this.userId, 'manage-emoji')) {
diff --git a/packages/rocketchat-emoji-custom/server/publications/fullEmojiData.js b/packages/rocketchat-emoji-custom/server/publications/fullEmojiData.js
index cc3cb15da39..1bfe1455459 100644
--- a/packages/rocketchat-emoji-custom/server/publications/fullEmojiData.js
+++ b/packages/rocketchat-emoji-custom/server/publications/fullEmojiData.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.publish('fullEmojiData', function(filter, limit) {
 	if (!this.userId) {
 		return this.ready();
diff --git a/packages/rocketchat-emoji-custom/server/startup/emoji-custom.js b/packages/rocketchat-emoji-custom/server/startup/emoji-custom.js
index 00cae00a13e..595fc4f8018 100644
--- a/packages/rocketchat-emoji-custom/server/startup/emoji-custom.js
+++ b/packages/rocketchat-emoji-custom/server/startup/emoji-custom.js
@@ -1,4 +1,6 @@
 /* globals RocketChatFileEmojiCustomInstance */
+import _ from 'underscore';
+
 Meteor.startup(function() {
 	let storeType = 'GridFS';
 
diff --git a/packages/rocketchat-emoji/client/emojiParser.js b/packages/rocketchat-emoji/client/emojiParser.js
index 9c417305c12..bba9300830d 100644
--- a/packages/rocketchat-emoji/client/emojiParser.js
+++ b/packages/rocketchat-emoji/client/emojiParser.js
@@ -1,4 +1,6 @@
 /* globals isSetNotNull */
+import s from 'underscore.string';
+
 /*
  * emojiParser is a function that will replace emojis
  * @param {Object} message - The message object
@@ -8,7 +10,7 @@ RocketChat.callbacks.add('renderMessage', (message) => {
 		return message;
 	}
 
-	if (_.trim(message.html)) {
+	if (s.trim(message.html)) {
 		//&#39; to apostrophe (') for emojis such as :')
 		message.html = message.html.replace(/&#39;/g, '\'');
 
@@ -27,7 +29,7 @@ RocketChat.callbacks.add('renderMessage', (message) => {
 					continue;
 				}
 
-				if (_.trim(child.text()) === '') {
+				if (s.trim(child.text()) === '') {
 					continue;
 				}
 
diff --git a/packages/rocketchat-emoji/client/lib/EmojiPicker.js b/packages/rocketchat-emoji/client/lib/EmojiPicker.js
index 12679be3b80..125562b94a3 100644
--- a/packages/rocketchat-emoji/client/lib/EmojiPicker.js
+++ b/packages/rocketchat-emoji/client/lib/EmojiPicker.js
@@ -1,4 +1,6 @@
 /* globals Blaze, Template */
+import _ from 'underscore';
+
 RocketChat.EmojiPicker = {
 	width: 390,
 	height: 238,
diff --git a/packages/rocketchat-emoji/package.js b/packages/rocketchat-emoji/package.js
index cb50e712743..9d7dbdd0c6d 100644
--- a/packages/rocketchat-emoji/package.js
+++ b/packages/rocketchat-emoji/package.js
@@ -8,7 +8,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'templating',
 		'rocketchat:lib',
 		'rocketchat:ui-message'
diff --git a/packages/rocketchat-file-upload/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-file-upload/.npm/package/npm-shrinkwrap.json
index 62e1770f2f6..065895ec83c 100644
--- a/packages/rocketchat-file-upload/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-file-upload/.npm/package/npm-shrinkwrap.json
@@ -1,19 +1,10 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "filesize": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.3.0.tgz",
-      "from": "filesize@3.3.0"
-    },
-    "mime-db": {
-      "version": "1.23.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz",
-      "from": "mime-db@>=1.23.0 <1.24.0"
-    },
-    "mime-types": {
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
-      "from": "mime-types@2.1.11"
+      "integrity": "sha1-UxSeo0YOOy4CSWKlFkiqVyz5gSI="
     }
   }
 }
diff --git a/packages/rocketchat-file-upload/lib/FileUploadBase.js b/packages/rocketchat-file-upload/lib/FileUploadBase.js
index 486fe8592d3..3e2b166547f 100644
--- a/packages/rocketchat-file-upload/lib/FileUploadBase.js
+++ b/packages/rocketchat-file-upload/lib/FileUploadBase.js
@@ -1,5 +1,6 @@
 /* globals FileUploadBase:true, UploadFS */
 /* exported FileUploadBase */
+import _ from 'underscore';
 
 UploadFS.config.defaultStorePermissions = new UploadFS.StorePermissions({
 	insert(userId, doc) {
diff --git a/packages/rocketchat-file-upload/package.js b/packages/rocketchat-file-upload/package.js
index 91951ea1076..a05fe67f4d4 100644
--- a/packages/rocketchat-file-upload/package.js
+++ b/packages/rocketchat-file-upload/package.js
@@ -18,7 +18,6 @@ Package.onUse(function(api) {
 	api.use('rocketchat:lib');
 	api.use('random');
 	api.use('accounts-base');
-	api.use('underscore');
 	api.use('tracker');
 	api.use('webapp');
 
diff --git a/packages/rocketchat-file-upload/server/config/AmazonS3.js b/packages/rocketchat-file-upload/server/config/AmazonS3.js
index 3781cf5d273..7cc97b3ea52 100644
--- a/packages/rocketchat-file-upload/server/config/AmazonS3.js
+++ b/packages/rocketchat-file-upload/server/config/AmazonS3.js
@@ -1,5 +1,6 @@
 /* globals FileUpload */
 
+import _ from 'underscore';
 import { FileUploadClass } from '../lib/FileUpload';
 import '../../ufs/AmazonS3/server.js';
 
diff --git a/packages/rocketchat-file-upload/server/config/FileSystem.js b/packages/rocketchat-file-upload/server/config/FileSystem.js
index 263baad9907..f2ba60b9298 100644
--- a/packages/rocketchat-file-upload/server/config/FileSystem.js
+++ b/packages/rocketchat-file-upload/server/config/FileSystem.js
@@ -1,5 +1,6 @@
 /* globals FileUpload, UploadFS */
 
+import _ from 'underscore';
 import fs from 'fs';
 import { FileUploadClass } from '../lib/FileUpload';
 
diff --git a/packages/rocketchat-file-upload/server/config/GoogleStorage.js b/packages/rocketchat-file-upload/server/config/GoogleStorage.js
index 2010cfa68b9..89673b1035f 100644
--- a/packages/rocketchat-file-upload/server/config/GoogleStorage.js
+++ b/packages/rocketchat-file-upload/server/config/GoogleStorage.js
@@ -1,5 +1,6 @@
 /* globals FileUpload */
 
+import _ from 'underscore';
 import { FileUploadClass } from '../lib/FileUpload';
 import '../../ufs/GoogleStorage/server.js';
 
diff --git a/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js b/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js
index 45d245a4d3a..d741a1411f6 100644
--- a/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js
+++ b/packages/rocketchat-file-upload/server/config/Slingshot_DEPRECATED.js
@@ -1,4 +1,5 @@
 /* globals Slingshot, FileUpload */
+import _ from 'underscore';
 
 const configureSlingshot = _.debounce(() => {
 	const type = RocketChat.settings.get('FileUpload_Storage_Type');
diff --git a/packages/rocketchat-file-upload/server/config/_configUploadStorage.js b/packages/rocketchat-file-upload/server/config/_configUploadStorage.js
index df56dc4d307..d2ba5505f2d 100644
--- a/packages/rocketchat-file-upload/server/config/_configUploadStorage.js
+++ b/packages/rocketchat-file-upload/server/config/_configUploadStorage.js
@@ -1,5 +1,6 @@
 /* globals UploadFS */
 
+import _ from 'underscore';
 import './AmazonS3.js';
 import './FileSystem.js';
 import './GoogleStorage.js';
diff --git a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js b/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
index 9e739986043..1dd56865770 100644
--- a/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
+++ b/packages/rocketchat-file-upload/server/methods/sendFileMessage.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	'sendFileMessage'(roomId, store, file, msgData = {}) {
 		if (!Meteor.userId()) {
diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
index aa7343d7e42..fba85b9534d 100644
--- a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
+++ b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
@@ -1,5 +1,5 @@
-import {_} from 'meteor/underscore';
 import {UploadFS} from 'meteor/jalik:ufs';
+import _ from 'underscore';
 import S3 from 'aws-sdk/clients/s3';
 import stream from 'stream';
 
diff --git a/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json
index 212f661b907..3247f8f87fe 100644
--- a/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-file/.npm/package/npm-shrinkwrap.json
@@ -1,79 +1,80 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "array-parallel": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
-      "from": "array-parallel@>=0.1.3 <0.2.0"
+      "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0="
     },
     "array-series": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
-      "from": "array-series@>=0.1.5 <0.2.0"
+      "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8="
     },
     "cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "from": "cross-spawn@>=4.0.0 <5.0.0"
+      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE="
     },
     "debug": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-      "from": "debug@>=2.2.0 <2.3.0"
+      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo="
     },
     "flushwritable": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/flushwritable/-/flushwritable-1.0.0.tgz",
-      "from": "flushwritable@>=1.0.0 <2.0.0"
+      "integrity": "sha1-PjKNj95BKtR+c44751C00pAENJg="
     },
     "gm": {
       "version": "1.23.0",
       "resolved": "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz",
-      "from": "gm@1.23.0"
+      "integrity": "sha1-gKL+nL8TFRUCSEZERlhGEmn1JmE="
     },
     "gridfs-stream": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.1.1.tgz",
-      "from": "gridfs-stream@1.1.1"
+      "integrity": "sha1-PdOhAOwgIaGBKC9utGcJY2B034k="
     },
     "isexe": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz",
-      "from": "isexe@>=1.1.1 <2.0.0"
+      "integrity": "sha1-NvPiLmB1CSD15yQaR2qMakInWtA="
     },
     "lru-cache": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz",
-      "from": "lru-cache@>=4.0.1 <5.0.0"
+      "integrity": "sha1-E0OVXtry432bnn7nJB4nxLn7cr4="
     },
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "from": "minimist@0.0.8"
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "from": "mkdirp@0.5.1"
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM="
     },
     "ms": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "from": "ms@0.7.1"
+      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
     },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "from": "pseudomap@>=1.0.1 <2.0.0"
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "which": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/which/-/which-1.2.11.tgz",
-      "from": "which@>=1.2.9 <2.0.0"
+      "integrity": "sha1-yLLu6muMFln6fB3U/aq+lTPcXos="
     },
     "yallist": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz",
-      "from": "yallist@>=2.0.0 <3.0.0"
+      "integrity": "sha1-MGxUODXwnuGkyyO3vOmrNByRzdQ="
     }
   }
 }
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 2617915b67c..b853584d630 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1,1392 +1,1395 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "ajv": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-      "from": "ajv@>=5.1.0 <6.0.0"
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto="
     },
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "from": "ansi-regex@>=2.0.0 <3.0.0"
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "arguejs": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
-      "from": "arguejs@>=0.2.3 <0.3.0"
+      "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc="
     },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "from": "array-union@>=1.0.1 <2.0.0"
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk="
     },
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "from": "array-uniq@>=1.0.3 <2.0.0"
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
     },
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "from": "arrify@>=1.0.0 <2.0.0"
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
     },
     "ascli": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
-      "from": "ascli@>=1.0.0 <2.0.0"
+      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw="
     },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "from": "asn1@>=0.2.3 <0.3.0"
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "from": "assert-plus@>=1.0.0 <2.0.0"
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "async": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-      "from": "async@>=2.0.1 <3.0.0"
+      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw=="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "from": "asynckit@>=0.4.0 <0.5.0"
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "from": "aws-sign2@>=0.7.0 <0.8.0"
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "from": "aws4@>=1.6.0 <2.0.0"
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
     },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "from": "balanced-match@>=1.0.0 <2.0.0"
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base64url": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-      "from": "base64url@>=2.0.0 <3.0.0"
+      "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0"
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40="
     },
     "boom": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "from": "boom@>=4.0.0 <5.0.0"
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE="
     },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-      "from": "brace-expansion@>=1.1.7 <2.0.0"
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI="
     },
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "from": "buffer-equal@>=1.0.0 <2.0.0"
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
     },
     "buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "from": "buffer-equal-constant-time@1.0.1"
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
     },
     "bytebuffer": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
-      "from": "bytebuffer@>=5.0.0 <6.0.0"
+      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0="
     },
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "from": "camelcase@>=2.0.1 <3.0.0"
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
     },
     "capture-stack-trace": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-      "from": "capture-stack-trace@>=1.0.0 <2.0.0"
+      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
     },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "from": "caseless@>=0.12.0 <0.13.0"
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "from": "cliui@>=3.0.3 <4.0.0"
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0="
     },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "from": "co@>=4.6.0 <5.0.0"
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "from": "code-point-at@>=1.0.0 <2.0.0"
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "colour": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
-      "from": "colour@>=0.7.1 <0.8.0"
+      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g="
     },
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "from": "combined-stream@>=1.0.5 <1.1.0"
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "from": "concat-map@0.0.1"
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "from": "concat-stream@>=1.5.0 <2.0.0"
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc="
     },
     "configstore": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-      "from": "configstore@>=3.0.0 <4.0.0"
+      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw=="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "from": "core-util-is@>=1.0.0 <1.1.0"
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "create-error-class": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-      "from": "create-error-class@>=3.0.2 <4.0.0"
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y="
     },
     "cryptiles": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "from": "cryptiles@>=3.0.0 <4.0.0",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
       "dependencies": {
         "boom": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "from": "boom@>=5.0.0 <6.0.0"
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw=="
         }
       }
     },
     "crypto-random-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-      "from": "crypto-random-string@>=1.0.0 <2.0.0"
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
     },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "from": "dashdash@>=1.12.0 <2.0.0"
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA="
     },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "from": "decamelize@>=1.1.1 <2.0.0"
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "from": "delayed-stream@>=1.0.0 <1.1.0"
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "dot-prop": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "from": "dot-prop@>=4.1.0 <5.0.0"
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ=="
     },
     "duplexify": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-      "from": "duplexify@>=3.5.0 <4.0.0"
+      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ=="
     },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "from": "ecc-jsbn@>=0.1.1 <0.2.0"
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU="
     },
     "ecdsa-sig-formatter": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-      "from": "ecdsa-sig-formatter@1.0.9"
+      "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE="
     },
     "end-of-stream": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-      "from": "end-of-stream@>=1.0.0 <2.0.0"
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY="
     },
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "from": "ent@>=2.2.0 <3.0.0"
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
     },
     "extend": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "from": "extend@>=3.0.0 <4.0.0"
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
     },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "from": "extsprintf@1.3.0"
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "from": "fast-deep-equal@>=1.0.0 <2.0.0"
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "from": "forever-agent@>=0.6.1 <0.7.0"
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "from": "form-data@>=2.3.1 <2.4.0"
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8="
     },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "from": "fs.realpath@>=1.0.0 <2.0.0"
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "gcp-metadata": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-      "from": "gcp-metadata@>=0.3.0 <0.4.0"
+      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ=="
     },
     "gcs-resumable-upload": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-      "from": "gcs-resumable-upload@>=0.8.0 <0.9.0"
+      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA=="
     },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "from": "getpass@>=0.1.1 <0.2.0"
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo="
     },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "from": "glob@>=7.0.5 <8.0.0"
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="
     },
     "globby": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "from": "globby@>=6.1.0 <7.0.0"
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        }
+      }
     },
     "google-auth-library": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-      "from": "google-auth-library@>=0.10.0 <0.11.0"
+      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24="
     },
     "google-auto-auth": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-      "from": "google-auto-auth@>=0.7.1 <0.8.0"
+      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A=="
     },
     "google-gax": {
       "version": "0.13.5",
       "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.13.5.tgz",
-      "from": "google-gax@>=0.13.0 <0.14.0",
+      "integrity": "sha1-OkjMUrfhZPcxk4836t0rc/fEk9c=",
       "dependencies": {
         "google-auto-auth": {
           "version": "0.5.4",
           "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.5.4.tgz",
-          "from": "google-auto-auth@>=0.5.2 <0.6.0"
+          "integrity": "sha1-HYbHko1jPnWpwasDSlJ+/M5KQLE="
         },
         "google-proto-files": {
           "version": "0.13.1",
           "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
-          "from": "google-proto-files@>=0.13.1 <0.14.0"
+          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g=="
         },
         "object-assign": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "from": "object-assign@>=3.0.0 <4.0.0"
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
         },
         "protobufjs": {
           "version": "6.8.0",
           "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
-          "from": "protobufjs@>=6.8.0 <7.0.0"
+          "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw=="
         }
       }
     },
     "google-p12-pem": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-      "from": "google-p12-pem@>=0.1.0 <0.2.0"
+      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc="
     },
     "google-proto-files": {
       "version": "0.12.1",
       "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.12.1.tgz",
-      "from": "google-proto-files@>=0.12.0 <0.13.0"
+      "integrity": "sha512-d+BiTMpYP4/pN+Kgi0lWE+2/GaVN4jy8LCabjo2Wd16Ykm5oRO5bI40bo8u2U4rN/GpZkMyfxZAjWVPRjGe3nQ=="
     },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "from": "graceful-fs@>=4.1.2 <5.0.0"
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "grpc": {
       "version": "1.6.6",
       "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
-      "from": "grpc@>=1.6.0 <2.0.0",
+      "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-          "from": "abbrev@1"
+          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
         },
         "ajv": {
           "version": "4.11.8",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "from": "ajv@^4.9.1"
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY="
         },
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "from": "ansi-regex@^2.0.0"
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "aproba": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-          "from": "aproba@^1.0.3"
+          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
         },
         "are-we-there-yet": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-          "from": "are-we-there-yet@~1.1.2"
+          "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0="
         },
         "asn1": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "from": "asn1@~0.2.3"
+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
         },
         "assert-plus": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-          "from": "assert-plus@^0.2.0"
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
         },
         "asynckit": {
           "version": "0.4.0",
           "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "from": "asynckit@^0.4.0"
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
         },
         "aws-sign2": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-          "from": "aws-sign2@~0.6.0"
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
         },
         "aws4": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-          "from": "aws4@^1.2.1"
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
         },
         "balanced-match": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "from": "balanced-match@^1.0.0"
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
         },
         "bcrypt-pbkdf": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-          "from": "bcrypt-pbkdf@^1.0.0"
+          "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40="
         },
         "block-stream": {
           "version": "0.0.9",
           "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-          "from": "block-stream@*"
+          "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo="
         },
         "boom": {
           "version": "2.10.1",
           "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-          "from": "boom@2.x.x"
+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
         },
         "brace-expansion": {
           "version": "1.1.8",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-          "from": "brace-expansion@^1.1.7"
+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI="
         },
         "caseless": {
           "version": "0.12.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "from": "caseless@~0.12.0"
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
         },
         "co": {
           "version": "4.6.0",
           "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "from": "co@^4.6.0"
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
         },
         "code-point-at": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "from": "code-point-at@^1.0.0"
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
         },
         "combined-stream": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-          "from": "combined-stream@~1.0.5"
+          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "from": "concat-map@0.0.1"
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "from": "console-control-strings@~1.1.0"
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
         },
         "core-util-is": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "from": "core-util-is@~1.0.0"
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
         },
         "cryptiles": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-          "from": "cryptiles@2.x.x"
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
         },
         "dashdash": {
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-          "from": "dashdash@^1.12.0",
+          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "from": "assert-plus@^1.0.0"
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "from": "debug@^2.2.0"
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
         },
         "deep-extend": {
           "version": "0.4.2",
           "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-          "from": "deep-extend@~0.4.0"
+          "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
         },
         "delayed-stream": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-          "from": "delayed-stream@~1.0.0"
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
         },
         "delegates": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-          "from": "delegates@^1.0.0"
+          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
         },
         "ecc-jsbn": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-          "from": "ecc-jsbn@~0.1.1"
+          "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU="
         },
         "extend": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "from": "extend@~3.0.0"
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
         },
         "extsprintf": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-          "from": "extsprintf@1.3.0"
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
         },
         "forever-agent": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-          "from": "forever-agent@~0.6.1"
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
         },
         "form-data": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-          "from": "form-data@~2.1.1"
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE="
         },
         "fs.realpath": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "from": "fs.realpath@^1.0.0"
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
         },
         "fstream": {
           "version": "1.0.11",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-          "from": "fstream@^1.0.2"
+          "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE="
         },
         "fstream-ignore": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-          "from": "fstream-ignore@^1.0.5"
+          "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU="
         },
         "gauge": {
           "version": "2.7.4",
           "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-          "from": "gauge@~2.7.3"
+          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c="
         },
         "getpass": {
           "version": "0.1.7",
           "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-          "from": "getpass@^0.1.1",
+          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "from": "assert-plus@^1.0.0"
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
         "glob": {
           "version": "7.1.2",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "from": "glob@^7.0.5"
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="
         },
         "graceful-fs": {
           "version": "4.1.11",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "from": "graceful-fs@^4.1.2"
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
         },
         "har-schema": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-          "from": "har-schema@^1.0.5"
+          "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
         },
         "har-validator": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-          "from": "har-validator@~4.2.1"
+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio="
         },
         "has-unicode": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-          "from": "has-unicode@^2.0.0"
+          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
         },
         "hawk": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-          "from": "hawk@3.1.3"
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ="
         },
         "hoek": {
           "version": "2.16.3",
           "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "from": "hoek@2.x.x"
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
         },
         "http-signature": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-          "from": "http-signature@~1.1.0"
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8="
         },
         "inflight": {
           "version": "1.0.6",
           "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "from": "inflight@^1.0.4"
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
         },
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "from": "inherits@~2.0.3"
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
         "ini": {
           "version": "1.3.4",
           "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-          "from": "ini@~1.3.0"
+          "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
         },
         "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",
-          "from": "is-fullwidth-code-point@^1.0.0"
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs="
         },
         "is-typedarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "from": "is-typedarray@~1.0.0"
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "from": "isarray@~1.0.0"
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "isstream": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-          "from": "isstream@~0.1.2"
+          "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
         },
         "jsbn": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-          "from": "jsbn@~0.1.0"
+          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
         },
         "json-schema": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-          "from": "json-schema@0.2.3"
+          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
         },
         "json-stable-stringify": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-          "from": "json-stable-stringify@^1.0.1"
+          "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8="
         },
         "json-stringify-safe": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-          "from": "json-stringify-safe@~5.0.1"
+          "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
         },
         "jsonify": {
           "version": "0.0.0",
           "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "from": "jsonify@~0.0.0"
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
         },
         "jsprim": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-          "from": "jsprim@^1.2.2",
+          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "from": "assert-plus@1.0.0"
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
         "mime-db": {
           "version": "1.30.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-          "from": "mime-db@~1.30.0"
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
         },
         "mime-types": {
           "version": "2.1.17",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-          "from": "mime-types@~2.1.7"
+          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo="
         },
         "minimatch": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "from": "minimatch@^3.0.4"
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="
         },
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "from": "minimist@^1.2.0"
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         },
         "mkdirp": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "from": "mkdirp@^0.5.1",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-              "from": "minimist@0.0.8"
+              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
             }
           }
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "from": "ms@2.0.0"
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "node-pre-gyp": {
           "version": "0.6.38",
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
-          "from": "node-pre-gyp@0.6.38"
+          "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0="
         },
         "nopt": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "from": "nopt@^4.0.1"
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00="
         },
         "npmlog": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-          "from": "npmlog@^4.0.2"
+          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="
         },
         "number-is-nan": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "from": "number-is-nan@^1.0.0"
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
         },
         "oauth-sign": {
           "version": "0.8.2",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-          "from": "oauth-sign@~0.8.1"
+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "from": "object-assign@^4.1.0"
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "from": "once@^1.3.0"
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
         },
         "os-homedir": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-          "from": "os-homedir@^1.0.0"
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
         },
         "os-tmpdir": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-          "from": "os-tmpdir@^1.0.0"
+          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
         },
         "osenv": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-          "from": "osenv@^0.1.4"
+          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ="
         },
         "path-is-absolute": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "from": "path-is-absolute@^1.0.0"
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
         },
         "performance-now": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-          "from": "performance-now@^0.2.0"
+          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
         },
         "process-nextick-args": {
           "version": "1.0.7",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "from": "process-nextick-args@~1.0.6"
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
         },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "from": "punycode@^1.4.1"
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         },
         "qs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "from": "qs@~6.4.0"
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
         },
         "rc": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-          "from": "rc@^1.1.7"
+          "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU="
         },
         "readable-stream": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "from": "readable-stream@^2.0.6"
+          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ=="
         },
         "request": {
           "version": "2.81.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-          "from": "request@2.81.0"
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA="
         },
         "rimraf": {
           "version": "2.6.2",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "from": "rimraf@^2.6.1"
+          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w=="
         },
         "safe-buffer": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "from": "safe-buffer@~5.1.1"
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
         },
         "semver": {
           "version": "5.4.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-          "from": "semver@^5.3.0"
+          "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
         },
         "set-blocking": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-          "from": "set-blocking@~2.0.0"
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
         },
         "signal-exit": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "from": "signal-exit@^3.0.0"
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
         },
         "sntp": {
           "version": "1.0.9",
           "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-          "from": "sntp@1.x.x"
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
         },
         "sshpk": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-          "from": "sshpk@^1.7.0",
+          "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "from": "assert-plus@^1.0.0"
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "from": "string-width@^1.0.1"
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M="
         },
         "string_decoder": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "from": "string_decoder@~1.0.3"
+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="
         },
         "stringstream": {
           "version": "0.0.5",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-          "from": "stringstream@~0.0.4"
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "from": "strip-ansi@^3.0.1"
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
         },
         "strip-json-comments": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "from": "strip-json-comments@~2.0.1"
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
         },
         "tar": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-          "from": "tar@^2.2.1"
+          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE="
         },
         "tar-pack": {
           "version": "3.4.0",
           "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-          "from": "tar-pack@^3.4.0"
+          "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ="
         },
         "tough-cookie": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-          "from": "tough-cookie@~2.3.0"
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE="
         },
         "tunnel-agent": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "from": "tunnel-agent@^0.6.0"
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0="
         },
         "tweetnacl": {
           "version": "0.14.5",
           "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "from": "tweetnacl@~0.14.0"
+          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
         },
         "uid-number": {
           "version": "0.0.6",
           "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-          "from": "uid-number@^0.0.6"
+          "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
         },
         "util-deprecate": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "from": "util-deprecate@~1.0.1"
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
         },
         "uuid": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "from": "uuid@^3.0.0"
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
         },
         "verror": {
           "version": "1.10.0",
           "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-          "from": "verror@1.10.0",
+          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "from": "assert-plus@^1.0.0"
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
         "wide-align": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-          "from": "wide-align@^1.1.0"
+          "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w=="
         },
         "wrappy": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "from": "wrappy@1"
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         }
       }
     },
     "gtoken": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-      "from": "gtoken@>=1.2.1 <2.0.0"
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz",
+      "integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w=="
     },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "from": "har-schema@>=2.0.0 <3.0.0"
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "from": "har-validator@>=5.0.3 <5.1.0"
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0="
     },
     "hash-stream-validation": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-      "from": "hash-stream-validation@>=0.2.1 <0.3.0"
+      "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE="
     },
     "hawk": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "from": "hawk@>=6.0.2 <6.1.0"
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ=="
     },
     "hoek": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "from": "hoek@>=4.0.0 <5.0.0"
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
     },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "from": "http-signature@>=1.2.0 <1.3.0"
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE="
     },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "from": "imurmurhash@>=0.1.4 <0.2.0"
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "from": "inflight@>=1.0.4 <2.0.0"
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.3 <3.0.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "from": "invert-kv@>=1.0.0 <2.0.0"
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
     "is": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-      "from": "is@>=3.0.1 <4.0.0"
+      "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
     },
     "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",
-      "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0"
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs="
     },
     "is-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "from": "is-obj@>=1.0.0 <2.0.0"
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
     },
     "is-stream-ended": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-      "from": "is-stream-ended@>=0.1.0 <0.2.0"
+      "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "from": "is-typedarray@>=1.0.0 <1.1.0"
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "from": "isarray@>=1.0.0 <1.1.0"
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "from": "isstream@>=0.1.2 <0.2.0"
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "from": "jsbn@>=0.1.0 <0.2.0"
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "from": "json-schema@0.2.3"
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "from": "json-schema-traverse@>=0.3.0 <0.4.0"
-    },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "from": "json-stable-stringify@>=1.0.1 <2.0.0"
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "from": "json-stringify-safe@>=5.0.1 <5.1.0"
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "from": "jsonify@>=0.0.0 <0.1.0"
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "from": "jsprim@>=1.2.2 <2.0.0"
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI="
     },
     "jwa": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-      "from": "jwa@>=1.1.4 <2.0.0"
+      "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU="
     },
     "jws": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-      "from": "jws@>=3.1.4 <4.0.0"
+      "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI="
     },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "from": "lcid@>=1.0.0 <2.0.0"
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU="
     },
     "lodash": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "from": "lodash@>=4.14.0 <5.0.0"
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
     },
     "lodash.noop": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-      "from": "lodash.noop@>=3.0.1 <4.0.0"
+      "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
     },
     "log-driver": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-      "from": "log-driver@>=1.2.5 <2.0.0"
+      "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
     },
     "long": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-      "from": "long@>=3.0.0 <4.0.0"
+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
     },
     "make-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-      "from": "make-dir@>=1.0.0 <2.0.0"
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
+      "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA=="
     },
     "methmeth": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-      "from": "methmeth@>=1.1.0 <2.0.0"
+      "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
     },
     "mime": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "from": "mime@>=1.2.11 <2.0.0"
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
     },
     "mime-db": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "from": "mime-db@>=1.30.0 <1.31.0"
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
     },
     "mime-types": {
       "version": "2.1.17",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "from": "mime-types@>=2.0.8 <3.0.0"
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo="
     },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "from": "minimatch@>=3.0.4 <4.0.0"
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="
     },
     "modelo": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-      "from": "modelo@>=4.2.0 <5.0.0"
+      "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
     },
     "nan": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "from": "nan@>=2.7.0 <3.0.0"
+      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY="
     },
     "node-forge": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-      "from": "node-forge@>=0.7.1 <0.8.0"
+      "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
     },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "from": "number-is-nan@>=1.0.0 <2.0.0"
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "from": "oauth-sign@>=0.8.2 <0.9.0"
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "from": "object-assign@>=4.0.1 <5.0.0"
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "from": "once@>=1.3.1 <2.0.0"
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
     },
     "optjs": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
-      "from": "optjs@>=3.2.2 <3.3.0"
+      "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4="
     },
     "os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "from": "os-locale@>=1.4.0 <2.0.0"
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk="
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "from": "path-is-absolute@>=1.0.0 <2.0.0"
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "from": "performance-now@>=2.1.0 <3.0.0"
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "from": "pify@>=2.3.0 <3.0.0"
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "from": "pinkie@>=2.0.0 <3.0.0"
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "from": "pinkie-promise@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
     },
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "from": "process-nextick-args@>=1.0.6 <1.1.0"
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
     "prop-assign": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/prop-assign/-/prop-assign-1.0.0.tgz",
-      "from": "prop-assign@>=1.0.0 <2.0.0"
+      "integrity": "sha1-l2eh+/1wk5CGR6boRtMbT+qnBFk="
     },
     "propprop": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/propprop/-/propprop-0.3.1.tgz",
-      "from": "propprop@>=0.3.0 <0.4.0"
+      "integrity": "sha1-oEmjVouJZEAGfRXY7J8zc15XAXg="
     },
     "protobufjs": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
-      "from": "protobufjs@>=5.0.2 <6.0.0"
+      "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE="
     },
     "pump": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-      "from": "pump@>=1.0.0 <2.0.0"
+      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE="
     },
     "pumpify": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-      "from": "pumpify@>=1.3.3 <2.0.0"
+      "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs="
     },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "from": "punycode@>=1.4.1 <2.0.0"
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "from": "qs@>=6.5.1 <6.6.0"
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
     },
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "from": "readable-stream@>=2.2.2 <3.0.0"
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ=="
     },
     "request": {
       "version": "2.83.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "from": "request@>=2.79.0 <3.0.0"
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw=="
     },
     "retry-request": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.1.tgz",
-      "from": "retry-request@>=3.0.0 <4.0.0"
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
+      "integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg=="
     },
     "rgb-hex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz",
-      "from": "rgb-hex@>=1.0.0 <2.0.0"
+      "integrity": "sha1-v6+M2c2RZLWibXHrTxWgllMks8E="
     },
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "from": "safe-buffer@>=5.1.1 <5.2.0"
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "from": "signal-exit@>=3.0.2 <4.0.0"
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "sntp": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
-      "from": "sntp@>=2.0.0 <3.0.0"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="
     },
     "split-array-stream": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
-      "from": "split-array-stream@>=1.0.0 <2.0.0"
+      "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo="
     },
     "sshpk": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "from": "sshpk@>=1.7.0 <2.0.0"
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M="
     },
     "stream-events": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-      "from": "stream-events@>=1.0.1 <2.0.0"
+      "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI="
     },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "from": "stream-shift@>=1.0.0 <2.0.0"
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
     },
     "string-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-      "from": "string-format-obj@>=1.0.0 <2.0.0"
+      "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
     },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "from": "string-width@>=1.0.1 <2.0.0"
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M="
     },
     "string_decoder": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "from": "string_decoder@>=1.0.3 <1.1.0"
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="
     },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "from": "stringstream@>=0.0.5 <0.1.0"
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "from": "strip-ansi@>=3.0.1 <4.0.0"
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
     },
     "stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-      "from": "stubs@>=3.0.0 <4.0.0"
+      "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
     },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-      "from": "through2@>=2.0.0 <3.0.0"
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4="
     },
     "tough-cookie": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "from": "tough-cookie@>=2.3.3 <2.4.0"
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE="
     },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "from": "tunnel-agent@>=0.6.0 <0.7.0"
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0="
     },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "from": "tweetnacl@>=0.14.0 <0.15.0"
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "from": "typedarray@>=0.0.6 <0.0.7"
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "unique-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-      "from": "unique-string@>=1.0.0 <2.0.0"
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo="
     },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "from": "util-deprecate@>=1.0.1 <1.1.0"
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "from": "uuid@>=3.1.0 <4.0.0"
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
     },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "from": "verror@1.10.0"
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA="
     },
     "window-size": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-      "from": "window-size@>=0.1.4 <0.2.0"
+      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
     },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "from": "wrap-ansi@>=2.0.0 <3.0.0"
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU="
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "from": "wrappy@>=1.0.0 <2.0.0"
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-      "from": "write-file-atomic@>=2.0.0 <3.0.0"
+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA=="
     },
     "xdg-basedir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-      "from": "xdg-basedir@>=3.0.0 <4.0.0"
+      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
     },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "from": "xtend@>=4.0.1 <4.1.0"
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     },
     "y18n": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "from": "y18n@>=3.2.0 <4.0.0"
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
     },
     "yargs": {
       "version": "3.32.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-      "from": "yargs@>=3.10.0 <4.0.0"
+      "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU="
     }
   }
 }
diff --git a/packages/rocketchat-highlight-words/client/client.js b/packages/rocketchat-highlight-words/client/client.js
index 8972dd03e87..22a897bdcc6 100644
--- a/packages/rocketchat-highlight-words/client/client.js
+++ b/packages/rocketchat-highlight-words/client/client.js
@@ -2,11 +2,13 @@
  * Hilights is a named function that will process Highlights
  * @param {Object} message - The message object
  */
+import _ from 'underscore';
+import s from 'underscore.string';
 
 function HighlightWordsClient(message) {
 	let msg = message;
 	if (!_.isString(message)) {
-		if (_.trim(message.html)) {
+		if (s.trim(message.html)) {
 			msg = message.html;
 		} else {
 			return message;
@@ -16,7 +18,7 @@ function HighlightWordsClient(message) {
 	const to_highlight = Meteor.user() && Meteor.user().settings && Meteor.user().settings.preferences && Meteor.user().settings.preferences.highlights;
 	if (Array.isArray(to_highlight)) {
 		to_highlight.forEach((highlight) => {
-			if (!_.isBlank(highlight)) {
+			if (!s.isBlank(highlight)) {
 				return msg = msg.replace(new RegExp(`(^|\\b|[\\s\\n\\r\\t.,،'\\\"\\+!?:-])(${ s.escapeRegExp(highlight) })($|\\b|[\\s\\n\\r\\t.,،'\\\"\\+!?:-])(?![^<]*>|[^<>]*<\\/)`, 'gmi'), '$1<span class="highlight-text">$2</span>$3');
 			}
 		});
diff --git a/packages/rocketchat-iframe-login/iframe_client.js b/packages/rocketchat-iframe-login/iframe_client.js
index 2169d097714..dcfa7d5d6bb 100644
--- a/packages/rocketchat-iframe-login/iframe_client.js
+++ b/packages/rocketchat-iframe-login/iframe_client.js
@@ -1,5 +1,7 @@
 /* globals Accounts, Tracker, ReactiveVar, FlowRouter, Accounts, HTTP, facebookConnectPlugin, TwitterConnect, OAuth */
 
+import _ from 'underscore';
+
 const _unstoreLoginToken = Accounts._unstoreLoginToken;
 Accounts._unstoreLoginToken = function() {
 	RocketChat.iframeLogin.tryLogin();
diff --git a/packages/rocketchat-iframe-login/package.js b/packages/rocketchat-iframe-login/package.js
index 292f5e36a89..49e071079c6 100644
--- a/packages/rocketchat-iframe-login/package.js
+++ b/packages/rocketchat-iframe-login/package.js
@@ -13,7 +13,6 @@ Package.onUse(function(api) {
 
 	api.use('rocketchat:lib');
 	api.use('accounts-base');
-	api.use('underscore');
 	api.use('ecmascript');
 	api.use('reactive-var');
 	api.use('http');
diff --git a/packages/rocketchat-importer-csv/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-importer-csv/.npm/package/npm-shrinkwrap.json
index 324c8efc5f3..55a218561d3 100644
--- a/packages/rocketchat-importer-csv/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-importer-csv/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,10 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "csv-parse": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz",
-      "from": "csv-parse@1.2.0"
+      "integrity": "sha1-BHtzhoq5qFdG6IX2N/ntD7ZFpCU="
     }
   }
 }
diff --git a/packages/rocketchat-importer-hipchat-enterprise/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-importer-hipchat-enterprise/.npm/package/npm-shrinkwrap.json
index c064b4aa320..421733200cc 100644
--- a/packages/rocketchat-importer-hipchat-enterprise/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-importer-hipchat-enterprise/.npm/package/npm-shrinkwrap.json
@@ -1,81 +1,82 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "bl": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-      "from": "bl@>=1.0.0 <2.0.0",
+      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
       "dependencies": {
         "readable-stream": {
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "from": "readable-stream@>=2.0.5 <2.1.0"
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44="
         }
       }
     },
     "buffer-shims": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-      "from": "buffer-shims@>=1.0.0 <2.0.0"
+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "from": "core-util-is@>=1.0.0 <1.1.0"
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "end-of-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
-      "from": "end-of-stream@>=1.0.0 <2.0.0"
+      "integrity": "sha1-6TUyWLqpEIll78QcsO+K3i88+wc="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.1 <2.1.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "from": "isarray@>=1.0.0 <1.1.0"
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "once": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-      "from": "once@>=1.3.0 <1.4.0"
+      "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA="
     },
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "from": "process-nextick-args@>=1.0.6 <1.1.0"
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
     "readable-stream": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz",
-      "from": "readable-stream@>=2.0.0 <3.0.0"
+      "integrity": "sha1-qeb+w8fdqF+LsbO6cChgRVb8gl4="
     },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "from": "string_decoder@>=0.10.0 <0.11.0"
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "tar-stream": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
-      "from": "tar-stream@1.5.2"
+      "integrity": "sha1-+8bG6DwaGdTLSMfZYXH8JI7/x78="
     },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "from": "util-deprecate@>=1.0.1 <1.1.0"
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "from": "wrappy@>=1.0.0 <2.0.0"
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "from": "xtend@>=4.0.0 <5.0.0"
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     }
   }
 }
diff --git a/packages/rocketchat-importer-hipchat/server.js b/packages/rocketchat-importer-hipchat/server.js
index 007e90efa07..530165b8df1 100644
--- a/packages/rocketchat-importer-hipchat/server.js
+++ b/packages/rocketchat-importer-hipchat/server.js
@@ -1,4 +1,6 @@
 /* globals Importer */
+import _ from 'underscore';
+import s from 'underscore.string';
 import moment from 'moment';
 
 import 'moment-timezone';
@@ -34,11 +36,11 @@ Importer.HipChat = Importer.HipChat = (function() {
 						this.updateProgress(Importer.ProgressStep.PREPARING_CHANNELS);
 						const tempRooms = JSON.parse(entry.getData().toString()).rooms;
 						tempRooms.forEach(room => {
-							room.name = _.slugify(room.name);
+							room.name = s.slugify(room.name);
 						});
 					} else if (roomName.indexOf('/') > -1) {
 						const item = roomName.split('/');
-						roomName = _.slugify(item[0]);
+						roomName = s.slugify(item[0]);
 						const msgGroupData = item[1].split('.')[0];
 						if (!tempMessages[roomName]) {
 							tempMessages[roomName] = {};
diff --git a/packages/rocketchat-importer-slack/server.js b/packages/rocketchat-importer-slack/server.js
index c48d5a3bc63..b1c58645d36 100644
--- a/packages/rocketchat-importer-slack/server.js
+++ b/packages/rocketchat-importer-slack/server.js
@@ -1,4 +1,6 @@
 /* globals Importer */
+import _ from 'underscore';
+
 Importer.Slack = class extends Importer.Base {
 	constructor(name, descriptionI18N, mimeType) {
 		super(name, descriptionI18N, mimeType);
diff --git a/packages/rocketchat-importer/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-importer/.npm/package/npm-shrinkwrap.json
index 238dae99d69..62802c37d7f 100644
--- a/packages/rocketchat-importer/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-importer/.npm/package/npm-shrinkwrap.json
@@ -1,19 +1,15 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "adm-zip": {
       "version": "0.4.7",
       "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
-      "from": "adm-zip@0.4.7"
+      "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E="
     },
     "bson": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.5.tgz",
-      "from": "bson@0.5.5"
-    },
-    "file-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.0.0.tgz",
-      "from": "file-type@4.0.0"
+      "integrity": "sha1-HWcl1ADw+/AnG/a6/I+hEmwpmDs="
     }
   }
 }
diff --git a/packages/rocketchat-importer/client/admin/adminImport.js b/packages/rocketchat-importer/client/admin/adminImport.js
index fde895bf7f9..2f7a71d84c3 100644
--- a/packages/rocketchat-importer/client/admin/adminImport.js
+++ b/packages/rocketchat-importer/client/admin/adminImport.js
@@ -1,4 +1,6 @@
 /* globals Importer */
+import _ from 'underscore';
+
 Template.adminImport.helpers({
 	isAdmin() {
 		return RocketChat.authz.hasRole(Meteor.userId(), 'admin');
diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/packages/rocketchat-importer/client/admin/adminImportPrepare.js
index f47d996000d..524f656dfe4 100644
--- a/packages/rocketchat-importer/client/admin/adminImportPrepare.js
+++ b/packages/rocketchat-importer/client/admin/adminImportPrepare.js
@@ -1,5 +1,7 @@
 /* globals Importer */
+import _ from 'underscore';
 import toastr from 'toastr';
+
 Template.adminImportPrepare.helpers({
 	isAdmin() {
 		return RocketChat.authz.hasRole(Meteor.userId(), 'admin');
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
index 383b5d1ba9b..0f713474ad7 100644
--- a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
+++ b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js
@@ -1,5 +1,6 @@
 /* global ChatIntegrations, ChatIntegrationHistory */
 
+import _ from 'underscore';
 import hljs from 'highlight.js';
 import moment from 'moment';
 import toastr from 'toastr';
diff --git a/packages/rocketchat-integrations/package.js b/packages/rocketchat-integrations/package.js
index 8ac8f310284..40c33e992a4 100644
--- a/packages/rocketchat-integrations/package.js
+++ b/packages/rocketchat-integrations/package.js
@@ -8,7 +8,6 @@ Package.describe({
 
 Package.onUse(function(api) {
 	api.use('mongo');
-	api.use('underscore');
 	api.use('ecmascript');
 	api.use('babel-compiler');
 	api.use('rocketchat:lib');
diff --git a/packages/rocketchat-integrations/server/api/api.js b/packages/rocketchat-integrations/server/api/api.js
index 85e20208254..f2b563272c1 100644
--- a/packages/rocketchat-integrations/server/api/api.js
+++ b/packages/rocketchat-integrations/server/api/api.js
@@ -1,5 +1,8 @@
 /* globals Api Meteor Restivus logger processWebhookMessage*/
 // TODO: remove globals
+
+import _ from 'underscore';
+import s from 'underscore.string';
 import vm from 'vm';
 import moment from 'moment';
 
diff --git a/packages/rocketchat-integrations/server/lib/triggerHandler.js b/packages/rocketchat-integrations/server/lib/triggerHandler.js
index 5012c42e643..e13e9c7b13e 100644
--- a/packages/rocketchat-integrations/server/lib/triggerHandler.js
+++ b/packages/rocketchat-integrations/server/lib/triggerHandler.js
@@ -1,4 +1,6 @@
 /* global logger, processWebhookMessage */
+import _ from 'underscore';
+import s from 'underscore.string';
 import moment from 'moment';
 
 RocketChat.integrations.triggerHandler = new class RocketChatIntegrationHandler {
diff --git a/packages/rocketchat-integrations/server/lib/validation.js b/packages/rocketchat-integrations/server/lib/validation.js
index a8947bdb601..328a54965d7 100644
--- a/packages/rocketchat-integrations/server/lib/validation.js
+++ b/packages/rocketchat-integrations/server/lib/validation.js
@@ -1,4 +1,6 @@
 /* global Babel */
+import _ from 'underscore';
+import s from 'underscore.string';
 const scopedChannels = ['all_public_channels', 'all_private_groups', 'all_direct_messages'];
 const validChannelChars = ['@', '#'];
 
diff --git a/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js b/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js
index 12f2828bd60..ffababb1d13 100644
--- a/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js
+++ b/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.js
@@ -1,4 +1,6 @@
 /* global Babel */
+import _ from 'underscore';
+import s from 'underscore.string';
 const validChannelChars = ['@', '#'];
 
 Meteor.methods({
diff --git a/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js b/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js
index a888484d05c..bb789b816ad 100644
--- a/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js
+++ b/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.js
@@ -1,4 +1,6 @@
 /* global Babel */
+import _ from 'underscore';
+import s from 'underscore.string';
 const validChannelChars = ['@', '#'];
 
 Meteor.methods({
diff --git a/packages/rocketchat-integrations/server/processWebhookMessage.js b/packages/rocketchat-integrations/server/processWebhookMessage.js
index 23b2f35d1d6..993f1a9acb6 100644
--- a/packages/rocketchat-integrations/server/processWebhookMessage.js
+++ b/packages/rocketchat-integrations/server/processWebhookMessage.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 this.processWebhookMessage = function(messageObj, user, defaultValues = { channel: '', alias: '', avatar: '', emoji: '' }, mustBeJoined = false) {
 	const sentData = [];
 	const channels = [].concat(messageObj.channel || messageObj.roomId || defaultValues.channel);
@@ -46,7 +49,7 @@ this.processWebhookMessage = function(messageObj, user, defaultValues = { channe
 
 		const message = {
 			alias: messageObj.username || messageObj.alias || defaultValues.alias,
-			msg: _.trim(messageObj.text || messageObj.msg || ''),
+			msg: s.trim(messageObj.text || messageObj.msg || ''),
 			attachments: messageObj.attachments,
 			parseUrls: messageObj.parseUrls !== undefined ? messageObj.parseUrls : !messageObj.attachments,
 			bot: messageObj.bot,
@@ -67,7 +70,7 @@ this.processWebhookMessage = function(messageObj, user, defaultValues = { channe
 			for (let i = 0; i < message.attachments.length; i++) {
 				const attachment = message.attachments[i];
 				if (attachment.msg) {
-					attachment.text = _.trim(attachment.msg);
+					attachment.text = s.trim(attachment.msg);
 					delete attachment.msg;
 				}
 			}
diff --git a/packages/rocketchat-internal-hubot/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-internal-hubot/.npm/package/npm-shrinkwrap.json
index 7b8831f32d2..905088989c9 100644
--- a/packages/rocketchat-internal-hubot/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-internal-hubot/.npm/package/npm-shrinkwrap.json
@@ -1,712 +1,703 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "accepts": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz",
-      "from": "accepts@>=1.2.12 <1.3.0",
+      "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=",
       "dependencies": {
         "mime-db": {
           "version": "1.24.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz",
-          "from": "mime-db@>=1.24.0 <1.25.0"
+          "integrity": "sha1-4tE/k58AFsbk6a0lqGUvEmxGfww="
         },
         "mime-types": {
           "version": "2.1.12",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
-          "from": "mime-types@>=2.1.6 <2.2.0"
+          "integrity": "sha1-FSuiVndwIN1GY/VMLnvCY4HnFyk="
         }
       }
     },
     "ansi-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-      "from": "ansi-regex@>=2.0.0 <3.0.0"
+      "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "from": "ansi-styles@>=2.2.1 <3.0.0"
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "async": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "from": "async@>=0.1.0 <1.0.0"
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
     },
     "base64-url": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz",
-      "from": "base64-url@1.2.2"
+      "integrity": "sha1-kK8m74sLZ7yAGwXsz5QzRWSQCLM="
     },
     "basic-auth": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz",
-      "from": "basic-auth@>=1.0.3 <1.1.0"
+      "integrity": "sha1-Awk1sB3nyblKgksp8/zLdQ06UpA="
     },
     "basic-auth-connect": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz",
-      "from": "basic-auth-connect@1.0.0"
+      "integrity": "sha1-/bC0OWLKe0BFanwrtI/hc9otISI="
     },
     "batch": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz",
-      "from": "batch@0.5.3"
+      "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ="
     },
     "body-parser": {
       "version": "1.13.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz",
-      "from": "body-parser@>=1.13.3 <1.14.0",
+      "integrity": "sha1-wIzzMMM1jhUQFqBXRvE/ApyX+pc=",
       "dependencies": {
         "ee-first": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-          "from": "ee-first@1.1.1"
+          "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "mime-db": {
           "version": "1.24.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz",
-          "from": "mime-db@>=1.24.0 <1.25.0"
+          "integrity": "sha1-4tE/k58AFsbk6a0lqGUvEmxGfww="
         },
         "mime-types": {
           "version": "2.1.12",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
-          "from": "mime-types@>=2.1.11 <2.2.0"
+          "integrity": "sha1-FSuiVndwIN1GY/VMLnvCY4HnFyk="
         },
         "on-finished": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "from": "on-finished@>=2.3.0 <2.4.0"
+          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
         },
         "qs": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
-          "from": "qs@4.0.0"
+          "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc="
         },
         "type-is": {
           "version": "1.6.13",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz",
-          "from": "type-is@>=1.6.6 <1.7.0"
+          "integrity": "sha1-boO6e8MM0zp7sLf7AHN6IIW/nQg="
         }
       }
     },
     "bytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz",
-      "from": "bytes@2.1.0"
+      "integrity": "sha1-rJPEEOL/ycx89LRks4KJBn9eR7Q="
     },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "from": "chalk@>=1.0.0 <2.0.0"
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
     },
     "cline": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/cline/-/cline-0.8.2.tgz",
-      "from": "cline@>=0.8.2 <0.9.0"
+      "integrity": "sha1-6RHnQaCtLiTSnm+rLPifoyLVnHY="
     },
     "coffee-script": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz",
-      "from": "coffee-script@1.10.0"
+      "integrity": "sha1-EpOLz5vhlI+gBvkuDEyegXBRCMA="
     },
     "commander": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-      "from": "commander@2.6.0"
+      "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
     },
     "compressible": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz",
-      "from": "compressible@>=2.0.5 <2.1.0",
+      "integrity": "sha1-cWLmxG07nSAP+0XLTkoPeDJzJQM=",
       "dependencies": {
         "mime-db": {
           "version": "1.24.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz",
-          "from": "mime-db@>=1.23.0 <2.0.0"
+          "integrity": "sha1-4tE/k58AFsbk6a0lqGUvEmxGfww="
         }
       }
     },
     "compression": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz",
-      "from": "compression@>=1.5.2 <1.6.0"
+      "integrity": "sha1-sDuNhub4rSloPLqN+R3cb/x3s5U="
     },
     "connect": {
       "version": "2.30.2",
       "resolved": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz",
-      "from": "connect@2.30.2",
+      "integrity": "sha1-jam8vooFTT0xjXTf7JA7XDmhtgk=",
       "dependencies": {
         "mime-db": {
           "version": "1.24.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz",
-          "from": "mime-db@>=1.24.0 <1.25.0"
+          "integrity": "sha1-4tE/k58AFsbk6a0lqGUvEmxGfww="
         },
         "mime-types": {
           "version": "2.1.12",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
-          "from": "mime-types@>=2.1.11 <2.2.0"
+          "integrity": "sha1-FSuiVndwIN1GY/VMLnvCY4HnFyk="
         },
         "qs": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
-          "from": "qs@4.0.0"
+          "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc="
         },
         "type-is": {
           "version": "1.6.13",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz",
-          "from": "type-is@>=1.6.6 <1.7.0"
+          "integrity": "sha1-boO6e8MM0zp7sLf7AHN6IIW/nQg="
         }
       }
     },
     "connect-multiparty": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz",
-      "from": "connect-multiparty@>=1.2.5 <2.0.0"
+      "integrity": "sha1-L6vs/cGop3S6GUhNzmYMgYqFVec="
     },
     "connect-timeout": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz",
-      "from": "connect-timeout@>=1.6.2 <1.7.0"
+      "integrity": "sha1-3ppexh4zoStu2qt7XwYumMWZuI4="
     },
     "content-disposition": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz",
-      "from": "content-disposition@0.5.0"
+      "integrity": "sha1-QoT+auBjCHRjnkToCkGMKTQTXp4="
     },
     "content-type": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
-      "from": "content-type@>=1.0.1 <1.1.0"
+      "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0="
     },
     "cookie": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz",
-      "from": "cookie@0.1.3"
+      "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU="
     },
     "cookie-parser": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz",
-      "from": "cookie-parser@>=1.3.5 <1.4.0"
+      "integrity": "sha1-nXVVcPtdF4kHcSJ6AjFNm+fPg1Y="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "from": "cookie-signature@1.0.6"
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "from": "core-util-is@>=1.0.0 <1.1.0"
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "crc": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
-      "from": "crc@3.3.0"
+      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo="
     },
     "csrf": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz",
-      "from": "csrf@>=3.0.0 <3.1.0"
+      "integrity": "sha1-adEyIN6VdigIuxIPdTOplPxCk7U="
     },
     "csurf": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz",
-      "from": "csurf@>=1.8.3 <1.9.0"
+      "integrity": "sha1-I/KhO/HY/OHQyZZYg5RELLqGpWo="
     },
     "debug": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-      "from": "debug@>=2.2.0 <2.3.0"
+      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo="
     },
     "depd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
-      "from": "depd@>=1.0.1 <1.1.0"
+      "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo="
     },
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "from": "destroy@>=1.0.4 <1.1.0"
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
     "ee-first": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
-      "from": "ee-first@1.1.0"
+      "integrity": "sha1-ag18YiHkkP7v2S7D9EHJzozQl/Q="
     },
     "errorhandler": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz",
-      "from": "errorhandler@>=1.4.2 <1.5.0",
+      "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=",
       "dependencies": {
         "accepts": {
           "version": "1.3.3",
           "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-          "from": "accepts@>=1.3.0 <1.4.0"
+          "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo="
         },
         "escape-html": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-          "from": "escape-html@>=1.0.3 <1.1.0"
+          "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
         },
         "mime-db": {
           "version": "1.24.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz",
-          "from": "mime-db@>=1.24.0 <1.25.0"
+          "integrity": "sha1-4tE/k58AFsbk6a0lqGUvEmxGfww="
         },
         "mime-types": {
           "version": "2.1.12",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
-          "from": "mime-types@>=2.1.11 <2.2.0"
+          "integrity": "sha1-FSuiVndwIN1GY/VMLnvCY4HnFyk="
         },
         "negotiator": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-          "from": "negotiator@0.6.1"
+          "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
         }
       }
     },
     "escape-html": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz",
-      "from": "escape-html@1.0.2"
+      "integrity": "sha1-130y+pjjjC9BroXpJ44ODmuhAiw="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "etag": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz",
-      "from": "etag@>=1.7.0 <1.8.0"
+      "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg="
     },
     "express": {
       "version": "3.21.2",
       "resolved": "https://registry.npmjs.org/express/-/express-3.21.2.tgz",
-      "from": "express@>=3.21.2 <4.0.0"
+      "integrity": "sha1-DCkD7lxU5j1lqWFwdkcDVQZlo94="
     },
     "express-session": {
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz",
-      "from": "express-session@>=1.11.3 <1.12.0",
+      "integrity": "sha1-XMmPP1/4Ttg1+Ry/CqvQxxB0AK8=",
       "dependencies": {
         "base64-url": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz",
-          "from": "base64-url@1.2.1"
+          "integrity": "sha1-GZ/WYXAqDnt9yubgaYuwicUvbXg="
         },
         "uid-safe": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz",
-          "from": "uid-safe@>=2.0.0 <2.1.0"
+          "integrity": "sha1-p/PGymSh9qXQTsDvPkw9U2cxcTc="
         }
       }
     },
     "finalhandler": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz",
-      "from": "finalhandler@0.4.0",
+      "integrity": "sha1-llpS2ejQXSuFdUhUH7ibU6JJfZs=",
       "dependencies": {
         "ee-first": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-          "from": "ee-first@1.1.1"
+          "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "on-finished": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "from": "on-finished@>=2.3.0 <2.4.0"
+          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
         }
       }
     },
     "forwarded": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
-      "from": "forwarded@>=0.1.0 <0.2.0"
+      "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M="
     },
     "fresh": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz",
-      "from": "fresh@0.3.0"
+      "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8="
     },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "from": "has-ansi@>=2.0.0 <3.0.0"
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
     },
     "http-errors": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
-      "from": "http-errors@>=1.3.1 <1.4.0"
+      "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI="
     },
     "hubot": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/hubot/-/hubot-2.19.0.tgz",
-      "from": "hubot@2.19.0",
+      "integrity": "sha1-h8Vy0hD7DV+J91YXeuACDUn/ujY=",
       "dependencies": {
         "coffee-script": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz",
-          "from": "coffee-script@1.6.3"
+          "integrity": "sha1-Y1XTLPGwTN/2tITl5xF4Ky8MOb4="
         }
       }
     },
     "hubot-help": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hubot-help/-/hubot-help-0.2.0.tgz",
-      "from": "hubot-help@0.2.0"
-    },
-    "hubot-scripts": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/hubot-scripts/-/hubot-scripts-2.17.1.tgz",
-      "from": "hubot-scripts@2.17.1"
+      "integrity": "sha1-N1sP16Hq+ypxzy5Ui8sia/fmZkI="
     },
     "iconv-lite": {
       "version": "0.4.11",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz",
-      "from": "iconv-lite@0.4.11"
+      "integrity": "sha1-LstC/SlHRJIiCaLnxATayHk9it4="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.1 <2.1.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ipaddr.js": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz",
-      "from": "ipaddr.js@1.0.5"
+      "integrity": "sha1-X6eM8wG4JceKvDBC2BJyMEnqI8c="
     },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "from": "isarray@0.0.1"
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
     "log": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/log/-/log-1.4.0.tgz",
-      "from": "log@1.4.0"
+      "integrity": "sha1-S6HYkP3iSbAx3KA7w36q8yVlbxw="
     },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "from": "media-typer@0.3.0"
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "merge-descriptors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz",
-      "from": "merge-descriptors@1.0.0"
+      "integrity": "sha1-IWnPdTjhsMyH+4jhUC2EdLv3mGQ="
     },
     "method-override": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz",
-      "from": "method-override@>=2.3.5 <2.4.0",
+      "integrity": "sha1-IJJhzFiNRdnVoCL/INfV646SF54=",
       "dependencies": {
         "vary": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz",
-          "from": "vary@>=1.1.0 <1.2.0"
+          "integrity": "sha1-4eWv+70WrnaN0mdDlLmtMCJlMUA="
         }
       }
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "from": "methods@>=1.1.1 <1.2.0"
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "mime": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-      "from": "mime@1.3.4"
+      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM="
     },
     "mime-db": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
-      "from": "mime-db@>=1.12.0 <1.13.0"
+      "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc="
     },
     "mime-types": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-      "from": "mime-types@>=2.0.9 <2.1.0"
+      "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY="
     },
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "from": "minimist@0.0.8"
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "from": "mkdirp@0.5.1"
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM="
     },
     "morgan": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz",
-      "from": "morgan@>=1.6.1 <1.7.0",
+      "integrity": "sha1-X9gYOYxoGcuiinzWZk8pL+HAu/I=",
       "dependencies": {
         "ee-first": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-          "from": "ee-first@1.1.1"
+          "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "on-finished": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "from": "on-finished@>=2.3.0 <2.4.0"
+          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
         }
       }
     },
     "ms": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "from": "ms@0.7.1"
+      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
     },
     "multiparty": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz",
-      "from": "multiparty@>=3.3.2 <3.4.0"
+      "integrity": "sha1-Nd5oBNwZZD5SSfPT473GyM4wHT8="
     },
     "negotiator": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz",
-      "from": "negotiator@0.5.3"
+      "integrity": "sha1-Jp1cR2gQ7JLtvntsLygxY4T5p+g="
     },
     "on-finished": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
-      "from": "on-finished@>=2.1.0 <2.2.0"
+      "integrity": "sha1-+CyhyeOk8yhrG5k4YQ5bhja9PLI="
     },
     "on-headers": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-      "from": "on-headers@>=1.0.0 <1.1.0"
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
     },
     "optparse": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz",
-      "from": "optparse@1.0.4"
+      "integrity": "sha1-wGJXnS0F0kPCIaMEpx4Ml5YjzPE="
     },
     "parseurl": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
-      "from": "parseurl@>=1.3.0 <1.4.0"
+      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY="
     },
     "pause": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz",
-      "from": "pause@0.1.0"
+      "integrity": "sha1-68ikqGGf8LioGsFRPDQ0/0af23Q="
     },
     "proxy-addr": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz",
-      "from": "proxy-addr@>=1.0.8 <1.1.0"
+      "integrity": "sha1-DUCoL4Afw1VWfS7LZe/j8HfxIcU="
     },
     "qs": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/qs/-/qs-2.2.5.tgz",
-      "from": "qs@>=2.2.4 <2.3.0"
+      "integrity": "sha1-EIirr53MCuWuRbcJ5sa1iIsjkjw="
     },
     "random-bytes": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
-      "from": "random-bytes@>=1.0.0 <1.1.0"
+      "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs="
     },
     "range-parser": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz",
-      "from": "range-parser@>=1.0.2 <1.1.0"
+      "integrity": "sha1-aHKCNTXGkuLCoBA4Jq/YLC4P8XU="
     },
     "raw-body": {
       "version": "2.1.7",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz",
-      "from": "raw-body@>=2.1.2 <2.2.0",
+      "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=",
       "dependencies": {
         "bytes": {
           "version": "2.4.0",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
-          "from": "bytes@2.4.0"
+          "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk="
         },
         "iconv-lite": {
           "version": "0.4.13",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
-          "from": "iconv-lite@0.4.13"
+          "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI="
         }
       }
     },
     "readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "from": "readable-stream@>=1.1.9 <1.2.0"
-    },
-    "redis": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-0.8.4.tgz",
-      "from": "redis@0.8.4"
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk="
     },
     "response-time": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz",
-      "from": "response-time@>=2.3.1 <2.4.0"
+      "integrity": "sha1-K94ZGB3myBq5XjIHoo1h2WWzF5c="
     },
     "rndm": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz",
-      "from": "rndm@1.2.0"
+      "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "scoped-http-client": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/scoped-http-client/-/scoped-http-client-0.11.0.tgz",
-      "from": "scoped-http-client@0.11.0"
+      "integrity": "sha1-iH+oKoNg8V1jmlLlBOVjwVfSbXQ="
     },
     "send": {
       "version": "0.13.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.13.0.tgz",
-      "from": "send@0.13.0",
+      "integrity": "sha1-UY+SGusFYK7H3KspkLFM9vPM5d4=",
       "dependencies": {
         "destroy": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
-          "from": "destroy@1.0.3"
+          "integrity": "sha1-tDO0ck5x/YVR2YhRdIUcX8N34sk="
         },
         "ee-first": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-          "from": "ee-first@1.1.1"
+          "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "on-finished": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "from": "on-finished@>=2.3.0 <2.4.0"
+          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
         },
         "statuses": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz",
-          "from": "statuses@>=1.2.1 <1.3.0"
+          "integrity": "sha1-3e1FzBglbVHtQK7BQkidXGECbSg="
         }
       }
     },
     "serve-favicon": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz",
-      "from": "serve-favicon@>=2.3.0 <2.4.0"
+      "integrity": "sha1-rtNsxoNAaabxicxyIsahqBHcWzk="
     },
     "serve-index": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz",
-      "from": "serve-index@>=1.7.2 <1.8.0",
+      "integrity": "sha1-egV/xu4o3GP2RWbl+lexEahq7NI=",
       "dependencies": {
         "escape-html": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-          "from": "escape-html@>=1.0.3 <1.1.0"
+          "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
         },
         "mime-db": {
           "version": "1.24.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz",
-          "from": "mime-db@>=1.24.0 <1.25.0"
+          "integrity": "sha1-4tE/k58AFsbk6a0lqGUvEmxGfww="
         },
         "mime-types": {
           "version": "2.1.12",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
-          "from": "mime-types@>=2.1.9 <2.2.0"
+          "integrity": "sha1-FSuiVndwIN1GY/VMLnvCY4HnFyk="
         }
       }
     },
     "serve-static": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz",
-      "from": "serve-static@>=1.10.0 <1.11.0",
+      "integrity": "sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=",
       "dependencies": {
         "depd": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
-          "from": "depd@>=1.1.0 <1.2.0"
+          "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM="
         },
         "ee-first": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-          "from": "ee-first@1.1.1"
+          "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "escape-html": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-          "from": "escape-html@>=1.0.3 <1.1.0"
+          "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
         },
         "on-finished": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "from": "on-finished@>=2.3.0 <2.4.0"
+          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
         },
         "send": {
           "version": "0.13.2",
           "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz",
-          "from": "send@0.13.2"
+          "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4="
         },
         "statuses": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz",
-          "from": "statuses@>=1.2.1 <1.3.0"
+          "integrity": "sha1-3e1FzBglbVHtQK7BQkidXGECbSg="
         }
       }
     },
     "statuses": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz",
-      "from": "statuses@>=1.0.0 <2.0.0"
+      "integrity": "sha1-jlV1jLIOdoLB9Pzo3KswvwHR4Ho="
     },
     "stream-counter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz",
-      "from": "stream-counter@>=0.2.0 <0.3.0"
+      "integrity": "sha1-3tJmVWMZyLDiIoErnPOyb6fZR94="
     },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "from": "string_decoder@>=0.10.0 <0.11.0"
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "from": "strip-ansi@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
     },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "from": "supports-color@>=2.0.0 <3.0.0"
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "tsscmp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
-      "from": "tsscmp@1.0.5"
+      "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc="
     },
     "type-is": {
       "version": "1.5.7",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz",
-      "from": "type-is@>=1.5.2 <1.6.0"
+      "integrity": "sha1-uTaKWTzG730GReeLL0xky+zQXpA="
     },
     "uid-safe": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz",
-      "from": "uid-safe@2.1.1"
+      "integrity": "sha1-Pb+UNrUovp9SiCwFpiFsN2PbNmY="
     },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "from": "unpipe@1.0.0"
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
     "utils-merge": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-      "from": "utils-merge@1.0.0"
+      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg="
     },
     "vary": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz",
-      "from": "vary@>=1.0.1 <1.1.0"
+      "integrity": "sha1-meSYFWaihhGN+yuBc1ffeZM3bRA="
     },
     "vhost": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz",
-      "from": "vhost@>=3.0.1 <3.1.0"
+      "integrity": "sha1-L7HezUxGaqiLD5NBrzPcGv8keNU="
     }
   }
 }
diff --git a/packages/rocketchat-internal-hubot/hubot.js b/packages/rocketchat-internal-hubot/hubot.js
index ff049030efc..d7316a0f159 100644
--- a/packages/rocketchat-internal-hubot/hubot.js
+++ b/packages/rocketchat-internal-hubot/hubot.js
@@ -1,4 +1,7 @@
 /* globals __meteor_bootstrap__ */
+import _ from 'underscore';
+import s from 'underscore.string';
+
 const CoffeeScript = Npm.require('coffee-script');
 CoffeeScript.register();
 const Hubot = Npm.require('hubot');
diff --git a/packages/rocketchat-internal-hubot/package.js b/packages/rocketchat-internal-hubot/package.js
index 4d1295ee207..c9da187112d 100644
--- a/packages/rocketchat-internal-hubot/package.js
+++ b/packages/rocketchat-internal-hubot/package.js
@@ -8,11 +8,9 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'tracker',
 		'rocketchat:lib'
 	]);
-	api.use('underscorestring:underscore.string');
 
 	api.use('templating', 'client');
 
diff --git a/packages/rocketchat-irc/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-irc/.npm/package/npm-shrinkwrap.json
index bea157664c0..0aed90e3e2e 100644
--- a/packages/rocketchat-irc/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-irc/.npm/package/npm-shrinkwrap.json
@@ -1,14 +1,15 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "coffee-script": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.9.3.tgz",
-      "from": "coffee-script@1.9.3"
+      "integrity": "sha1-WW5ug/z8tnxZZKtw1ES+/wrASsc="
     },
     "lru-cache": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
-      "from": "lru-cache@2.6.5"
+      "integrity": "sha1-5W1jVBSO3o13B7WNFDIg/QjfD9U="
     }
   }
 }
diff --git a/packages/rocketchat-irc/package.js b/packages/rocketchat-irc/package.js
index d1192c74501..cdd26750c90 100644
--- a/packages/rocketchat-irc/package.js
+++ b/packages/rocketchat-irc/package.js
@@ -13,7 +13,6 @@ Npm.depends({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-irc/server/server.js b/packages/rocketchat-irc/server/server.js
index ebfd223f775..16d3c60aacc 100644
--- a/packages/rocketchat-irc/server/server.js
+++ b/packages/rocketchat-irc/server/server.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import net from 'net';
 import Lru from 'lru-cache';
 
diff --git a/packages/rocketchat-issuelinks/client.js b/packages/rocketchat-issuelinks/client.js
index 794fa8bd12d..4d3528a4534 100644
--- a/packages/rocketchat-issuelinks/client.js
+++ b/packages/rocketchat-issuelinks/client.js
@@ -1,10 +1,12 @@
+import s from 'underscore.string';
+
 //
 // IssueLink is a named function that will add issue links
 // @param {Object} message - The message object
 //
 
 function IssueLink(message) {
-	if (_.trim(message.html) && RocketChat.settings.get('IssueLinks_Enabled')) {
+	if (s.trim(message.html) && RocketChat.settings.get('IssueLinks_Enabled')) {
 		message.html = message.html.replace(/(?:^|\s|\n)(#[0-9]+)\b/g, function(match, issueNumber) {
 			const url = RocketChat.settings.get('IssueLinks_Template').replace('%s', issueNumber.substring(1));
 			return match.replace(issueNumber, `<a href="${ url }" target="_blank">${ issueNumber }</a>`);
diff --git a/packages/rocketchat-katex/katex.js b/packages/rocketchat-katex/katex.js
index 234165def86..27aaa288a2b 100644
--- a/packages/rocketchat-katex/katex.js
+++ b/packages/rocketchat-katex/katex.js
@@ -2,6 +2,9 @@
  * KaTeX is a fast, easy-to-use JavaScript library for TeX math rendering on the web.
  * https://github.com/Khan/KaTeX
  */
+import _ from 'underscore';
+import s from 'underscore.string';
+
 const katex = require('katex');
 
 class Boundary {
@@ -195,7 +198,7 @@ class Katex {
 		if (this.katex_enabled()) {
 			let msg = message;
 			if (!_.isString(message)) {
-				if (_.trim(message.html)) {
+				if (s.trim(message.html)) {
 					msg = message.html;
 				} else {
 					return message;
diff --git a/packages/rocketchat-katex/package-lock.json b/packages/rocketchat-katex/package-lock.json
index 46d4f685052..ef5ab99ffdd 100644
--- a/packages/rocketchat-katex/package-lock.json
+++ b/packages/rocketchat-katex/package-lock.json
@@ -2,10 +2,14 @@
   "name": "rocketchat-katex",
   "version": "1.0.0",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "katex": {
       "version": "https://registry.npmjs.org/katex/-/katex-0.7.1.tgz",
-      "integrity": "sha1-BrtSmO+tBeHnIoA1uo4VkfMGG48="
+      "integrity": "sha1-BrtSmO+tBeHnIoA1uo4VkfMGG48=",
+      "requires": {
+        "match-at": "https://registry.npmjs.org/match-at/-/match-at-0.1.0.tgz"
+      }
     },
     "match-at": {
       "version": "https://registry.npmjs.org/match-at/-/match-at-0.1.0.tgz",
diff --git a/packages/rocketchat-katex/package.js b/packages/rocketchat-katex/package.js
index c72507a3b1d..c2a0fa3ee45 100644
--- a/packages/rocketchat-katex/package.js
+++ b/packages/rocketchat-katex/package.js
@@ -7,9 +7,7 @@ Package.describe({
 
 Package.onUse(function(api) {
 	api.use('ecmascript');
-	api.use('underscore');
 	api.use('templating');
-	api.use('underscorestring:underscore.string');
 	api.use('rocketchat:lib');
 
 	api.addFiles('settings.js', 'server');
diff --git a/packages/rocketchat-ldap/package.js b/packages/rocketchat-ldap/package.js
index fccce5e20c6..4fd39f85d7b 100644
--- a/packages/rocketchat-ldap/package.js
+++ b/packages/rocketchat-ldap/package.js
@@ -10,7 +10,6 @@ Package.onUse(function(api) {
 	api.use('rocketchat:lib');
 	api.use('yasaricli:slugify');
 	api.use('ecmascript');
-	api.use('underscore');
 	api.use('sha');
 
 	api.use('templating', 'client');
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
index 8abf47353b5..6bbfa024d4f 100644
--- a/packages/rocketchat-ldap/server/sync.js
+++ b/packages/rocketchat-ldap/server/sync.js
@@ -1,5 +1,6 @@
 /* globals slugify, SyncedCron */
 
+import _ from 'underscore';
 import LDAP from './ldap';
 
 const logger = new Logger('LDAPSync', {});
diff --git a/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json
index 1f3369640de..44139fd581d 100644
--- a/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json
@@ -1,532 +1,533 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "acorn": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
-      "from": "acorn@>=1.0.3 <2.0.0"
+      "integrity": "sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ="
     },
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "from": "amdefine@>=0.0.4"
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "from": "ansi-regex@>=2.0.0 <3.0.0"
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "from": "ansi-styles@>=2.2.1 <3.0.0"
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "asap": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
-      "from": "asap@>=2.0.3 <2.1.0"
+      "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8="
     },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "from": "asn1@>=0.2.3 <0.3.0"
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "from": "assert-plus@>=0.2.0 <0.3.0"
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
     },
     "ast-types": {
       "version": "0.8.15",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz",
-      "from": "ast-types@0.8.15"
+      "integrity": "sha1-ju8IJ/BN/w7IhXupJavj/qYZTlI="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "from": "asynckit@>=0.4.0 <0.5.0"
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "from": "aws-sign2@>=0.6.0 <0.7.0"
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
     },
     "aws4": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz",
-      "from": "aws4@>=1.2.1 <2.0.0"
+      "integrity": "sha1-Cin/t5wxyecS7rCH6OemS0pW11U="
     },
     "bad-words": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/bad-words/-/bad-words-1.3.1.tgz",
-      "from": "bad-words@1.3.1"
+      "integrity": "sha1-YD3VpBLnItb/vGtqnIiKNzQTv4I="
     },
     "badwords-list": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/badwords-list/-/badwords-list-1.0.0.tgz",
-      "from": "badwords-list@>=1.0.0 <2.0.0"
+      "integrity": "sha1-XphW2/E0gqKVw7CzBK+51M/FxXk="
     },
     "base62": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz",
-      "from": "base62@0.1.1"
+      "integrity": "sha1-e0F0wvlESXU7EcJlHAg9qEGnsIQ="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz",
-      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0"
+      "integrity": "sha1-PKdrhSQccXC/fZcD57mqdGMAQNQ="
     },
     "bintrees": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
-      "from": "bintrees@1.0.1"
+      "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
     },
     "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "from": "boom@>=2.0.0 <3.0.0"
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
     },
     "bugsnag": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/bugsnag/-/bugsnag-1.8.0.tgz",
-      "from": "bugsnag@1.8.0"
+      "integrity": "sha1-5BKdm6KaxRQSANGG/4wK/vdDN8c="
     },
     "caseless": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-      "from": "caseless@>=0.11.0 <0.12.0"
+      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
     },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "from": "chalk@>=1.1.1 <2.0.0"
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
     },
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "from": "combined-stream@>=1.0.5 <1.1.0"
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
     },
     "commander": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "from": "commander@>=2.9.0 <3.0.0"
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "from": "core-util-is@>=1.0.0 <1.1.0"
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "from": "cryptiles@>=2.0.0 <3.0.0"
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
     },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "from": "dashdash@>=1.12.0 <2.0.0",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "from": "delayed-stream@>=1.0.0 <1.1.0"
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "from": "ecc-jsbn@>=0.1.1 <0.2.0"
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU="
     },
     "es3ify": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/es3ify/-/es3ify-0.1.4.tgz",
-      "from": "es3ify@>=0.1.3 <0.2.0"
+      "integrity": "sha1-rZ+l3xrjTz8x4SEbWBiy1RB439E="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "esmangle-evaluator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esmangle-evaluator/-/esmangle-evaluator-1.0.1.tgz",
-      "from": "esmangle-evaluator@>=1.0.0 <2.0.0"
+      "integrity": "sha1-Yg2GbvSGGzMR91dm1SqFcrs8YzY="
     },
     "esprima-fb": {
       "version": "3001.1.0-dev-harmony-fb",
       "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz",
-      "from": "esprima-fb@>=3001.1.0-dev-harmony-fb <3001.2.0"
+      "integrity": "sha1-t303q8046gt3Qmu4vCkizmtCZBE="
     },
     "extend": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-      "from": "extend@>=3.0.0 <3.1.0"
+      "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
     },
     "extsprintf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-      "from": "extsprintf@1.0.2"
+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
     },
     "falafel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz",
-      "from": "falafel@>=1.0.1 <2.0.0"
+      "integrity": "sha1-wY0k71CRF0pJfzGM0ksCaiXN2rQ="
     },
     "foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "from": "foreach@>=2.0.5 <3.0.0"
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
     },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "from": "forever-agent@>=0.6.1 <0.7.0"
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
-      "from": "form-data@>=2.1.1 <2.2.0"
+      "integrity": "sha1-icNTQAi5fq2ky7FX1Y9vXfAl6uQ="
     },
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "from": "generate-function@>=2.0.0 <3.0.0"
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
     },
     "generate-object-property": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "from": "generate-object-property@>=1.1.0 <2.0.0"
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA="
     },
     "getpass": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
-      "from": "getpass@>=0.1.1 <0.2.0",
+      "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "graceful-readlink": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "from": "graceful-readlink@>=1.0.0"
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
     },
     "har-validator": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-      "from": "har-validator@>=2.0.6 <2.1.0"
+      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0="
     },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "from": "has-ansi@>=2.0.0 <3.0.0"
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
     },
     "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "from": "hawk@>=3.1.3 <3.2.0"
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ="
     },
     "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "from": "hoek@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
     },
     "http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "from": "http-signature@>=1.1.0 <1.2.0"
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8="
     },
     "immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "from": "immediate@>=3.0.5 <3.1.0"
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.1 <2.1.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "inline-process-browser": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/inline-process-browser/-/inline-process-browser-1.0.0.tgz",
-      "from": "inline-process-browser@>=1.0.0 <2.0.0"
+      "integrity": "sha1-RqYbFT3TybFiSxoAYm7bT39BTyI="
     },
     "is-my-json-valid": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
-      "from": "is-my-json-valid@>=2.12.4 <3.0.0"
+      "integrity": "sha1-k27do8o8IR/ZjzstPgjaQ/eykVs="
     },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "from": "is-property@>=1.0.0 <2.0.0"
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "from": "is-typedarray@>=1.0.0 <1.1.0"
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "from": "isarray@0.0.1"
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "from": "isstream@>=0.1.2 <0.2.0"
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jodid25519": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-      "from": "jodid25519@>=1.0.0 <2.0.0"
+      "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc="
     },
     "jsbn": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz",
-      "from": "jsbn@>=0.1.0 <0.2.0"
+      "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0="
     },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "from": "json-schema@0.2.3"
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "from": "json-stringify-safe@>=5.0.1 <5.1.0"
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsonpointer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "from": "jsonpointer@>=4.0.0 <5.0.0"
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
     },
     "jsprim": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
-      "from": "jsprim@>=1.2.2 <2.0.0"
+      "integrity": "sha1-KnJW9wQSop7jZwqspiWZTE3P8lI="
     },
     "jstransform": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jstransform/-/jstransform-3.0.0.tgz",
-      "from": "jstransform@>=3.0.0 <3.1.0"
+      "integrity": "sha1-olkats7o2XvzvoMNv6IxO4fNZAs="
     },
     "lie": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.0.2.tgz",
-      "from": "lie@3.0.2"
+      "integrity": "sha1-/9oh17uibzd8rYZdNkmy/Izjn+o="
     },
     "localforage": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.4.2.tgz",
-      "from": "localforage@1.4.2"
+      "integrity": "sha1-X66KkdFG0eqbTG3NDt3r3PamFlM="
     },
     "lokijs": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/lokijs/-/lokijs-1.4.1.tgz",
-      "from": "lokijs@1.4.1"
+      "integrity": "sha1-6he+ktLqfKuhyBbWwgBkJOjbC/4="
     },
     "mime-db": {
       "version": "1.26.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz",
-      "from": "mime-db@>=1.26.0 <1.27.0"
+      "integrity": "sha1-6v/NDk/Gk1z4E02iRuLmw1MFrf8="
     },
     "mime-types": {
       "version": "2.1.14",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz",
-      "from": "mime-types@>=2.1.7 <2.2.0"
+      "integrity": "sha1-9+99l1g/yvO30oK2+LVnnaselO4="
     },
     "node-dogstatsd": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/node-dogstatsd/-/node-dogstatsd-0.0.6.tgz",
-      "from": "node-dogstatsd@0.0.6"
+      "integrity": "sha1-1pfk0ZA6f/DBZHnNXRzeBDc34Ec="
     },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "from": "oauth-sign@>=0.8.1 <0.9.0"
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "object-keys": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-      "from": "object-keys@>=1.0.6 <2.0.0"
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
     },
     "object-path": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
-      "from": "object-path@0.9.2"
+      "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "from": "pinkie@>=2.0.0 <3.0.0"
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "from": "pinkie-promise@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
     },
     "private": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz",
-      "from": "private@>=0.1.5 <0.2.0"
+      "integrity": "sha1-VcapdtD5uvuZJIUTUP5HubX7t8E="
     },
     "prom-client": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-7.0.1.tgz",
-      "from": "prom-client@7.0.1"
+      "integrity": "sha1-+pO6MbdlVLLvEWC+gEdiqfbzr+Q="
     },
     "promise": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz",
-      "from": "promise@>=7.0.0 <8.0.0"
+      "integrity": "sha1-SJZUxpJha4qlWwck+oCbt9tJxb8="
     },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "from": "punycode@>=1.4.1 <2.0.0"
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz",
-      "from": "qs@>=6.3.0 <6.4.0"
+      "integrity": "sha1-9AOyZPI7wBIox0ExtAfxjV6l1EI="
     },
     "readable-stream": {
       "version": "1.0.34",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "from": "readable-stream@>=1.0.33-1 <1.1.0-0"
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw="
     },
     "recast": {
       "version": "0.10.43",
       "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz",
-      "from": "recast@>=0.10.1 <0.11.0",
+      "integrity": "sha1-uV1Q9tYHYaX2JS4V2AZ4FoSRzn8=",
       "dependencies": {
         "esprima-fb": {
           "version": "15001.1001.0-dev-harmony-fb",
           "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
-          "from": "esprima-fb@>=15001.1001.0-dev-harmony-fb <15001.1002.0"
+          "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk="
         },
         "source-map": {
           "version": "0.5.6",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "from": "source-map@>=0.5.0 <0.6.0"
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
         }
       }
     },
     "request": {
       "version": "2.79.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-      "from": "request@>=2.0.0 <3.0.0"
+      "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4="
     },
     "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "from": "sntp@>=1.0.0 <2.0.0"
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
     },
     "source-map": {
       "version": "0.1.31",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz",
-      "from": "source-map@0.1.31"
+      "integrity": "sha1-n3BNDWnZ4TioG63267T94z0VHGE="
     },
     "sshpk": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz",
-      "from": "sshpk@>=1.7.0 <2.0.0",
+      "integrity": "sha1-1agEziJpVRVjjnmNviMnPeBwpfo=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "stack-trace": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
-      "from": "stack-trace@0.0.9"
+      "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU="
     },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "from": "string_decoder@>=0.10.0 <0.11.0"
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "from": "stringstream@>=0.0.4 <0.1.0"
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "from": "strip-ansi@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
     },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "from": "supports-color@>=2.0.0 <3.0.0"
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "tdigest": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
-      "from": "tdigest@>=0.1.1 <0.2.0"
+      "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE="
     },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "from": "through@>=2.3.4 <2.4.0"
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "from": "through2@>=0.6.5 <0.7.0"
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg="
     },
     "tough-cookie": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "from": "tough-cookie@>=2.3.0 <2.4.0"
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo="
     },
     "tunnel-agent": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "from": "tunnel-agent@>=0.4.1 <0.5.0"
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
     },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "from": "tweetnacl@>=0.14.0 <0.15.0"
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "unreachable-branch-transform": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/unreachable-branch-transform/-/unreachable-branch-transform-0.3.0.tgz",
-      "from": "unreachable-branch-transform@>=0.3.0 <0.4.0"
+      "integrity": "sha1-2ZzExudG0mSSiEW2EdtUsPNHTKo="
     },
     "util-extend": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
-      "from": "util-extend@>=1.0.1 <2.0.0"
+      "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8="
     },
     "uuid": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-      "from": "uuid@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
     },
     "verror": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-      "from": "verror@1.3.6"
+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw="
     },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "from": "xtend@>=4.0.0 <5.0.0"
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     }
   }
 }
diff --git a/packages/rocketchat-lib/client/AdminBox.js b/packages/rocketchat-lib/client/AdminBox.js
index dfce133efa8..10492de6a26 100644
--- a/packages/rocketchat-lib/client/AdminBox.js
+++ b/packages/rocketchat-lib/client/AdminBox.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.AdminBox = new class {
 	constructor() {
 		this.options = new ReactiveVar([]);
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 4a931008a51..4add4c27d43 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -1,5 +1,6 @@
 /* globals chatMessages cordova */
 
+import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';
 
diff --git a/packages/rocketchat-lib/client/OAuthProxy.js b/packages/rocketchat-lib/client/OAuthProxy.js
index 5c8b5296192..b5c36676b0b 100644
--- a/packages/rocketchat-lib/client/OAuthProxy.js
+++ b/packages/rocketchat-lib/client/OAuthProxy.js
@@ -1,4 +1,5 @@
 /* globals OAuth */
+import _ from 'underscore';
 
 OAuth.launchLogin = _.wrap(OAuth.launchLogin, function(func, options) {
 	const proxy = RocketChat.settings.get('Accounts_OAuth_Proxy_services').replace(/\s/g, '').split(',');
diff --git a/packages/rocketchat-lib/client/lib/TabBar.js b/packages/rocketchat-lib/client/lib/TabBar.js
index 4eb3939bc13..e1a622b4261 100644
--- a/packages/rocketchat-lib/client/lib/TabBar.js
+++ b/packages/rocketchat-lib/client/lib/TabBar.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.TabBar = new (class TabBar {
 	constructor() {
 		this.buttons = new ReactiveVar({});
diff --git a/packages/rocketchat-lib/client/lib/cachedCollection.js b/packages/rocketchat-lib/client/lib/cachedCollection.js
index 7fed8068d2b..08ed0c357dd 100644
--- a/packages/rocketchat-lib/client/lib/cachedCollection.js
+++ b/packages/rocketchat-lib/client/lib/cachedCollection.js
@@ -1,4 +1,5 @@
 import localforage from 'localforage';
+import _ from 'underscore';
 
 class CachedCollectionManager {
 	constructor() {
diff --git a/packages/rocketchat-lib/client/lib/openRoom.js b/packages/rocketchat-lib/client/lib/openRoom.js
index c39c744f681..3ca566a57cc 100644
--- a/packages/rocketchat-lib/client/lib/openRoom.js
+++ b/packages/rocketchat-lib/client/lib/openRoom.js
@@ -1,4 +1,6 @@
 /* globals fireGlobalEvent readMessage currentTracker*/
+import _ from 'underscore';
+
 currentTracker = undefined;
 
 function openRoom(type, name) {
diff --git a/packages/rocketchat-lib/client/lib/roomTypes.js b/packages/rocketchat-lib/client/lib/roomTypes.js
index b03ba4c964d..82f78beb559 100644
--- a/packages/rocketchat-lib/client/lib/roomTypes.js
+++ b/packages/rocketchat-lib/client/lib/roomTypes.js
@@ -1,4 +1,6 @@
+import _ from 'underscore';
 import roomTypesCommon from '../../lib/roomTypesCommon';
+
 RocketChat.roomTypes = new class extends roomTypesCommon {
 	checkCondition(roomType) {
 		return roomType.condition == null || roomType.condition();
diff --git a/packages/rocketchat-lib/client/methods/sendMessage.js b/packages/rocketchat-lib/client/methods/sendMessage.js
index 85cce415c2a..5138c696f9c 100644
--- a/packages/rocketchat-lib/client/methods/sendMessage.js
+++ b/packages/rocketchat-lib/client/methods/sendMessage.js
@@ -1,6 +1,8 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	sendMessage(message) {
-		if (!Meteor.userId() || _.trim(message.msg) === '') {
+		if (!Meteor.userId() || s.trim(message.msg) === '') {
 			return false;
 		}
 		const user = Meteor.user();
diff --git a/packages/rocketchat-lib/lib/Message.js b/packages/rocketchat-lib/lib/Message.js
index 1eefff6ccba..23ee2128e6c 100644
--- a/packages/rocketchat-lib/lib/Message.js
+++ b/packages/rocketchat-lib/lib/Message.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.Message = {
 	parse(msg, language) {
 		const messageType = RocketChat.MessageTypes.getType(msg);
@@ -20,8 +22,8 @@ RocketChat.Message = {
 			return msg.html;
 		}
 		msg.html = msg.msg;
-		if (_.trim(msg.html) !== '') {
-			msg.html = _.escapeHTML(msg.html);
+		if (s.trim(msg.html) !== '') {
+			msg.html = s.escapeHTML(msg.html);
 		}
 		msg.html = msg.html.replace(/\n/gm, '<br/>');
 		return msg.html;
diff --git a/packages/rocketchat-lib/lib/callbacks.js b/packages/rocketchat-lib/lib/callbacks.js
index 86f56a2eea8..f4f8e70865a 100644
--- a/packages/rocketchat-lib/lib/callbacks.js
+++ b/packages/rocketchat-lib/lib/callbacks.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 /*
 * Callback hooks provide an easy way to add extra steps to common operations.
 * @namespace RocketChat.callbacks
diff --git a/packages/rocketchat-lib/lib/fileUploadRestrictions.js b/packages/rocketchat-lib/lib/fileUploadRestrictions.js
index 41290c9a729..763d11ca691 100644
--- a/packages/rocketchat-lib/lib/fileUploadRestrictions.js
+++ b/packages/rocketchat-lib/lib/fileUploadRestrictions.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.fileUploadMediaWhiteList = function() {
 	const mediaTypeWhiteList = RocketChat.settings.get('FileUpload_MediaTypeWhiteList');
 
diff --git a/packages/rocketchat-lib/lib/getURL.js b/packages/rocketchat-lib/lib/getURL.js
index c70735b079e..6802a153b71 100644
--- a/packages/rocketchat-lib/lib/getURL.js
+++ b/packages/rocketchat-lib/lib/getURL.js
@@ -1,10 +1,12 @@
+import s from 'underscore.string';
+
 RocketChat.getURL = (path, { cdn = true, full = false } = {}) => {
-	const cdnPrefix = _.rtrim(_.trim(RocketChat.settings.get('CDN_PREFIX') || ''), '/');
-	const pathPrefix = _.rtrim(_.trim(__meteor_runtime_config__.ROOT_URL_PATH_PREFIX || ''), '/');
+	const cdnPrefix = s.rtrim(s.trim(RocketChat.settings.get('CDN_PREFIX') || ''), '/');
+	const pathPrefix = s.rtrim(s.trim(__meteor_runtime_config__.ROOT_URL_PATH_PREFIX || ''), '/');
 
 	let basePath;
 
-	const finalPath = _.ltrim(_.trim(path), '/');
+	const finalPath = s.ltrim(s.trim(path), '/');
 
 	if (cdn && cdnPrefix !== '') {
 		basePath = cdnPrefix + pathPrefix;
diff --git a/packages/rocketchat-lib/lib/getValidRoomName.js b/packages/rocketchat-lib/lib/getValidRoomName.js
index 149c0114089..eb85ab9bc66 100644
--- a/packages/rocketchat-lib/lib/getValidRoomName.js
+++ b/packages/rocketchat-lib/lib/getValidRoomName.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.getValidRoomName = function getValidRoomName(displayName, rid = '') {
 	let slugifiedName = displayName;
 
diff --git a/packages/rocketchat-lib/lib/placeholders.js b/packages/rocketchat-lib/lib/placeholders.js
index 3eb82aa6f03..8c3907b567f 100644
--- a/packages/rocketchat-lib/lib/placeholders.js
+++ b/packages/rocketchat-lib/lib/placeholders.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.placeholders = {};
 
 RocketChat.placeholders.replace = function(str, data) {
@@ -10,8 +12,8 @@ RocketChat.placeholders.replace = function(str, data) {
 
 	if (data) {
 		str = str.replace(/\[name\]/g, data.name || '');
-		str = str.replace(/\[fname\]/g, _.strLeft(data.name, ' ') || '');
-		str = str.replace(/\[lname\]/g, _.strRightBack(data.name, ' ') || '');
+		str = str.replace(/\[fname\]/g, s.strLeft(data.name, ' ') || '');
+		str = str.replace(/\[lname\]/g, s.strRightBack(data.name, ' ') || '');
 		str = str.replace(/\[email\]/g, data.email || '');
 		str = str.replace(/\[password\]/g, data.password || '');
 		str = str.replace(/\[User\]/g, data.user || '');
diff --git a/packages/rocketchat-lib/lib/promises.js b/packages/rocketchat-lib/lib/promises.js
index 1e040f172bc..6a52e562ae9 100644
--- a/packages/rocketchat-lib/lib/promises.js
+++ b/packages/rocketchat-lib/lib/promises.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 
 /*
 * Callback hooks provide an easy way to add extra steps to common operations.
diff --git a/packages/rocketchat-lib/lib/settings.js b/packages/rocketchat-lib/lib/settings.js
index ecdd2c87c4b..407aa3b26c1 100644
--- a/packages/rocketchat-lib/lib/settings.js
+++ b/packages/rocketchat-lib/lib/settings.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 
 /*
 * RocketChat.settings holds all packages settings
diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index f0e2fb5b6a7..15ada28e8ea 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -27,10 +27,8 @@ Package.onUse(function(api) {
 	api.use('check');
 	api.use('tracker');
 	api.use('ddp-rate-limiter');
-	api.use('underscore');
 	api.use('mongo');
 	api.use('oauth');
-	api.use('underscorestring:underscore.string@3.3.4');
 	api.use('matb33:collection-hooks');
 	api.use('service-configuration');
 	api.use('check');
diff --git a/packages/rocketchat-lib/server/functions/checkEmailAvailability.js b/packages/rocketchat-lib/server/functions/checkEmailAvailability.js
index e5dee1791ba..b60d92741b2 100644
--- a/packages/rocketchat-lib/server/functions/checkEmailAvailability.js
+++ b/packages/rocketchat-lib/server/functions/checkEmailAvailability.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.checkEmailAvailability = function(email) {
 	return !Meteor.users.findOne({ 'emails.address': { $regex : new RegExp(`^${ s.trim(s.escapeRegExp(email)) }$`, 'i') } });
 };
diff --git a/packages/rocketchat-lib/server/functions/checkUsernameAvailability.js b/packages/rocketchat-lib/server/functions/checkUsernameAvailability.js
index 01e8f8c1b10..b29ddde8c31 100644
--- a/packages/rocketchat-lib/server/functions/checkUsernameAvailability.js
+++ b/packages/rocketchat-lib/server/functions/checkUsernameAvailability.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 RocketChat.checkUsernameAvailability = function(username) {
 	return RocketChat.settings.get('Accounts_BlockedUsernameList', function(key, value) {
 		const usernameBlackList = _.map(value.split(','), function(username) {
diff --git a/packages/rocketchat-lib/server/functions/createRoom.js b/packages/rocketchat-lib/server/functions/createRoom.js
index 5c9a176c66a..386680e6b79 100644
--- a/packages/rocketchat-lib/server/functions/createRoom.js
+++ b/packages/rocketchat-lib/server/functions/createRoom.js
@@ -1,4 +1,7 @@
 /* globals RocketChat */
+import _ from 'underscore';
+import s from 'underscore.string';
+
 RocketChat.createRoom = function(type, name, owner, members, readOnly, extraData={}) {
 	name = s.trim(name);
 	owner = s.trim(owner);
diff --git a/packages/rocketchat-lib/server/functions/getFullUserData.js b/packages/rocketchat-lib/server/functions/getFullUserData.js
index 0b5290b3b3e..7bc9c9893fb 100644
--- a/packages/rocketchat-lib/server/functions/getFullUserData.js
+++ b/packages/rocketchat-lib/server/functions/getFullUserData.js
@@ -1,4 +1,7 @@
 /* globals RocketChat */
+import _ from 'underscore';
+import s from 'underscore.string';
+
 RocketChat.getFullUserData = function({userId, filter, limit}) {
 	let fields = {
 		name: 1,
diff --git a/packages/rocketchat-lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js b/packages/rocketchat-lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js
index 10b8999e07a..17aa5c6d7da 100644
--- a/packages/rocketchat-lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js
+++ b/packages/rocketchat-lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js
@@ -1,4 +1,6 @@
 /* globals RocketChat */
+import _ from 'underscore';
+
 RocketChat.getRoomByNameOrIdWithOptionToJoin = function _getRoomByNameOrIdWithOptionToJoin({ currentUserId, nameOrId, type='', tryDirectByUserIdOnly=false, joinChannel=true, errorOnEmpty=true }) {
 	let room;
 
diff --git a/packages/rocketchat-lib/server/functions/saveCustomFields.js b/packages/rocketchat-lib/server/functions/saveCustomFields.js
index 8088ed49d6a..7336a6056c5 100644
--- a/packages/rocketchat-lib/server/functions/saveCustomFields.js
+++ b/packages/rocketchat-lib/server/functions/saveCustomFields.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.saveCustomFields = function(userId, formData) {
 	if (s.trim(RocketChat.settings.get('Accounts_CustomFields')) !== '') {
 		RocketChat.validateCustomFields(formData);
diff --git a/packages/rocketchat-lib/server/functions/saveCustomFieldsWithoutValidation.js b/packages/rocketchat-lib/server/functions/saveCustomFieldsWithoutValidation.js
index c67904b24c1..d0f6ec896d1 100644
--- a/packages/rocketchat-lib/server/functions/saveCustomFieldsWithoutValidation.js
+++ b/packages/rocketchat-lib/server/functions/saveCustomFieldsWithoutValidation.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.saveCustomFieldsWithoutValidation = function(userId, formData) {
 	if (s.trim(RocketChat.settings.get('Accounts_CustomFields')) !== '') {
 		let customFieldsMeta;
diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js
index fade4261aaf..15f9d70ba7d 100644
--- a/packages/rocketchat-lib/server/functions/saveUser.js
+++ b/packages/rocketchat-lib/server/functions/saveUser.js
@@ -1,4 +1,7 @@
 /* globals Gravatar */
+import _ from 'underscore';
+import s from 'underscore.string';
+
 RocketChat.saveUser = function(userId, userData) {
 	const user = RocketChat.models.Users.findOneById(userId);
 	const existingRoles = _.pluck(RocketChat.authz.getRoles(), '_id');
diff --git a/packages/rocketchat-lib/server/functions/sendMessage.js b/packages/rocketchat-lib/server/functions/sendMessage.js
index 11bbba806a8..46b44edd90c 100644
--- a/packages/rocketchat-lib/server/functions/sendMessage.js
+++ b/packages/rocketchat-lib/server/functions/sendMessage.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.sendMessage = function(user, message, room, upsert = false) {
 	if (!user || !message || !room._id) {
 		return false;
diff --git a/packages/rocketchat-lib/server/functions/setEmail.js b/packages/rocketchat-lib/server/functions/setEmail.js
index e30f5942579..b63f39cb832 100644
--- a/packages/rocketchat-lib/server/functions/setEmail.js
+++ b/packages/rocketchat-lib/server/functions/setEmail.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat._setEmail = function(userId, email) {
 	email = s.trim(email);
 	if (!userId) {
diff --git a/packages/rocketchat-lib/server/functions/setRealName.js b/packages/rocketchat-lib/server/functions/setRealName.js
index 359287b9b49..da7be9783ca 100644
--- a/packages/rocketchat-lib/server/functions/setRealName.js
+++ b/packages/rocketchat-lib/server/functions/setRealName.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat._setRealName = function(userId, name) {
 	name = s.trim(name);
 	if (!userId || !name) {
diff --git a/packages/rocketchat-lib/server/functions/setUsername.js b/packages/rocketchat-lib/server/functions/setUsername.js
index 20eeabdccf0..96b57d1a7c8 100644
--- a/packages/rocketchat-lib/server/functions/setUsername.js
+++ b/packages/rocketchat-lib/server/functions/setUsername.js
@@ -1,3 +1,4 @@
+import s from 'underscore.string';
 
 RocketChat._setUsername = function(userId, u) {
 	const username = s.trim(u);
diff --git a/packages/rocketchat-lib/server/functions/settings.js b/packages/rocketchat-lib/server/functions/settings.js
index a9049f14ba0..cef8a2d960e 100644
--- a/packages/rocketchat-lib/server/functions/settings.js
+++ b/packages/rocketchat-lib/server/functions/settings.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const blockedSettings = {};
 
 if (process.env.SETTINGS_BLOCKED) {
diff --git a/packages/rocketchat-lib/server/functions/validateCustomFields.js b/packages/rocketchat-lib/server/functions/validateCustomFields.js
index 83e60415fb0..2994ad9ed0b 100644
--- a/packages/rocketchat-lib/server/functions/validateCustomFields.js
+++ b/packages/rocketchat-lib/server/functions/validateCustomFields.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.validateCustomFields = function(fields) {
 	// Special Case:
 	// If an admin didn't set any custom fields there's nothing to validate against so consider any customFields valid
diff --git a/packages/rocketchat-lib/server/lib/RateLimiter.js b/packages/rocketchat-lib/server/lib/RateLimiter.js
index aa0554c8d56..c812ad3d67f 100644
--- a/packages/rocketchat-lib/server/lib/RateLimiter.js
+++ b/packages/rocketchat-lib/server/lib/RateLimiter.js
@@ -1,4 +1,6 @@
 /* globals RateLimiter */
+import _ from 'underscore';
+
 RocketChat.RateLimiter = new class {
 	limitFunction(fn, numRequests, timeInterval, matchers) {
 		if (process.env.TEST_MODE === 'true') {
diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js
index b254b748fd7..1a000e44b17 100644
--- a/packages/rocketchat-lib/server/lib/debug.js
+++ b/packages/rocketchat-lib/server/lib/debug.js
@@ -1,4 +1,6 @@
 /* global InstanceStatus */
+import _ from 'underscore';
+
 const logger = new Logger('Meteor', {
 	methods: {
 		method: {
diff --git a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js b/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
index efe67344d3c..98074e754f5 100644
--- a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+import s from 'underscore.string';
 import moment from 'moment';
 
 RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
index 2f507d071fc..3dae5ee20ce 100644
--- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
@@ -1,4 +1,5 @@
 import moment from 'moment';
+import s from 'underscore.string';
 
 RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	// skips this callback if the message was edited
diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index ddda8b880de..2543f2fb7e1 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -1,4 +1,6 @@
 /* globals Push */
+import _ from 'underscore';
+import s from 'underscore.string';
 import moment from 'moment';
 
 /**
diff --git a/packages/rocketchat-lib/server/lib/validateEmailDomain.js b/packages/rocketchat-lib/server/lib/validateEmailDomain.js
index 54d06f24be6..7771055b3bd 100644
--- a/packages/rocketchat-lib/server/lib/validateEmailDomain.js
+++ b/packages/rocketchat-lib/server/lib/validateEmailDomain.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 const dns = Npm.require('dns');
 
 let emailDomainBlackList = [];
diff --git a/packages/rocketchat-lib/server/methods/addOAuthService.js b/packages/rocketchat-lib/server/methods/addOAuthService.js
index f2c450dab79..bf858ad46ea 100644
--- a/packages/rocketchat-lib/server/methods/addOAuthService.js
+++ b/packages/rocketchat-lib/server/methods/addOAuthService.js
@@ -1,5 +1,6 @@
 /* eslint no-multi-spaces: 0 */
 /* eslint comma-spacing: 0 */
+import s from 'underscore.string';
 
 Meteor.methods({
 	addOAuthService(name) {
diff --git a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js b/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js
index 5d75a8bdc3e..33d0343b089 100644
--- a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js
+++ b/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	deleteUserOwnAccount(password) {
 
diff --git a/packages/rocketchat-lib/server/methods/filterATAllTag.js b/packages/rocketchat-lib/server/methods/filterATAllTag.js
index 7dac2b3e4ce..f0469ee81a1 100644
--- a/packages/rocketchat-lib/server/methods/filterATAllTag.js
+++ b/packages/rocketchat-lib/server/methods/filterATAllTag.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.callbacks.add('beforeSaveMessage', function(message) {
 	// Test if the message mentions include @all.
 	if (message.mentions != null &&
diff --git a/packages/rocketchat-lib/server/methods/getChannelHistory.js b/packages/rocketchat-lib/server/methods/getChannelHistory.js
index 280221e40e1..b3583cb253e 100644
--- a/packages/rocketchat-lib/server/methods/getChannelHistory.js
+++ b/packages/rocketchat-lib/server/methods/getChannelHistory.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	getChannelHistory({rid, latest, oldest, inclusive, count = 20, unreads}) {
 		check(rid, String);
diff --git a/packages/rocketchat-lib/server/methods/getRoomRoles.js b/packages/rocketchat-lib/server/methods/getRoomRoles.js
index 36d6e39f7f5..4ea535ea62c 100644
--- a/packages/rocketchat-lib/server/methods/getRoomRoles.js
+++ b/packages/rocketchat-lib/server/methods/getRoomRoles.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	getRoomRoles(rid) {
 		check(rid, String);
diff --git a/packages/rocketchat-lib/server/methods/getUserRoles.js b/packages/rocketchat-lib/server/methods/getUserRoles.js
index 75555693c6b..db6d6a0d936 100644
--- a/packages/rocketchat-lib/server/methods/getUserRoles.js
+++ b/packages/rocketchat-lib/server/methods/getUserRoles.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	getUserRoles() {
 
diff --git a/packages/rocketchat-lib/server/methods/removeOAuthService.js b/packages/rocketchat-lib/server/methods/removeOAuthService.js
index 10830261850..f2af0b46350 100644
--- a/packages/rocketchat-lib/server/methods/removeOAuthService.js
+++ b/packages/rocketchat-lib/server/methods/removeOAuthService.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	removeOAuthService(name) {
 
diff --git a/packages/rocketchat-lib/server/methods/robotMethods.js b/packages/rocketchat-lib/server/methods/robotMethods.js
index e14fbd287b0..cb81c24d04a 100644
--- a/packages/rocketchat-lib/server/methods/robotMethods.js
+++ b/packages/rocketchat-lib/server/methods/robotMethods.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	'robot.modelCall'(model, method, args) {
 		check(model, String);
diff --git a/packages/rocketchat-lib/server/methods/sendInvitationEmail.js b/packages/rocketchat-lib/server/methods/sendInvitationEmail.js
index bbde68a48f8..72b7a8fddde 100644
--- a/packages/rocketchat-lib/server/methods/sendInvitationEmail.js
+++ b/packages/rocketchat-lib/server/methods/sendInvitationEmail.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 
 Meteor.methods({
 	sendInvitationEmail(emails) {
diff --git a/packages/rocketchat-lib/server/methods/setUsername.js b/packages/rocketchat-lib/server/methods/setUsername.js
index 041dc6e4276..4fad4ac2b16 100644
--- a/packages/rocketchat-lib/server/methods/setUsername.js
+++ b/packages/rocketchat-lib/server/methods/setUsername.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	setUsername(username, param = {}) {
 		const { joinDefaultChannelsSilenced } = param;
diff --git a/packages/rocketchat-lib/server/models/Avatars.js b/packages/rocketchat-lib/server/models/Avatars.js
index 76d88df19f1..0b82ed59771 100644
--- a/packages/rocketchat-lib/server/models/Avatars.js
+++ b/packages/rocketchat-lib/server/models/Avatars.js
@@ -1,4 +1,6 @@
 /* globals InstanceStatus */
+import _ from 'underscore';
+import s from 'underscore.string';
 
 RocketChat.models.Avatars = new class extends RocketChat.models._Base {
 	constructor() {
diff --git a/packages/rocketchat-lib/server/models/Messages.js b/packages/rocketchat-lib/server/models/Messages.js
index 7b07df2219a..db6036bb07d 100644
--- a/packages/rocketchat-lib/server/models/Messages.js
+++ b/packages/rocketchat-lib/server/models/Messages.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.models.Messages = new class extends RocketChat.models._Base {
 	constructor() {
 		super('message');
diff --git a/packages/rocketchat-lib/server/models/Reports.js b/packages/rocketchat-lib/server/models/Reports.js
index ee4947fbc89..366670f29db 100644
--- a/packages/rocketchat-lib/server/models/Reports.js
+++ b/packages/rocketchat-lib/server/models/Reports.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.models.Reports = new class extends RocketChat.models._Base {
 	constructor() {
 		super('reports');
diff --git a/packages/rocketchat-lib/server/models/Rooms.js b/packages/rocketchat-lib/server/models/Rooms.js
index 6b1f9f7e21f..7e4d22d8ed9 100644
--- a/packages/rocketchat-lib/server/models/Rooms.js
+++ b/packages/rocketchat-lib/server/models/Rooms.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 class ModelRooms extends RocketChat.models._Base {
 	constructor() {
 		super(...arguments);
diff --git a/packages/rocketchat-lib/server/models/Subscriptions.js b/packages/rocketchat-lib/server/models/Subscriptions.js
index e741e532260..4c59e26add7 100644
--- a/packages/rocketchat-lib/server/models/Subscriptions.js
+++ b/packages/rocketchat-lib/server/models/Subscriptions.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 class ModelSubscriptions extends RocketChat.models._Base {
 	constructor() {
 		super(...arguments);
diff --git a/packages/rocketchat-lib/server/models/Uploads.js b/packages/rocketchat-lib/server/models/Uploads.js
index 34d1dc6b9ea..49693c06b39 100644
--- a/packages/rocketchat-lib/server/models/Uploads.js
+++ b/packages/rocketchat-lib/server/models/Uploads.js
@@ -1,4 +1,6 @@
 /* globals InstanceStatus */
+import _ from 'underscore';
+import s from 'underscore.string';
 
 RocketChat.models.Uploads = new class extends RocketChat.models._Base {
 	constructor() {
diff --git a/packages/rocketchat-lib/server/models/Users.js b/packages/rocketchat-lib/server/models/Users.js
index 05081e440c9..c7c9f941cfe 100644
--- a/packages/rocketchat-lib/server/models/Users.js
+++ b/packages/rocketchat-lib/server/models/Users.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 class ModelUsers extends RocketChat.models._Base {
 	constructor() {
 		super(...arguments);
diff --git a/packages/rocketchat-lib/server/models/_BaseCache.js b/packages/rocketchat-lib/server/models/_BaseCache.js
index ea7f6e77abc..1e01cabb866 100644
--- a/packages/rocketchat-lib/server/models/_BaseCache.js
+++ b/packages/rocketchat-lib/server/models/_BaseCache.js
@@ -1,5 +1,5 @@
 /* eslint new-cap: 0 */
-
+import _ from 'underscore';
 import loki from 'lokijs';
 import {EventEmitter} from 'events';
 import objectPath from 'object-path';
diff --git a/packages/rocketchat-lib/server/models/_BaseDb.js b/packages/rocketchat-lib/server/models/_BaseDb.js
index 9e9db35504d..9597c010b33 100644
--- a/packages/rocketchat-lib/server/models/_BaseDb.js
+++ b/packages/rocketchat-lib/server/models/_BaseDb.js
@@ -1,4 +1,5 @@
 /* globals MongoInternals */
+import _ from 'underscore';
 
 const baseName = 'rocketchat_';
 import {EventEmitter} from 'events';
diff --git a/packages/rocketchat-lib/server/oauth/google.js b/packages/rocketchat-lib/server/oauth/google.js
index 37e4222e3f7..03cd045920f 100644
--- a/packages/rocketchat-lib/server/oauth/google.js
+++ b/packages/rocketchat-lib/server/oauth/google.js
@@ -1,4 +1,5 @@
 /* globals Google */
+import _ from 'underscore';
 
 function getIdentity(accessToken) {
 	try {
diff --git a/packages/rocketchat-lib/server/oauth/oauth.js b/packages/rocketchat-lib/server/oauth/oauth.js
index 2c7655fa879..cf6375136b0 100644
--- a/packages/rocketchat-lib/server/oauth/oauth.js
+++ b/packages/rocketchat-lib/server/oauth/oauth.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const AccessTokenServices = {};
 
 RocketChat.registerAccessTokenService = function(serviceName, handleAccessTokenRequest) {
diff --git a/packages/rocketchat-lib/server/oauth/proxy.js b/packages/rocketchat-lib/server/oauth/proxy.js
index 593eac4611a..8886aabba8a 100644
--- a/packages/rocketchat-lib/server/oauth/proxy.js
+++ b/packages/rocketchat-lib/server/oauth/proxy.js
@@ -1,4 +1,5 @@
 /* globals OAuth */
+import _ from 'underscore';
 
 OAuth._redirectUri = _.wrap(OAuth._redirectUri, function(func, serviceName, ...args) {
 	const proxy = RocketChat.settings.get('Accounts_OAuth_Proxy_services').replace(/\s/g, '').split(',');
diff --git a/packages/rocketchat-lib/server/publications/settings.js b/packages/rocketchat-lib/server/publications/settings.js
index cbc39fb4b8f..5707468422b 100644
--- a/packages/rocketchat-lib/server/publications/settings.js
+++ b/packages/rocketchat-lib/server/publications/settings.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	'public-settings/get'(updatedAt) {
 		this.unblock();
diff --git a/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js b/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
index 370a2c23945..1b70453ee32 100644
--- a/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
+++ b/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
@@ -1,4 +1,6 @@
 /* globals CustomOAuth */
+import _ from 'underscore';
+
 const logger = new Logger('rocketchat:lib', {
 	methods: {
 		oauth_updated: {
diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.js b/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.js
index bcd1942af36..514438f16e2 100644
--- a/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.js
+++ b/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.js
@@ -1,4 +1,6 @@
 /* globals WebAppInternals*/
+import _ from 'underscore';
+
 function testWebAppInternals(fn) {
 	typeof WebAppInternals !== 'undefined' && fn(WebAppInternals);
 }
diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadDirectReply.js b/packages/rocketchat-lib/server/startup/settingsOnLoadDirectReply.js
index 7d9594e101f..b172e520a93 100644
--- a/packages/rocketchat-lib/server/startup/settingsOnLoadDirectReply.js
+++ b/packages/rocketchat-lib/server/startup/settingsOnLoadDirectReply.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import { IMAPIntercepter } from '../lib/interceptDirectReplyEmails.js';
 import { POP3Helper } from '../lib/interceptDirectReplyEmails.js';
 
diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js b/packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js
index 70b8d4f7d25..d70d684a876 100644
--- a/packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js
+++ b/packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const buildMailURL = _.debounce(function() {
 	console.log('Updating process.env.MAIL_URL');
 
diff --git a/packages/rocketchat-livechat/app/.meteor/packages b/packages/rocketchat-livechat/app/.meteor/packages
index b0e4e967d69..312eb359bf8 100644
--- a/packages/rocketchat-livechat/app/.meteor/packages
+++ b/packages/rocketchat-livechat/app/.meteor/packages
@@ -4,39 +4,37 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor@1.7.2
-webapp@1.3.19
-logging@1.1.17
+meteor@1.8.0
+webapp@1.4.0
+logging@1.1.19
 tracker@1.1.3
 deps@1.0.12
 session@1.1.7
-ddp@1.3.1
+ddp@1.4.0
 livedata@1.0.18
-mongo@1.2.2
+mongo@1.3.0
 blaze
 ui
 spacebars
 templating
 check@1.2.5
-underscore@1.0.10
 jquery@1.11.10
 random@1.0.10
-ejson@1.0.14
+ejson@1.1.0
 rocketchat:streamer
 kadira:flow-router
 kadira:blaze-layout
 konecty:nrr
-less@2.7.9
-underscorestring:underscore.string
+less@2.7.11
 momentjs:moment
 mizzao:timesync
 reactive-var@1.0.11
-accounts-password@1.4.0
+accounts-password@1.5.0
 tap:i18n
 smoral:sweetalert
-ecmascript@0.8.3
+ecmascript@0.9.0
 es5-shim@4.6.15
 standard-minifier-css@1.3.5
-standard-minifier-js@2.1.2
-shell-server@0.2.4
-dynamic-import@0.1.3
+standard-minifier-js@2.2.0
+shell-server@0.3.0
+dynamic-import@0.2.0
diff --git a/packages/rocketchat-livechat/app/.meteor/release b/packages/rocketchat-livechat/app/.meteor/release
index 099d5b9c0e8..0fa8d22ddad 100644
--- a/packages/rocketchat-livechat/app/.meteor/release
+++ b/packages/rocketchat-livechat/app/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2.2
+METEOR@1.6
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index 78322274acf..7411b8c654d 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -1,71 +1,71 @@
-accounts-base@1.3.4
-accounts-password@1.4.0
+accounts-base@1.4.0
+accounts-password@1.5.0
 aldeed:simple-schema@1.5.3
-allow-deny@1.0.9
-babel-compiler@6.20.0
-babel-runtime@1.0.1
+allow-deny@1.1.0
+babel-compiler@6.24.7
+babel-runtime@1.1.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-tools@1.0.10
-boilerplate-generator@1.2.0
+boilerplate-generator@1.3.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
 cfs:http-methods@0.0.32
 check@1.2.5
-coffeescript@1.12.7_1
-coffeescript-compiler@1.12.7_1
-ddp@1.3.1
-ddp-client@2.1.3
-ddp-common@1.2.9
+coffeescript@1.12.7_3
+coffeescript-compiler@1.12.7_3
+ddp@1.4.0
+ddp-client@2.2.0
+ddp-common@1.3.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.2
+ddp-server@2.1.0
 deps@1.0.12
 diff-sequence@1.0.7
-dynamic-import@0.1.3
-ecmascript@0.8.3
-ecmascript-runtime@0.4.1
-ecmascript-runtime-client@0.4.3
-ecmascript-runtime-server@0.4.1
-ejson@1.0.14
+dynamic-import@0.2.0
+ecmascript@0.9.0
+ecmascript-runtime@0.5.0
+ecmascript-runtime-client@0.5.0
+ecmascript-runtime-server@0.5.0
+ejson@1.1.0
 email@1.2.3
 es5-shim@4.6.15
 geojson-utils@1.0.10
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.2.12
+http@1.3.0
 id-map@1.0.9
 jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.12.1
 konecty:nrr@2.0.2
-less@2.7.9
+less@2.7.11
 livedata@1.0.18
-localstorage@1.1.1
-logging@1.1.17
+localstorage@1.2.0
+logging@1.1.19
 mdg:validation-error@0.5.1
-meteor@1.7.2
+meteor@1.8.0
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.4
-minimongo@1.3.2
+minifier-js@2.2.0
+minimongo@1.4.0
 mizzao:timesync@0.5.0
-modules@0.10.0
-modules-runtime@0.8.0
-momentjs:moment@2.18.1
-mongo@1.2.2
-mongo-dev-server@1.0.1
+modules@0.11.0
+modules-runtime@0.9.0
+momentjs:moment@2.19.1
+mongo@1.3.0
+mongo-dev-server@1.1.0
 mongo-id@1.0.6
 npm-bcrypt@0.9.3
-npm-mongo@2.2.30
+npm-mongo@2.2.33
 observe-sequence@1.0.16
 ordered-dict@1.0.9
-promise@0.9.0
+promise@0.10.0
 raix:eventemitter@0.1.3
 random@1.0.10
 rate-limit@1.0.8
-reactive-dict@1.1.9
+reactive-dict@1.2.0
 reactive-var@1.0.11
 retry@1.0.9
 rocketchat:streamer@0.5.0
@@ -73,13 +73,13 @@ routepolicy@1.0.12
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
-shell-server@0.2.4
+shell-server@0.3.0
 smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
 standard-minifier-css@1.3.5
-standard-minifier-js@2.1.2
+standard-minifier-js@2.2.0
 tap:i18n@1.8.2
 templating@1.3.2
 templating-compiler@1.3.3
@@ -88,7 +88,6 @@ templating-tools@1.1.2
 tracker@1.1.3
 ui@1.0.13
 underscore@1.0.10
-underscorestring:underscore.string@3.3.4
 url@1.1.0
-webapp@1.3.19
+webapp@1.4.0
 webapp-hashing@1.0.9
diff --git a/packages/rocketchat-livechat/app/client/lib/chatMessages.js b/packages/rocketchat-livechat/app/client/lib/chatMessages.js
index 26e151e64b4..cb41d52ef9e 100644
--- a/packages/rocketchat-livechat/app/client/lib/chatMessages.js
+++ b/packages/rocketchat-livechat/app/client/lib/chatMessages.js
@@ -1,4 +1,6 @@
 /* globals MsgTyping, showError, Livechat */
+import _ from 'underscore';
+import s from 'underscore.string';
 import toastr from 'toastr';
 
 this.ChatMessages = class ChatMessages {
diff --git a/packages/rocketchat-livechat/app/client/lib/fromApp/RoomHistoryManager.js b/packages/rocketchat-livechat/app/client/lib/fromApp/RoomHistoryManager.js
index fbbb46c912b..c53a671576d 100644
--- a/packages/rocketchat-livechat/app/client/lib/fromApp/RoomHistoryManager.js
+++ b/packages/rocketchat-livechat/app/client/lib/fromApp/RoomHistoryManager.js
@@ -1,4 +1,6 @@
 /* globals readMessage UserRoles RoomRoles*/
+import _ from 'underscore';
+
 export const RoomHistoryManager = new class {
 	constructor() {
 		this.defaultLimit = 50;
diff --git a/packages/rocketchat-livechat/app/client/lib/msgTyping.js b/packages/rocketchat-livechat/app/client/lib/msgTyping.js
index 1d387f744e0..aa00b0ad5fe 100644
--- a/packages/rocketchat-livechat/app/client/lib/msgTyping.js
+++ b/packages/rocketchat-livechat/app/client/lib/msgTyping.js
@@ -1,4 +1,6 @@
 /* globals Notifications */
+import _ from 'underscore';
+
 export const MsgTyping = (function() {
 	const timeout = 15000;
 	const timeouts = {};
diff --git a/packages/rocketchat-livechat/app/client/lib/tapi18n.js b/packages/rocketchat-livechat/app/client/lib/tapi18n.js
index 8f1a41e9741..65a7357566e 100644
--- a/packages/rocketchat-livechat/app/client/lib/tapi18n.js
+++ b/packages/rocketchat-livechat/app/client/lib/tapi18n.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 this.t = function(key, ...replaces) {
 	if (_.isObject(replaces[0])) {
 		return TAPi18n.__(key, replaces);
diff --git a/packages/rocketchat-livechat/app/client/methods/sendMessageExternal.js b/packages/rocketchat-livechat/app/client/methods/sendMessageExternal.js
index 35c8844fa88..0169a7e7bb0 100644
--- a/packages/rocketchat-livechat/app/client/methods/sendMessageExternal.js
+++ b/packages/rocketchat-livechat/app/client/methods/sendMessageExternal.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	sendMessageLivechat(message) {
 		if (s.trim(message.msg) !== '') {
diff --git a/packages/rocketchat-livechat/app/client/views/message.js b/packages/rocketchat-livechat/app/client/views/message.js
index 86c64ed26e7..edf40fee5cd 100644
--- a/packages/rocketchat-livechat/app/client/views/message.js
+++ b/packages/rocketchat-livechat/app/client/views/message.js
@@ -1,5 +1,6 @@
 /* globals Livechat, t, tr, livechatAutolinker */
 import moment from 'moment';
+import s from 'underscore.string';
 
 Template.message.helpers({
 	own() {
diff --git a/packages/rocketchat-livechat/app/client/views/messages.js b/packages/rocketchat-livechat/app/client/views/messages.js
index 9c0fe36b43e..4b7820e35ce 100644
--- a/packages/rocketchat-livechat/app/client/views/messages.js
+++ b/packages/rocketchat-livechat/app/client/views/messages.js
@@ -1,4 +1,5 @@
 /* globals Livechat, LivechatVideoCall, MsgTyping */
+import _ from 'underscore';
 
 Template.messages.helpers({
 	messages() {
diff --git a/packages/rocketchat-livechat/app/client/views/offlineForm.js b/packages/rocketchat-livechat/app/client/views/offlineForm.js
index ee101a8c709..d834cf58d40 100644
--- a/packages/rocketchat-livechat/app/client/views/offlineForm.js
+++ b/packages/rocketchat-livechat/app/client/views/offlineForm.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Template.offlineForm.helpers({
 	error() {
 		return Template.instance().error.get();
diff --git a/packages/rocketchat-livechat/app/client/views/register.js b/packages/rocketchat-livechat/app/client/views/register.js
index 607d2e57c76..f62c8341311 100644
--- a/packages/rocketchat-livechat/app/client/views/register.js
+++ b/packages/rocketchat-livechat/app/client/views/register.js
@@ -1,4 +1,5 @@
 /* globals Department, Livechat, LivechatVideoCall */
+import _ from 'underscore';
 
 Template.register.helpers({
 	error() {
diff --git a/packages/rocketchat-livechat/app/package-lock.json b/packages/rocketchat-livechat/app/package-lock.json
index c760d61a356..f30977ae886 100644
--- a/packages/rocketchat-livechat/app/package-lock.json
+++ b/packages/rocketchat-livechat/app/package-lock.json
@@ -45,8 +45,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "autolinker": {
-      "version": "https://registry.npmjs.org/autolinker/-/autolinker-1.4.3.tgz",
-      "integrity": "sha1-LmFQV8jjcTmabXeUmppq8k/kbfw="
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.4.4.tgz",
+      "integrity": "sha1-hKqqm7B8eU8IVc1wQaMe7G9vqMo="
     },
     "aws-sign2": {
       "version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
@@ -423,8 +424,9 @@
       }
     },
     "moment": {
-      "version": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
+      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
     },
     "ms": {
       "version": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -613,6 +615,11 @@
         "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
       }
     },
+    "sprintf-js": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
+      "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
+    },
     "sshpk": {
       "version": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
@@ -633,13 +640,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-      "requires": {
-        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-      }
-    },
     "string-width": {
       "version": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
@@ -649,6 +649,13 @@
         "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
       }
     },
+    "string_decoder": {
+      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "requires": {
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+      }
+    },
     "stringstream": {
       "version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
       "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
@@ -714,6 +721,20 @@
       "version": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
       "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
     },
+    "underscore": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+    },
+    "underscore.string": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
+      "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
+      "requires": {
+        "sprintf-js": "1.1.1",
+        "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+      }
+    },
     "util-deprecate": {
       "version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
diff --git a/packages/rocketchat-livechat/app/package.json b/packages/rocketchat-livechat/app/package.json
index 47f55d9d029..9c8601e0a69 100644
--- a/packages/rocketchat-livechat/app/package.json
+++ b/packages/rocketchat-livechat/app/package.json
@@ -24,7 +24,9 @@
     "jquery": "^3.2.1",
     "babel-runtime": "^6.26.0",
     "bcrypt": "^1.0.3",
-    "moment": "^2.18.1",
-    "toastr": "^2.1.2"
+    "moment": "^2.19.1",
+    "toastr": "^2.1.2",
+    "underscore": "^1.8.3",
+    "underscore.string": "^3.3.4"
   }
 }
diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
index 1a5bc68f3f6..c4925cf1541 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
@@ -1,5 +1,6 @@
 /*globals jscolor*/
 /*eslint new-cap: ["error", { "newIsCapExceptions": ["jscolor"] }]*/
+import s from 'underscore.string';
 import moment from 'moment';
 import toastr from 'toastr';
 
@@ -245,7 +246,7 @@ Template.livechatAppearance.events({
 		const settings = [
 			{
 				_id: 'Livechat_title',
-				value: _.trim(instance.title.get())
+				value: s.trim(instance.title.get())
 			},
 			{
 				_id: 'Livechat_title_color',
@@ -257,19 +258,19 @@ Template.livechatAppearance.events({
 			},
 			{
 				_id: 'Livechat_offline_form_unavailable',
-				value: _.trim(instance.offlineUnavailableMessage.get())
+				value: s.trim(instance.offlineUnavailableMessage.get())
 			},
 			{
 				_id: 'Livechat_offline_message',
-				value: _.trim(instance.offlineMessage.get())
+				value: s.trim(instance.offlineMessage.get())
 			},
 			{
 				_id: 'Livechat_offline_success_message',
-				value: _.trim(instance.offlineSuccessMessage.get())
+				value: s.trim(instance.offlineSuccessMessage.get())
 			},
 			{
 				_id: 'Livechat_offline_title',
-				value: _.trim(instance.titleOffline.get())
+				value: s.trim(instance.titleOffline.get())
 			},
 			{
 				_id: 'Livechat_offline_title_color',
diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
index 2062bf6c434..2a1ae39eec4 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import moment from 'moment';
 
 const LivechatRoom = new Mongo.Collection('livechatRoom');
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
index a48be4a9a89..7022a7c9f78 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
@@ -1,4 +1,6 @@
+import _ from 'underscore';
 import toastr from 'toastr';
+
 Template.livechatDepartmentForm.helpers({
 	department() {
 		return Template.instance().department.get();
diff --git a/packages/rocketchat-livechat/client/views/app/livechatInstallation.js b/packages/rocketchat-livechat/client/views/app/livechatInstallation.js
index 4511a0bcea5..25ed32ab4cb 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatInstallation.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatInstallation.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Template.livechatInstallation.helpers({
 	script() {
 		const siteUrl = s.rtrim(RocketChat.settings.get('Site_Url'), '/');
diff --git a/packages/rocketchat-livechat/client/views/app/livechatIntegrations.js b/packages/rocketchat-livechat/client/views/app/livechatIntegrations.js
index 9e93d916fc0..0a80388c0dc 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatIntegrations.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatIntegrations.js
@@ -1,5 +1,8 @@
-import toastr from 'toastr';
 /* globals LivechatIntegration */
+import _ from 'underscore';
+import s from 'underscore.string';
+import toastr from 'toastr';
+
 Template.livechatIntegrations.helpers({
 	webhookUrl() {
 		const setting = LivechatIntegration.findOne('Livechat_webhookUrl');
diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.js b/packages/rocketchat-livechat/client/views/app/livechatUsers.js
index 554083d4dd3..18b23c53584 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatUsers.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatUsers.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import toastr from 'toastr';
 let ManagerUsers;
 
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
index 92d1a22ab44..6ec3b026712 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
+++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+import s from 'underscore.string';
 import moment from 'moment';
 import UAParser from 'ua-parser-js';
 
diff --git a/packages/rocketchat-livechat/imports/server/rest/users.js b/packages/rocketchat-livechat/imports/server/rest/users.js
index c203d9df8b8..8d874a36ec3 100644
--- a/packages/rocketchat-livechat/imports/server/rest/users.js
+++ b/packages/rocketchat-livechat/imports/server/rest/users.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.API.v1.addRoute('livechat/users/:type', { authRequired: true }, {
 	get() {
 		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
diff --git a/packages/rocketchat-livechat/livechat.js b/packages/rocketchat-livechat/livechat.js
index 1e306b55754..3815773dfdd 100644
--- a/packages/rocketchat-livechat/livechat.js
+++ b/packages/rocketchat-livechat/livechat.js
@@ -1,4 +1,5 @@
 /* globals WebApp:true */
+import _ from 'underscore';
 import url from 'url';
 
 WebApp = Package.webapp.WebApp;
diff --git a/packages/rocketchat-livechat/package.js b/packages/rocketchat-livechat/package.js
index c90187ef6f3..c7d9709900e 100644
--- a/packages/rocketchat-livechat/package.js
+++ b/packages/rocketchat-livechat/package.js
@@ -24,7 +24,6 @@ Npm.depends({
 Package.onUse(function(api) {
 	api.use(['webapp', 'autoupdate'], 'server');
 	api.use('ecmascript');
-	api.use('underscorestring:underscore.string');
 	api.use('rocketchat:lib');
 	api.use('rocketchat:authorization');
 	api.use('rocketchat:logger');
diff --git a/packages/rocketchat-livechat/permissions.js b/packages/rocketchat-livechat/permissions.js
index d7b0fdd4deb..cb38a05abf9 100644
--- a/packages/rocketchat-livechat/permissions.js
+++ b/packages/rocketchat-livechat/permissions.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.startup(() => {
 	const roles = _.pluck(RocketChat.models.Roles.find().fetch(), 'name');
 	if (roles.indexOf('livechat-agent') === -1) {
diff --git a/packages/rocketchat-livechat/server/hooks/externalMessage.js b/packages/rocketchat-livechat/server/hooks/externalMessage.js
index ad9f228399d..f1cbe11c875 100644
--- a/packages/rocketchat-livechat/server/hooks/externalMessage.js
+++ b/packages/rocketchat-livechat/server/hooks/externalMessage.js
@@ -1,4 +1,5 @@
 /* globals HTTP, SystemLogger */
+import _ from 'underscore';
 
 let knowledgeEnabled = false;
 let apiaiKey = '';
diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/packages/rocketchat-livechat/server/lib/Livechat.js
index 42a1d5c1400..9450dc57556 100644
--- a/packages/rocketchat-livechat/server/lib/Livechat.js
+++ b/packages/rocketchat-livechat/server/lib/Livechat.js
@@ -1,4 +1,6 @@
 /* globals HTTP */
+import _ from 'underscore';
+import s from 'underscore.string';
 import UAParser from 'ua-parser-js';
 
 RocketChat.Livechat = {
diff --git a/packages/rocketchat-livechat/server/lib/QueueMethods.js b/packages/rocketchat-livechat/server/lib/QueueMethods.js
index 425dc26fdde..318ce9918f7 100644
--- a/packages/rocketchat-livechat/server/lib/QueueMethods.js
+++ b/packages/rocketchat-livechat/server/lib/QueueMethods.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.QueueMethods = {
 	/* Least Amount Queuing method:
 	 *
diff --git a/packages/rocketchat-livechat/server/methods/getInitialData.js b/packages/rocketchat-livechat/server/methods/getInitialData.js
index 9054de51728..26e99aef2ff 100644
--- a/packages/rocketchat-livechat/server/methods/getInitialData.js
+++ b/packages/rocketchat-livechat/server/methods/getInitialData.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	'livechat:getInitialData'(visitorToken) {
 		const info = {
diff --git a/packages/rocketchat-livechat/server/methods/saveIntegration.js b/packages/rocketchat-livechat/server/methods/saveIntegration.js
index 4e094b5c637..f839f8adbe6 100644
--- a/packages/rocketchat-livechat/server/methods/saveIntegration.js
+++ b/packages/rocketchat-livechat/server/methods/saveIntegration.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	'livechat:saveIntegration'(values) {
 		if (!Meteor.userId() || !RocketChat.authz.hasPermission(Meteor.userId(), 'view-livechat-manager')) {
diff --git a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js b/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
index 4d04b268f05..fb296b9ba24 100644
--- a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
+++ b/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
@@ -1,4 +1,5 @@
 /* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding"]}] */
+import _ from 'underscore';
 
 Meteor.methods({
 	'livechat:saveSurveyFeedback'(visitorToken, visitorRoom, formData) {
diff --git a/packages/rocketchat-livechat/server/methods/searchAgent.js b/packages/rocketchat-livechat/server/methods/searchAgent.js
index 3a9ee5d5a7a..2df48d57705 100644
--- a/packages/rocketchat-livechat/server/methods/searchAgent.js
+++ b/packages/rocketchat-livechat/server/methods/searchAgent.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	'livechat:searchAgent'(username) {
 		if (!Meteor.userId() || !RocketChat.authz.hasPermission(Meteor.userId(), 'view-livechat-manager')) {
diff --git a/packages/rocketchat-livechat/server/models/LivechatCustomField.js b/packages/rocketchat-livechat/server/models/LivechatCustomField.js
index a9b41b10136..e84f1e96a5f 100644
--- a/packages/rocketchat-livechat/server/models/LivechatCustomField.js
+++ b/packages/rocketchat-livechat/server/models/LivechatCustomField.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 /**
  * Livechat Custom Fields model
  */
diff --git a/packages/rocketchat-livechat/server/models/LivechatDepartment.js b/packages/rocketchat-livechat/server/models/LivechatDepartment.js
index 1da6e23c1a5..3a75982f663 100644
--- a/packages/rocketchat-livechat/server/models/LivechatDepartment.js
+++ b/packages/rocketchat-livechat/server/models/LivechatDepartment.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 /**
  * Livechat Department model
  */
diff --git a/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js b/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js
index 2be64d52060..7215f516eeb 100644
--- a/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js
+++ b/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 /**
  * Livechat Department model
  */
diff --git a/packages/rocketchat-livechat/server/models/Rooms.js b/packages/rocketchat-livechat/server/models/Rooms.js
index f2275590196..7fb8e5176a6 100644
--- a/packages/rocketchat-livechat/server/models/Rooms.js
+++ b/packages/rocketchat-livechat/server/models/Rooms.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 /**
  * Gets visitor by token
  * @param {string} token - Visitor token
diff --git a/packages/rocketchat-livechat/server/models/Users.js b/packages/rocketchat-livechat/server/models/Users.js
index 75cd14114d7..d4062ae6b2d 100644
--- a/packages/rocketchat-livechat/server/models/Users.js
+++ b/packages/rocketchat-livechat/server/models/Users.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+import s from 'underscore.string';
 /**
  * Sets an user as (non)operator
  * @param {string} _id - User's _id
diff --git a/packages/rocketchat-livechat/server/publications/customFields.js b/packages/rocketchat-livechat/server/publications/customFields.js
index 60adffdeaf6..b01590fe068 100644
--- a/packages/rocketchat-livechat/server/publications/customFields.js
+++ b/packages/rocketchat-livechat/server/publications/customFields.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.publish('livechat:customFields', function(_id) {
 	if (!this.userId) {
 		return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:customFields' }));
diff --git a/packages/rocketchat-livechat/server/rest/users.js b/packages/rocketchat-livechat/server/rest/users.js
index c203d9df8b8..8d874a36ec3 100644
--- a/packages/rocketchat-livechat/server/rest/users.js
+++ b/packages/rocketchat-livechat/server/rest/users.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.API.v1.addRoute('livechat/users/:type', { authRequired: true }, {
 	get() {
 		if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
diff --git a/packages/rocketchat-logger/client/logger.js b/packages/rocketchat-logger/client/logger.js
index 2533b23828d..fa23e1727bd 100644
--- a/packages/rocketchat-logger/client/logger.js
+++ b/packages/rocketchat-logger/client/logger.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const Template = Package.templating.Template;
 
 Template.log = false;
diff --git a/packages/rocketchat-logger/client/views/viewLogs.js b/packages/rocketchat-logger/client/views/viewLogs.js
index d6664b34af7..e355adc3c90 100644
--- a/packages/rocketchat-logger/client/views/viewLogs.js
+++ b/packages/rocketchat-logger/client/views/viewLogs.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import moment from 'moment';
 // TODO: remove this globals
 /* globals ansispan stdout readMessage*/
diff --git a/packages/rocketchat-logger/package.js b/packages/rocketchat-logger/package.js
index 713e1aba1e5..10d00a207c6 100644
--- a/packages/rocketchat-logger/package.js
+++ b/packages/rocketchat-logger/package.js
@@ -7,7 +7,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use('mongo');
 	api.use('ecmascript');
-	api.use('underscore');
 	api.use('random');
 	api.use('logging');
 	api.use('nooitaf:colors');
diff --git a/packages/rocketchat-logger/server/server.js b/packages/rocketchat-logger/server/server.js
index 0b64612c4a4..5766af7e065 100644
--- a/packages/rocketchat-logger/server/server.js
+++ b/packages/rocketchat-logger/server/server.js
@@ -1,4 +1,6 @@
 /* globals EventEmitter LoggerManager SystemLogger Log*/
+import _ from 'underscore';
+import s from 'underscore.string';
 
 //TODO: change this global to import
 LoggerManager = new class extends EventEmitter { // eslint-disable-line no-undef
diff --git a/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json
index f1daeccebc3..50f2b7deb71 100644
--- a/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json
@@ -1,14 +1,10 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
-    "highlight.js": {
-      "version": "9.9.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.9.0.tgz",
-      "from": "highlight.js@9.9.0"
-    },
     "marked": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
-      "from": "marked@0.3.6"
+      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
     }
   }
 }
diff --git a/packages/rocketchat-markdown/markdown.js b/packages/rocketchat-markdown/markdown.js
index 62907774289..001b39ba57b 100644
--- a/packages/rocketchat-markdown/markdown.js
+++ b/packages/rocketchat-markdown/markdown.js
@@ -2,6 +2,7 @@
  * Markdown is a named function that will parse markdown syntax
  * @param {Object} message - The message object
  */
+import s from 'underscore.string';
 import { Meteor } from 'meteor/meteor';
 import { Blaze } from 'meteor/blaze';
 import { RocketChat } from 'meteor/rocketchat:lib';
@@ -17,7 +18,7 @@ const parsers = {
 class MarkdownClass {
 	parse(text) {
 		const message = {
-			html: _.escapeHTML(text)
+			html: s.escapeHTML(text)
 		};
 		return this.mountTokensBack(this.parseMessageNotEscaped(message)).html;
 	}
@@ -58,7 +59,7 @@ RocketChat.Markdown = Markdown;
 
 // renderMessage already did html escape
 const MarkdownMessage = (message) => {
-	if (_.trim(message != null ? message.html : undefined)) {
+	if (s.trim(message != null ? message.html : undefined)) {
 		message = Markdown.parseMessageNotEscaped(message);
 	}
 
diff --git a/packages/rocketchat-markdown/package.js b/packages/rocketchat-markdown/package.js
index 4c1c8160869..12d4a63c539 100644
--- a/packages/rocketchat-markdown/package.js
+++ b/packages/rocketchat-markdown/package.js
@@ -12,7 +12,6 @@ Npm.depends({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'templating',
 		'rocketchat:lib'
 	]);
diff --git a/packages/rocketchat-markdown/parser/marked/marked.js b/packages/rocketchat-markdown/parser/marked/marked.js
index 9480ec1cc89..13082a83b78 100644
--- a/packages/rocketchat-markdown/parser/marked/marked.js
+++ b/packages/rocketchat-markdown/parser/marked/marked.js
@@ -1,6 +1,7 @@
 import { RocketChat } from 'meteor/rocketchat:lib';
 import { Random } from 'meteor/random';
-import { _ } from 'meteor/underscore';
+import _ from 'underscore';
+import s from 'underscore.string';
 import hljs from 'highlight.js';
 import _marked from 'marked';
 
@@ -20,9 +21,9 @@ renderer.code = function(code, lang, escaped) {
 	let text = null;
 
 	if (!lang) {
-		text = `<pre><code class="code-colors hljs">${ (escaped ? code : _.escapeHTML(code, true)) }</code></pre>`;
+		text = `<pre><code class="code-colors hljs">${ (escaped ? code : s.escapeHTML(code, true)) }</code></pre>`;
 	} else {
-		text = `<pre><code class="code-colors hljs ${ escape(lang, true) }">${ (escaped ? code : _.escapeHTML(code, true)) }</code></pre>`;
+		text = `<pre><code class="code-colors hljs ${ escape(lang, true) }">${ (escaped ? code : s.escapeHTML(code, true)) }</code></pre>`;
 	}
 
 	if (_.isString(msg)) {
@@ -91,7 +92,7 @@ export const marked = (message) => {
 	if (smartLists == null) { smartLists = RocketChat.settings.get('Markdown_Marked_SmartLists'); }
 	if (smartypants == null) { smartypants = RocketChat.settings.get('Markdown_Marked_Smartypants'); }
 
-	msg.html = _marked(_.unescapeHTML(msg.html), {
+	msg.html = _marked(s.unescapeHTML(msg.html), {
 		gfm,
 		tables,
 		breaks,
diff --git a/packages/rocketchat-markdown/parser/original/code.js b/packages/rocketchat-markdown/parser/original/code.js
index 15ec3e81d7b..3f9a242a28a 100644
--- a/packages/rocketchat-markdown/parser/original/code.js
+++ b/packages/rocketchat-markdown/parser/original/code.js
@@ -3,7 +3,7 @@
  * @param {Object} message - The message object
  */
 import { Random } from 'meteor/random';
-import { _ } from 'meteor/underscore';
+import s from 'underscore.string';
 import hljs from 'highlight.js';
 
 const inlinecode = (message) => {
@@ -47,10 +47,10 @@ const codeblocks = (message) => {
 				const lang = !singleLine && Array.from(hljs.listLanguages()).includes(s.trim(codeMatch[1])) ? s.trim(codeMatch[1]) : '';
 				const code =
 					singleLine ?
-						_.unescapeHTML(codeMatch[1]) :
+						s.unescapeHTML(codeMatch[1]) :
 						lang === '' ?
-							_.unescapeHTML(codeMatch[1] + codeMatch[2]) :
-							_.unescapeHTML(codeMatch[2]);
+							s.unescapeHTML(codeMatch[1] + codeMatch[2]) :
+							s.unescapeHTML(codeMatch[2]);
 
 				const result = lang === '' ? hljs.highlightAuto((lang + code)) : hljs.highlight(lang, code);
 				const token = `=!=${ Random.id() }=!=`;
diff --git a/packages/rocketchat-markdown/parser/original/markdown.js b/packages/rocketchat-markdown/parser/original/markdown.js
index 6b64da6734d..b6ed3bc66ff 100644
--- a/packages/rocketchat-markdown/parser/original/markdown.js
+++ b/packages/rocketchat-markdown/parser/original/markdown.js
@@ -4,8 +4,8 @@
  */
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { _ } from 'meteor/underscore';
 import { RocketChat } from 'meteor/rocketchat:lib';
+import s from 'underscore.string';
 
 const parseNotEscaped = function(msg, message) {
 	if (message && message.tokens == null) {
@@ -66,19 +66,19 @@ const parseNotEscaped = function(msg, message) {
 	// Support ![alt text](http://image url)
 	msg = msg.replace(new RegExp(`!\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), (match, title, url) => {
 		const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
-		return addAsToken(`<a href="${ _.escapeHTML(url) }" title="${ _.escapeHTML(title) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer"><div class="inline-image" style="background-image: url(${ _.escapeHTML(url) });"></div></a>`);
+		return addAsToken(`<a href="${ s.escapeHTML(url) }" title="${ s.escapeHTML(title) }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer"><div class="inline-image" style="background-image: url(${ s.escapeHTML(url) });"></div></a>`);
 	});
 
 	// Support [Text](http://link)
 	msg = msg.replace(new RegExp(`\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), (match, title, url) => {
 		const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
-		return addAsToken(`<a href="${ _.escapeHTML(url) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer">${ _.escapeHTML(title) }</a>`);
+		return addAsToken(`<a href="${ s.escapeHTML(url) }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer">${ s.escapeHTML(title) }</a>`);
 	});
 
 	// Support <http://link|Text>
 	msg = msg.replace(new RegExp(`(?:<|&lt;)((?:${ schemes }):\\/\\/[^\\|]+)\\|(.+?)(?=>|&gt;)(?:>|&gt;)`, 'gm'), (match, url, title) => {
 		const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
-		return addAsToken(`<a href="${ _.escapeHTML(url) }" target="${ _.escapeHTML(target) }" rel="noopener noreferrer">${ _.escapeHTML(title) }</a>`);
+		return addAsToken(`<a href="${ s.escapeHTML(url) }" target="${ s.escapeHTML(target) }" rel="noopener noreferrer">${ s.escapeHTML(title) }</a>`);
 	});
 
 	return msg;
diff --git a/packages/rocketchat-markdown/tests/client.mocks.js b/packages/rocketchat-markdown/tests/client.mocks.js
index 0c39955210f..1df22bd253e 100644
--- a/packages/rocketchat-markdown/tests/client.mocks.js
+++ b/packages/rocketchat-markdown/tests/client.mocks.js
@@ -34,8 +34,6 @@ mock('meteor/rocketchat:lib', {
 	}
 });
 
-mock('meteor/underscore', { _ });
-
 mock('meteor/random', {
 	Random: {
 		id() {
diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
index 1419865acd3..fd62f71651b 100644
--- a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
+++ b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
@@ -1,4 +1,6 @@
 /*globals MentionedMessage */
+import _ from 'underscore';
+
 Template.mentionsFlexTab.helpers({
 	hasMessages() {
 		return MentionedMessage.find({
diff --git a/packages/rocketchat-mentions-flextab/package.js b/packages/rocketchat-mentions-flextab/package.js
index 4f38223f73a..bb55679e629 100644
--- a/packages/rocketchat-mentions-flextab/package.js
+++ b/packages/rocketchat-mentions-flextab/package.js
@@ -9,7 +9,6 @@ Package.onUse(function(api) {
 	api.use([
 		'mongo',
 		'ecmascript',
-		'underscore',
 		'less',
 		'rocketchat:lib'
 	]);
diff --git a/packages/rocketchat-mentions/package.js b/packages/rocketchat-mentions/package.js
index ccc3cf51ab1..82da6a0d780 100644
--- a/packages/rocketchat-mentions/package.js
+++ b/packages/rocketchat-mentions/package.js
@@ -8,8 +8,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib',
-		'underscore'
+		'rocketchat:lib'
 	]);
 
 	api.addFiles('server.js', 'server');
diff --git a/packages/rocketchat-mentions/server.js b/packages/rocketchat-mentions/server.js
index f04030f231d..09c265a650e 100644
--- a/packages/rocketchat-mentions/server.js
+++ b/packages/rocketchat-mentions/server.js
@@ -1,4 +1,6 @@
+import _ from 'underscore';
 import MentionsServer from './MentionsServer';
+
 const mention = new MentionsServer({
 	pattern: () => RocketChat.settings.get('UTF8_Names_Validation'),
 	messageMaxAll: () => RocketChat.settings.get('Message_MaxAll'),
diff --git a/packages/rocketchat-message-attachments/package.js b/packages/rocketchat-message-attachments/package.js
index 87435f49f18..eaaa2c47f6f 100644
--- a/packages/rocketchat-message-attachments/package.js
+++ b/packages/rocketchat-message-attachments/package.js
@@ -9,7 +9,6 @@ Package.onUse(function(api) {
 	api.use([
 		'templating',
 		'ecmascript',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.js b/packages/rocketchat-message-pin/client/views/pinnedMessages.js
index 594d3e2efc3..0fc258d2ae3 100644
--- a/packages/rocketchat-message-pin/client/views/pinnedMessages.js
+++ b/packages/rocketchat-message-pin/client/views/pinnedMessages.js
@@ -1,4 +1,6 @@
 /* globals PinnedMessage */
+import _ from 'underscore';
+
 Template.pinnedMessages.helpers({
 	hasMessages() {
 		return PinnedMessage.find({
diff --git a/packages/rocketchat-message-pin/package.js b/packages/rocketchat-message-pin/package.js
index 028954aa59c..2b746f5e4ec 100644
--- a/packages/rocketchat-message-pin/package.js
+++ b/packages/rocketchat-message-pin/package.js
@@ -8,7 +8,6 @@ Package.onUse(function(api) {
 	api.use([
 		'mongo',
 		'ecmascript',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-message-snippet/client/messageType.js b/packages/rocketchat-message-snippet/client/messageType.js
index c1f1573a3d7..321ba5c924f 100644
--- a/packages/rocketchat-message-snippet/client/messageType.js
+++ b/packages/rocketchat-message-snippet/client/messageType.js
@@ -1,10 +1,12 @@
+import s from 'underscore.string';
+
 Meteor.startup(function() {
 	RocketChat.MessageTypes.registerType({
 		id: 'message_snippeted',
 		system: true,
 		message: 'Snippeted_a_message',
 		data(message) {
-			const snippetLink = `<a href="/snippet/${ message.snippetId }/${ encodeURIComponent(message.snippetName) }">${ _.escapeHTML(message.snippetName) }</a>`;
+			const snippetLink = `<a href="/snippet/${ message.snippetId }/${ encodeURIComponent(message.snippetName) }">${ s.escapeHTML(message.snippetName) }</a>`;
 			return { snippetLink };
 		}
 	});
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js
index 323c71c91ff..d7fe82702d7 100644
--- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js
+++ b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 import moment from 'moment';
 
 Template.snippetMessage.helpers({
@@ -13,6 +15,6 @@ Template.snippetMessage.helpers({
 		}
 	},
 	body() {
-		return `<a href="/snippet/${ this._id }/${ encodeURIComponent(this.snippetName) }">${ _.escapeHTML(this.snippetName) }</a>`;
+		return `<a href="/snippet/${ this._id }/${ encodeURIComponent(this.snippetName) }">${ s.escapeHTML(this.snippetName) }</a>`;
 	}
 });
diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
index 3fdada28c98..dde68c1b3c7 100644
--- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
+++ b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 /* global SnippetedMessages */
 Template.snippetedMessages.helpers({
 	hasMessages() {
diff --git a/packages/rocketchat-message-snippet/package.js b/packages/rocketchat-message-snippet/package.js
index a1228f83108..b8b928ca95e 100644
--- a/packages/rocketchat-message-snippet/package.js
+++ b/packages/rocketchat-message-snippet/package.js
@@ -15,7 +15,6 @@ Package.onUse(function(api) {
 		'rocketchat:markdown',
 		'rocketchat:theme',
 		'random',
-		'underscore',
 		'tracker',
 		'webapp'
 	]);
diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js
index 1539e6f77b9..dd08536ff6a 100644
--- a/packages/rocketchat-message-star/client/actionButton.js
+++ b/packages/rocketchat-message-star/client/actionButton.js
@@ -1,4 +1,6 @@
+import _ from 'underscore';
 import toastr from 'toastr';
+
 Meteor.startup(function() {
 	RocketChat.MessageAction.addButton({
 		id: 'star-message',
diff --git a/packages/rocketchat-message-star/client/views/starredMessages.js b/packages/rocketchat-message-star/client/views/starredMessages.js
index f898b857834..d1f70242bcc 100644
--- a/packages/rocketchat-message-star/client/views/starredMessages.js
+++ b/packages/rocketchat-message-star/client/views/starredMessages.js
@@ -1,4 +1,6 @@
 /*globals StarredMessage */
+import _ from 'underscore';
+
 Template.starredMessages.helpers({
 	hasMessages() {
 		return StarredMessage.find({
diff --git a/packages/rocketchat-message-star/package.js b/packages/rocketchat-message-star/package.js
index 61d5f71bcaa..258ed472ebf 100644
--- a/packages/rocketchat-message-star/package.js
+++ b/packages/rocketchat-message-star/package.js
@@ -9,7 +9,6 @@ Package.onUse(function(api) {
 	api.use([
 		'mongo',
 		'ecmascript',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-migrations/migrations.js b/packages/rocketchat-migrations/migrations.js
index 82885469da8..c661e665970 100644
--- a/packages/rocketchat-migrations/migrations.js
+++ b/packages/rocketchat-migrations/migrations.js
@@ -1,4 +1,5 @@
 /* eslint-disable */
+import _ from 'underscore';
 import moment from 'moment';
 /*
 	Adds migration capabilities. Migrations are defined like:
diff --git a/packages/rocketchat-migrations/package.js b/packages/rocketchat-migrations/package.js
index b4fa65fea49..1b39c81a884 100644
--- a/packages/rocketchat-migrations/package.js
+++ b/packages/rocketchat-migrations/package.js
@@ -9,7 +9,6 @@ Package.onUse(function(api) {
 	api.use('rocketchat:lib');
 	api.use('rocketchat:version');
 	api.use('ecmascript');
-	api.use('underscore');
 	api.use('check');
 	api.use('mongo');
 
diff --git a/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js b/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js
index 80ddecef58f..fb542cbd94f 100644
--- a/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js
+++ b/packages/rocketchat-oauth2-server-config/admin/server/methods/addOAuthApp.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	addOAuthApp(application) {
 		if (!RocketChat.authz.hasPermission(this.userId, 'manage-oauth-apps')) {
diff --git a/packages/rocketchat-oauth2-server-config/admin/server/methods/updateOAuthApp.js b/packages/rocketchat-oauth2-server-config/admin/server/methods/updateOAuthApp.js
index 78a742b726f..aa9cd4569f2 100644
--- a/packages/rocketchat-oauth2-server-config/admin/server/methods/updateOAuthApp.js
+++ b/packages/rocketchat-oauth2-server-config/admin/server/methods/updateOAuthApp.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	updateOAuthApp(applicationId, application) {
 		if (!RocketChat.authz.hasPermission(this.userId, 'manage-oauth-apps')) {
diff --git a/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js b/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js
index a93f9ae4baf..ad7e3be83f7 100644
--- a/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js
+++ b/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js
@@ -1,4 +1,5 @@
 /*global OAuth2Server */
+import _ from 'underscore';
 
 const oauth2server = new OAuth2Server({
 	accessTokensCollectionName: 'rocketchat_oauth_access_tokens',
diff --git a/packages/rocketchat-oembed/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-oembed/.npm/package/npm-shrinkwrap.json
index 7b7a488b34c..a9123a9e63e 100644
--- a/packages/rocketchat-oembed/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-oembed/.npm/package/npm-shrinkwrap.json
@@ -1,29 +1,30 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "he": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.0.tgz",
-      "from": "he@1.1.0"
+      "integrity": "sha1-KTGdSb7sE6mx88T5sqbd5IWbsqc="
     },
     "iconv-lite": {
       "version": "0.4.13",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
-      "from": "iconv-lite@0.4.13"
+      "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI="
     },
     "ip-range-check": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/ip-range-check/-/ip-range-check-0.0.2.tgz",
-      "from": "ip-range-check@0.0.2"
+      "integrity": "sha1-YFyFloeqTxhGORjUYZDYs2maKTw="
     },
     "ipaddr.js": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz",
-      "from": "ipaddr.js@>=1.0.1 <2.0.0"
+      "integrity": "sha1-irpJyRknmVhb3WQ+DMtQ6K53e6Q="
     },
     "jschardet": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.4.1.tgz",
-      "from": "jschardet@1.4.1"
+      "integrity": "sha1-Xg+JZt2+iX9tKH4hlr/gzzoAkOw="
     }
   }
 }
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.js b/packages/rocketchat-oembed/client/oembedUrlWidget.js
index 110f0c96e70..6e4396ef777 100644
--- a/packages/rocketchat-oembed/client/oembedUrlWidget.js
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const getTitle = function(self) {
 	if (self.meta == null) {
 		return;
diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js
index 9f776d12a20..afebe8bf302 100644
--- a/packages/rocketchat-oembed/package.js
+++ b/packages/rocketchat-oembed/package.js
@@ -17,7 +17,6 @@ Package.onUse(function(api) {
 		'http',
 		'templating',
 		'ecmascript',
-		'underscore',
 		'konecty:change-case',
 		'rocketchat:lib'
 	]);
diff --git a/packages/rocketchat-oembed/server/jumpToMessage.js b/packages/rocketchat-oembed/server/jumpToMessage.js
index 0167878c3b0..c65b1e3d898 100644
--- a/packages/rocketchat-oembed/server/jumpToMessage.js
+++ b/packages/rocketchat-oembed/server/jumpToMessage.js
@@ -1,4 +1,5 @@
 /* globals getAvatarUrlFromUsername */
+import _ from 'underscore';
 
 const URL = Npm.require('url');
 const QueryString = Npm.require('querystring');
diff --git a/packages/rocketchat-oembed/server/providers.js b/packages/rocketchat-oembed/server/providers.js
index 4d5c59ffce9..990d83c8b2b 100644
--- a/packages/rocketchat-oembed/server/providers.js
+++ b/packages/rocketchat-oembed/server/providers.js
@@ -1,5 +1,5 @@
 /*globals changeCase */
-
+import _ from 'underscore';
 
 const URL = Npm.require('url');
 
diff --git a/packages/rocketchat-oembed/server/server.js b/packages/rocketchat-oembed/server/server.js
index 8a1e4ca789a..41d478ab012 100644
--- a/packages/rocketchat-oembed/server/server.js
+++ b/packages/rocketchat-oembed/server/server.js
@@ -1,4 +1,6 @@
 /*globals HTTPInternals, changeCase */
+import _ from 'underscore';
+
 const URL = Npm.require('url');
 
 const querystring = Npm.require('querystring');
diff --git a/packages/rocketchat-otr/client/rocketchat.otr.room.js b/packages/rocketchat-otr/client/rocketchat.otr.room.js
index 47513a7e8c9..d0f9929e072 100644
--- a/packages/rocketchat-otr/client/rocketchat.otr.room.js
+++ b/packages/rocketchat-otr/client/rocketchat.otr.room.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import toastr from 'toastr';
 /* globals crypto */
 
diff --git a/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json b/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json
index 7f67f9efde1..6cc2d7e7d66 100644
--- a/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json
+++ b/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json
@@ -1,71 +1,79 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "from": "ansi-regex@>=2.0.0 <3.0.0"
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "from": "ansi-styles@>=2.2.1 <3.0.0"
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "app-module-path": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz",
-      "from": "app-module-path@2.2.0"
+      "integrity": "sha1-ZBqlXft9am8KgUHEucCqULbCTdU="
     },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "from": "chalk@>=1.1.3 <2.0.0",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "dependencies": {
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "from": "supports-color@>=2.0.0 <3.0.0"
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         }
       }
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "from": "has-ansi@>=2.0.0 <3.0.0"
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
     },
     "has-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "from": "has-flag@>=1.0.0 <2.0.0"
+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
     },
     "js-base64": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-      "from": "js-base64@>=2.1.9 <3.0.0"
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
+      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw=="
     },
     "postcss": {
       "version": "5.2.17",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-      "from": "postcss@5.2.17"
+      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
     },
     "source-map": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "from": "source-map@0.5.6"
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "from": "strip-ansi@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
     },
     "supports-color": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "from": "supports-color@>=3.2.3 <4.0.0"
+      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY="
     }
   }
 }
diff --git a/packages/rocketchat-push-notifications/package.js b/packages/rocketchat-push-notifications/package.js
index f300949d3bd..f23ad5a372b 100644
--- a/packages/rocketchat-push-notifications/package.js
+++ b/packages/rocketchat-push-notifications/package.js
@@ -8,7 +8,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-reactions/client/methods/setReaction.js b/packages/rocketchat-reactions/client/methods/setReaction.js
index 38fcd46a3d2..59d05ae71dc 100644
--- a/packages/rocketchat-reactions/client/methods/setReaction.js
+++ b/packages/rocketchat-reactions/client/methods/setReaction.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	setReaction(reaction, messageId) {
 		if (!Meteor.userId()) {
diff --git a/packages/rocketchat-reactions/setReaction.js b/packages/rocketchat-reactions/setReaction.js
index 1d655e50576..3514785268c 100644
--- a/packages/rocketchat-reactions/setReaction.js
+++ b/packages/rocketchat-reactions/setReaction.js
@@ -1,4 +1,6 @@
 /* globals msgStream */
+import _ from 'underscore';
+
 Meteor.methods({
 	setReaction(reaction, messageId) {
 		if (!Meteor.userId()) {
diff --git a/packages/rocketchat-sandstorm/server/events.js b/packages/rocketchat-sandstorm/server/events.js
index 27ba75d68ea..6123dcb7f1b 100644
--- a/packages/rocketchat-sandstorm/server/events.js
+++ b/packages/rocketchat-sandstorm/server/events.js
@@ -1,5 +1,7 @@
 /* globals getHttpBridge, waitPromise */
 
+import _ from 'underscore';
+
 RocketChat.Sandstorm.notify = function() {};
 
 if (process.env.SANDSTORM === '1') {
diff --git a/packages/rocketchat-slackbridge/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-slackbridge/.npm/package/npm-shrinkwrap.json
index 093df3799e7..a8db3e03aa7 100644
--- a/packages/rocketchat-slackbridge/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-slackbridge/.npm/package/npm-shrinkwrap.json
@@ -1,432 +1,433 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "agent-base": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
-      "from": "agent-base@>=2.0.0 <3.0.0"
+      "integrity": "sha1-vY+ehqjrIh//oHvRS+/VXfFCgV4="
     },
     "ansi-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-      "from": "ansi-regex@>=2.0.0 <3.0.0"
+      "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "from": "ansi-styles@>=2.2.1 <3.0.0"
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "from": "asn1@>=0.2.3 <0.3.0"
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "from": "assert-plus@>=0.2.0 <0.3.0"
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
     },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "from": "async@>=1.5.0 <2.0.0"
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "from": "asynckit@>=0.4.0 <0.5.0"
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "from": "aws-sign2@>=0.6.0 <0.7.0"
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
     },
     "aws4": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz",
-      "from": "aws4@>=1.2.1 <2.0.0"
+      "integrity": "sha1-Cin/t5wxyecS7rCH6OemS0pW11U="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz",
-      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0"
+      "integrity": "sha1-PKdrhSQccXC/fZcD57mqdGMAQNQ="
     },
     "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "from": "boom@>=2.0.0 <3.0.0"
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
     },
     "caseless": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-      "from": "caseless@>=0.11.0 <0.12.0"
+      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
     },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "from": "chalk@>=1.1.1 <2.0.0"
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
     },
     "colors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "from": "colors@>=1.0.0 <1.1.0"
+      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
     },
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "from": "combined-stream@>=1.0.5 <1.1.0"
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
     },
     "commander": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "from": "commander@>=2.9.0 <3.0.0"
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
     },
     "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "from": "cryptiles@>=2.0.0 <3.0.0"
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
     },
     "cycle": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
-      "from": "cycle@>=1.0.0 <1.1.0"
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI="
     },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "from": "dashdash@>=1.12.0 <2.0.0",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "debug": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-      "from": "debug@>=2.0.0 <3.0.0"
+      "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w="
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "from": "delayed-stream@>=1.0.0 <1.1.0"
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "from": "ecc-jsbn@>=0.1.1 <0.2.0"
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eventemitter3": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
-      "from": "eventemitter3@>=1.1.1 <2.0.0"
+      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg="
     },
     "extend": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-      "from": "extend@>=3.0.0 <4.0.0"
+      "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
     },
     "extsprintf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-      "from": "extsprintf@1.0.2"
+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
     },
     "eyes": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
-      "from": "eyes@>=0.1.0 <0.2.0"
+      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A="
     },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "from": "forever-agent@>=0.6.1 <0.7.0"
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
-      "from": "form-data@>=2.1.1 <2.2.0"
+      "integrity": "sha1-icNTQAi5fq2ky7FX1Y9vXfAl6uQ="
     },
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "from": "generate-function@>=2.0.0 <3.0.0"
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
     },
     "generate-object-property": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "from": "generate-object-property@>=1.1.0 <2.0.0"
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA="
     },
     "getpass": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
-      "from": "getpass@>=0.1.1 <0.2.0",
+      "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "graceful-readlink": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "from": "graceful-readlink@>=1.0.0"
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
     },
     "har-validator": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-      "from": "har-validator@>=2.0.6 <2.1.0"
+      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0="
     },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "from": "has-ansi@>=2.0.0 <3.0.0"
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
     },
     "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "from": "hawk@>=3.1.3 <3.2.0"
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ="
     },
     "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "from": "hoek@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
     },
     "http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "from": "http-signature@>=1.1.0 <1.2.0"
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8="
     },
     "https-proxy-agent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
-      "from": "https-proxy-agent@>=1.0.0 <2.0.0"
+      "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.1 <3.0.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "is-my-json-valid": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
-      "from": "is-my-json-valid@>=2.12.4 <3.0.0"
+      "integrity": "sha1-k27do8o8IR/ZjzstPgjaQ/eykVs="
     },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "from": "is-property@>=1.0.0 <2.0.0"
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "from": "is-typedarray@>=1.0.0 <1.1.0"
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "from": "isstream@>=0.1.2 <0.2.0"
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jodid25519": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-      "from": "jodid25519@>=1.0.0 <2.0.0"
+      "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc="
     },
     "jsbn": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz",
-      "from": "jsbn@>=0.1.0 <0.2.0"
+      "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0="
     },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "from": "json-schema@0.2.3"
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "from": "json-stringify-safe@>=5.0.1 <5.1.0"
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsonpointer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz",
-      "from": "jsonpointer@>=4.0.0 <5.0.0"
+      "integrity": "sha1-ZmHhYdL8RF8Z+YQwIxNDci4fy9U="
     },
     "jsprim": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
-      "from": "jsprim@>=1.2.2 <2.0.0"
+      "integrity": "sha1-KnJW9wQSop7jZwqspiWZTE3P8lI="
     },
     "lodash": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-      "from": "lodash@>=3.10.1 <4.0.0"
+      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
     },
     "mime-db": {
       "version": "1.25.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz",
-      "from": "mime-db@>=1.25.0 <1.26.0"
+      "integrity": "sha1-wY29fHOl2/b0SgJNwNFloeexw5I="
     },
     "mime-types": {
       "version": "2.1.13",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz",
-      "from": "mime-types@>=2.1.7 <2.2.0"
+      "integrity": "sha1-4HqqnGxrmnyjASxpADrSWjnpKog="
     },
     "ms": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-      "from": "ms@0.7.2"
+      "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U="
     },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "from": "oauth-sign@>=0.8.1 <0.9.0"
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "options": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "from": "options@>=0.0.5"
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "from": "pinkie@>=2.0.0 <3.0.0"
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "from": "pinkie-promise@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
     },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "from": "punycode@>=1.4.1 <2.0.0"
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz",
-      "from": "qs@>=6.3.0 <6.4.0"
+      "integrity": "sha1-9AOyZPI7wBIox0ExtAfxjV6l1EI="
     },
     "request": {
       "version": "2.79.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-      "from": "request@>=2.64.0 <3.0.0"
+      "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4="
     },
     "retry": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz",
-      "from": "retry@>=0.8.0 <0.9.0"
+      "integrity": "sha1-I2dijcDtskex6rZJ3FOshiisLV8="
     },
     "semver": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
-      "from": "semver@>=5.0.1 <5.1.0"
+      "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no="
     },
     "slack-client": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/slack-client/-/slack-client-2.0.6.tgz",
-      "from": "slack-client@2.0.6"
+      "integrity": "sha1-eOuJ9/UnYg4UXM17HY0WvWcLs4M="
     },
     "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "from": "sntp@>=1.0.0 <2.0.0"
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
     },
     "sshpk": {
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
-      "from": "sshpk@>=1.7.0 <2.0.0",
+      "integrity": "sha1-MOGl0ykkSXShr2FREznVla9mOLA=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "stack-trace": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
-      "from": "stack-trace@>=0.0.0 <0.1.0"
+      "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU="
     },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "from": "stringstream@>=0.0.4 <0.1.0"
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "from": "strip-ansi@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
     },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "from": "supports-color@>=2.0.0 <3.0.0"
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "tough-cookie": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "from": "tough-cookie@>=2.3.0 <2.4.0"
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo="
     },
     "tunnel-agent": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "from": "tunnel-agent@>=0.4.1 <0.5.0"
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
     },
     "tweetnacl": {
       "version": "0.14.4",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.4.tgz",
-      "from": "tweetnacl@>=0.14.0 <0.15.0"
+      "integrity": "sha1-jJ2/tSeVaG8WbNICN5S88QPRPCs="
     },
     "ultron": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-      "from": "ultron@>=1.0.0 <1.1.0"
+      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
     },
     "url-join": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz",
-      "from": "url-join@0.0.1"
+      "integrity": "sha1-HbSK1CLTQCRpqH99l73r/k+x48g="
     },
     "uuid": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-      "from": "uuid@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
     },
     "verror": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-      "from": "verror@1.3.6"
+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw="
     },
     "winston": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.0.tgz",
-      "from": "winston@>=2.1.1 <3.0.0",
+      "integrity": "sha1-IH+qq2/M8/5JN0PdKwPbr8fOt4w=",
       "dependencies": {
         "async": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "from": "async@>=1.0.0 <1.1.0"
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k="
         }
       }
     },
     "ws": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz",
-      "from": "ws@>=1.0.1 <2.0.0"
+      "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg="
     },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "from": "xtend@>=4.0.0 <5.0.0"
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     }
   }
 }
diff --git a/packages/rocketchat-slackbridge/server/slackbridge.js b/packages/rocketchat-slackbridge/server/slackbridge.js
index 4c80dbbde87..66e54369cc9 100644
--- a/packages/rocketchat-slackbridge/server/slackbridge.js
+++ b/packages/rocketchat-slackbridge/server/slackbridge.js
@@ -1,4 +1,5 @@
 /* globals logger */
+import _ from 'underscore';
 
 class SlackBridge {
 
diff --git a/packages/rocketchat-slashcommands-me/me.js b/packages/rocketchat-slashcommands-me/me.js
index 97d0e9e6b0c..0f1c225b823 100644
--- a/packages/rocketchat-slashcommands-me/me.js
+++ b/packages/rocketchat-slashcommands-me/me.js
@@ -1,3 +1,4 @@
+import s from 'underscore.string';
 
 /*
  * Me is a named function that will replace /me commands
@@ -7,7 +8,7 @@ RocketChat.slashCommands.add('me', function Me(command, params, item) {
 	if (command !== 'me') {
 		return;
 	}
-	if (_.trim(params)) {
+	if (s.trim(params)) {
 		const msg = item;
 		msg.msg = `_${ params }_`;
 		Meteor.call('sendMessage', msg);
diff --git a/packages/rocketchat-smarsh-connector/package.js b/packages/rocketchat-smarsh-connector/package.js
index a8cbecf94d2..ee00273d95f 100644
--- a/packages/rocketchat-smarsh-connector/package.js
+++ b/packages/rocketchat-smarsh-connector/package.js
@@ -8,8 +8,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'rocketchat:lib',
-		'underscore'
+		'rocketchat:lib'
 	]);
 
 	api.addFiles('lib/rocketchat.js', [ 'client', 'server' ]);
diff --git a/packages/rocketchat-smarsh-connector/server/functions/generateEml.js b/packages/rocketchat-smarsh-connector/server/functions/generateEml.js
index b4ce38d6b7b..7d36d307b82 100644
--- a/packages/rocketchat-smarsh-connector/server/functions/generateEml.js
+++ b/packages/rocketchat-smarsh-connector/server/functions/generateEml.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import moment from 'moment';
 import 'moment-timezone';
 
diff --git a/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js b/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js
index f90fa5d38aa..3e9b8172354 100644
--- a/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js
+++ b/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js
@@ -6,6 +6,8 @@
 //  files: ['i3nc9l3mn']
 // }
 
+import _ from 'underscore';
+
 RocketChat.smarsh.sendEmail = (data) => {
 	const attachments = [];
 
diff --git a/packages/rocketchat-smarsh-connector/server/startup.js b/packages/rocketchat-smarsh-connector/server/startup.js
index a1d515a690d..1281f11ba3a 100644
--- a/packages/rocketchat-smarsh-connector/server/startup.js
+++ b/packages/rocketchat-smarsh-connector/server/startup.js
@@ -1,4 +1,6 @@
 /* globals SyncedCron */
+import _ from 'underscore';
+
 const smarshJobName = 'Smarsh EML Connector';
 
 const _addSmarshSyncedCronJob = _.debounce(Meteor.bindEnvironment(function __addSmarshSyncedCronJobDebounced() {
diff --git a/packages/rocketchat-sms/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-sms/.npm/package/npm-shrinkwrap.json
index 6b77bf07e4e..89f6766fcf2 100644
--- a/packages/rocketchat-sms/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-sms/.npm/package/npm-shrinkwrap.json
@@ -1,406 +1,407 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "ansi-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-      "from": "ansi-regex@>=2.0.0 <3.0.0"
+      "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "from": "ansi-styles@>=2.2.1 <3.0.0"
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "asn1": {
       "version": "0.1.11",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-      "from": "asn1@0.1.11"
+      "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc="
     },
     "assert-plus": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-      "from": "assert-plus@>=0.1.5 <0.2.0"
+      "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA="
     },
     "async": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "from": "async@>=0.9.0 <0.10.0"
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
     },
     "aws-sign2": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-      "from": "aws-sign2@>=0.5.0 <0.6.0"
+      "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM="
     },
     "base64-url": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz",
-      "from": "base64-url@>=1.2.1 <2.0.0"
+      "integrity": "sha1-+LbFN/CaT8WMmcuG4LDpxhRhog8="
     },
     "base64url": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz",
-      "from": "base64url@>=1.0.4 <1.1.0"
+      "integrity": "sha1-1k03XWinxkDZEuI1jRcNylu1RoE="
     },
     "bl": {
       "version": "0.9.5",
       "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
-      "from": "bl@>=0.9.0 <0.10.0",
+      "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
       "dependencies": {
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "from": "readable-stream@>=1.0.26 <1.1.0"
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw="
         }
       }
     },
     "bluebird": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "from": "bluebird@>=2.9.30 <3.0.0"
+      "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE="
     },
     "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "from": "boom@>=2.0.0 <3.0.0"
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
     },
     "buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "from": "buffer-equal-constant-time@>=1.0.1 <2.0.0"
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
     },
     "camelcase": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "from": "camelcase@>=1.0.1 <2.0.0"
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
     },
     "camelcase-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
-      "from": "camelcase-keys@>=1.0.0 <2.0.0"
+      "integrity": "sha1-vRoRv5sxoc5JNJOpMN4aC69K1+w="
     },
     "caseless": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
-      "from": "caseless@>=0.9.0 <0.10.0"
+      "integrity": "sha1-t7Zc5r8UE4hlOc/VM/CzDv+pz4g="
     },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "from": "chalk@>=1.0.0 <2.0.0"
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
     },
     "combined-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-      "from": "combined-stream@>=0.0.5 <0.1.0"
+      "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8="
     },
     "commander": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "from": "commander@>=2.8.1 <3.0.0"
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
     },
     "concat-stream": {
       "version": "1.4.10",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
-      "from": "concat-stream@>=1.4.7 <1.5.0"
+      "integrity": "sha1-rMO79WAsuMyYDGrIQPp9hgPj7zY="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "from": "core-util-is@>=1.0.0 <1.1.0"
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "from": "cryptiles@>=2.0.0 <3.0.0"
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
     },
     "ctype": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "from": "ctype@0.5.3"
+      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8="
     },
     "delayed-stream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-      "from": "delayed-stream@0.0.5"
+      "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8="
     },
     "deprecate": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/deprecate/-/deprecate-0.1.0.tgz",
-      "from": "deprecate@>=0.1.0 <0.2.0"
+      "integrity": "sha1-xJBYYS3GyOUUXq/kg5uMLH0EHBQ="
     },
     "ecdsa-sig-formatter": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz",
-      "from": "ecdsa-sig-formatter@>=1.0.0 <2.0.0"
+      "integrity": "sha1-MTfpdqHWIyUX4lE+BOMveby98SY="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "from": "forever-agent@>=0.6.0 <0.7.0"
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-      "from": "form-data@>=0.2.0 <0.3.0"
+      "integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY="
     },
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "from": "generate-function@>=2.0.0 <3.0.0"
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
     },
     "generate-object-property": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "from": "generate-object-property@>=1.1.0 <2.0.0"
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA="
     },
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "from": "get-stdin@>=4.0.1 <5.0.0"
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
     },
     "graceful-readlink": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "from": "graceful-readlink@>=1.0.0"
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
     },
     "har-validator": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
-      "from": "har-validator@>=1.4.0 <2.0.0"
+      "integrity": "sha1-2DhCsOtMQ1lgrrEIoGejqpTA7rI="
     },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "from": "has-ansi@>=2.0.0 <3.0.0"
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
     },
     "hawk": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
-      "from": "hawk@>=2.3.0 <2.4.0"
+      "integrity": "sha1-HnMc45RH+h0PbXB/e87r7A/R7B8="
     },
     "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "from": "hoek@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
     },
     "http-signature": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-      "from": "http-signature@>=0.10.0 <0.11.0"
+      "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY="
     },
     "indent-string": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz",
-      "from": "indent-string@>=1.1.0 <2.0.0"
+      "integrity": "sha1-25m8xYPrarux5I3LsZmamGBBy2s="
     },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "from": "inherits@>=2.0.1 <2.1.0"
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "is-finite": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "from": "is-finite@>=1.0.0 <2.0.0"
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko="
     },
     "is-my-json-valid": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
-      "from": "is-my-json-valid@>=2.12.0 <3.0.0"
+      "integrity": "sha1-k27do8o8IR/ZjzstPgjaQ/eykVs="
     },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "from": "is-property@>=1.0.0 <2.0.0"
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
     },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "from": "isarray@0.0.1"
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "from": "isstream@>=0.1.1 <0.2.0"
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "from": "json-stringify-safe@>=5.0.0 <5.1.0"
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsonpointer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz",
-      "from": "jsonpointer@>=4.0.0 <5.0.0"
+      "integrity": "sha1-ZmHhYdL8RF8Z+YQwIxNDci4fy9U="
     },
     "jsonwebtoken": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-5.4.1.tgz",
-      "from": "jsonwebtoken@>=5.4.0 <5.5.0"
+      "integrity": "sha1-IFXGORlf/lYxT6alHfAkaBhqlpU="
     },
     "jwa": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz",
-      "from": "jwa@>=1.1.2 <2.0.0"
+      "integrity": "sha1-+p8vAF/wxjDnxBUmox8395czzW0="
     },
     "jws": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz",
-      "from": "jws@>=3.0.0 <4.0.0"
+      "integrity": "sha1-uI8bRYGixe6IE8BrP9+Q6ptcfmw="
     },
     "jwt-simple": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/jwt-simple/-/jwt-simple-0.1.0.tgz",
-      "from": "jwt-simple@>=0.1.0 <0.2.0"
+      "integrity": "sha1-VGs0qrAuPNScQ6QnlJizTZQAQeM="
     },
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "from": "map-obj@>=1.0.0 <2.0.0"
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
     },
     "meow": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz",
-      "from": "meow@>=2.0.0 <2.1.0"
+      "integrity": "sha1-j1MKjs9dQNP0tN+Tw0cpAPuiqPE="
     },
     "mime-db": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
-      "from": "mime-db@>=1.12.0 <1.13.0"
+      "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc="
     },
     "mime-types": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-      "from": "mime-types@>=2.0.1 <2.1.0"
+      "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY="
     },
     "minimist": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "from": "minimist@>=1.1.0 <2.0.0"
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "ms": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-      "from": "ms@>=0.7.1 <0.8.0"
+      "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U="
     },
     "node-uuid": {
       "version": "1.4.7",
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz",
-      "from": "node-uuid@>=1.4.0 <1.5.0"
+      "integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8="
     },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "from": "number-is-nan@>=1.0.0 <2.0.0"
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
-      "from": "oauth-sign@>=0.6.0 <0.7.0"
+      "integrity": "sha1-fb6uRPbKRU4fFoRR1jB0ZzWBPOM="
     },
     "object-assign": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz",
-      "from": "object-assign@>=1.0.0 <2.0.0"
+      "integrity": "sha1-5l3Idm07R7S4MHRlyDEdoDCwcKY="
     },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "from": "punycode@>=1.4.1 <2.0.0"
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "q": {
       "version": "0.9.7",
       "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
-      "from": "q@0.9.7"
+      "integrity": "sha1-TeLmyzspCIyeTLwDv51C+5bOL3U="
     },
     "qs": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz",
-      "from": "qs@>=2.4.0 <2.5.0"
+      "integrity": "sha1-9854jld33wtQENp/fE5zujJHD1o="
     },
     "readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "from": "readable-stream@>=1.1.9 <1.2.0"
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk="
     },
     "repeating": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
-      "from": "repeating@>=1.1.0 <2.0.0"
+      "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw="
     },
     "request": {
       "version": "2.55.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
-      "from": "request@>=2.55.0 <2.56.0"
+      "integrity": "sha1-11wc32eddrsQD5v/4f5VG1wk6T0="
     },
     "scmp": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz",
-      "from": "scmp@0.0.3"
+      "integrity": "sha1-NkjfLXKUZB5/eGc//CloHZutkHM="
     },
     "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "from": "sntp@>=1.0.0 <2.0.0"
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
     },
     "string.prototype.startswith": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/string.prototype.startswith/-/string.prototype.startswith-0.2.0.tgz",
-      "from": "string.prototype.startswith@>=0.2.0 <0.3.0"
+      "integrity": "sha1-2miYLjU6TprEpDtFCiBF0cRFrns="
     },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "from": "string_decoder@>=0.10.0 <0.11.0"
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "from": "stringstream@>=0.0.4 <0.1.0"
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "from": "strip-ansi@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
     },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "from": "supports-color@>=2.0.0 <3.0.0"
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "tough-cookie": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "from": "tough-cookie@>=0.12.0"
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo="
     },
     "tunnel-agent": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "from": "tunnel-agent@>=0.4.0 <0.5.0"
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
     },
     "twilio": {
       "version": "2.9.1",
       "resolved": "https://registry.npmjs.org/twilio/-/twilio-2.9.1.tgz",
-      "from": "twilio@2.9.1"
+      "integrity": "sha1-BDv6JAzLM/X3a3cUNMJCGgFEvIU="
     },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "from": "typedarray@>=0.0.5 <0.1.0"
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "underscore": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "from": "underscore@>=1.0.0 <2.0.0"
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
     },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "from": "xtend@>=4.0.0 <5.0.0"
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     }
   }
 }
diff --git a/packages/rocketchat-spotify/lib/spotify.js b/packages/rocketchat-spotify/lib/spotify.js
index 501822d81b6..ada4be1648f 100644
--- a/packages/rocketchat-spotify/lib/spotify.js
+++ b/packages/rocketchat-spotify/lib/spotify.js
@@ -2,9 +2,11 @@
  * Spotify a named function that will process Spotify links or syntaxes (ex: spotify:track:1q6IK1l4qpYykOaWaLJkWG)
  * @param {Object} message - The message object
  */
+import _ from 'underscore';
+import s from 'underscore.string';
 
 const process = function(message, source, callback) {
-	if (_.trim(source)) {
+	if (s.trim(source)) {
 		// Separate text in code blocks and non code blocks
 		const msgParts = source.split(/(```\w*[\n ]?[\s\S]*?```+?)|(`(?:[^`]+)`)/);
 
diff --git a/packages/rocketchat-spotify/package.js b/packages/rocketchat-spotify/package.js
index 7eae0a9e918..2e2a6e3cb45 100644
--- a/packages/rocketchat-spotify/package.js
+++ b/packages/rocketchat-spotify/package.js
@@ -9,7 +9,6 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'templating',
-		'underscore',
 		'rocketchat:oembed',
 		'rocketchat:lib'
 	]);
diff --git a/packages/rocketchat-statistics/server/functions/get.js b/packages/rocketchat-statistics/server/functions/get.js
index 2e9547406f9..de6063f5cea 100644
--- a/packages/rocketchat-statistics/server/functions/get.js
+++ b/packages/rocketchat-statistics/server/functions/get.js
@@ -1,4 +1,6 @@
 /* global InstanceStatus, MongoInternals */
+import _ from 'underscore';
+
 RocketChat.statistics.get = function _getStatistics() {
 	const statistics = {};
 
diff --git a/packages/rocketchat-theme/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-theme/.npm/package/npm-shrinkwrap.json
index 6c44400ecd7..c84611234b8 100644
--- a/packages/rocketchat-theme/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-theme/.npm/package/npm-shrinkwrap.json
@@ -1,430 +1,430 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "amdefine": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
-      "from": "amdefine@>=0.0.4"
+      "integrity": "sha1-/RdHRwDLXMnCtwnwvp0jzjwZjDM="
     },
     "ansi-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-      "from": "ansi-regex@>=2.0.0 <3.0.0"
+      "integrity": "sha1-xQYbbg74qBd15Q9dZhUb9r83EQc="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "from": "ansi-styles@>=2.2.1 <3.0.0"
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "asap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz",
-      "from": "asap@>=1.0.0 <1.1.0"
+      "integrity": "sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0="
     },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "from": "asn1@>=0.2.3 <0.3.0"
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "from": "assert-plus@>=0.2.0 <0.3.0"
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "from": "asynckit@>=0.4.0 <0.5.0"
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "autoprefixer-core": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-5.2.1.tgz",
-      "from": "autoprefixer-core@>=5.0.0 <6.0.0"
+      "integrity": "sha1-5kDEFK5Bmq4hwa1DyOoPPbgqVm0="
     },
     "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "from": "aws-sign2@>=0.6.0 <0.7.0"
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
     },
     "aws4": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz",
-      "from": "aws4@>=1.2.1 <2.0.0"
+      "integrity": "sha1-Cin/t5wxyecS7rCH6OemS0pW11U="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz",
-      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0"
+      "integrity": "sha1-PKdrhSQccXC/fZcD57mqdGMAQNQ="
     },
     "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "from": "boom@>=2.0.0 <3.0.0"
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
     },
     "browserslist": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-0.4.0.tgz",
-      "from": "browserslist@>=0.4.0 <0.5.0"
+      "integrity": "sha1-O9SrkZncG5FQ1NbbpNnTqrvIbdQ="
     },
     "caniuse-db": {
       "version": "1.0.30000570",
       "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000570.tgz",
-      "from": "caniuse-db@>=1.0.30000214 <2.0.0"
+      "integrity": "sha1-IYQ5E4VfSHOXSFDujvnmKPU7yN4="
     },
     "caseless": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-      "from": "caseless@>=0.11.0 <0.12.0"
+      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
     },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "from": "chalk@>=1.1.1 <2.0.0"
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
     },
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "from": "combined-stream@>=1.0.5 <1.1.0"
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
     },
     "commander": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "from": "commander@>=2.9.0 <3.0.0"
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
     },
     "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "from": "cryptiles@>=2.0.0 <3.0.0"
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
     },
     "dashdash": {
       "version": "1.14.0",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
-      "from": "dashdash@>=1.12.0 <2.0.0",
+      "integrity": "sha1-KeSGxUGL8PNWA0qZPVFoajPoQUE=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "from": "delayed-stream@>=1.0.0 <1.1.0"
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "from": "ecc-jsbn@>=0.1.1 <0.2.0"
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU="
     },
     "errno": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-      "from": "errno@>=0.1.1 <0.2.0"
+      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0="
     },
     "es6-promise": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
-      "from": "es6-promise@>=2.3.0 <2.4.0"
+      "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "extend": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-      "from": "extend@>=3.0.0 <3.1.0"
+      "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
     },
     "extsprintf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-      "from": "extsprintf@1.0.2"
+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
     },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "from": "forever-agent@>=0.6.1 <0.7.0"
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz",
-      "from": "form-data@>=2.1.1 <2.2.0"
+      "integrity": "sha1-St8DQuGnmvoehMjDIKn/yCOSofM="
     },
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "from": "generate-function@>=2.0.0 <3.0.0"
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
     },
     "generate-object-property": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "from": "generate-object-property@>=1.1.0 <2.0.0"
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA="
     },
     "getpass": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
-      "from": "getpass@>=0.1.1 <0.2.0",
+      "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "graceful-fs": {
       "version": "3.0.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-      "from": "graceful-fs@>=3.0.5 <4.0.0"
+      "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg="
     },
     "graceful-readlink": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "from": "graceful-readlink@>=1.0.0"
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
     },
     "har-validator": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-      "from": "har-validator@>=2.0.6 <2.1.0"
+      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0="
     },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "from": "has-ansi@>=2.0.0 <3.0.0"
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
     },
     "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "from": "hawk@>=3.1.3 <3.2.0"
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ="
     },
     "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "from": "hoek@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
     },
     "http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "from": "http-signature@>=1.1.0 <1.2.0"
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8="
     },
     "image-size": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz",
-      "from": "image-size@>=0.3.5 <0.4.0"
+      "integrity": "sha1-gyQOqy+1sAsEqrjHSwRx6cunrYw="
     },
     "is-my-json-valid": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
-      "from": "is-my-json-valid@>=2.12.4 <3.0.0"
+      "integrity": "sha1-k27do8o8IR/ZjzstPgjaQ/eykVs="
     },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "from": "is-property@>=1.0.0 <2.0.0"
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "from": "is-typedarray@>=1.0.0 <1.1.0"
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "from": "isstream@>=0.1.2 <0.2.0"
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jodid25519": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-      "from": "jodid25519@>=1.0.0 <2.0.0"
+      "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc="
     },
     "js-base64": {
       "version": "2.1.9",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-      "from": "js-base64@>=2.1.8 <2.2.0"
+      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4="
     },
     "jsbn": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz",
-      "from": "jsbn@>=0.1.0 <0.2.0"
+      "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0="
     },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "from": "json-schema@0.2.3"
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "from": "json-stringify-safe@>=5.0.1 <5.1.0"
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsonpointer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz",
-      "from": "jsonpointer@>=4.0.0 <5.0.0"
+      "integrity": "sha1-ZmHhYdL8RF8Z+YQwIxNDci4fy9U="
     },
     "jsprim": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
-      "from": "jsprim@>=1.2.2 <2.0.0"
+      "integrity": "sha1-KnJW9wQSop7jZwqspiWZTE3P8lI="
     },
     "less": {
-      "version": "2.5.0",
-      "resolved": "https://github.com/meteor/less.js/tarball/8130849eb3d7f0ecf0ca8d0af7c4207b0442e3f6",
-      "from": "https://github.com/meteor/less.js/tarball/8130849eb3d7f0ecf0ca8d0af7c4207b0442e3f6"
+      "version": "https://github.com/meteor/less.js/tarball/8130849eb3d7f0ecf0ca8d0af7c4207b0442e3f6",
+      "integrity": "sha1-dD95WEi4QkZPVjcydtAMY6WS/qM="
     },
     "less-plugin-autoprefix": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/less-plugin-autoprefix/-/less-plugin-autoprefix-1.4.2.tgz",
-      "from": "less-plugin-autoprefix@1.4.2"
+      "integrity": "sha1-qkHkMshVh6YuH5WDGNNJoua21Zs="
     },
     "mime": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-      "from": "mime@>=1.2.11 <2.0.0"
+      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM="
     },
     "mime-db": {
       "version": "1.24.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz",
-      "from": "mime-db@>=1.24.0 <1.25.0"
+      "integrity": "sha1-4tE/k58AFsbk6a0lqGUvEmxGfww="
     },
     "mime-types": {
       "version": "2.1.12",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
-      "from": "mime-types@>=2.1.7 <2.2.0"
+      "integrity": "sha1-FSuiVndwIN1GY/VMLnvCY4HnFyk="
     },
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "from": "minimist@0.0.8"
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "from": "mkdirp@>=0.5.0 <0.6.0"
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM="
     },
     "natives": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-      "from": "natives@>=1.1.0 <2.0.0"
+      "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE="
     },
     "node-uuid": {
       "version": "1.4.7",
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz",
-      "from": "node-uuid@>=1.4.7 <1.5.0"
+      "integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8="
     },
     "num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "from": "num2fraction@>=1.1.0 <2.0.0"
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
     },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "from": "oauth-sign@>=0.8.1 <0.9.0"
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "from": "pinkie@>=2.0.0 <3.0.0"
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "from": "pinkie-promise@>=2.0.0 <3.0.0"
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
     },
     "postcss": {
       "version": "4.1.16",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-4.1.16.tgz",
-      "from": "postcss@>=4.1.11 <5.0.0"
+      "integrity": "sha1-TESbTIr53zyvbTf44eV10DYXWNw="
     },
     "promise": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz",
-      "from": "promise@>=6.0.1 <7.0.0"
+      "integrity": "sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY="
     },
     "prr": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "from": "prr@>=0.0.0 <0.1.0"
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo="
     },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "from": "punycode@>=1.4.1 <2.0.0"
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz",
-      "from": "qs@>=6.3.0 <6.4.0"
+      "integrity": "sha1-9AOyZPI7wBIox0ExtAfxjV6l1EI="
     },
     "request": {
       "version": "2.76.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.76.0.tgz",
-      "from": "request@>=2.51.0 <3.0.0"
+      "integrity": "sha1-vkRQWv73A2CgQ2lVEGvjlF2VVg4="
     },
     "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "from": "sntp@>=1.0.0 <2.0.0"
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
     },
     "source-map": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "from": "source-map@>=0.4.2 <0.5.0"
+      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s="
     },
     "sshpk": {
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
-      "from": "sshpk@>=1.7.0 <2.0.0",
+      "integrity": "sha1-MOGl0ykkSXShr2FREznVla9mOLA=",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "from": "assert-plus@>=1.0.0 <2.0.0"
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "from": "stringstream@>=0.0.4 <0.1.0"
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "from": "strip-ansi@>=3.0.0 <4.0.0"
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
     },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "from": "supports-color@>=2.0.0 <3.0.0"
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "tough-cookie": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "from": "tough-cookie@>=2.3.0 <2.4.0"
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo="
     },
     "tunnel-agent": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "from": "tunnel-agent@>=0.4.1 <0.5.0"
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
     },
     "tweetnacl": {
       "version": "0.14.3",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz",
-      "from": "tweetnacl@>=0.14.0 <0.15.0"
+      "integrity": "sha1-PaOC9nDyXe1417PReSEZvKC3Ey0="
     },
     "verror": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-      "from": "verror@1.3.6"
+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw="
     },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "from": "xtend@>=4.0.0 <5.0.0"
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     }
   }
 }
diff --git a/packages/rocketchat-theme/package.js b/packages/rocketchat-theme/package.js
index 02dc8bb1e30..1696fb962f2 100644
--- a/packages/rocketchat-theme/package.js
+++ b/packages/rocketchat-theme/package.js
@@ -11,7 +11,6 @@ Package.onUse(function(api) {
 	api.use('rocketchat:assets');
 	api.use('ecmascript');
 	api.use('less');
-	api.use('underscore');
 	api.use('webapp');
 	api.use('webapp-hashing');
 	api.use('templating', 'client');
diff --git a/packages/rocketchat-theme/server/server.js b/packages/rocketchat-theme/server/server.js
index 0c214db1544..e23207e1fb9 100644
--- a/packages/rocketchat-theme/server/server.js
+++ b/packages/rocketchat-theme/server/server.js
@@ -1,5 +1,6 @@
 /* globals WebAppHashing */
 
+import _ from 'underscore';
 import less from 'less';
 import Autoprefixer from 'less-plugin-autoprefix';
 import crypto from 'crypto';
diff --git a/packages/rocketchat-tutum/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-tutum/.npm/package/npm-shrinkwrap.json
index 5d36dbdce51..881f3566927 100644
--- a/packages/rocketchat-tutum/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-tutum/.npm/package/npm-shrinkwrap.json
@@ -1,14 +1,15 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "double-ended-queue": {
       "version": "2.1.0-0",
       "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
-      "from": "double-ended-queue@>=2.1.0-0 <3.0.0"
+      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
     },
     "redis": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/redis/-/redis-2.2.5.tgz",
-      "from": "redis@2.2.5"
+      "integrity": "sha1-+B1XALMmhmCfKcCvsp1TnthTrXg="
     }
   }
 }
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js
index 1239dfac1e8..30793a44227 100644
--- a/packages/rocketchat-ui-account/client/accountPreferences.js
+++ b/packages/rocketchat-ui-account/client/accountPreferences.js
@@ -1,4 +1,6 @@
 /*globals defaultUserLanguage, KonchatNotification */
+import _ from 'underscore';
+import s from 'underscore.string';
 import toastr from 'toastr';
 
 const notificationLabels = {
@@ -154,7 +156,7 @@ Template.accountPreferences.onCreated(function() {
 		data.autoImageLoad = $('input[name=autoImageLoad]:checked').val();
 		data.emailNotificationMode = $('select[name=emailNotificationMode]').val();
 		data.highlights = _.compact(_.map($('[name=highlights]').val().split(','), function(e) {
-			return _.trim(e);
+			return s.trim(e);
 		}));
 		data.desktopNotificationDuration = $('input[name=desktopNotificationDuration]').val();
 		data.desktopNotifications = $('#desktopNotifications').find('select').val();
diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js
index 8bd364d6c5d..f06444d5e52 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.js
+++ b/packages/rocketchat-ui-account/client/accountProfile.js
@@ -1,4 +1,7 @@
+import _ from 'underscore';
+import s from 'underscore.string';
 import toastr from 'toastr';
+
 const validateEmail = (email) => /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(email);
 const validateUsername = (username) => {
 	const reg = new RegExp(`^${ RocketChat.settings.get('UTF8_Names_Validation') }$`);
@@ -22,7 +25,7 @@ const setAvatar = function(event, template) {
 	});
 };
 const loginWith = function(event, template) {
-	const loginWithService = `loginWith${ _.capitalize(this.name) }`;
+	const loginWithService = `loginWith${ s.capitalize(this.name) }`;
 	const serviceConfig = {};
 	Meteor[loginWithService](serviceConfig, function(error) {
 		if (error && error.error) {
@@ -55,7 +58,7 @@ Template.accountProfile.helpers({
 				return {
 					name: service,
 					// TODO: improve this fix
-					service: !suggestions.avatars[service.toLowerCase()] ? RocketChat.settings.get(`Accounts_OAuth_${ _.capitalize(service.toLowerCase()) }`) : false,
+					service: !suggestions.avatars[service.toLowerCase()] ? RocketChat.settings.get(`Accounts_OAuth_${ s.capitalize(service.toLowerCase()) }`) : false,
 					suggestion: suggestions.avatars[service.toLowerCase()]
 				};
 			})
@@ -196,30 +199,30 @@ Template.accountProfile.onCreated(function() {
 		if (typedPassword) {
 			data.typedPassword = typedPassword;
 		}
-		if (_.trim(self.password.get()) && RocketChat.settings.get('Accounts_AllowPasswordChange')) {
+		if (s.trim(self.password.get()) && RocketChat.settings.get('Accounts_AllowPasswordChange')) {
 			data.newPassword = self.password.get();
 		}
-		if (_.trim(self.realname.get()) !== user.name) {
-			data.realname = _.trim(self.realname.get());
+		if (s.trim(self.realname.get()) !== user.name) {
+			data.realname = s.trim(self.realname.get());
 		}
-		if (_.trim(self.username.get()) !== user.username) {
+		if (s.trim(self.username.get()) !== user.username) {
 			if (!RocketChat.settings.get('Accounts_AllowUsernameChange')) {
 				toastr.remove();
 				toastr.error(t('Username_Change_Disabled'));
 				instance.clearForm();
 				return cb && cb();
 			} else {
-				data.username = _.trim(self.username.get());
+				data.username = s.trim(self.username.get());
 			}
 		}
-		if (_.trim(self.email.get()) !== (user.emails && user.emails[0] && user.emails[0].address)) {
+		if (s.trim(self.email.get()) !== (user.emails && user.emails[0] && user.emails[0].address)) {
 			if (!RocketChat.settings.get('Accounts_AllowEmailChange')) {
 				toastr.remove();
 				toastr.error(t('Email_Change_Disabled'));
 				instance.clearForm();
 				return cb && cb();
 			} else {
-				data.email = _.trim(self.email.get());
+				data.email = s.trim(self.email.get());
 			}
 		}
 		const customFields = {};
@@ -320,7 +323,7 @@ Template.accountProfile.events({
 		const send = $(e.target.send);
 		send.addClass('loading');
 		const reqPass = ((email !== (user && user.emails && user.emails[0] && user.emails[0].address))
-			|| _.trim(password)) && (user && user.services && user.services.password && s.trim(user.services.password.bcrypt));
+			|| s.trim(password)) && (user && user.services && user.services.password && s.trim(user.services.password.bcrypt));
 		if (!reqPass) {
 			return instance.save(undefined, () => setTimeout(() => send.removeClass('loading'), 1000));
 		}
diff --git a/packages/rocketchat-ui-account/client/avatar/prompt.js b/packages/rocketchat-ui-account/client/avatar/prompt.js
index 391a8c01621..5e07c0f2298 100644
--- a/packages/rocketchat-ui-account/client/avatar/prompt.js
+++ b/packages/rocketchat-ui-account/client/avatar/prompt.js
@@ -1,5 +1,6 @@
 /* globals fileUploadHandler */
 
+import s from 'underscore.string';
 import toastr from 'toastr';
 import mime from 'mime-type/with-db';
 
@@ -32,7 +33,7 @@ Template.avatarPrompt.helpers({
 	},
 	suggestAvatar(service) {
 		const suggestions = Template.instance().suggestions.get();
-		return RocketChat.settings.get(`Accounts_OAuth_${ _.capitalize(service) }`) && !suggestions.avatars[service];
+		return RocketChat.settings.get(`Accounts_OAuth_${ s.capitalize(service) }`) && !suggestions.avatars[service];
 	},
 	upload() {
 		return Template.instance().upload.get();
@@ -61,7 +62,7 @@ Template.avatarPrompt.events({
 				}
 			});
 		} else if (this.service === 'url') {
-			if (_.trim($('#avatarurl').val())) {
+			if (s.trim($('#avatarurl').val())) {
 				Meteor.call('setAvatarFromService', $('#avatarurl').val(), '', this.service, function(err) {
 					if (err) {
 						if (err.details.timeToReset && err.details.timeToReset) {
@@ -123,7 +124,7 @@ Template.avatarPrompt.events({
 		}
 	},
 	'click .login-with-service'(event, template) {
-		const loginWithService = `loginWith${ _.capitalize(this) }`;
+		const loginWithService = `loginWith${ s.capitalize(this) }`;
 		const serviceConfig = {};
 		Meteor[loginWithService](serviceConfig, function(error) {
 			if (error && error.error) {
diff --git a/packages/rocketchat-ui-account/package.js b/packages/rocketchat-ui-account/package.js
index b461ce56a88..2d8ac01d4fa 100644
--- a/packages/rocketchat-ui-account/package.js
+++ b/packages/rocketchat-ui-account/package.js
@@ -14,7 +14,6 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'templating',
-		'underscore',
 		'rocketchat:lib',
 		'sha'
 	]);
diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js
index b5a67575899..f3ce8fc6874 100644
--- a/packages/rocketchat-ui-admin/client/admin.js
+++ b/packages/rocketchat-ui-admin/client/admin.js
@@ -1,5 +1,8 @@
 /*globals jscolor, i18nDefaultQuery */
+import _ from 'underscore';
+import s from 'underscore.string';
 import toastr from 'toastr';
+
 const TempSettings = new Mongo.Collection(null);
 
 RocketChat.TempSettings = TempSettings;
@@ -332,7 +335,7 @@ Template.admin.helpers({
 
 Template.admin.events({
 	'change .input-monitor, keyup .input-monitor': _.throttle(function(e) {
-		let value = _.trim($(e.target).val());
+		let value = s.trim($(e.target).val());
 		switch (this.type) {
 			case 'int':
 				value = parseInt(value);
@@ -353,7 +356,7 @@ Template.admin.events({
 		});
 	}, 500),
 	'change select[name=color-editor]'(e) {
-		const value = _.trim($(e.target).val());
+		const value = s.trim($(e.target).val());
 		TempSettings.update({ _id: this._id }, { $set: { editor: value }});
 		RocketChat.settings.collectionPrivate.update({ _id: this._id }, { $set: { editor: value }});
 	},
diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js
index ad181b29f58..b0d5fdbbd28 100644
--- a/packages/rocketchat-ui-admin/client/adminFlex.js
+++ b/packages/rocketchat-ui-admin/client/adminFlex.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Template.adminFlex.onCreated(function() {
 	this.settingsFilter = new ReactiveVar('');
 	if (RocketChat.settings.cachedCollectionPrivate == null) {
@@ -25,7 +28,7 @@ Template.adminFlex.helpers({
 			type: 'group'
 		};
 		if (filter) {
-			const filterRegex = new RegExp(_.escapeRegExp(filter), 'i');
+			const filterRegex = new RegExp(s.escapeRegExp(filter), 'i');
 			const records = RocketChat.settings.collectionPrivate.find().fetch();
 			let groups = [];
 			records.forEach(function(record) {
diff --git a/packages/rocketchat-ui-admin/client/adminInfo.js b/packages/rocketchat-ui-admin/client/adminInfo.js
index a3a2874ed27..22a696cd33f 100644
--- a/packages/rocketchat-ui-admin/client/adminInfo.js
+++ b/packages/rocketchat-ui-admin/client/adminInfo.js
@@ -1,3 +1,4 @@
+import s from 'underscore.string';
 import moment from 'moment';
 
 Template.adminInfo.helpers({
@@ -12,9 +13,9 @@ Template.adminInfo.helpers({
 	},
 	inGB(size) {
 		if (size > 1073741824) {
-			return `${ _.numberFormat(size / 1024 / 1024 / 1024, 2) } GB`;
+			return `${ s.numberFormat(size / 1024 / 1024 / 1024, 2) } GB`;
 		}
-		return `${ _.numberFormat(size / 1024 / 1024, 2) } MB`;
+		return `${ s.numberFormat(size / 1024 / 1024, 2) } MB`;
 	},
 	humanReadableTime(time) {
 		const days = Math.floor(time / 86400);
@@ -42,7 +43,7 @@ Template.adminInfo.helpers({
 		}
 	},
 	numFormat(number) {
-		return _.numberFormat(number, 2);
+		return s.numberFormat(number, 2);
 	},
 	info() {
 		return RocketChat.Info;
diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js
index f535c422881..84be3e9339d 100644
--- a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js
+++ b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js
@@ -1,4 +1,6 @@
 /*globals RocketChatTabBar, AdminChatRoom */
+import _ from 'underscore';
+import s from 'underscore.string';
 
 this.AdminChatRoom = new Mongo.Collection('rocketchat_room');
 
@@ -97,14 +99,14 @@ Template.adminRooms.onCreated(function() {
 	this.rooms = function() {
 		let filter;
 		if (instance.filter && instance.filter.get()) {
-			filter = _.trim(instance.filter.get());
+			filter = s.trim(instance.filter.get());
 		}
 		let types = instance.types && instance.types.get();
 		if (!_.isArray(types)) {
 			types = [];
 		}
 		let query = {};
-		filter = _.trim(filter);
+		filter = s.trim(filter);
 		if (filter) {
 			const filterReg = new RegExp(s.escapeRegExp(filter), 'i');
 			query = { $or: [{ name: filterReg }, { t: 'd', usernames: filterReg } ]};
diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js
index c39c766a0e4..73e9674f3d5 100644
--- a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js
+++ b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js
@@ -1,4 +1,6 @@
+import _ from 'underscore';
 import toastr from 'toastr';
+
 Template.adminInviteUser.helpers({
 	isAdmin() {
 		return RocketChat.authz.hasRole(Meteor.userId(), 'admin');
diff --git a/packages/rocketchat-ui-admin/client/users/adminUsers.js b/packages/rocketchat-ui-admin/client/users/adminUsers.js
index 500344c22e5..eb56fad97ed 100644
--- a/packages/rocketchat-ui-admin/client/users/adminUsers.js
+++ b/packages/rocketchat-ui-admin/client/users/adminUsers.js
@@ -1,4 +1,7 @@
 /* globals RocketChatTabBar */
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Template.adminUsers.helpers({
 	isReady() {
 		const instance = Template.instance();
@@ -74,7 +77,7 @@ Template.adminUsers.onCreated(function() {
 		let query;
 
 		if (instance.filter && instance.filter.get()) {
-			filter = _.trim(instance.filter.get());
+			filter = s.trim(instance.filter.get());
 		}
 
 		if (filter) {
diff --git a/packages/rocketchat-ui-admin/package.js b/packages/rocketchat-ui-admin/package.js
index 619e158cbdb..f66cdc392df 100644
--- a/packages/rocketchat-ui-admin/package.js
+++ b/packages/rocketchat-ui-admin/package.js
@@ -15,7 +15,6 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'templating',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-ui-admin/publications/adminRooms.js b/packages/rocketchat-ui-admin/publications/adminRooms.js
index 33701504f87..3cf98d2e09f 100644
--- a/packages/rocketchat-ui-admin/publications/adminRooms.js
+++ b/packages/rocketchat-ui-admin/publications/adminRooms.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Meteor.publish('adminRooms', function(filter, types, limit) {
 	if (!this.userId) {
 		return this.ready();
@@ -30,7 +33,7 @@ Meteor.publish('adminRooms', function(filter, types, limit) {
 		}
 	};
 
-	filter = _.trim(filter);
+	filter = s.trim(filter);
 	if (filter && types.length) {
 		// CACHE: can we stop using publications here?
 		return RocketChat.models.Rooms.findByNameContainingAndTypes(filter, types, options);
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
index de254edb32e..763712df15b 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
@@ -1,4 +1,5 @@
 /* globals WebRTC */
+import _ from 'underscore';
 
 Template.membersList.helpers({
 	tAddUsers() {
diff --git a/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js b/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js
index c4a718c52ed..c5be5304680 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/messageSearch.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.startup(function() {
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-search-message',
diff --git a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js
index c9244473c45..c5e1e400af6 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js
@@ -1,4 +1,7 @@
 /* globals chatMessages*/
+import _ from 'underscore';
+import s from 'underscore.string';
+
 const roomFiles = new Mongo.Collection('room_files');
 
 Template.uploadedFilesList.helpers({
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js
index 52c46830284..3d01d77c99e 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js
@@ -1,4 +1,5 @@
 import toastr from 'toastr';
+import s from 'underscore.string';
 
 Template.userEdit.helpers({
 
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
index e73d47d55d2..498e676889d 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
@@ -1,4 +1,6 @@
 /* globals RoomRoles, UserRoles*/
+import _ from 'underscore';
+import s from 'underscore.string';
 import moment from 'moment';
 import toastr from 'toastr';
 
diff --git a/packages/rocketchat-ui-flextab/package.js b/packages/rocketchat-ui-flextab/package.js
index 764c8ea4682..0b06a8e035d 100644
--- a/packages/rocketchat-ui-flextab/package.js
+++ b/packages/rocketchat-ui-flextab/package.js
@@ -15,7 +15,6 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'templating',
-		'underscore',
 		'rocketchat:lib'
 	]);
 
diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js
index fa6d28a19a5..5a97a2a8dd6 100644
--- a/packages/rocketchat-ui-login/client/login/form.js
+++ b/packages/rocketchat-ui-login/client/login/form.js
@@ -1,4 +1,6 @@
 /*globals OnePassword, device, setLanguage */
+import _ from 'underscore';
+import s from 'underscore.string';
 import toastr from 'toastr';
 
 Template.loginForm.helpers({
diff --git a/packages/rocketchat-ui-login/client/login/services.js b/packages/rocketchat-ui-login/client/login/services.js
index ad5aaea96ed..e16394a5020 100644
--- a/packages/rocketchat-ui-login/client/login/services.js
+++ b/packages/rocketchat-ui-login/client/login/services.js
@@ -1,4 +1,5 @@
 /* globals CustomOAuth */
+import s from 'underscore.string';
 import toastr from 'toastr';
 
 Meteor.startup(function() {
@@ -44,7 +45,7 @@ Template.loginServices.helpers({
 					icon = service.service;
 					break;
 				default:
-					serviceName = _.capitalize(service.service);
+					serviceName = s.capitalize(service.service);
 					icon = service.service;
 			}
 			return services.push({
@@ -85,7 +86,7 @@ Template.loginServices.events({
 				}
 			});
 		} else {
-			const loginWithService = `loginWith${ longinMethods[this.service.service] || _.capitalize(this.service.service) }`;
+			const loginWithService = `loginWith${ longinMethods[this.service.service] || s.capitalize(this.service.service) }`;
 			const serviceConfig = this.service.clientConfig || {};
 			return Meteor[loginWithService](serviceConfig, function(error) {
 				loadingIcon.addClass('hidden');
diff --git a/packages/rocketchat-ui-login/package.js b/packages/rocketchat-ui-login/package.js
index ef7df90a784..db5728806d8 100644
--- a/packages/rocketchat-ui-login/package.js
+++ b/packages/rocketchat-ui-login/package.js
@@ -14,7 +14,6 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'templating',
-		'underscore',
 		'rocketchat:lib',
 		'rocketchat:assets',
 		'rocketchat:2fa'
diff --git a/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
index 00d02c6b242..45085f6c56d 100644
--- a/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-ui-master/.npm/package/npm-shrinkwrap.json
@@ -1,29 +1,30 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "clipboard": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz",
-      "from": "clipboard@1.7.1"
+      "integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs="
     },
     "delegate": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz",
-      "from": "delegate@>=3.1.2 <4.0.0"
+      "integrity": "sha1-moJRp3fXAl+qVXN7w7BxdCEnqf0="
     },
     "good-listener": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "from": "good-listener@>=1.2.2 <2.0.0"
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA="
     },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "from": "select@>=1.1.2 <2.0.0"
+      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     "tiny-emitter": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
-      "from": "tiny-emitter@>=2.0.0 <3.0.0"
+      "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="
     }
   }
 }
diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index d8e7707bfb3..bd5d39973af 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -1,5 +1,6 @@
 /* globals toolbarSearch, menu, isRtl, fireGlobalEvent, CachedChatSubscription, DynamicCss */
 import Clipboard from 'clipboard';
+import s from 'underscore.string';
 
 RocketChat.settings.collection.find({_id:/theme-color-rc/i}, {fields:{ value: 1 }}).observe({changed: () => { DynamicCss.run(true); }});
 
@@ -86,7 +87,7 @@ Template.body.onRendered(function() {
 	Tracker.autorun(function(c) {
 		const w = window;
 		const d = document;
-		const s = 'script';
+		const script = 'script';
 		const l = 'dataLayer';
 		const i = RocketChat.settings.get('GoogleTagManager_id');
 		if (Match.test(i, String) && i.trim() !== '') {
@@ -103,7 +104,7 @@ Template.body.onRendered(function() {
 				j.async = true;
 				j.src = `//www.googletagmanager.com/gtm.js?id=${ i }${ dl }`;
 				return f.parentNode.insertBefore(j, f);
-			}(w, d, s, l, i));
+			}(w, d, script, l, i));
 		}
 	});
 	if (Meteor.isCordova) {
diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js
index f75c8d54966..98f9cdc9ca0 100644
--- a/packages/rocketchat-ui-master/package.js
+++ b/packages/rocketchat-ui-master/package.js
@@ -19,7 +19,6 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'templating',
-		'underscore',
 		'reactive-var',
 		'rocketchat:lib',
 		'meteorhacks:inject-initial'
diff --git a/packages/rocketchat-ui-master/server/inject.js b/packages/rocketchat-ui-master/server/inject.js
index e8e60d3284d..4f70c56de2d 100644
--- a/packages/rocketchat-ui-master/server/inject.js
+++ b/packages/rocketchat-ui-master/server/inject.js
@@ -1,4 +1,6 @@
 /* globals Inject */
+import _ from 'underscore';
+
 const renderDynamicCssList = _.debounce(Meteor.bindEnvironment(() => {
 	// const variables = RocketChat.models.Settings.findOne({_id:'theme-custom-variables'}, {fields: { value: 1}});
 	const colors = RocketChat.models.Settings.find({_id:/theme-color-rc/i}, {fields: { value: 1, editor: 1}}).fetch().filter(color => color && color.value);
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index ad64a746b16..e2de12804f8 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -1,4 +1,5 @@
 /* globals renderEmoji renderMessageBody */
+import _ from 'underscore';
 import moment from 'moment';
 
 Template.message.helpers({
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.js b/packages/rocketchat-ui-message/client/popup/messagePopup.js
index 9b0726b8904..3855b317eb1 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopup.js
+++ b/packages/rocketchat-ui-message/client/popup/messagePopup.js
@@ -1,6 +1,9 @@
 /* globals toolbarSearch */
 // This is not supposed to be a complete list
 // it is just to improve readability in this file
+
+import _ from 'underscore';
+
 const keys = {
 	TAB: 9,
 	ENTER: 13,
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
index 2258629508b..36e244bcd97 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
+++ b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
@@ -1,4 +1,6 @@
 /* globals filteredUsersMemory */
+import _ from 'underscore';
+
 filteredUsersMemory = new Mongo.Collection(null);
 
 Meteor.startup(function() {
diff --git a/packages/rocketchat-ui-message/client/renderMessageBody.js b/packages/rocketchat-ui-message/client/renderMessageBody.js
index f9efbb53492..1884627e237 100644
--- a/packages/rocketchat-ui-message/client/renderMessageBody.js
+++ b/packages/rocketchat-ui-message/client/renderMessageBody.js
@@ -1,10 +1,11 @@
 /* global renderMessageBody:true */
+import s from 'underscore.string';
 
 renderMessageBody = function(msg) {
 	msg.html = msg.msg;
 
-	if (_.trim(msg.html) !== '') {
-		msg.html = _.escapeHTML(msg.html);
+	if (s.trim(msg.html) !== '') {
+		msg.html = s.escapeHTML(msg.html);
 	}
 
 	const message = RocketChat.callbacks.run('renderMessage', msg);
diff --git a/packages/rocketchat-ui-message/package.js b/packages/rocketchat-ui-message/package.js
index 7873a5ff71a..1f4baec6745 100644
--- a/packages/rocketchat-ui-message/package.js
+++ b/packages/rocketchat-ui-message/package.js
@@ -15,7 +15,6 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'templating',
-		'underscore',
 		'tracker',
 		'rocketchat:lib',
 		'rocketchat:ui-account',
diff --git a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js
index 386af43b780..4310bc1a32d 100644
--- a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js
+++ b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Template.createCombinedFlex.helpers({
 	selectedUsers() {
 		return Template.instance().selectedUsers.get();
diff --git a/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js b/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js
index 03f04c5db80..12e2c9f458c 100644
--- a/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js
+++ b/packages/rocketchat-ui-sidenav/client/listChannelsFlex.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Template.listChannelsFlex.helpers({
 	channel() {
 		return Template.instance().channelsList.get();
@@ -94,7 +97,7 @@ Template.listChannelsFlex.onCreated(function() {
 			if (_.isNumber(this.limit.get())) {
 				options.limit = this.limit.get();
 			}
-			if (_.trim(this.sortSubscriptions.get())) {
+			if (s.trim(this.sortSubscriptions.get())) {
 				switch (this.sortSubscriptions.get()) {
 					case 'name':
 						options.sort = { name: 1 };
diff --git a/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js b/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js
index 733c0ac9bb3..c17049f867d 100644
--- a/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js
+++ b/packages/rocketchat-ui-sidenav/client/listCombinedFlex.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Template.listCombinedFlex.helpers({
 	channel() {
 		return Template.instance().channelsList.get();
@@ -103,7 +106,7 @@ Template.listCombinedFlex.onCreated(function() {
 			if (_.isNumber(this.limit.get())) {
 				options.limit = this.limit.get();
 			}
-			if (_.trim(this.sortSubscriptions.get())) {
+			if (s.trim(this.sortSubscriptions.get())) {
 				switch (this.sortSubscriptions.get()) {
 					case 'name':
 						options.sort = { name: 1 };
@@ -114,7 +117,7 @@ Template.listCombinedFlex.onCreated(function() {
 				}
 			}
 			let type = {$in: ['c', 'p']};
-			if (_.trim(this.channelType.get())) {
+			if (s.trim(this.channelType.get())) {
 				switch (this.channelType.get()) {
 					case 'public':
 						type = 'c';
diff --git a/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js b/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js
index c6a052dbdb7..dcf26eca563 100644
--- a/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js
+++ b/packages/rocketchat-ui-sidenav/client/listPrivateGroupsFlex.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Template.listPrivateGroupsFlex.helpers({
 	groups() {
 		return Template.instance().groups.get();
@@ -60,7 +63,7 @@ Template.listPrivateGroupsFlex.onCreated(function() {
 		if (_.isNumber(this.limit.get())) {
 			options.limit = this.limit.get();
 		}
-		if (_.trim(this.sort.get())) {
+		if (s.trim(this.sort.get())) {
 			switch (this.sort.get()) {
 				case 'name':
 					options.sort = { name: 1 };
diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
index c59bdb92c15..34ec4967b27 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.js
+++ b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Template.roomList.helpers({
 	rooms() {
 		if (this.identifier === 'unread') {
diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.js b/packages/rocketchat-ui-sidenav/client/toolbar.js
index 9cf8ae8c768..4500bddf55e 100644
--- a/packages/rocketchat-ui-sidenav/client/toolbar.js
+++ b/packages/rocketchat-ui-sidenav/client/toolbar.js
@@ -1,4 +1,6 @@
 /* global menu */
+import _ from 'underscore';
+
 let isLoading;
 let filterText = '';
 let usernamesFromClient;
diff --git a/packages/rocketchat-ui-sidenav/package.js b/packages/rocketchat-ui-sidenav/package.js
index 07594ddb9ba..8d875673992 100644
--- a/packages/rocketchat-ui-sidenav/package.js
+++ b/packages/rocketchat-ui-sidenav/package.js
@@ -14,7 +14,6 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'templating',
-		'underscore',
 		'rocketchat:lib',
 		'rocketchat:ui'
 	]);
diff --git a/packages/rocketchat-ui-vrecord/package.js b/packages/rocketchat-ui-vrecord/package.js
index d538f9fb570..2f32e2e4524 100644
--- a/packages/rocketchat-ui-vrecord/package.js
+++ b/packages/rocketchat-ui-vrecord/package.js
@@ -10,7 +10,6 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'templating',
-		'underscore',
 		'tracker',
 		'rocketchat:lib'
 	]);
diff --git a/packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json
index 00d02c6b242..45085f6c56d 100644
--- a/packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json
@@ -1,29 +1,30 @@
 {
+  "lockfileVersion": 1,
   "dependencies": {
     "clipboard": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz",
-      "from": "clipboard@1.7.1"
+      "integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs="
     },
     "delegate": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz",
-      "from": "delegate@>=3.1.2 <4.0.0"
+      "integrity": "sha1-moJRp3fXAl+qVXN7w7BxdCEnqf0="
     },
     "good-listener": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "from": "good-listener@>=1.2.2 <2.0.0"
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA="
     },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "from": "select@>=1.1.2 <2.0.0"
+      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     "tiny-emitter": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
-      "from": "tiny-emitter@>=2.0.0 <3.0.0"
+      "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="
     }
   }
 }
diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
index e5aaa2f37e5..6be9d25efcf 100644
--- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
@@ -1,4 +1,6 @@
 /* globals readMessage UserRoles RoomRoles*/
+import _ from 'underscore';
+
 export const RoomHistoryManager = new class {
 	constructor() {
 		this.defaultLimit = 50;
diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index af895ee9d5d..46c8805cbb0 100644
--- a/packages/rocketchat-ui/client/lib/RoomManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const RoomManager = new function() {
 	const openedRooms = {};
 	const msgStream = new Meteor.Streamer('room-messages');
diff --git a/packages/rocketchat-ui/client/lib/accountBox.js b/packages/rocketchat-ui/client/lib/accountBox.js
index fad7143d6c6..c0e0347a755 100644
--- a/packages/rocketchat-ui/client/lib/accountBox.js
+++ b/packages/rocketchat-ui/client/lib/accountBox.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 this.AccountBox = (function() {
 	let status = 0;
 	const self = {};
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
index 4995a98b268..d47bea352e6 100644
--- a/packages/rocketchat-ui/client/lib/chatMessages.js
+++ b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -1,4 +1,5 @@
 /* globals MsgTyping */
+import s from 'underscore.string';
 import moment from 'moment';
 import toastr from 'toastr';
 this.ChatMessages = class ChatMessages {
@@ -176,7 +177,7 @@ this.ChatMessages = class ChatMessages {
 		* * @param {function?} done callback
 		*/
 	send(rid, input, done = function() {}) {
-		if (_.trim(input.value) !== '') {
+		if (s.trim(input.value) !== '') {
 			readMessage.enable();
 			readMessage.readNow();
 			$('.message.first-unread').removeClass('first-unread');
@@ -344,7 +345,7 @@ this.ChatMessages = class ChatMessages {
 	}
 
 	update(id, rid, msg, isDescription) {
-		if ((_.trim(msg) !== '') || (isDescription === true)) {
+		if ((s.trim(msg) !== '') || (isDescription === true)) {
 			Meteor.call('updateMessage', { _id: id, msg, rid });
 			this.clearEditing();
 			return this.stopTyping(rid);
@@ -352,7 +353,7 @@ this.ChatMessages = class ChatMessages {
 	}
 
 	startTyping(rid, input) {
-		if (_.trim(input.value) !== '') {
+		if (s.trim(input.value) !== '') {
 			return MsgTyping.start(rid);
 		} else {
 			return MsgTyping.stop(rid);
diff --git a/packages/rocketchat-ui/client/lib/collections.js b/packages/rocketchat-ui/client/lib/collections.js
index 3d95243fbce..b5d469677ec 100644
--- a/packages/rocketchat-ui/client/lib/collections.js
+++ b/packages/rocketchat-ui/client/lib/collections.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 this.ChatMessage = new Mongo.Collection(null);
 this.CachedChatRoom = new RocketChat.CachedCollection({ name: 'rooms' });
 this.ChatRoom = this.CachedChatRoom.collection;
diff --git a/packages/rocketchat-ui/client/lib/cordova/user-state.js b/packages/rocketchat-ui/client/lib/cordova/user-state.js
index ac31d901760..20455bbac02 100644
--- a/packages/rocketchat-ui/client/lib/cordova/user-state.js
+++ b/packages/rocketchat-ui/client/lib/cordova/user-state.js
@@ -1,4 +1,5 @@
 /* globals UserPresence, readMessage */
+import _ from 'underscore';
 
 let timer = undefined;
 if (Meteor.isCordova) {
diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js
index 870b5be71e0..795a651e586 100644
--- a/packages/rocketchat-ui/client/lib/fileUpload.js
+++ b/packages/rocketchat-ui/client/lib/fileUpload.js
@@ -1,5 +1,7 @@
 /* globals fileUploadHandler, Handlebars, fileUpload */
 /* exported fileUpload */
+import _ from 'underscore';
+import s from 'underscore.string';
 
 function readAsDataURL(file, callback) {
 	const reader = new FileReader();
diff --git a/packages/rocketchat-ui/client/lib/iframeCommands.js b/packages/rocketchat-ui/client/lib/iframeCommands.js
index 2647b8acf92..cd270e1136a 100644
--- a/packages/rocketchat-ui/client/lib/iframeCommands.js
+++ b/packages/rocketchat-ui/client/lib/iframeCommands.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 const commands = {
 	go(data) {
 		if (typeof data.path !== 'string' || data.path.trim().length === 0) {
@@ -28,7 +30,7 @@ const commands = {
 			const customOauth = ServiceConfiguration.configurations.findOne({service: data.service});
 
 			if (customOauth) {
-				const customLoginWith = Meteor[`loginWith${ _.capitalize(customOauth.service, true) }`];
+				const customLoginWith = Meteor[`loginWith${ s.capitalize(customOauth.service, true) }`];
 				const customRedirectUri = data.redirectUrl || siteUrl;
 				customLoginWith.call(Meteor, {'redirectUrl': customRedirectUri}, customOAuthCallback);
 			}
diff --git a/packages/rocketchat-ui/client/lib/menu.js b/packages/rocketchat-ui/client/lib/menu.js
index ff339473624..b39ea56d2dc 100644
--- a/packages/rocketchat-ui/client/lib/menu.js
+++ b/packages/rocketchat-ui/client/lib/menu.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import EventEmitter from 'wolfy87-eventemitter';
 const sideNavW = 280;
 const map = (x, in_min, in_max, out_min, out_max) => (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
diff --git a/packages/rocketchat-ui/client/lib/msgTyping.js b/packages/rocketchat-ui/client/lib/msgTyping.js
index c1e6adde7f8..08b23480762 100644
--- a/packages/rocketchat-ui/client/lib/msgTyping.js
+++ b/packages/rocketchat-ui/client/lib/msgTyping.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 export const MsgTyping = (function() {
 	const timeout = 15000;
 	const timeouts = {};
diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js
index fd0cfbac7f2..4d3173cce23 100644
--- a/packages/rocketchat-ui/client/lib/notification.js
+++ b/packages/rocketchat-ui/client/lib/notification.js
@@ -1,4 +1,7 @@
 // @TODO implementar 'clicar na notificacao' abre a janela do chat
+import _ from 'underscore';
+import s from 'underscore.string';
+
 const KonchatNotification = {
 	notificationStatus: new ReactiveVar,
 
@@ -20,7 +23,7 @@ const KonchatNotification = {
 			return RocketChat.promises.run('onClientMessageReceived', message).then(function(message) {
 				const n = new Notification(notification.title, {
 					icon: notification.icon || getAvatarUrlFromUsername(notification.payload.sender.username),
-					body: _.stripTags(message.msg),
+					body: s.stripTags(message.msg),
 					tag: notification.payload._id,
 					silent: true,
 					canReply: true
diff --git a/packages/rocketchat-ui/client/lib/readMessages.js b/packages/rocketchat-ui/client/lib/readMessages.js
index 249cf12f40b..72b7b10ca50 100644
--- a/packages/rocketchat-ui/client/lib/readMessages.js
+++ b/packages/rocketchat-ui/client/lib/readMessages.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 /* DEFINITIONS
 - If window loses focus user needs to scroll or click/touch some place
 - On hit ESC enable read, force read of current room and remove unread mark
diff --git a/packages/rocketchat-ui/client/lib/tapi18n.js b/packages/rocketchat-ui/client/lib/tapi18n.js
index 8f1a41e9741..65a7357566e 100644
--- a/packages/rocketchat-ui/client/lib/tapi18n.js
+++ b/packages/rocketchat-ui/client/lib/tapi18n.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 this.t = function(key, ...replaces) {
 	if (_.isObject(replaces[0])) {
 		return TAPi18n.__(key, replaces);
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index f8910a5f6fc..be57af66257 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const acEvents = {
 	'click .rc-popup-list__item'(e, t) {
 		t.ac.onItemClick(this, e);
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 2a78e136304..250e14cffa8 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -1,4 +1,5 @@
 /* globals RocketChatTabBar , chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover , device */
+import _ from 'underscore';
 import moment from 'moment';
 import mime from 'mime-type/with-db';
 import Clipboard from 'clipboard';
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 3c192cedd2b..30638a861d4 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -24,7 +24,6 @@ Package.onUse(function(api) {
 		'reactive-var',
 		'ecmascript',
 		'templating',
-		'underscore',
 		'rocketchat:lib',
 		'rocketchat:ui-master',
 		'raix:push',
diff --git a/packages/rocketchat-videobridge/package.js b/packages/rocketchat-videobridge/package.js
index 1c25535319c..85f1bda3501 100644
--- a/packages/rocketchat-videobridge/package.js
+++ b/packages/rocketchat-videobridge/package.js
@@ -8,7 +8,6 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
-		'underscore',
 		'less',
 		'rocketchat:lib'
 	]);
diff --git a/server/configuration/accounts_meld.js b/server/configuration/accounts_meld.js
index 8eee62d4f85..0851d0ca561 100644
--- a/server/configuration/accounts_meld.js
+++ b/server/configuration/accounts_meld.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const orig_updateOrCreateUserFromExternalService = Accounts.updateOrCreateUserFromExternalService;
 
 Accounts.updateOrCreateUserFromExternalService = function(serviceName, serviceData = {} /*, options*/) {
diff --git a/server/lib/accounts.js b/server/lib/accounts.js
index 1cffa6d39a0..a3f487a4d8a 100644
--- a/server/lib/accounts.js
+++ b/server/lib/accounts.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 const accountsConfig = {
 	forbidClientAccountCreation: true,
 	loginExpirationInDays: RocketChat.settings.get('Accounts_LoginExpiration')
diff --git a/server/lib/cordova/facebook-login.js b/server/lib/cordova/facebook-login.js
index c7a6c73dc82..7e29557f151 100644
--- a/server/lib/cordova/facebook-login.js
+++ b/server/lib/cordova/facebook-login.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 function getIdentity(accessToken) {
 	try {
 		return HTTP.get('https://graph.facebook.com/me', {
diff --git a/server/methods/afterVerifyEmail.js b/server/methods/afterVerifyEmail.js
index 7b92f596167..72bcb19def6 100644
--- a/server/methods/afterVerifyEmail.js
+++ b/server/methods/afterVerifyEmail.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	afterVerifyEmail() {
 		const userId = Meteor.userId();
diff --git a/server/methods/channelsList.js b/server/methods/channelsList.js
index 98959e000c7..f9e0cac56e7 100644
--- a/server/methods/channelsList.js
+++ b/server/methods/channelsList.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Meteor.methods({
 	channelsList(filter, channelType, limit, sort) {
 		this.unblock();
@@ -27,7 +30,7 @@ Meteor.methods({
 			options.limit = limit;
 		}
 
-		if (_.trim(sort)) {
+		if (s.trim(sort)) {
 			switch (sort) {
 				case 'name':
 					options.sort = {
diff --git a/server/methods/getUsernameSuggestion.js b/server/methods/getUsernameSuggestion.js
index 26534233005..45d6143f43a 100644
--- a/server/methods/getUsernameSuggestion.js
+++ b/server/methods/getUsernameSuggestion.js
@@ -1,4 +1,5 @@
 /* global slugify */
+import _ from 'underscore';
 
 function slug(text) {
 	text = slugify(text, '.');
diff --git a/server/methods/groupsList.js b/server/methods/groupsList.js
index 09e4e8e272f..a235e9bf44c 100644
--- a/server/methods/groupsList.js
+++ b/server/methods/groupsList.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 Meteor.methods({
 	groupsList(nameFilter, limit, sort) {
 
@@ -20,7 +23,7 @@ Meteor.methods({
 		}
 
 		//Verify there is a sort option and it's a string
-		if (_.trim(sort)) {
+		if (s.trim(sort)) {
 			switch (sort) {
 				case 'name':
 					options.sort = { name: 1 };
diff --git a/server/methods/loadHistory.js b/server/methods/loadHistory.js
index 31858c9aa82..6b569c2062f 100644
--- a/server/methods/loadHistory.js
+++ b/server/methods/loadHistory.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const hideMessagesOfType = [];
 
 RocketChat.settings.get(/Message_HideType_.+/, function(key, value) {
diff --git a/server/methods/loadNextMessages.js b/server/methods/loadNextMessages.js
index 5012eedf108..e663bfd9abe 100644
--- a/server/methods/loadNextMessages.js
+++ b/server/methods/loadNextMessages.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	loadNextMessages(rid, end, limit = 20) {
 		check(rid, String);
diff --git a/server/methods/loadSurroundingMessages.js b/server/methods/loadSurroundingMessages.js
index 6739677a6dc..e4615c082b2 100644
--- a/server/methods/loadSurroundingMessages.js
+++ b/server/methods/loadSurroundingMessages.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.methods({
 	loadSurroundingMessages(message, limit = 50) {
 		check(message, Object);
diff --git a/server/methods/messageSearch.js b/server/methods/messageSearch.js
index e0a2b3d4b93..b6c6b0804f3 100644
--- a/server/methods/messageSearch.js
+++ b/server/methods/messageSearch.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	messageSearch(text, rid, limit) {
 		const result = {
diff --git a/server/methods/registerUser.js b/server/methods/registerUser.js
index 17c0ceb71b1..e2371beaeed 100644
--- a/server/methods/registerUser.js
+++ b/server/methods/registerUser.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	registerUser(formData) {
 		const AllowAnonymousRead = RocketChat.settings.get('Accounts_AllowAnonymousRead');
diff --git a/server/methods/sendForgotPasswordEmail.js b/server/methods/sendForgotPasswordEmail.js
index 9fcef298612..54b8f3acec2 100644
--- a/server/methods/sendForgotPasswordEmail.js
+++ b/server/methods/sendForgotPasswordEmail.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	sendForgotPasswordEmail(email) {
 		check(email, String);
diff --git a/server/publications/messages.js b/server/publications/messages.js
index 1a97be102bd..66b1029b9f9 100644
--- a/server/publications/messages.js
+++ b/server/publications/messages.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.publish('messages', function(rid/*, start*/) {
 	if (!this.userId) {
 		return this.ready();
diff --git a/server/publications/room.js b/server/publications/room.js
index 0e9e6a1190a..1ba67abf419 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 const fields = {
 	_id: 1,
 	name: 1,
diff --git a/server/publications/spotlight.js b/server/publications/spotlight.js
index 8f5b0cfa287..3c4f2f6492a 100644
--- a/server/publications/spotlight.js
+++ b/server/publications/spotlight.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 Meteor.methods({
 	spotlight(text, usernames, type = {users: true, rooms: true}, rid) {
 		const regex = new RegExp(s.trim(s.escapeRegExp(text)), 'i');
diff --git a/server/publications/userAutocomplete.js b/server/publications/userAutocomplete.js
index a5a88607d1b..24e0e3ce1c2 100644
--- a/server/publications/userAutocomplete.js
+++ b/server/publications/userAutocomplete.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.publish('userAutocomplete', function(selector) {
 	if (!this.userId) {
 		return this.ready();
diff --git a/server/startup/avatar.js b/server/startup/avatar.js
index 261f18fa276..565aee7b6c7 100644
--- a/server/startup/avatar.js
+++ b/server/startup/avatar.js
@@ -1,4 +1,5 @@
 /* globals FileUpload */
+import _ from 'underscore';
 
 Meteor.startup(function() {
 	WebApp.connectHandlers.use('/avatar/', Meteor.bindEnvironment(function(req, res/*, next*/) {
diff --git a/server/startup/i18n-validation.js b/server/startup/i18n-validation.js
index 96f39e52137..adfcda4addf 100644
--- a/server/startup/i18n-validation.js
+++ b/server/startup/i18n-validation.js
@@ -1,3 +1,6 @@
+import _ from 'underscore';
+import s from 'underscore.string';
+
 function flat(obj, newObj = {}, path = '') {
 	for (const key of Object.keys(obj)) {
 		const value = obj[key];
diff --git a/server/startup/initialData.js b/server/startup/initialData.js
index b8f9acdcaf3..f3f4badf77f 100644
--- a/server/startup/initialData.js
+++ b/server/startup/initialData.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 Meteor.startup(function() {
 	Meteor.defer(function() {
 		if (!RocketChat.models.Rooms.findOneById('GENERAL')) {
diff --git a/server/startup/migrations/v007.js b/server/startup/migrations/v007.js
index 715c2981a41..349139fdfdb 100644
--- a/server/startup/migrations/v007.js
+++ b/server/startup/migrations/v007.js
@@ -1,4 +1,5 @@
 /* globals OEmbed */
+import _ from 'underscore';
 
 RocketChat.Migrations.add({
 	version: 7,
diff --git a/server/startup/migrations/v010.js b/server/startup/migrations/v010.js
index f04e1cdf08a..7911483adf8 100644
--- a/server/startup/migrations/v010.js
+++ b/server/startup/migrations/v010.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.Migrations.add({
 	version: 10,
 	up() {
diff --git a/server/startup/migrations/v019.js b/server/startup/migrations/v019.js
index 10d08d43e54..224b1f9e871 100644
--- a/server/startup/migrations/v019.js
+++ b/server/startup/migrations/v019.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.Migrations.add({
 	version: 19,
 	up() {
diff --git a/server/startup/migrations/v055.js b/server/startup/migrations/v055.js
index ed1fed5ff9b..205a7fa1a44 100644
--- a/server/startup/migrations/v055.js
+++ b/server/startup/migrations/v055.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.Migrations.add({
 	version: 55,
 	up() {
diff --git a/server/startup/migrations/v060.js b/server/startup/migrations/v060.js
index eee784829f9..f1e119b0419 100644
--- a/server/startup/migrations/v060.js
+++ b/server/startup/migrations/v060.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 RocketChat.Migrations.add({
 	version: 60,
 	up() {
diff --git a/server/startup/migrations/v064.js b/server/startup/migrations/v064.js
index aae3feff7b5..c21560f2906 100644
--- a/server/startup/migrations/v064.js
+++ b/server/startup/migrations/v064.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 RocketChat.Migrations.add({
 	version: 64,
 	up() {
diff --git a/server/startup/migrations/xrun.js b/server/startup/migrations/xrun.js
index 156af688755..34804b48512 100644
--- a/server/startup/migrations/xrun.js
+++ b/server/startup/migrations/xrun.js
@@ -1,3 +1,5 @@
+import _ from 'underscore';
+
 if (RocketChat.Migrations.getVersion() !== 0) {
 	RocketChat.Migrations.migrateTo(process.env.MIGRATION_VERSION || 'latest');
 } else {
diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
index 321bdc72b54..0ff335dd8a2 100644
--- a/server/stream/streamBroadcast.js
+++ b/server/stream/streamBroadcast.js
@@ -1,5 +1,6 @@
 /* global InstanceStatus, DDP, LoggerManager */
 
+import _ from 'underscore';
 import {DDPCommon} from 'meteor/ddp-common';
 
 process.env.PORT = String(process.env.PORT).trim();

From 59c2243a1e2b47566aac5556b0be0fd5b59216cd Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Mon, 30 Oct 2017 14:36:25 -0500
Subject: [PATCH 210/244] Update snap version to use 8.8.1

---
 .snapcraft/snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index bc1b90aafb5..6ad120b1f5d 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -39,7 +39,7 @@ apps:
 parts:
     node:
         plugin: nodejs
-        node-engine: 4.8.4
+        node-engine: 8.8.1
         build-packages:
             # For fibers
             - python
@@ -49,7 +49,7 @@ parts:
         plugin: dump
         prepare: cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc
         after: [node]
-        source: https://download.rocket.chat/build/#{RC_VERSION}.tgz
+        source: https://download.rocket.chat/build/rocket.chat-#{RC_VERSION}.tgz
         source-type: tar
         stage-packages:
             - graphicsmagick

From 451613c757e1c11b9abe578fe2d79680c84ac93a Mon Sep 17 00:00:00 2001
From: Alex Brazier <aejbrazier.apps@gmail.com>
Date: Mon, 30 Oct 2017 19:49:14 +0000
Subject: [PATCH 211/244] Restore sorting direct messages by full name if
 setting enabled

---
 packages/rocketchat-ui-sidenav/client/roomList.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
index c59bdb92c15..34a94636a2f 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.js
+++ b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -19,7 +19,12 @@ Template.roomList.helpers({
 		const query = {
 			open: true
 		};
-		const sort = { 't': 1, 'name': 1 };
+		const sort = { 't': 1 };
+		if (this.identifier === 'd' && RocketChat.settings.get('UI_Use_Real_Name')) {
+			sort.fname = 1;
+		} else {
+			sort.name = 1;
+		}
 		if (this.identifier === 'f') {
 			query.f = favoritesEnabled;
 		} else {

From 90267e813d605de0fa0d9805c5a2ecebac570b79 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Mon, 30 Oct 2017 14:50:08 -0500
Subject: [PATCH 212/244] use rocketchat/base:8 containing node.js 8.8.1

---
 .docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 71d4153d0ec..a3ca219368e 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocketchat/base:4
+FROM rocketchat/base:8
 
 ENV RC_VERSION 0.59.0-develop
 

From 2c427770019369417bd7ea2ba851ee5c33179b8c Mon Sep 17 00:00:00 2001
From: Alex Brazier <aejbrazier.apps@gmail.com>
Date: Mon, 30 Oct 2017 20:14:06 +0000
Subject: [PATCH 213/244] Show real name of current user at top of side nav if
 setting enabled

---
 packages/rocketchat-ui-sidenav/client/accountBox.html | 6 +++++-
 packages/rocketchat-ui-sidenav/client/accountBox.js   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.html b/packages/rocketchat-ui-sidenav/client/accountBox.html
index 9707b1cc04b..466b6609edd 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.html
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.html
@@ -6,7 +6,11 @@
 					{{> avatar username=username}}
 				</div>
 				<div class="sidebar__account-data">
-					<h3 class="sidebar__account-username" data-username="{{username}}">@{{username}}</h3>
+					{{#if fname}}
+						<h3 class="sidebar__account-username" data-username="{{username}}">{{fname}}</h3>
+					{{else}}
+						<h3 class="sidebar__account-username" data-username="{{username}}">@{{username}}</h3>
+					{{/if}}
 					<div class="sidebar__account-status">
 						<div class="sidebar__account-status-bullet sidebar__account-status-bullet--{{bullet}}" title="{{visualStatus}}"></div>
 						<div class="sidebar__account-visual-status">{{visualStatus}}</div>
diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js
index 6b3cb2de581..5450d8af62b 100644
--- a/packages/rocketchat-ui-sidenav/client/accountBox.js
+++ b/packages/rocketchat-ui-sidenav/client/accountBox.js
@@ -5,7 +5,7 @@ Template.accountBox.helpers({
 		if (Meteor.user() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
 			return {
 				name: t('Anonymous'),
-				fname: t('Anonymous'),
+				fname: RocketChat.settings.get('UI_Use_Real_Name') && t('Anonymous'),
 				status: 'online',
 				visualStatus: t('online'),
 				bullet: 'general-success-background',
@@ -24,7 +24,7 @@ Template.accountBox.helpers({
 			bullet: userStatus,
 			_id: Meteor.userId(),
 			username,
-			fname: name || username
+			fname: RocketChat.settings.get('UI_Use_Real_Name') && name
 		};
 	},
 

From 47782ee26fe03ce67a0b6ed5e32046ee8255f846 Mon Sep 17 00:00:00 2001
From: jasonjyu <jasonyu@fas.harvard.edu>
Date: Mon, 30 Oct 2017 19:57:00 -0400
Subject: [PATCH 214/244] Updated comments.

---
 tests/chimp-config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/chimp-config.js b/tests/chimp-config.js
index d03dcfc8273..057b3f94ce2 100644
--- a/tests/chimp-config.js
+++ b/tests/chimp-config.js
@@ -70,21 +70,21 @@ module.exports = {
 	// 		baseURL: 'https://selenium-release.storage.googleapis.com',
 	// 		drivers: {
 	// 			chrome: {
-	// 				// check for more recent versions of chrome driver here:
+	// 				// check for more recent versions of Chrome driver here:
 	// 				// http://chromedriver.storage.googleapis.com/index.html
 	// 				version: '2.25',
 	// 				arch: process.arch,
 	// 				baseURL: 'https://chromedriver.storage.googleapis.com'
 	// 			},
 	// 			ie: {
-	// 				// check for more recent versions of internet explorer driver here:
+	// 				// check for more recent versions of Internet Explorer driver here:
 	// 				// http://selenium-release.storage.googleapis.com/index.html
 	// 				version: '2.50.0',
 	// 				arch: 'ia32',
 	// 				baseURL: 'https://selenium-release.storage.googleapis.com'
 	// 			},
 	// 			firefox: {
-	// 				// check for more recent versions of gecko  driver here:
+	// 				// check for more recent versions of Gecko driver here:
 	// 				// https://github.com/mozilla/geckodriver/releases
 	// 				version: '0.11.1',
 	// 				arch: process.arch,

From 966dfa9feb320a10c9cae363ef706ea1a2cc8d43 Mon Sep 17 00:00:00 2001
From: Arun Galva <arungalva@hotmail.com>
Date: Tue, 31 Oct 2017 01:08:08 -0400
Subject: [PATCH 215/244] i18n'd Resend_verification_mail, username_initials,
 uplaod avatar

---
 packages/rocketchat-i18n/i18n/en.i18n.json                | 2 ++
 packages/rocketchat-ui-account/client/accountProfile.html | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index da4d5b12fa3..107fd698bb4 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -832,6 +832,7 @@
   "Importer_Source_File": "Source File Selection",
   "Incoming_Livechats": "Incoming Livechats",
   "Incoming_WebHook": "Incoming WebHook",
+  "initials_avatar":"Initials Avatar",
   "inline_code": "inline code",
   "Install_Extension": "Install Extension",
   "Install_FxOs": "Install Rocket.Chat on your Firefox",
@@ -1852,6 +1853,7 @@
   "Unread_Tray_Icon_Alert": "Unread Tray Icon Alert",
   "Unstar_Message": "Remove Star",
   "Updated_at": "Updated at",
+  "Upload_user_avatar": "Upload avatar",
   "Upload_file_description": "File description",
   "Upload_file_name": "File name",
   "Upload_file_question": "Upload file?",
diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index 9c0afbffa06..798f8885737 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -38,10 +38,10 @@
 									{{#if allowAvatarChange}}
 										{{#if suggestions.ready}}
 											<div class="rc-select-avatar__list">
-												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-initials" aria-label="{{_ "Username_initials" }}">
+												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-initials" aria-label="{{_ "initials_avatar" }}">
 													{{> avatar username=initialsUsername }}
 												</div>
-												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-upload" aria-label="{{_ "Upload_file" }}">
+												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-upload" aria-label="{{_ "Upload_user_avatar" }}">
 													<label class="rc-select-avatar__upload-label avatar" for="upload-avatar">
 														{{> icon block="rc-select-avatar__upload-icon" icon="upload"}}
 													</label>
@@ -116,7 +116,7 @@
 								{{/unless}}
 								{{#unless emailVerified}}
 									<div class="rc-input__error">
-										<button class="rc-button rc-button--small" id="resend-verification-email">{{_ "Resend_verification_mail"}}</button>
+										<button class="rc-button rc-button--small" id="resend-verification-email">{{_ "Resend_verification_email"}}</button>
 									</div>
 								{{/unless}}
 							</div>

From e2c751b2e2dc8c1ff1cdbb97cd5c056bf5032e69 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 31 Oct 2017 14:50:17 -0200
Subject: [PATCH 216/244] update postcss

---
 .postcssrc                                    |   16 +-
 package-lock.json                             | 1049 ++++-------------
 package.json                                  |  263 +++--
 .../minifier-postcss/npm-shrinkwrap.json      |   71 +-
 packages/rocketchat-postcss/package.js        |    2 +-
 .../client/imports/components/popover.css     |   27 -
 6 files changed, 368 insertions(+), 1060 deletions(-)

diff --git a/.postcssrc b/.postcssrc
index d6cf5e49cbd..8a0a3294ca3 100644
--- a/.postcssrc
+++ b/.postcssrc
@@ -1,12 +1,14 @@
 {
 	"plugins": {
-		"postcss-smart-import": {},
-		"postcss-cssnext": {
-			"features": {
-				"customProperties": {
-					"preserve": true
-				}
-			},
+		"postcss-import": {},
+		"postcss-custom-properties": {
+			"preserve": true
+		},
+		"postcss-media-minmax": {},
+		"postcss-selector-not": {},
+		"postcss-calc": {},
+		"postcss-nesting": {},
+		"autoprefixer": {
 			"browsers": [
 				"ie > 10",
 				"last 2 Edge versions",
diff --git a/package-lock.json b/package-lock.json
index 7e43abf5031..47faa516c71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -193,11 +193,14 @@
 			"version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
 			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
 		},
-		"any-promise": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz",
-			"integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=",
-			"dev": true
+		"ansi-styles": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+			"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+			"dev": true,
+			"requires": {
+				"color-convert": "1.9.0"
+			}
 		},
 		"anymatch": {
 			"version": "1.3.2",
@@ -545,17 +548,40 @@
 			"dev": true
 		},
 		"autoprefixer": {
-			"version": "6.7.7",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-			"integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+			"version": "7.1.6",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
+			"integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==",
 			"dev": true,
 			"requires": {
-				"browserslist": "1.7.7",
-				"caniuse-db": "1.0.30000756",
+				"browserslist": "2.6.1",
+				"caniuse-lite": "1.0.30000756",
 				"normalize-range": "0.1.2",
 				"num2fraction": "1.2.2",
-				"postcss": "5.2.18",
+				"postcss": "6.0.13",
 				"postcss-value-parser": "3.3.0"
+			},
+			"dependencies": {
+				"browserslist": {
+					"version": "2.6.1",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz",
+					"integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "1.0.30000756",
+						"electron-to-chromium": "1.3.27"
+					}
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				}
 			}
 		},
 		"aws-sdk": {
@@ -2720,16 +2746,6 @@
 			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
 			"dev": true
 		},
-		"browserslist": {
-			"version": "1.7.7",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-			"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-			"dev": true,
-			"requires": {
-				"caniuse-db": "1.0.30000756",
-				"electron-to-chromium": "1.3.27"
-			}
-		},
 		"buffer": {
 			"version": "4.9.1",
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -2834,24 +2850,6 @@
 				"map-obj": "1.0.1"
 			}
 		},
-		"caniuse-api": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-			"integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-			"dev": true,
-			"requires": {
-				"browserslist": "1.7.7",
-				"caniuse-db": "1.0.30000756",
-				"lodash.memoize": "4.1.2",
-				"lodash.uniq": "4.5.0"
-			}
-		},
-		"caniuse-db": {
-			"version": "1.0.30000756",
-			"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000756.tgz",
-			"integrity": "sha1-6TimuZFjDzDSJj3TRYvrZdNiJos=",
-			"dev": true
-		},
 		"caniuse-lite": {
 			"version": "1.0.30000756",
 			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz",
@@ -2899,6 +2897,17 @@
 				"check-error": "1.0.2"
 			}
 		},
+		"chalk": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+			"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "3.2.0",
+				"escape-string-regexp": "1.0.5",
+				"supports-color": "4.5.0"
+			}
+		},
 		"check-error": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -4336,12 +4345,6 @@
 				}
 			}
 		},
-		"clone": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-			"integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-			"dev": true
-		},
 		"clone-regexp": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
@@ -4367,17 +4370,6 @@
 			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.31.0.tgz",
 			"integrity": "sha512-LKbMZKoAz7pMmWuSEl253G6yyloSulj1kXfvYv+3n3I8wMiI7QwnCHwKM3Zw5S9ItNV28Layq0/ihQXWmn9T9w=="
 		},
-		"color": {
-			"version": "0.11.4",
-			"resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-			"integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-			"dev": true,
-			"requires": {
-				"clone": "1.0.2",
-				"color-convert": "1.9.0",
-				"color-string": "0.3.0"
-			}
-		},
 		"color-convert": {
 			"version": "1.9.0",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
@@ -4393,15 +4385,6 @@
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
 			"dev": true
 		},
-		"color-string": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-			"integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-			"dev": true,
-			"requires": {
-				"color-name": "1.1.3"
-			}
-		},
 		"colors": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
@@ -4442,12 +4425,6 @@
 				}
 			}
 		},
-		"complex.js": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.4.tgz",
-			"integrity": "sha512-Syl95HpxUTS0QjwNxencZsKukgh1zdS9uXeXX2Us0pHaqBR6kiZZi0AkZ9VpZFwHJyVIUVzI4EumjWdXP3fy6w==",
-			"dev": true
-		},
 		"compress-commons": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
@@ -4994,41 +4971,6 @@
 				}
 			}
 		},
-		"css-color-function": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
-			"integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "0.1.0",
-				"color": "0.11.4",
-				"debug": "3.1.0",
-				"rgb": "0.1.0"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "0.1.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
-					"integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
-					"dev": true
-				},
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				}
-			}
-		},
 		"css-parse": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
@@ -5038,6 +4980,12 @@
 				"css": "2.2.1"
 			}
 		},
+		"css-unit-converter": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
+			"integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
+			"dev": true
+		},
 		"css-value": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
@@ -5160,12 +5108,6 @@
 			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
 			"dev": true
 		},
-		"decimal.js": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-7.2.3.tgz",
-			"integrity": "sha512-AoFI37QS0S87Ft0r3Bdz4q9xSpm1Paa9lSeKLXgMPk/u/+QPIM5Gy4DHcZQS1seqPJH4gHLauPGn347z0HbsrA==",
-			"dev": true
-		},
 		"deep-eql": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
@@ -6226,12 +6168,6 @@
 				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
 			}
 		},
-		"fraction.js": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.2.tgz",
-			"integrity": "sha512-OswcigOSil3vYXgrPSx4NCaSyPikXqVNYN/4CyhS0ucVOJ4GVYr6KQQLLcAudvS/4bBOzxqJ3XIsFaaMjl98ZQ==",
-			"dev": true
-		},
 		"freeport": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/freeport/-/freeport-1.0.5.tgz",
@@ -7452,23 +7388,6 @@
 				}
 			}
 		},
-		"gonzales-pe": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.2.tgz",
-			"integrity": "sha512-jbQFnd6CD3iEuGtSKVhsh37tQIkkx+/eil3tufyYOHMouG89uqtkWGP03P4vxY+XGeJnCi3ewIY+BnBogyC61Q==",
-			"dev": true,
-			"requires": {
-				"minimist": "1.1.3"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
-					"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
-					"dev": true
-				}
-			}
-		},
 		"google-auth-library": {
 			"version": "0.10.0",
 			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
@@ -7966,23 +7885,6 @@
 				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"
 			}
 		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "2.1.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				}
-			}
-		},
 		"has-flag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
@@ -8674,12 +8576,6 @@
 			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
 			"dev": true
 		},
-		"isnumeric": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
-			"integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ=",
-			"dev": true
-		},
 		"isobject": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
@@ -8719,12 +8615,6 @@
 			"integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
 			"dev": true
 		},
-		"javascript-natural-sort": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-			"integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=",
-			"dev": true
-		},
 		"jmespath": {
 			"version": "0.15.0",
 			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
@@ -9086,12 +8976,6 @@
 				}
 			}
 		},
-		"lodash": {
-			"version": "4.17.4",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-			"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-			"dev": true
-		},
 		"lodash._baseassign": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
@@ -9166,12 +9050,6 @@
 				"lodash.isarray": "3.0.4"
 			}
 		},
-		"lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-			"dev": true
-		},
 		"lodash.noop": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
@@ -9196,12 +9074,6 @@
 				"lodash._reinterpolate": "3.0.0"
 			}
 		},
-		"lodash.uniq": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-			"dev": true
-		},
 		"log-driver": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
@@ -9350,27 +9222,6 @@
 			"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
 			"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
 		},
-		"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=",
-			"dev": true
-		},
-		"mathjs": {
-			"version": "3.16.5",
-			"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-3.16.5.tgz",
-			"integrity": "sha1-11pSZUNdKCSwZ7N6R4dx3uv2qsw=",
-			"dev": true,
-			"requires": {
-				"complex.js": "2.0.4",
-				"decimal.js": "7.2.3",
-				"fraction.js": "4.0.2",
-				"javascript-natural-sort": "0.7.1",
-				"seed-random": "2.2.0",
-				"tiny-emitter": "2.0.0",
-				"typed-function": "0.10.5"
-			}
-		},
 		"mathml-tag-names": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz",
@@ -9973,12 +9824,6 @@
 				"wrappy": "1.0.2"
 			}
 		},
-		"onecolor": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/onecolor/-/onecolor-2.4.2.tgz",
-			"integrity": "sha1-pT7D/xccNEYBbdUhDRobVEv32HQ=",
-			"dev": true
-		},
 		"onetime": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -10423,27 +10268,6 @@
 				"pinkie": "2.0.4"
 			}
 		},
-		"pixrem": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/pixrem/-/pixrem-3.0.2.tgz",
-			"integrity": "sha1-MNG6+0w73Ojpu0vVahOYVhkyDDQ=",
-			"dev": true,
-			"requires": {
-				"browserslist": "1.7.7",
-				"postcss": "5.2.18",
-				"reduce-css-calc": "1.3.0"
-			}
-		},
-		"pleeease-filters": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-3.0.1.tgz",
-			"integrity": "sha1-Tf4OjxBGYTUXxktyi8gGCKfr8i8=",
-			"dev": true,
-			"requires": {
-				"onecolor": "2.4.2",
-				"postcss": "5.2.18"
-			}
-		},
 		"pluralize": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
@@ -10544,341 +10368,141 @@
 				}
 			}
 		},
-		"postcss-apply": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.3.0.tgz",
-			"integrity": "sha1-ovN8W9+ogeTBX08kXsDNlt0ucNU=",
+		"postcss-calc": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.1.tgz",
+			"integrity": "sha1-PSQXG79udinUIqQ26/5t2VEfQzA=",
 			"dev": true,
 			"requires": {
-				"balanced-match": "0.4.2",
-				"postcss": "5.2.18"
+				"css-unit-converter": "1.1.1",
+				"postcss": "6.0.13",
+				"postcss-selector-parser": "2.2.3",
+				"reduce-css-calc": "2.1.1"
 			},
 			"dependencies": {
-				"balanced-match": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				},
+				"reduce-css-calc": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.1.tgz",
+					"integrity": "sha1-9OzXoA7D5Wg3c/IIBnrX2hF7nbA=",
+					"dev": true,
+					"requires": {
+						"css-unit-converter": "1.1.1",
+						"postcss-value-parser": "3.3.0"
+					}
 				}
 			}
 		},
-		"postcss-attribute-case-insensitive": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-1.0.1.tgz",
-			"integrity": "sha1-zrc3d+EGFn6yM/GTjJvZ8uaXMI0=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18",
-				"postcss-selector-parser": "2.2.3"
-			}
-		},
-		"postcss-calc": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-			"integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
+		"postcss-custom-properties": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz",
+			"integrity": "sha512-eNR2h9T9ciKMoQEORrPjH33XeN/nuvVuxArOKmHtsFbGbNss631tgTrKou3/pmjAZbA4QQkhLIkPQkIk3WW+8w==",
 			"dev": true,
 			"requires": {
-				"postcss": "5.2.18",
-				"postcss-message-helpers": "2.0.0",
-				"reduce-css-calc": "1.3.0"
+				"balanced-match": "1.0.0",
+				"postcss": "6.0.13"
+			},
+			"dependencies": {
+				"balanced-match": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"dev": true
+				},
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				}
 			}
 		},
-		"postcss-color-function": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-2.0.1.tgz",
-			"integrity": "sha1-mtIm9VDop8f4uKd4YFRbbdf1UkE=",
+		"postcss-import": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.0.0.tgz",
+			"integrity": "sha1-qWLi34LTvFptpqOGhBdHIE9B71s=",
 			"dev": true,
 			"requires": {
-				"css-color-function": "1.3.3",
-				"postcss": "5.2.18",
-				"postcss-message-helpers": "2.0.0",
-				"postcss-value-parser": "3.3.0"
+				"postcss": "6.0.13",
+				"postcss-value-parser": "3.3.0",
+				"read-cache": "1.0.0",
+				"resolve": "1.5.0"
+			},
+			"dependencies": {
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+					"dev": true,
+					"requires": {
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
+					}
+				}
 			}
 		},
-		"postcss-color-gray": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-3.0.1.tgz",
-			"integrity": "sha1-dEMu3mbdg7HRNjVlxos3bhj/Z3A=",
+		"postcss-less": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.1.tgz",
+			"integrity": "sha512-zl0EEqq8Urh37Ppdv9zzhpZpLHrgkxmt6e3O4ftRa7/b8Uq2LV+/KBVM8/KuzmHNu+mthhOArg1lxbfqQ3NUdg==",
 			"dev": true,
 			"requires": {
-				"color": "0.11.4",
-				"postcss": "5.2.18",
-				"postcss-message-helpers": "2.0.0",
-				"reduce-function-call": "1.0.2"
+				"postcss": "5.2.18"
 			}
 		},
-		"postcss-color-hex-alpha": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-2.0.0.tgz",
-			"integrity": "sha1-RP1uyt5mAoZIyIHLZQTNy/3GzQk=",
+		"postcss-media-minmax": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
+			"integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
 			"dev": true,
 			"requires": {
-				"color": "0.10.1",
-				"postcss": "5.2.18",
-				"postcss-message-helpers": "2.0.0"
+				"postcss": "6.0.13"
 			},
 			"dependencies": {
-				"color": {
-					"version": "0.10.1",
-					"resolved": "https://registry.npmjs.org/color/-/color-0.10.1.tgz",
-					"integrity": "sha1-wEGI34KiCd3rzOzazT7DIPGTc58=",
+				"postcss": {
+					"version": "6.0.13",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
 					"dev": true,
 					"requires": {
-						"color-convert": "0.5.3",
-						"color-string": "0.3.0"
+						"chalk": "2.3.0",
+						"source-map": "0.6.1",
+						"supports-color": "4.5.0"
 					}
-				},
-				"color-convert": {
-					"version": "0.5.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
-					"integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
-					"dev": true
 				}
 			}
 		},
-		"postcss-color-hsl": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-1.0.5.tgz",
-			"integrity": "sha1-9Tuxw0gxDOMHrYnjGBqGRzi15oc=",
+		"postcss-media-query-parser": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+			"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
+			"dev": true
+		},
+		"postcss-nesting": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-3.0.0.tgz",
+			"integrity": "sha512-ijQlEXUcYXXNPdLMFcMEr4i5SEPRKR8fq/Iya4L0mQbNOCz+szTGCBlf0Cvu2HiQLjCNqLnGO4fKFLbNnXe7Ag==",
 			"dev": true,
 			"requires": {
-				"postcss": "5.2.18",
-				"postcss-value-parser": "3.3.0",
-				"units-css": "0.4.0"
-			}
-		},
-		"postcss-color-hwb": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-2.0.1.tgz",
-			"integrity": "sha1-1jr6+bcMtZX5AKKcn+V78qMvq+w=",
-			"dev": true,
-			"requires": {
-				"color": "0.11.4",
-				"postcss": "5.2.18",
-				"postcss-message-helpers": "2.0.0",
-				"reduce-function-call": "1.0.2"
-			}
-		},
-		"postcss-color-rebeccapurple": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-2.0.1.tgz",
-			"integrity": "sha1-dMZETny7fYVhO19yht96SRYIRRw=",
-			"dev": true,
-			"requires": {
-				"color": "0.11.4",
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-color-rgb": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-1.1.4.tgz",
-			"integrity": "sha1-8pJD4i6OjBNDRHQJI3LUzmBb6Lw=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18",
-				"postcss-value-parser": "3.3.0"
-			}
-		},
-		"postcss-color-rgba-fallback": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz",
-			"integrity": "sha1-bSlJG+WZCpMXPUfnx29YELCUAro=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18",
-				"postcss-value-parser": "3.3.0",
-				"rgb-hex": "1.0.0"
-			}
-		},
-		"postcss-cssnext": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-2.11.0.tgz",
-			"integrity": "sha1-MeaPAB5AlgTacDtm3hS4uMjJ8rE=",
-			"dev": true,
-			"requires": {
-				"autoprefixer": "6.7.7",
-				"caniuse-api": "1.6.1",
-				"chalk": "1.1.3",
-				"pixrem": "3.0.2",
-				"pleeease-filters": "3.0.1",
-				"postcss": "5.2.18",
-				"postcss-apply": "0.3.0",
-				"postcss-attribute-case-insensitive": "1.0.1",
-				"postcss-calc": "5.3.1",
-				"postcss-color-function": "2.0.1",
-				"postcss-color-gray": "3.0.1",
-				"postcss-color-hex-alpha": "2.0.0",
-				"postcss-color-hsl": "1.0.5",
-				"postcss-color-hwb": "2.0.1",
-				"postcss-color-rebeccapurple": "2.0.1",
-				"postcss-color-rgb": "1.1.4",
-				"postcss-color-rgba-fallback": "2.2.0",
-				"postcss-custom-media": "5.0.1",
-				"postcss-custom-properties": "5.0.2",
-				"postcss-custom-selectors": "3.0.0",
-				"postcss-font-family-system-ui": "1.0.2",
-				"postcss-font-variant": "2.0.1",
-				"postcss-image-set-polyfill": "0.3.5",
-				"postcss-initial": "1.5.3",
-				"postcss-media-minmax": "2.1.2",
-				"postcss-nesting": "2.3.1",
-				"postcss-pseudo-class-any-link": "1.0.0",
-				"postcss-pseudoelements": "3.0.0",
-				"postcss-replace-overflow-wrap": "1.0.0",
-				"postcss-selector-matches": "2.0.5",
-				"postcss-selector-not": "2.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				}
-			}
-		},
-		"postcss-custom-media": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz",
-			"integrity": "sha1-E40loYS/LrVN4S1VpsAcMKnYvYE=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-custom-properties": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-5.0.2.tgz",
-			"integrity": "sha1-lxnXjy2pz59TgQrrwj1GVhMKzrE=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "0.4.2",
-				"postcss": "5.2.18"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
-				}
-			}
-		},
-		"postcss-custom-selectors": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-3.0.0.tgz",
-			"integrity": "sha1-j4Ekn17Qeo0JF89qOf5bBWt/lqw=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "0.2.1",
-				"postcss": "5.2.18",
-				"postcss-selector-matches": "2.0.5"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
-					"integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
-					"dev": true
-				}
-			}
-		},
-		"postcss-font-family-system-ui": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-1.0.2.tgz",
-			"integrity": "sha1-PhpeP7fjHl6ecUOcyw6AFFVpJ8c=",
-			"dev": true,
-			"requires": {
-				"lodash": "4.17.4",
-				"postcss": "5.2.18",
-				"postcss-value-parser": "3.3.0"
-			}
-		},
-		"postcss-font-variant": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-2.0.1.tgz",
-			"integrity": "sha1-fKKRA/WfoCyjrOLKIrL3VoU9Tvg=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-image-set-polyfill": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz",
-			"integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
-			"dev": true,
-			"requires": {
-				"postcss": "6.0.13",
-				"postcss-media-query-parser": "0.2.3"
+				"postcss": "6.0.13"
 			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
 				"postcss": {
 					"version": "6.0.13",
 					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
@@ -10889,114 +10513,9 @@
 						"source-map": "0.6.1",
 						"supports-color": "4.5.0"
 					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
 				}
 			}
 		},
-		"postcss-initial": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-1.5.3.tgz",
-			"integrity": "sha1-IMPpHJaCLdsb7UlQjbltVrrDd9A=",
-			"dev": true,
-			"requires": {
-				"lodash.template": "4.4.0",
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-less": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.1.tgz",
-			"integrity": "sha512-zl0EEqq8Urh37Ppdv9zzhpZpLHrgkxmt6e3O4ftRa7/b8Uq2LV+/KBVM8/KuzmHNu+mthhOArg1lxbfqQ3NUdg==",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-media-minmax": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-2.1.2.tgz",
-			"integrity": "sha1-RExc+JJqteT9iiUJ6Sl+dRZJzfg=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-media-query-parser": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-			"dev": true
-		},
-		"postcss-message-helpers": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-			"integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-			"dev": true
-		},
-		"postcss-nesting": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-2.3.1.tgz",
-			"integrity": "sha1-lKa2pO9wf77CCof+5clXdZtOAc8=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-pseudo-class-any-link": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-1.0.0.tgz",
-			"integrity": "sha1-kDI5GWQB0zX+c6x1YYb6YuaTryY=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18",
-				"postcss-selector-parser": "1.3.3"
-			},
-			"dependencies": {
-				"postcss-selector-parser": {
-					"version": "1.3.3",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.3.tgz",
-					"integrity": "sha1-0u4Z33pk+O8hwacchvfUg1yIwoE=",
-					"dev": true,
-					"requires": {
-						"flatten": "1.0.2",
-						"indexes-of": "1.0.1",
-						"uniq": "1.0.1"
-					}
-				}
-			}
-		},
-		"postcss-pseudoelements": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz",
-			"integrity": "sha1-bGghd8eQC6BTtt8X+MWQKEx7i7w=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-replace-overflow-wrap": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-1.0.0.tgz",
-			"integrity": "sha1-8KA7Meq5Y2ppNr/SEOKu8bQ0pkM=",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
 		"postcss-reporter": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
@@ -11150,17 +10669,6 @@
 				}
 			}
 		},
-		"postcss-sass": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.1.0.tgz",
-			"integrity": "sha1-DSplW10kHsj0Gbs9o43lyhF0bds=",
-			"dev": true,
-			"requires": {
-				"gonzales-pe": "4.2.2",
-				"mathjs": "3.16.5",
-				"postcss": "5.2.18"
-			}
-		},
 		"postcss-scss": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz",
@@ -11230,14 +10738,14 @@
 				}
 			}
 		},
-		"postcss-selector-matches": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz",
-			"integrity": "sha1-+g9Dvle2jneqTNEYBwI0kqExAn8=",
+		"postcss-selector-not": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
+			"integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
 			"dev": true,
 			"requires": {
 				"balanced-match": "0.4.2",
-				"postcss": "5.2.18"
+				"postcss": "6.0.13"
 			},
 			"dependencies": {
 				"balanced-match": {
@@ -11245,94 +10753,6 @@
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
 					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
 					"dev": true
-				}
-			}
-		},
-		"postcss-selector-not": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-2.0.0.tgz",
-			"integrity": "sha1-xzrSGj91I0vuf+4mnhVP1qhpeY0=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "0.2.1",
-				"postcss": "5.2.18"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
-					"integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
-					"dev": true
-				}
-			}
-		},
-		"postcss-selector-parser": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-			"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-			"dev": true,
-			"requires": {
-				"flatten": "1.0.2",
-				"indexes-of": "1.0.1",
-				"uniq": "1.0.1"
-			}
-		},
-		"postcss-smart-import": {
-			"version": "0.7.5",
-			"resolved": "https://registry.npmjs.org/postcss-smart-import/-/postcss-smart-import-0.7.5.tgz",
-			"integrity": "sha512-Bs9wAFxH5irGpenBg9a65jTcydZLh7VBTX6NYwMXvVXO6y9CQ83kRmfpQDs5lHhl6IODeIeQfJep5HBMd9UVCQ==",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.26.0",
-				"lodash": "4.17.4",
-				"object-assign": "4.1.1",
-				"postcss": "6.0.13",
-				"postcss-sass": "0.1.0",
-				"postcss-scss": "1.0.2",
-				"postcss-value-parser": "3.3.0",
-				"promise-each": "2.2.0",
-				"read-cache": "1.0.0",
-				"resolve": "1.5.0",
-				"sugarss": "1.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
 				},
 				"postcss": {
 					"version": "6.0.13",
@@ -11344,24 +10764,20 @@
 						"source-map": "0.6.1",
 						"supports-color": "4.5.0"
 					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
 				}
 			}
 		},
+		"postcss-selector-parser": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+			"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+			"dev": true,
+			"requires": {
+				"flatten": "1.0.2",
+				"indexes-of": "1.0.1",
+				"uniq": "1.0.1"
+			}
+		},
 		"postcss-sorting": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-3.1.0.tgz",
@@ -11479,15 +10895,6 @@
 				"tdigest": "0.1.1"
 			}
 		},
-		"promise-each": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
-			"integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=",
-			"dev": true,
-			"requires": {
-				"any-promise": "0.1.0"
-			}
-		},
 		"proxyquire": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
@@ -11771,42 +11178,6 @@
 				"strip-indent": "1.0.1"
 			}
 		},
-		"reduce-css-calc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-			"integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "0.4.2",
-				"math-expression-evaluator": "1.2.17",
-				"reduce-function-call": "1.0.2"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
-				}
-			}
-		},
-		"reduce-function-call": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
-			"integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "0.4.2"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
-				}
-			}
-		},
 		"regenerator-runtime": {
 			"version": "0.10.5",
 			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@@ -11956,18 +11327,6 @@
 				"through2": "2.0.3"
 			}
 		},
-		"rgb": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
-			"integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
-			"dev": true
-		},
-		"rgb-hex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz",
-			"integrity": "sha1-v6+M2c2RZLWibXHrTxWgllMks8E=",
-			"dev": true
-		},
 		"rgb2hex": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
@@ -12027,12 +11386,6 @@
 			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
 			"integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
 		},
-		"seed-random": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
-			"integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ=",
-			"dev": true
-		},
 		"selenium-standalone": {
 			"version": "6.11.0",
 			"resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.11.0.tgz",
@@ -12361,6 +11714,12 @@
 				"hoek": "2.16.3"
 			}
 		},
+		"source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true
+		},
 		"source-map-resolve": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
@@ -13127,6 +12486,23 @@
 				}
 			}
 		},
+		"supports-color": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+			"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+			"dev": true,
+			"requires": {
+				"has-flag": "2.0.0"
+			},
+			"dependencies": {
+				"has-flag": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+					"dev": true
+				}
+			}
+		},
 		"svg-tags": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
@@ -13510,12 +12886,6 @@
 				}
 			}
 		},
-		"tiny-emitter": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.0.tgz",
-			"integrity": "sha1-utMnrbGAS0KiMa+nQVMr2ITNCa0=",
-			"dev": true
-		},
 		"tmp": {
 			"version": "0.0.33",
 			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -13600,12 +12970,6 @@
 			"integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
 			"dev": true
 		},
-		"typed-function": {
-			"version": "0.10.5",
-			"resolved": "https://registry.npmjs.org/typed-function/-/typed-function-0.10.5.tgz",
-			"integrity": "sha1-Lg8Yq9BlIZ+raUpEamXG0ZgYMsA=",
-			"dev": true
-		},
 		"typedarray": {
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -13653,7 +13017,6 @@
 			"version": "3.3.4",
 			"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
 			"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
-			"dev": true,
 			"requires": {
 				"sprintf-js": "1.1.1",
 				"util-deprecate": "1.0.2"
@@ -13662,14 +13025,12 @@
 				"sprintf-js": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
-					"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=",
-					"dev": true
+					"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 				}
 			}
 		},
@@ -13687,16 +13048,6 @@
 				"crypto-random-string": "1.0.0"
 			}
 		},
-		"units-css": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
-			"integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
-			"dev": true,
-			"requires": {
-				"isnumeric": "0.2.0",
-				"viewport-dimensions": "0.2.0"
-			}
-		},
 		"upper-case": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -13811,12 +13162,6 @@
 				}
 			}
 		},
-		"viewport-dimensions": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
-			"integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w=",
-			"dev": true
-		},
 		"walkdir": {
 			"version": "0.0.11",
 			"resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
diff --git a/package.json b/package.json
index 65bd1e9314b..768ebeca98b 100644
--- a/package.json
+++ b/package.json
@@ -1,131 +1,136 @@
 {
-	"name": "Rocket.Chat",
-	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-develop",
-	"author": {
-		"name": "Rocket.Chat",
-		"url": "https://rocket.chat/"
-	},
-	"contributors": [
-		{
-			"name": "Aaron Ogle",
-			"email": "aaron.ogle@rocket.chat"
-		},
-		{
-			"name": "Bradley Hilton",
-			"email": "bradley.hilton@rocket.chat"
-		},
-		{
-			"name": "Diego Sampaio",
-			"email": "diego.sampaio@rocket.chat"
-		},
-		{
-			"name": "Gabriel Engel",
-			"email": "gabriel.engel@rocket.chat"
-		},
-		{
-			"name": "Guilherme Gazzo",
-			"email": "guilherme.gazzo@rocket.chat"
-		},
-		{
-			"name": "Karl Prieb",
-			"email": "karl.priebk@rocket.chat"
-		},
-		{
-			"name": "Marcelo Schmidt",
-			"email": "marcelo.schmidt@rocket.chat"
-		},
-		{
-			"name": "Rodrigo Nascimento",
-			"email": "rodrigo.nascimento@rocket.chat"
-		},
-		{
-			"name": "Sing Li",
-			"email": "sing.li@rocket.chat"
-		}
-	],
-	"mocha": {
-		"tests": [
-			"packages/**/*.tests.js"
-		],
-		"files": [
-			"packages/**/*.mocks.js",
-			"packages/**/*.js",
-			"!packages/**/*.tests.js"
-		]
-	},
-	"keywords": [
-		"rocketchat",
-		"rocket",
-		"chat"
-	],
-	"scripts": {
-		"start": "meteor npm i && meteor",
-		"lint": "eslint .",
-		"lint-fix": "eslint . --fix",
-		"stylelint": "stylelint packages/**/*.css",
-		"test": "node .scripts/start.js",
-		"deploy": "npm run build && pm2 startOrRestart pm2.json",
-		"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
-		"chimp-test": "chimp tests/chimp-config.js",
-		"postinstall": "cd packages/rocketchat-katex && npm i",
-		"testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
-		"coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
-		"testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
-		"version": "node .scripts/version.js",
-		"set-version": "node .scripts/set-version.js",
-		"release": "npm run set-version --silent"
-	},
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/RocketChat/Rocket.Chat.git"
-	},
-	"bugs": {
-		"url": "https://github.com/RocketChat/Rocket.Chat/issues",
-		"email": "support@rocket.chat"
-	},
-	"devDependencies": {
-		"babel-mocha-es6-compiler": "^0.1.0",
-		"babel-plugin-array-includes": "^2.0.3",
-		"chimp": "^0.50.2",
-		"conventional-changelog-cli": "^1.3.4",
-		"eslint": "^4.10.0",
-		"mock-require": "^2.0.2",
-		"postcss-cssnext": "^2.11.0",
-		"postcss-smart-import": "^0.7.5",
-		"proxyquire": "^1.8.0",
-		"simple-git": "^1.80.1",
-		"stylelint": "^8.2.0",
-		"stylelint-order": "^0.7.0",
-		"supertest": "^3.0.0"
-	},
-	"dependencies": {
-		"@google-cloud/storage": "^1.4.0",
-		"aws-sdk": "^2.141.0",
-		"babel-runtime": "^6.26.0",
-		"bcrypt": "^1.0.3",
-		"bunyan": "^1.8.12",
-		"codemirror": "^5.31.0",
-		"core-js": "2.5.1",
-		"emailreplyparser": "0.0.5",
-		"file-type": "^7.2.0",
-		"highlight.js": "^9.12.0",
-		"imap": "^0.8.19",
-		"jquery": "^3.2.1",
-		"ldapjs": "^1.0.1",
-		"mailparser-node4": "^2.0.2-2",
-		"mime-db": "^1.31.0",
-		"mime-type": "^3.0.5",
-		"moment": "^2.19.1",
-		"moment-timezone": "^0.5.13",
-		"photoswipe": "^4.1.2",
-		"poplib": "^0.1.7",
-		"prom-client": "^10.2.1",
-		"semver": "^5.4.1",
-		"toastr": "^2.1.2",
-		"underscore": "^1.8.3",
-		"underscore.string": "^3.3.4",
-		"wolfy87-eventemitter": "^5.2.3"
-	}
+  "name": "Rocket.Chat",
+  "description": "The Ultimate Open Source WebChat Platform",
+  "version": "0.59.0-develop",
+  "author": {
+    "name": "Rocket.Chat",
+    "url": "https://rocket.chat/"
+  },
+  "contributors": [
+    {
+      "name": "Aaron Ogle",
+      "email": "aaron.ogle@rocket.chat"
+    },
+    {
+      "name": "Bradley Hilton",
+      "email": "bradley.hilton@rocket.chat"
+    },
+    {
+      "name": "Diego Sampaio",
+      "email": "diego.sampaio@rocket.chat"
+    },
+    {
+      "name": "Gabriel Engel",
+      "email": "gabriel.engel@rocket.chat"
+    },
+    {
+      "name": "Guilherme Gazzo",
+      "email": "guilherme.gazzo@rocket.chat"
+    },
+    {
+      "name": "Karl Prieb",
+      "email": "karl.priebk@rocket.chat"
+    },
+    {
+      "name": "Marcelo Schmidt",
+      "email": "marcelo.schmidt@rocket.chat"
+    },
+    {
+      "name": "Rodrigo Nascimento",
+      "email": "rodrigo.nascimento@rocket.chat"
+    },
+    {
+      "name": "Sing Li",
+      "email": "sing.li@rocket.chat"
+    }
+  ],
+  "mocha": {
+    "tests": [
+      "packages/**/*.tests.js"
+    ],
+    "files": [
+      "packages/**/*.mocks.js",
+      "packages/**/*.js",
+      "!packages/**/*.tests.js"
+    ]
+  },
+  "keywords": [
+    "rocketchat",
+    "rocket",
+    "chat"
+  ],
+  "scripts": {
+    "start": "meteor npm i && meteor",
+    "lint": "eslint .",
+    "lint-fix": "eslint . --fix",
+    "stylelint": "stylelint packages/**/*.css",
+    "test": "node .scripts/start.js",
+    "deploy": "npm run build && pm2 startOrRestart pm2.json",
+    "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
+    "chimp-test": "chimp tests/chimp-config.js",
+    "postinstall": "cd packages/rocketchat-katex && npm i",
+    "testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+    "coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+    "testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+    "version": "node .scripts/version.js",
+    "set-version": "node .scripts/set-version.js",
+    "release": "npm run set-version --silent"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/RocketChat/Rocket.Chat.git"
+  },
+  "bugs": {
+    "url": "https://github.com/RocketChat/Rocket.Chat/issues",
+    "email": "support@rocket.chat"
+  },
+  "devDependencies": {
+    "autoprefixer": "^7.1.6",
+    "babel-mocha-es6-compiler": "^0.1.0",
+    "babel-plugin-array-includes": "^2.0.3",
+    "chimp": "^0.50.2",
+    "conventional-changelog-cli": "^1.3.4",
+    "eslint": "^4.10.0",
+    "mock-require": "^2.0.2",
+    "postcss-calc": "^6.0.1",
+    "postcss-custom-properties": "^6.2.0",
+    "postcss-import": "^11.0.0",
+    "postcss-media-minmax": "^3.0.0",
+    "postcss-nesting": "^3.0.0",
+    "postcss-selector-not": "^3.0.1",
+    "proxyquire": "^1.8.0",
+    "simple-git": "^1.80.1",
+    "stylelint": "^8.2.0",
+    "stylelint-order": "^0.7.0",
+    "supertest": "^3.0.0"
+  },
+  "dependencies": {
+    "@google-cloud/storage": "^1.4.0",
+    "aws-sdk": "^2.141.0",
+    "babel-runtime": "^6.26.0",
+    "bcrypt": "^1.0.3",
+    "bunyan": "^1.8.12",
+    "codemirror": "^5.31.0",
+    "core-js": "2.5.1",
+    "emailreplyparser": "0.0.5",
+    "file-type": "^7.2.0",
+    "highlight.js": "^9.12.0",
+    "imap": "^0.8.19",
+    "jquery": "^3.2.1",
+    "ldapjs": "^1.0.1",
+    "mailparser-node4": "^2.0.2-2",
+    "mime-db": "^1.31.0",
+    "mime-type": "^3.0.5",
+    "moment": "^2.19.1",
+    "moment-timezone": "^0.5.13",
+    "photoswipe": "^4.1.2",
+    "poplib": "^0.1.7",
+    "prom-client": "^10.2.1",
+    "semver": "^5.4.1",
+    "toastr": "^2.1.2",
+    "underscore": "^1.8.3",
+    "underscore.string": "^3.3.4",
+    "wolfy87-eventemitter": "^5.2.3"
+  }
 }
diff --git a/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json b/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json
index 6cc2d7e7d66..9d7e066dbc5 100644
--- a/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json
+++ b/packages/rocketchat-postcss/.npm/plugin/minifier-postcss/npm-shrinkwrap.json
@@ -1,15 +1,10 @@
 {
   "lockfileVersion": 1,
   "dependencies": {
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-    },
     "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+      "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug=="
     },
     "app-module-path": {
       "version": "2.2.0",
@@ -17,46 +12,39 @@
       "integrity": "sha1-ZBqlXft9am8KgUHEucCqULbCTdU="
     },
     "chalk": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+      "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q=="
+    },
+    "color-convert": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
+      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o="
+    },
+    "color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
-      }
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
-    },
     "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-    },
-    "js-base64": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
-      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
     },
     "postcss": {
-      "version": "5.2.17",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+      "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
       "dependencies": {
         "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -65,15 +53,10 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
       "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
     },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
-    },
     "supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY="
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+      "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s="
     }
   }
 }
diff --git a/packages/rocketchat-postcss/package.js b/packages/rocketchat-postcss/package.js
index 181c5f0a48f..51d1143e3e0 100644
--- a/packages/rocketchat-postcss/package.js
+++ b/packages/rocketchat-postcss/package.js
@@ -12,7 +12,7 @@ Package.registerBuildPlugin({
 	],
 	npmDependencies: {
 		'app-module-path': '2.2.0',
-		'postcss': '5.2.17',
+		'postcss': '6.0.13',
 		'source-map': '0.5.6'
 	},
 	sources: [
diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 2cf63f88865..7fce75d1509 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -1,26 +1,3 @@
-:root {
-	--rc-popover-open: {
-		display: flex;
-
-		animation: dropdown-show 0.1s cubic-bezier(0.45, 0.05, 0.55, 0.95);
-		align-items: flex-start;
-	}
-	--rc-popover-open-mobile: {
-		position: fixed;
-		top: initial;
-		right: 0;
-		bottom: 0;
-		left: 0;
-
-		display: inline-block;
-
-		width: 100vw;
-		padding: 8px;
-
-		animation: dropup-show 0.5s cubic-bezier(0.45, 0.05, 0.55, 0.95);
-	}
-}
-
 .rc-popover {
 	position: fixed;
 	z-index: 9999;
@@ -51,10 +28,6 @@
 		box-shadow: 0 0 2px 0 rgba(47, 52, 61, 0.08), 0 0 12px 0 rgba(47, 52, 61, 0.12);
 	}
 
-	&--show {
-		@apply --rc-popover-open;
-	}
-
 	&__column {
 		display: flex;
 		flex-direction: column;

From ba2d0bad15468e22c24f744df6568b175508f217 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 31 Oct 2017 15:21:54 -0200
Subject: [PATCH 217/244] Update package-lock

---
 package-lock.json                             | 23255 +++++++---------
 .../rocketchat-livechat/app/package-lock.json |   770 +-
 2 files changed, 9890 insertions(+), 14135 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 47faa516c71..7b000a40dd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13801 +1,9458 @@
 {
-	"name": "Rocket.Chat",
-	"version": "0.59.0-develop",
-	"lockfileVersion": 1,
-	"requires": true,
-	"dependencies": {
-		"@google-cloud/common": {
-			"version": "0.13.6",
-			"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
-			"integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
-			"requires": {
-				"array-uniq": "1.0.3",
-				"arrify": "1.0.1",
-				"concat-stream": "1.6.0",
-				"create-error-class": "3.0.2",
-				"duplexify": "3.5.1",
-				"ent": "2.2.0",
-				"extend": "3.0.1",
-				"google-auto-auth": "0.7.2",
-				"is": "3.2.1",
-				"log-driver": "1.2.5",
-				"methmeth": "1.1.0",
-				"modelo": "4.2.0",
-				"request": "2.81.0",
-				"retry-request": "3.1.0",
-				"split-array-stream": "1.0.3",
-				"stream-events": "1.0.2",
-				"string-format-obj": "1.1.0",
-				"through2": "2.0.3"
-			},
-			"dependencies": {
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-				}
-			}
-		},
-		"@google-cloud/storage": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.4.0.tgz",
-			"integrity": "sha512-vt1NU7D12OGYPhWfwBD1Q2qFS6Suykorlp3NLaES2W9CW6sEBWLwScxElXt8nPvonYBCFt99jP4g1AqY+0hefw==",
-			"requires": {
-				"@google-cloud/common": "0.13.6",
-				"arrify": "1.0.1",
-				"async": "2.5.0",
-				"concat-stream": "1.6.0",
-				"create-error-class": "3.0.2",
-				"duplexify": "3.5.1",
-				"extend": "3.0.1",
-				"gcs-resumable-upload": "0.8.2",
-				"hash-stream-validation": "0.2.1",
-				"is": "3.2.1",
-				"mime-types": "2.1.17",
-				"once": "1.4.0",
-				"pumpify": "1.3.5",
-				"safe-buffer": "5.1.1",
-				"snakeize": "0.1.0",
-				"stream-events": "1.0.2",
-				"string-format-obj": "1.1.0",
-				"through2": "2.0.3"
-			},
-			"dependencies": {
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-				},
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo="
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
-		"JSONStream": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
-			"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
-			"dev": true,
-			"requires": {
-				"jsonparse": "1.3.1",
-				"through": "2.3.8"
-			}
-		},
-		"abbrev": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-			"integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
-		},
-		"acorn": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-			"integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
-			"dev": true
-		},
-		"acorn-jsx": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-			"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-			"dev": true,
-			"requires": {
-				"acorn": "3.3.0"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-					"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-					"dev": true
-				}
-			}
-		},
-		"add-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
-			"integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-			"dev": true
-		},
-		"addressparser": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
-			"integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
-		},
-		"agent-base": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
-			"integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
-			"dev": true,
-			"requires": {
-				"extend": "3.0.1",
-				"semver": "5.0.3"
-			},
-			"dependencies": {
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-					"dev": true
-				},
-				"semver": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
-					"integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
-					"dev": true
-				}
-			}
-		},
-		"ajv": {
-			"version": "4.11.8",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-			"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-			"requires": {
-				"co": "4.6.0",
-				"json-stable-stringify": "1.0.1"
-			}
-		},
-		"ajv-keywords": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-			"integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
-			"dev": true
-		},
-		"align-text": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-			"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-			"dev": true,
-			"requires": {
-				"kind-of": "3.2.2",
-				"longest": "1.0.1",
-				"repeat-string": "1.6.1"
-			}
-		},
-		"amdefine": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-			"dev": true
-		},
-		"ansi-escapes": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-			"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-			"dev": true
-		},
-		"ansi-regex": {
-			"version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-		},
-		"ansi-styles": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-			"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-			"dev": true,
-			"requires": {
-				"color-convert": "1.9.0"
-			}
-		},
-		"anymatch": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-			"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-			"dev": true,
-			"requires": {
-				"micromatch": "2.3.11",
-				"normalize-path": "2.1.1"
-			}
-		},
-		"aproba": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-			"integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw=="
-		},
-		"archiver": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz",
-			"integrity": "sha1-TyGU1tj5nfP1MeaIHxTxXVX6ryI=",
-			"dev": true,
-			"requires": {
-				"archiver-utils": "1.3.0",
-				"async": "2.5.0",
-				"buffer-crc32": "0.2.13",
-				"glob": "7.1.2",
-				"lodash": "4.17.4",
-				"readable-stream": "2.3.3",
-				"tar-stream": "1.5.2",
-				"walkdir": "0.0.11",
-				"zip-stream": "1.2.0"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"archiver-utils": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-			"integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
-			"dev": true,
-			"requires": {
-				"glob": "7.1.2",
-				"graceful-fs": "4.1.11",
-				"lazystream": "1.0.0",
-				"lodash": "4.17.4",
-				"normalize-path": "2.1.1",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"are-we-there-yet": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-			"integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-			"requires": {
-				"delegates": "1.0.0",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"argparse": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-			"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "1.0.3"
-			},
-			"dependencies": {
-				"sprintf-js": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-					"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-					"dev": true
-				}
-			}
-		},
-		"arr-diff": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-			"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-			"dev": true,
-			"requires": {
-				"arr-flatten": "1.1.0"
-			}
-		},
-		"arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-			"dev": true
-		},
-		"array-find-index": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-			"dev": true
-		},
-		"array-ify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-			"integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
-			"dev": true
-		},
-		"array-includes": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
-			"integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
-			"requires": {
-				"define-properties": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-				"es-abstract": "1.7.0"
-			}
-		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-			"dev": true,
-			"requires": {
-				"array-uniq": "1.0.3"
-			}
-		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
-		},
-		"array-unique": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-			"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-			"dev": true
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-		},
-		"asn1": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-		},
-		"assert-plus": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
-		},
-		"assertion-error": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
-			"integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
-			"dev": true
-		},
-		"async": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-			"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-			"requires": {
-				"lodash": "4.17.4"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-				}
-			}
-		},
-		"async-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-			"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-			"dev": true
-		},
-		"asynckit": {
-			"version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-		},
-		"atob": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-			"integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
-			"dev": true
-		},
-		"autoprefixer": {
-			"version": "7.1.6",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
-			"integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==",
-			"dev": true,
-			"requires": {
-				"browserslist": "2.6.1",
-				"caniuse-lite": "1.0.30000756",
-				"normalize-range": "0.1.2",
-				"num2fraction": "1.2.2",
-				"postcss": "6.0.13",
-				"postcss-value-parser": "3.3.0"
-			},
-			"dependencies": {
-				"browserslist": {
-					"version": "2.6.1",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz",
-					"integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "1.0.30000756",
-						"electron-to-chromium": "1.3.27"
-					}
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				}
-			}
-		},
-		"aws-sdk": {
-			"version": "2.141.0",
-			"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz",
-			"integrity": "sha1-PZallw/Z9UDOq8wdS66zO3FYOqc=",
-			"requires": {
-				"buffer": "4.9.1",
-				"crypto-browserify": "1.0.9",
-				"events": "1.1.1",
-				"jmespath": "0.15.0",
-				"querystring": "0.2.0",
-				"sax": "1.2.1",
-				"url": "0.10.3",
-				"uuid": "3.1.0",
-				"xml2js": "0.4.17",
-				"xmlbuilder": "4.2.1"
-			}
-		},
-		"aws-sign2": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-			"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
-		},
-		"aws4": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-			"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
-		},
-		"babel-mocha-es6-compiler": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/babel-mocha-es6-compiler/-/babel-mocha-es6-compiler-0.1.0.tgz",
-			"integrity": "sha1-QMnkBoCvRhWP7usntJQUtrgOxDg=",
-			"dev": true,
-			"requires": {
-				"babel-core": "6.9.1",
-				"babel-plugin-add-module-exports": "0.2.1",
-				"babel-preset-es2015": "6.3.13",
-				"babel-preset-react": "6.3.13",
-				"babel-preset-stage-0": "6.3.13"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"babel-code-frame": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"esutils": "2.0.2",
-						"js-tokens": "3.0.2"
-					}
-				},
-				"babel-core": {
-					"version": "6.9.1",
-					"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.9.1.tgz",
-					"integrity": "sha1-SNRx7r9N5GngqUL+RW3MlLGL6A0=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "6.26.0",
-						"babel-generator": "6.26.0",
-						"babel-helpers": "6.24.1",
-						"babel-messages": "6.23.0",
-						"babel-register": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"convert-source-map": "1.5.0",
-						"debug": "2.6.9",
-						"json5": "0.4.0",
-						"lodash": "4.17.4",
-						"minimatch": "2.0.10",
-						"path-exists": "1.0.0",
-						"path-is-absolute": "1.0.1",
-						"private": "0.1.8",
-						"shebang-regex": "1.0.0",
-						"slash": "1.0.0",
-						"source-map": "0.5.7"
-					}
-				},
-				"babel-generator": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
-					"integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
-					"dev": true,
-					"requires": {
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"detect-indent": "4.0.0",
-						"jsesc": "1.3.0",
-						"lodash": "4.17.4",
-						"source-map": "0.5.7",
-						"trim-right": "1.0.1"
-					}
-				},
-				"babel-helper-bindify-decorators": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
-					"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-builder-binary-assignment-operator-visitor": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-					"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-					"dev": true,
-					"requires": {
-						"babel-helper-explode-assignable-expression": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-builder-react-jsx": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
-					"integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"esutils": "2.0.2"
-					}
-				},
-				"babel-helper-call-delegate": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-					"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-					"dev": true,
-					"requires": {
-						"babel-helper-hoist-variables": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-define-map": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-					"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-helper-explode-assignable-expression": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-					"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-explode-class": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
-					"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
-					"dev": true,
-					"requires": {
-						"babel-helper-bindify-decorators": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-function-name": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-					"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-					"dev": true,
-					"requires": {
-						"babel-helper-get-function-arity": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-get-function-arity": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-					"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-hoist-variables": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-					"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-optimise-call-expression": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-					"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-regex": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-					"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-helper-remap-async-to-generator": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-					"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-replace-supers": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-					"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-					"dev": true,
-					"requires": {
-						"babel-helper-optimise-call-expression": "6.24.1",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helpers": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-					"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0"
-					}
-				},
-				"babel-messages": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-add-module-exports": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
-					"integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
-					"dev": true
-				},
-				"babel-plugin-check-es2015-constants": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-					"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-syntax-async-functions": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-					"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-					"dev": true
-				},
-				"babel-plugin-syntax-async-generators": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-					"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
-					"dev": true
-				},
-				"babel-plugin-syntax-class-constructor-call": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-					"integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
-					"dev": true
-				},
-				"babel-plugin-syntax-class-properties": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-					"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
-					"dev": true
-				},
-				"babel-plugin-syntax-decorators": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-					"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
-					"dev": true
-				},
-				"babel-plugin-syntax-do-expressions": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
-					"integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
-					"dev": true
-				},
-				"babel-plugin-syntax-dynamic-import": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-					"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-					"dev": true
-				},
-				"babel-plugin-syntax-exponentiation-operator": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-					"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-					"dev": true
-				},
-				"babel-plugin-syntax-export-extensions": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-					"integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
-					"dev": true
-				},
-				"babel-plugin-syntax-flow": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-					"integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
-					"dev": true
-				},
-				"babel-plugin-syntax-function-bind": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
-					"integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
-					"dev": true
-				},
-				"babel-plugin-syntax-jsx": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-					"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-					"dev": true
-				},
-				"babel-plugin-syntax-object-rest-spread": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-					"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-					"dev": true
-				},
-				"babel-plugin-syntax-trailing-function-commas": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-					"integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-					"dev": true
-				},
-				"babel-plugin-transform-async-generator-functions": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
-					"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
-					"dev": true,
-					"requires": {
-						"babel-helper-remap-async-to-generator": "6.24.1",
-						"babel-plugin-syntax-async-generators": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-async-to-generator": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-					"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-					"dev": true,
-					"requires": {
-						"babel-helper-remap-async-to-generator": "6.24.1",
-						"babel-plugin-syntax-async-functions": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-class-constructor-call": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
-					"integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-class-constructor-call": "6.18.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-class-properties": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
-					"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-plugin-syntax-class-properties": "6.13.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-decorators": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
-					"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
-					"dev": true,
-					"requires": {
-						"babel-helper-explode-class": "6.24.1",
-						"babel-plugin-syntax-decorators": "6.13.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-do-expressions": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
-					"integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-do-expressions": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-arrow-functions": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-					"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-block-scoped-functions": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-					"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-block-scoping": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-					"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-plugin-transform-es2015-classes": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-					"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-					"dev": true,
-					"requires": {
-						"babel-helper-define-map": "6.26.0",
-						"babel-helper-function-name": "6.24.1",
-						"babel-helper-optimise-call-expression": "6.24.1",
-						"babel-helper-replace-supers": "6.24.1",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-computed-properties": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-					"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-destructuring": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-					"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-for-of": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-					"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-function-name": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-					"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-literals": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-					"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-modules-commonjs": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
-					"integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-transform-strict-mode": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-object-super": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-					"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-					"dev": true,
-					"requires": {
-						"babel-helper-replace-supers": "6.24.1",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-parameters": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-					"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-					"dev": true,
-					"requires": {
-						"babel-helper-call-delegate": "6.24.1",
-						"babel-helper-get-function-arity": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-shorthand-properties": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-					"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-spread": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-					"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-sticky-regex": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-					"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-					"dev": true,
-					"requires": {
-						"babel-helper-regex": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-template-literals": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-					"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-typeof-symbol": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-					"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-unicode-regex": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-					"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-					"dev": true,
-					"requires": {
-						"babel-helper-regex": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"regexpu-core": "2.0.0"
-					}
-				},
-				"babel-plugin-transform-exponentiation-operator": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-					"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-					"dev": true,
-					"requires": {
-						"babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-						"babel-plugin-syntax-exponentiation-operator": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-export-extensions": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
-					"integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-export-extensions": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-flow-strip-types": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
-					"integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-flow": "6.18.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-function-bind": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
-					"integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-function-bind": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-object-rest-spread": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
-					"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-object-rest-spread": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-react-display-name": {
-					"version": "6.25.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
-					"integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-react-jsx": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
-					"integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
-					"dev": true,
-					"requires": {
-						"babel-helper-builder-react-jsx": "6.26.0",
-						"babel-plugin-syntax-jsx": "6.18.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-react-jsx-source": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
-					"integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-jsx": "6.18.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-regenerator": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-					"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-					"dev": true,
-					"requires": {
-						"regenerator-transform": "0.10.1"
-					}
-				},
-				"babel-plugin-transform-strict-mode": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-					"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-preset-es2015": {
-					"version": "6.3.13",
-					"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
-					"integrity": "sha1-l9zn7ykuGMubK3VF2AxZPCjZUX8=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-check-es2015-constants": "6.22.0",
-						"babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-						"babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-						"babel-plugin-transform-es2015-block-scoping": "6.26.0",
-						"babel-plugin-transform-es2015-classes": "6.24.1",
-						"babel-plugin-transform-es2015-computed-properties": "6.24.1",
-						"babel-plugin-transform-es2015-destructuring": "6.23.0",
-						"babel-plugin-transform-es2015-for-of": "6.23.0",
-						"babel-plugin-transform-es2015-function-name": "6.24.1",
-						"babel-plugin-transform-es2015-literals": "6.22.0",
-						"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-						"babel-plugin-transform-es2015-object-super": "6.24.1",
-						"babel-plugin-transform-es2015-parameters": "6.24.1",
-						"babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-						"babel-plugin-transform-es2015-spread": "6.22.0",
-						"babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-						"babel-plugin-transform-es2015-template-literals": "6.22.0",
-						"babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-						"babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-						"babel-plugin-transform-regenerator": "6.26.0"
-					}
-				},
-				"babel-preset-react": {
-					"version": "6.3.13",
-					"resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.3.13.tgz",
-					"integrity": "sha1-E9VeBqZfqqoHw5v2Op2DbgMhFvo=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-flow": "6.18.0",
-						"babel-plugin-syntax-jsx": "6.18.0",
-						"babel-plugin-transform-flow-strip-types": "6.22.0",
-						"babel-plugin-transform-react-display-name": "6.25.0",
-						"babel-plugin-transform-react-jsx": "6.24.1",
-						"babel-plugin-transform-react-jsx-source": "6.22.0"
-					}
-				},
-				"babel-preset-stage-0": {
-					"version": "6.3.13",
-					"resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.3.13.tgz",
-					"integrity": "sha1-eKN8VvCzmI8qeZMtywzrj/N3sNE=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-transform-do-expressions": "6.22.0",
-						"babel-plugin-transform-function-bind": "6.22.0",
-						"babel-preset-stage-1": "6.24.1"
-					}
-				},
-				"babel-preset-stage-1": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
-					"integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-transform-class-constructor-call": "6.24.1",
-						"babel-plugin-transform-export-extensions": "6.22.0",
-						"babel-preset-stage-2": "6.24.1"
-					}
-				},
-				"babel-preset-stage-2": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
-					"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-dynamic-import": "6.18.0",
-						"babel-plugin-transform-class-properties": "6.24.1",
-						"babel-plugin-transform-decorators": "6.24.1",
-						"babel-preset-stage-3": "6.24.1"
-					}
-				},
-				"babel-preset-stage-3": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
-					"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-trailing-function-commas": "6.22.0",
-						"babel-plugin-transform-async-generator-functions": "6.24.1",
-						"babel-plugin-transform-async-to-generator": "6.24.1",
-						"babel-plugin-transform-exponentiation-operator": "6.24.1",
-						"babel-plugin-transform-object-rest-spread": "6.26.0"
-					}
-				},
-				"babel-register": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-					"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-					"dev": true,
-					"requires": {
-						"babel-core": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"core-js": "2.5.1",
-						"home-or-tmp": "2.0.0",
-						"lodash": "4.17.4",
-						"mkdirp": "0.5.1",
-						"source-map-support": "0.4.18"
-					},
-					"dependencies": {
-						"babel-core": {
-							"version": "6.26.0",
-							"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-							"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
-							"dev": true,
-							"requires": {
-								"babel-code-frame": "6.26.0",
-								"babel-generator": "6.26.0",
-								"babel-helpers": "6.24.1",
-								"babel-messages": "6.23.0",
-								"babel-register": "6.26.0",
-								"babel-runtime": "6.26.0",
-								"babel-template": "6.26.0",
-								"babel-traverse": "6.26.0",
-								"babel-types": "6.26.0",
-								"babylon": "6.18.0",
-								"convert-source-map": "1.5.0",
-								"debug": "2.6.9",
-								"json5": "0.5.1",
-								"lodash": "4.17.4",
-								"minimatch": "3.0.4",
-								"path-is-absolute": "1.0.1",
-								"private": "0.1.8",
-								"slash": "1.0.0",
-								"source-map": "0.5.7"
-							}
-						},
-						"json5": {
-							"version": "0.5.1",
-							"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-							"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-							"dev": true
-						},
-						"minimatch": {
-							"version": "3.0.4",
-							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-							"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-							"dev": true,
-							"requires": {
-								"brace-expansion": "1.1.8"
-							}
-						}
-					}
-				},
-				"babel-template": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-traverse": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "6.26.0",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"debug": "2.6.9",
-						"globals": "9.18.0",
-						"invariant": "2.2.2",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-types": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"esutils": "2.0.2",
-						"lodash": "4.17.4",
-						"to-fast-properties": "1.0.3"
-					}
-				},
-				"babylon": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-					"dev": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"brace-expansion": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-					"dev": true,
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-					"dev": true
-				},
-				"convert-source-map": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-					"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-					"dev": true
-				},
-				"core-js": {
-					"version": "2.5.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"detect-indent": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-					"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-					"dev": true,
-					"requires": {
-						"repeating": "2.0.1"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"globals": {
-					"version": "9.18.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"home-or-tmp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-					"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-					"dev": true,
-					"requires": {
-						"os-homedir": "1.0.2",
-						"os-tmpdir": "1.0.2"
-					}
-				},
-				"invariant": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-					"dev": true,
-					"requires": {
-						"loose-envify": "1.3.1"
-					}
-				},
-				"is-finite": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-					"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"js-tokens": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-					"dev": true
-				},
-				"jsesc": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-					"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-					"dev": true
-				},
-				"json5": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
-					"integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"loose-envify": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-					"dev": true,
-					"requires": {
-						"js-tokens": "3.0.2"
-					}
-				},
-				"minimatch": {
-					"version": "2.0.10",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-					"integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-					"dev": true
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"dev": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
-					"integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
-					"dev": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"dev": true
-				},
-				"private": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-					"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-					"dev": true
-				},
-				"regenerate": {
-					"version": "1.3.3",
-					"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-					"integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
-					"dev": true
-				},
-				"regenerator-transform": {
-					"version": "0.10.1",
-					"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-					"integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"private": "0.1.8"
-					}
-				},
-				"regexpu-core": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-					"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-					"dev": true,
-					"requires": {
-						"regenerate": "1.3.3",
-						"regjsgen": "0.2.0",
-						"regjsparser": "0.1.5"
-					}
-				},
-				"regjsgen": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-					"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-					"dev": true
-				},
-				"regjsparser": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-					"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-					"dev": true,
-					"requires": {
-						"jsesc": "0.5.0"
-					},
-					"dependencies": {
-						"jsesc": {
-							"version": "0.5.0",
-							"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-							"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-							"dev": true
-						}
-					}
-				},
-				"repeating": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-					"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-					"dev": true,
-					"requires": {
-						"is-finite": "1.0.2"
-					}
-				},
-				"shebang-regex": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-					"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-					"dev": true
-				},
-				"slash": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				},
-				"source-map-support": {
-					"version": "0.4.18",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-					"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-					"dev": true,
-					"requires": {
-						"source-map": "0.5.7"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				},
-				"to-fast-properties": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-					"dev": true
-				},
-				"trim-right": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-					"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-array-includes": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz",
-			"integrity": "sha1-z1RS6Bx7gD+3lZ8QRayI4uwo/3Y=",
-			"dev": true
-		},
-		"babel-plugin-transform-es2015-duplicate-keys": {
-			"version": "6.24.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-			"integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.26.0",
-				"babel-types": "6.26.0"
-			},
-			"dependencies": {
-				"babel-types": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"esutils": "2.0.2",
-						"lodash": "4.17.4",
-						"to-fast-properties": "1.0.3"
-					}
-				},
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"to-fast-properties": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-transform-es2015-modules-amd": {
-			"version": "6.24.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-			"integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-			"dev": true,
-			"requires": {
-				"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-				"babel-runtime": "6.26.0",
-				"babel-template": "6.26.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"babel-code-frame": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"esutils": "2.0.2",
-						"js-tokens": "3.0.2"
-					}
-				},
-				"babel-messages": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-modules-commonjs": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
-					"integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-transform-strict-mode": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-strict-mode": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-					"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-template": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-traverse": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "6.26.0",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"debug": "2.6.9",
-						"globals": "9.18.0",
-						"invariant": "2.2.2",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-types": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"esutils": "2.0.2",
-						"lodash": "4.17.4",
-						"to-fast-properties": "1.0.3"
-					}
-				},
-				"babylon": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"globals": {
-					"version": "9.18.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"invariant": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-					"dev": true,
-					"requires": {
-						"loose-envify": "1.3.1"
-					}
-				},
-				"js-tokens": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"loose-envify": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-					"dev": true,
-					"requires": {
-						"js-tokens": "3.0.2"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				},
-				"to-fast-properties": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-transform-es2015-modules-systemjs": {
-			"version": "6.24.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-			"integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-			"dev": true,
-			"requires": {
-				"babel-helper-hoist-variables": "6.24.1",
-				"babel-runtime": "6.26.0",
-				"babel-template": "6.26.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"babel-code-frame": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"esutils": "2.0.2",
-						"js-tokens": "3.0.2"
-					}
-				},
-				"babel-helper-hoist-variables": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-					"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-messages": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-template": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-traverse": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "6.26.0",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"debug": "2.6.9",
-						"globals": "9.18.0",
-						"invariant": "2.2.2",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-types": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"esutils": "2.0.2",
-						"lodash": "4.17.4",
-						"to-fast-properties": "1.0.3"
-					}
-				},
-				"babylon": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"globals": {
-					"version": "9.18.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"invariant": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-					"dev": true,
-					"requires": {
-						"loose-envify": "1.3.1"
-					}
-				},
-				"js-tokens": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"loose-envify": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-					"dev": true,
-					"requires": {
-						"js-tokens": "3.0.2"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				},
-				"to-fast-properties": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-transform-es2015-modules-umd": {
-			"version": "6.24.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-			"integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-			"dev": true,
-			"requires": {
-				"babel-plugin-transform-es2015-modules-amd": "6.24.1",
-				"babel-runtime": "6.26.0",
-				"babel-template": "6.26.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"babel-code-frame": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"esutils": "2.0.2",
-						"js-tokens": "3.0.2"
-					}
-				},
-				"babel-messages": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-template": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-traverse": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "6.26.0",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"debug": "2.6.9",
-						"globals": "9.18.0",
-						"invariant": "2.2.2",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-types": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"esutils": "2.0.2",
-						"lodash": "4.17.4",
-						"to-fast-properties": "1.0.3"
-					}
-				},
-				"babylon": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"globals": {
-					"version": "9.18.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"invariant": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-					"dev": true,
-					"requires": {
-						"loose-envify": "1.3.1"
-					}
-				},
-				"js-tokens": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"loose-envify": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-					"dev": true,
-					"requires": {
-						"js-tokens": "3.0.2"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				},
-				"to-fast-properties": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-transform-runtime": {
-			"version": "6.23.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
-			"integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.26.0"
-			}
-		},
-		"babel-polyfill": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-			"integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.26.0",
-				"core-js": "2.5.1",
-				"regenerator-runtime": "0.10.5"
-			},
-			"dependencies": {
-				"core-js": {
-					"version": "2.5.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-					"dev": true
-				}
-			}
-		},
-		"babel-runtime": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-			"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-			"requires": {
-				"core-js": "2.5.1",
-				"regenerator-runtime": "0.11.0"
-			},
-			"dependencies": {
-				"core-js": {
-					"version": "2.5.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
-				},
-				"regenerator-runtime": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-					"integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
-				}
-			}
-		},
-		"backoff": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
-			"integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=",
-			"requires": {
-				"precond": "0.2.3"
-			}
-		},
-		"balanced-match": {
-			"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-			"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-		},
-		"base64-js": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-			"integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
-		},
-		"base64url": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-			"integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
-		},
-		"bcrypt": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
-			"integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
-			"requires": {
-				"nan": "2.6.2",
-				"node-pre-gyp": "0.6.36"
-			}
-		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-			"optional": true,
-			"requires": {
-				"tweetnacl": "0.14.5"
-			}
-		},
-		"binary-extensions": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
-			"integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
-			"dev": true
-		},
-		"bintrees": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
-			"integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
-		},
-		"bl": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-			"integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "2.0.6"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-					"integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"string_decoder": "0.10.31",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"block-stream": {
-			"version": "0.0.9",
-			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-			}
-		},
-		"bluebird": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-			"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-			"dev": true
-		},
-		"boom": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-			"requires": {
-				"hoek": "2.16.3"
-			}
-		},
-		"brace-expansion": {
-			"version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-			"integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
-			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-				"concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-			}
-		},
-		"braces": {
-			"version": "1.8.5",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-			"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-			"dev": true,
-			"requires": {
-				"expand-range": "1.8.2",
-				"preserve": "0.2.0",
-				"repeat-element": "1.1.2"
-			}
-		},
-		"browser-stdout": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-			"dev": true
-		},
-		"buffer": {
-			"version": "4.9.1",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-			"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-			"requires": {
-				"base64-js": "1.2.1",
-				"ieee754": "1.1.8",
-				"isarray": "1.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-				}
-			}
-		},
-		"buffer-crc32": {
-			"version": "0.2.13",
-			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-			"dev": true
-		},
-		"buffer-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-			"integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
-		},
-		"buffer-equal-constant-time": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-			"integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-		},
-		"buffer-shims": {
-			"version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-			"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
-		},
-		"builtin-modules": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-			"dev": true
-		},
-		"bunyan": {
-			"version": "1.8.12",
-			"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
-			"integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
-			"requires": {
-				"dtrace-provider": "0.8.5",
-				"moment": "2.19.1",
-				"mv": "2.1.1",
-				"safe-json-stringify": "1.0.4"
-			}
-		},
-		"caller-id": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz",
-			"integrity": "sha1-Wb2sCJPRLDhxQIJ5Ix+XRYNk8Hs=",
-			"dev": true,
-			"requires": {
-				"stack-trace": "0.0.10"
-			}
-		},
-		"caller-path": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-			"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-			"dev": true,
-			"requires": {
-				"callsites": "0.2.0"
-			}
-		},
-		"callsites": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-			"integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-			"dev": true
-		},
-		"camel-case": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-			"integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-			"dev": true,
-			"requires": {
-				"no-case": "2.3.2",
-				"upper-case": "1.1.3"
-			}
-		},
-		"camelcase": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-			"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-			"dev": true
-		},
-		"camelcase-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-			"dev": true,
-			"requires": {
-				"camelcase": "2.1.1",
-				"map-obj": "1.0.1"
-			}
-		},
-		"caniuse-lite": {
-			"version": "1.0.30000756",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz",
-			"integrity": "sha1-PacBwVIbn6uHAExt58l/pH2+qtI=",
-			"dev": true
-		},
-		"capture-stack-trace": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-			"integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
-		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-		},
-		"center-align": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-			"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"align-text": "0.1.4",
-				"lazy-cache": "1.0.4"
-			}
-		},
-		"chai": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
-			"integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
-			"dev": true,
-			"requires": {
-				"assertion-error": "1.0.2",
-				"deep-eql": "0.1.3",
-				"type-detect": "1.0.0"
-			}
-		},
-		"chai-as-promised": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-6.0.0.tgz",
-			"integrity": "sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY=",
-			"dev": true,
-			"requires": {
-				"check-error": "1.0.2"
-			}
-		},
-		"chalk": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-			"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "3.2.0",
-				"escape-string-regexp": "1.0.5",
-				"supports-color": "4.5.0"
-			}
-		},
-		"check-error": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-			"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-			"dev": true
-		},
-		"child-process-debug": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/child-process-debug/-/child-process-debug-0.0.7.tgz",
-			"integrity": "sha1-VOEfuBw7b5Spa2MfrKk+0a9/itA=",
-			"dev": true
-		},
-		"chimp": {
-			"version": "0.50.2",
-			"resolved": "https://registry.npmjs.org/chimp/-/chimp-0.50.2.tgz",
-			"integrity": "sha1-XI2JnVbdOls1TlH0MoDjkVXnpZI=",
-			"dev": true,
-			"requires": {
-				"async": "0.9.2",
-				"babel-core": "6.26.0",
-				"babel-plugin-transform-runtime": "6.23.0",
-				"babel-polyfill": "6.26.0",
-				"babel-preset-es2015": "6.24.1",
-				"babel-preset-stage-2": "6.24.1",
-				"babel-register": "6.26.0",
-				"babel-runtime": "6.26.0",
-				"bluebird": "3.5.1",
-				"chai": "3.5.0",
-				"chai-as-promised": "6.0.0",
-				"child-process-debug": "0.0.7",
-				"chokidar": "1.6.1",
-				"chromedriver": "2.33.2",
-				"colors": "1.1.2",
-				"commander": "2.11.0",
-				"cucumber": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
-				"deep-extend": "0.4.2",
-				"exit": "0.1.2",
-				"fibers": "1.0.15",
-				"freeport": "1.0.5",
-				"fs-extra": "1.0.0",
-				"glob": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
-				"hapi": "8.8.0",
-				"jasmine": "2.8.0",
-				"loglevel": "1.4.1",
-				"minimist": "1.2.0",
-				"mocha": "3.5.3",
-				"phantomjs-prebuilt": "2.1.13",
-				"progress": "1.1.8",
-				"request": "2.81.0",
-				"requestretry": "1.5.0",
-				"saucelabs": "1.4.0",
-				"selenium-standalone": "6.11.0",
-				"underscore": "1.8.3",
-				"xolvio-ddp": "0.12.3",
-				"xolvio-jasmine-expect": "1.1.0",
-				"xolvio-sync-webdriverio": "9.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"async": {
-					"version": "0.9.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-					"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-					"dev": true
-				},
-				"babel-code-frame": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"esutils": "2.0.2",
-						"js-tokens": "3.0.2"
-					}
-				},
-				"babel-core": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-					"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "6.26.0",
-						"babel-generator": "6.26.0",
-						"babel-helpers": "6.24.1",
-						"babel-messages": "6.23.0",
-						"babel-register": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"convert-source-map": "1.5.0",
-						"debug": "2.6.9",
-						"json5": "0.5.1",
-						"lodash": "4.17.4",
-						"minimatch": "3.0.4",
-						"path-is-absolute": "1.0.1",
-						"private": "0.1.8",
-						"slash": "1.0.0",
-						"source-map": "0.5.7"
-					}
-				},
-				"babel-generator": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
-					"integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
-					"dev": true,
-					"requires": {
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"detect-indent": "4.0.0",
-						"jsesc": "1.3.0",
-						"lodash": "4.17.4",
-						"source-map": "0.5.7",
-						"trim-right": "1.0.1"
-					}
-				},
-				"babel-helper-bindify-decorators": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
-					"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-builder-binary-assignment-operator-visitor": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-					"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-					"dev": true,
-					"requires": {
-						"babel-helper-explode-assignable-expression": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-call-delegate": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-					"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-					"dev": true,
-					"requires": {
-						"babel-helper-hoist-variables": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-define-map": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-					"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-helper-explode-assignable-expression": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-					"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-explode-class": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
-					"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
-					"dev": true,
-					"requires": {
-						"babel-helper-bindify-decorators": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-function-name": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-					"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-					"dev": true,
-					"requires": {
-						"babel-helper-get-function-arity": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-get-function-arity": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-					"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-hoist-variables": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-					"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-optimise-call-expression": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-					"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-regex": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-					"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-helper-remap-async-to-generator": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-					"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helper-replace-supers": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-					"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-					"dev": true,
-					"requires": {
-						"babel-helper-optimise-call-expression": "6.24.1",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-helpers": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-					"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0"
-					}
-				},
-				"babel-messages": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-					"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-check-es2015-constants": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-					"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-syntax-async-functions": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-					"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-					"dev": true
-				},
-				"babel-plugin-syntax-async-generators": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-					"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
-					"dev": true
-				},
-				"babel-plugin-syntax-class-properties": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-					"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
-					"dev": true
-				},
-				"babel-plugin-syntax-decorators": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-					"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
-					"dev": true
-				},
-				"babel-plugin-syntax-dynamic-import": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-					"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-					"dev": true
-				},
-				"babel-plugin-syntax-exponentiation-operator": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-					"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-					"dev": true
-				},
-				"babel-plugin-syntax-object-rest-spread": {
-					"version": "6.13.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-					"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-					"dev": true
-				},
-				"babel-plugin-syntax-trailing-function-commas": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-					"integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-					"dev": true
-				},
-				"babel-plugin-transform-async-generator-functions": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
-					"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
-					"dev": true,
-					"requires": {
-						"babel-helper-remap-async-to-generator": "6.24.1",
-						"babel-plugin-syntax-async-generators": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-async-to-generator": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-					"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-					"dev": true,
-					"requires": {
-						"babel-helper-remap-async-to-generator": "6.24.1",
-						"babel-plugin-syntax-async-functions": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-class-properties": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
-					"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-plugin-syntax-class-properties": "6.13.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-decorators": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
-					"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
-					"dev": true,
-					"requires": {
-						"babel-helper-explode-class": "6.24.1",
-						"babel-plugin-syntax-decorators": "6.13.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-arrow-functions": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-					"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-block-scoped-functions": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-					"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-block-scoping": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-					"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-plugin-transform-es2015-classes": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-					"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-					"dev": true,
-					"requires": {
-						"babel-helper-define-map": "6.26.0",
-						"babel-helper-function-name": "6.24.1",
-						"babel-helper-optimise-call-expression": "6.24.1",
-						"babel-helper-replace-supers": "6.24.1",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-computed-properties": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-					"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-destructuring": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-					"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-for-of": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-					"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-function-name": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-					"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-					"dev": true,
-					"requires": {
-						"babel-helper-function-name": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-literals": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-					"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-modules-commonjs": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
-					"integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-transform-strict-mode": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-object-super": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-					"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-					"dev": true,
-					"requires": {
-						"babel-helper-replace-supers": "6.24.1",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-parameters": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-					"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-					"dev": true,
-					"requires": {
-						"babel-helper-call-delegate": "6.24.1",
-						"babel-helper-get-function-arity": "6.24.1",
-						"babel-runtime": "6.26.0",
-						"babel-template": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-shorthand-properties": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-					"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-spread": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-					"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-sticky-regex": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-					"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-					"dev": true,
-					"requires": {
-						"babel-helper-regex": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-template-literals": {
-					"version": "6.22.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-					"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-typeof-symbol": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-					"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-es2015-unicode-regex": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-					"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-					"dev": true,
-					"requires": {
-						"babel-helper-regex": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"regexpu-core": "2.0.0"
-					}
-				},
-				"babel-plugin-transform-exponentiation-operator": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-					"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-					"dev": true,
-					"requires": {
-						"babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-						"babel-plugin-syntax-exponentiation-operator": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-object-rest-spread": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
-					"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-object-rest-spread": "6.13.0",
-						"babel-runtime": "6.26.0"
-					}
-				},
-				"babel-plugin-transform-regenerator": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-					"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-					"dev": true,
-					"requires": {
-						"regenerator-transform": "0.10.1"
-					}
-				},
-				"babel-plugin-transform-strict-mode": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-					"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0"
-					}
-				},
-				"babel-preset-es2015": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
-					"integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-check-es2015-constants": "6.22.0",
-						"babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-						"babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-						"babel-plugin-transform-es2015-block-scoping": "6.26.0",
-						"babel-plugin-transform-es2015-classes": "6.24.1",
-						"babel-plugin-transform-es2015-computed-properties": "6.24.1",
-						"babel-plugin-transform-es2015-destructuring": "6.23.0",
-						"babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-						"babel-plugin-transform-es2015-for-of": "6.23.0",
-						"babel-plugin-transform-es2015-function-name": "6.24.1",
-						"babel-plugin-transform-es2015-literals": "6.22.0",
-						"babel-plugin-transform-es2015-modules-amd": "6.24.1",
-						"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-						"babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-						"babel-plugin-transform-es2015-modules-umd": "6.24.1",
-						"babel-plugin-transform-es2015-object-super": "6.24.1",
-						"babel-plugin-transform-es2015-parameters": "6.24.1",
-						"babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-						"babel-plugin-transform-es2015-spread": "6.22.0",
-						"babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-						"babel-plugin-transform-es2015-template-literals": "6.22.0",
-						"babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-						"babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-						"babel-plugin-transform-regenerator": "6.26.0"
-					}
-				},
-				"babel-preset-stage-2": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
-					"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-dynamic-import": "6.18.0",
-						"babel-plugin-transform-class-properties": "6.24.1",
-						"babel-plugin-transform-decorators": "6.24.1",
-						"babel-preset-stage-3": "6.24.1"
-					}
-				},
-				"babel-preset-stage-3": {
-					"version": "6.24.1",
-					"resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
-					"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
-					"dev": true,
-					"requires": {
-						"babel-plugin-syntax-trailing-function-commas": "6.22.0",
-						"babel-plugin-transform-async-generator-functions": "6.24.1",
-						"babel-plugin-transform-async-to-generator": "6.24.1",
-						"babel-plugin-transform-exponentiation-operator": "6.24.1",
-						"babel-plugin-transform-object-rest-spread": "6.26.0"
-					}
-				},
-				"babel-register": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-					"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-					"dev": true,
-					"requires": {
-						"babel-core": "6.26.0",
-						"babel-runtime": "6.26.0",
-						"core-js": "2.5.1",
-						"home-or-tmp": "2.0.0",
-						"lodash": "4.17.4",
-						"mkdirp": "0.5.1",
-						"source-map-support": "0.4.18"
-					}
-				},
-				"babel-template": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-					"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-traverse": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-traverse": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-					"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-					"dev": true,
-					"requires": {
-						"babel-code-frame": "6.26.0",
-						"babel-messages": "6.23.0",
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"babylon": "6.18.0",
-						"debug": "2.6.9",
-						"globals": "9.18.0",
-						"invariant": "2.2.2",
-						"lodash": "4.17.4"
-					}
-				},
-				"babel-types": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-					"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"esutils": "2.0.2",
-						"lodash": "4.17.4",
-						"to-fast-properties": "1.0.3"
-					}
-				},
-				"babylon": {
-					"version": "6.18.0",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-					"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-					"dev": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"brace-expansion": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-					"dev": true,
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-					"dev": true
-				},
-				"convert-source-map": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-					"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-					"dev": true
-				},
-				"core-js": {
-					"version": "2.5.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"detect-indent": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-					"integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-					"dev": true,
-					"requires": {
-						"repeating": "2.0.1"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"glob": {
-					"version": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "1.0.0",
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.3.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"globals": {
-					"version": "9.18.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"home-or-tmp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-					"integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-					"dev": true,
-					"requires": {
-						"os-homedir": "1.0.2",
-						"os-tmpdir": "1.0.2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"invariant": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-					"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-					"dev": true,
-					"requires": {
-						"loose-envify": "1.3.1"
-					}
-				},
-				"is-finite": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-					"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"js-tokens": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-					"dev": true
-				},
-				"jsesc": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-					"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-					"dev": true
-				},
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"loose-envify": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-					"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-					"dev": true,
-					"requires": {
-						"js-tokens": "3.0.2"
-					}
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "0.0.8",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-							"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-							"dev": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-					"dev": true
-				},
-				"once": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz",
-					"integrity": "sha1-FRr4a/wfCMS58H0GqyUP/L61ZYE=",
-					"dev": true
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"dev": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"dev": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"dev": true
-				},
-				"private": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-					"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-					"dev": true
-				},
-				"regenerate": {
-					"version": "1.3.3",
-					"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-					"integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
-					"dev": true
-				},
-				"regenerator-transform": {
-					"version": "0.10.1",
-					"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-					"integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-					"dev": true,
-					"requires": {
-						"babel-runtime": "6.26.0",
-						"babel-types": "6.26.0",
-						"private": "0.1.8"
-					}
-				},
-				"regexpu-core": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-					"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-					"dev": true,
-					"requires": {
-						"regenerate": "1.3.3",
-						"regjsgen": "0.2.0",
-						"regjsparser": "0.1.5"
-					}
-				},
-				"regjsgen": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-					"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-					"dev": true
-				},
-				"regjsparser": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-					"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-					"dev": true,
-					"requires": {
-						"jsesc": "0.5.0"
-					},
-					"dependencies": {
-						"jsesc": {
-							"version": "0.5.0",
-							"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-							"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-							"dev": true
-						}
-					}
-				},
-				"repeating": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-					"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-					"dev": true,
-					"requires": {
-						"is-finite": "1.0.2"
-					}
-				},
-				"slash": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				},
-				"source-map-support": {
-					"version": "0.4.18",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-					"integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-					"dev": true,
-					"requires": {
-						"source-map": "0.5.7"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				},
-				"to-fast-properties": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-					"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-					"dev": true
-				},
-				"trim-right": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-					"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-					"dev": true
-				}
-			}
-		},
-		"chokidar": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
-			"integrity": "sha1-L0RHq16W5Q+z14n9kNTHLg5McMI=",
-			"dev": true,
-			"requires": {
-				"anymatch": "1.3.2",
-				"async-each": "1.0.1",
-				"fsevents": "1.1.2",
-				"glob-parent": "2.0.0",
-				"inherits": "2.0.3",
-				"is-binary-path": "1.0.1",
-				"is-glob": "2.0.1",
-				"path-is-absolute": "1.0.1",
-				"readdirp": "2.1.0"
-			},
-			"dependencies": {
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"dev": true
-				}
-			}
-		},
-		"chromedriver": {
-			"version": "2.33.2",
-			"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.33.2.tgz",
-			"integrity": "sha512-etnQeM8Mqiys50ZB4IiuNqeB1WS2/EKFhVXwkPQ1qjzKMMAJUyrLjaRUcoZoHrbjGscnhBrWkRR+p3zcTGMhDg==",
-			"dev": true,
-			"requires": {
-				"del": "3.0.0",
-				"extract-zip": "1.6.5",
-				"kew": "0.7.0",
-				"mkdirp": "0.5.1",
-				"request": "2.83.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-					"integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-					"dev": true,
-					"requires": {
-						"co": "4.6.0",
-						"fast-deep-equal": "1.0.0",
-						"fast-json-stable-stringify": "2.0.0",
-						"json-schema-traverse": "0.3.1"
-					}
-				},
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				},
-				"asynckit": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-					"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-					"dev": true
-				},
-				"aws-sign2": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-					"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-					"dev": true
-				},
-				"boom": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-					"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-					"dev": true,
-					"requires": {
-						"hoek": "4.2.0"
-					}
-				},
-				"combined-stream": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "1.0.0"
-					}
-				},
-				"cryptiles": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-					"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-					"dev": true,
-					"requires": {
-						"boom": "5.2.0"
-					},
-					"dependencies": {
-						"boom": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-							"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-							"dev": true,
-							"requires": {
-								"hoek": "4.2.0"
-							}
-						}
-					}
-				},
-				"delayed-stream": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-					"dev": true
-				},
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-					"dev": true
-				},
-				"form-data": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-					"integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-					"dev": true,
-					"requires": {
-						"asynckit": "0.4.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.17"
-					}
-				},
-				"har-schema": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-					"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-					"dev": true
-				},
-				"har-validator": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-					"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-					"dev": true,
-					"requires": {
-						"ajv": "5.3.0",
-						"har-schema": "2.0.0"
-					}
-				},
-				"hawk": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-					"integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-					"dev": true,
-					"requires": {
-						"boom": "4.3.1",
-						"cryptiles": "3.1.2",
-						"hoek": "4.2.0",
-						"sntp": "2.1.0"
-					}
-				},
-				"hoek": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-					"integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-					"dev": true,
-					"requires": {
-						"assert-plus": "1.0.0",
-						"jsprim": "1.4.1",
-						"sshpk": "1.13.1"
-					}
-				},
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-					"dev": true
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"performance-now": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-					"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.5.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-					"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-					"dev": true
-				},
-				"request": {
-					"version": "2.83.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-					"integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "0.7.0",
-						"aws4": "1.6.0",
-						"caseless": "0.12.0",
-						"combined-stream": "1.0.5",
-						"extend": "3.0.1",
-						"forever-agent": "0.6.1",
-						"form-data": "2.3.1",
-						"har-validator": "5.0.3",
-						"hawk": "6.0.2",
-						"http-signature": "1.2.0",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.17",
-						"oauth-sign": "0.8.2",
-						"performance-now": "2.1.0",
-						"qs": "6.5.1",
-						"safe-buffer": "5.1.1",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.3",
-						"tunnel-agent": "0.6.0",
-						"uuid": "3.1.0"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"sntp": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-					"integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-					"dev": true,
-					"requires": {
-						"hoek": "4.2.0"
-					}
-				},
-				"tough-cookie": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-					"integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-					"dev": true,
-					"requires": {
-						"punycode": "1.4.1"
-					}
-				}
-			}
-		},
-		"circular-json": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-			"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-			"dev": true
-		},
-		"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=",
-			"dev": true,
-			"requires": {
-				"restore-cursor": "2.0.0"
-			}
-		},
-		"cli-table": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-			"integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
-			"dev": true,
-			"requires": {
-				"colors": "1.0.3"
-			},
-			"dependencies": {
-				"colors": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-					"integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-					"dev": true
-				}
-			}
-		},
-		"cli-width": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-			"dev": true
-		},
-		"cliui": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-			"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"center-align": "0.1.3",
-				"right-align": "0.1.3",
-				"wordwrap": "0.0.2"
-			},
-			"dependencies": {
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true,
-					"optional": true
-				}
-			}
-		},
-		"clone-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
-			"integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
-			"dev": true,
-			"requires": {
-				"is-regexp": "1.0.0",
-				"is-supported-regexp-flag": "1.0.0"
-			}
-		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-		},
-		"codemirror": {
-			"version": "5.31.0",
-			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.31.0.tgz",
-			"integrity": "sha512-LKbMZKoAz7pMmWuSEl253G6yyloSulj1kXfvYv+3n3I8wMiI7QwnCHwKM3Zw5S9ItNV28Layq0/ihQXWmn9T9w=="
-		},
-		"color-convert": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-			"integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
-			"dev": true,
-			"requires": {
-				"color-name": "1.1.3"
-			}
-		},
-		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
-		},
-		"colors": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-			"dev": true
-		},
-		"combined-stream": {
-			"version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-			"requires": {
-				"delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-			}
-		},
-		"commander": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-			"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-			"dev": true
-		},
-		"compare-func": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
-			"integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
-			"dev": true,
-			"requires": {
-				"array-ify": "1.0.0",
-				"dot-prop": "3.0.0"
-			},
-			"dependencies": {
-				"dot-prop": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
-					"integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
-					"dev": true,
-					"requires": {
-						"is-obj": "1.0.1"
-					}
-				}
-			}
-		},
-		"compress-commons": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
-			"integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
-			"dev": true,
-			"requires": {
-				"buffer-crc32": "0.2.13",
-				"crc32-stream": "2.0.0",
-				"normalize-path": "2.1.1",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"concat-map": {
-			"version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"concat-stream": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-			"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-			"requires": {
-				"inherits": "2.0.3",
-				"readable-stream": "2.3.3",
-				"typedarray": "0.0.6"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-				}
-			}
-		},
-		"configstore": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-			"integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
-			"requires": {
-				"dot-prop": "4.2.0",
-				"graceful-fs": "4.1.11",
-				"make-dir": "1.1.0",
-				"unique-string": "1.0.0",
-				"write-file-atomic": "2.3.0",
-				"xdg-basedir": "3.0.0"
-			}
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"conventional-changelog": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
-			"integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
-			"dev": true,
-			"requires": {
-				"conventional-changelog-angular": "1.5.1",
-				"conventional-changelog-atom": "0.1.1",
-				"conventional-changelog-codemirror": "0.2.0",
-				"conventional-changelog-core": "1.9.2",
-				"conventional-changelog-ember": "0.2.8",
-				"conventional-changelog-eslint": "0.2.0",
-				"conventional-changelog-express": "0.2.0",
-				"conventional-changelog-jquery": "0.1.0",
-				"conventional-changelog-jscs": "0.1.0",
-				"conventional-changelog-jshint": "0.2.0"
-			}
-		},
-		"conventional-changelog-angular": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
-			"integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
-			"dev": true,
-			"requires": {
-				"compare-func": "1.3.2",
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-atom": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
-			"integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-cli": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz",
-			"integrity": "sha512-b8B1i01df+Lq5t16L3g8uoEGdzViChIKmIo7TComL4DqqrjrtasRaT+/4OPGcApEgX86JkBqb4KVt85ytQinUw==",
-			"dev": true,
-			"requires": {
-				"add-stream": "1.0.0",
-				"conventional-changelog": "1.1.6",
-				"lodash": "4.17.4",
-				"meow": "3.7.0",
-				"tempfile": "1.1.1"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"conventional-changelog-codemirror": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
-			"integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-core": {
-			"version": "1.9.2",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
-			"integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
-			"dev": true,
-			"requires": {
-				"conventional-changelog-writer": "2.0.1",
-				"conventional-commits-parser": "2.0.0",
-				"dateformat": "1.0.12",
-				"get-pkg-repo": "1.4.0",
-				"git-raw-commits": "1.2.0",
-				"git-remote-origin-url": "2.0.0",
-				"git-semver-tags": "1.2.2",
-				"lodash": "4.17.4",
-				"normalize-package-data": "2.4.0",
-				"q": "1.5.1",
-				"read-pkg": "1.1.0",
-				"read-pkg-up": "1.0.1",
-				"through2": "2.0.3"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"conventional-changelog-ember": {
-			"version": "0.2.8",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
-			"integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-eslint": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
-			"integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-express": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
-			"integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-jquery": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz",
-			"integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-jscs": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz",
-			"integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-jshint": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
-			"integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
-			"dev": true,
-			"requires": {
-				"compare-func": "1.3.2",
-				"q": "1.5.1"
-			}
-		},
-		"conventional-changelog-writer": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
-			"integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
-			"dev": true,
-			"requires": {
-				"compare-func": "1.3.2",
-				"conventional-commits-filter": "1.0.0",
-				"dateformat": "1.0.12",
-				"handlebars": "4.0.11",
-				"json-stringify-safe": "5.0.1",
-				"lodash": "4.17.4",
-				"meow": "3.7.0",
-				"semver": "5.4.1",
-				"split": "1.0.1",
-				"through2": "2.0.3"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"conventional-commits-filter": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz",
-			"integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=",
-			"dev": true,
-			"requires": {
-				"is-subset": "0.1.1",
-				"modify-values": "1.0.0"
-			}
-		},
-		"conventional-commits-parser": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
-			"integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
-			"dev": true,
-			"requires": {
-				"JSONStream": "1.3.1",
-				"is-text-path": "1.0.1",
-				"lodash": "4.17.4",
-				"meow": "3.7.0",
-				"split2": "2.2.0",
-				"through2": "2.0.3",
-				"trim-off-newlines": "1.0.1"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"core-js": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-			"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
-		},
-		"core-util-is": {
-			"version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-		},
-		"cosmiconfig": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz",
-			"integrity": "sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==",
-			"dev": true,
-			"requires": {
-				"is-directory": "0.3.1",
-				"js-yaml": "3.10.0",
-				"parse-json": "3.0.0",
-				"require-from-string": "2.0.1"
-			},
-			"dependencies": {
-				"parse-json": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
-					"integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
-					"dev": true,
-					"requires": {
-						"error-ex": "1.3.1"
-					}
-				}
-			}
-		},
-		"crc": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
-			"integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
-			"dev": true
-		},
-		"crc32-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
-			"integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
-			"dev": true,
-			"requires": {
-				"crc": "3.5.0",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"create-error-class": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-			"integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-			"requires": {
-				"capture-stack-trace": "1.0.0"
-			}
-		},
-		"cross-spawn": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-			"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-			"dev": true,
-			"requires": {
-				"lru-cache": "4.1.1",
-				"shebang-command": "1.2.0",
-				"which": "1.2.14"
-			}
-		},
-		"cryptiles": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-			"requires": {
-				"boom": "2.10.1"
-			}
-		},
-		"crypto-browserify": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz",
-			"integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA="
-		},
-		"crypto-random-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-			"integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
-		},
-		"css": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-			"integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
-			"dev": true,
-			"requires": {
-				"inherits": "2.0.3",
-				"source-map": "0.1.43",
-				"source-map-resolve": "0.3.1",
-				"urix": "0.1.0"
-			},
-			"dependencies": {
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.1.43",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-					"dev": true,
-					"requires": {
-						"amdefine": "1.0.1"
-					}
-				}
-			}
-		},
-		"css-parse": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-			"integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-			"dev": true,
-			"requires": {
-				"css": "2.2.1"
-			}
-		},
-		"css-unit-converter": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
-			"integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
-			"dev": true
-		},
-		"css-value": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-			"integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
-			"dev": true
-		},
-		"ctype": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-			"integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
-			"dev": true
-		},
-		"cucumber": {
-			"version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
-			"dev": true,
-			"requires": {
-				"camel-case": "3.0.0",
-				"cli-table": "0.3.1",
-				"co": "4.6.0",
-				"colors": "1.1.2",
-				"commander": "2.11.0",
-				"duration": "0.2.0",
-				"fibers": "1.0.15",
-				"figures": "1.7.0",
-				"gherkin": "4.0.0",
-				"glob": "7.1.2",
-				"is-generator": "1.0.3",
-				"lodash": "4.17.4",
-				"meteor-promise": "0.8.6",
-				"stack-chain": "1.3.7",
-				"stacktrace-js": "1.3.1"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"currently-unhandled": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-			"dev": true,
-			"requires": {
-				"array-find-index": "1.0.2"
-			}
-		},
-		"d": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
-			"integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "0.10.35"
-			}
-		},
-		"dargs": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
-			"integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
-			"dev": true,
-			"requires": {
-				"number-is-nan": "1.0.1"
-			},
-			"dependencies": {
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-					"dev": true
-				}
-			}
-		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"requires": {
-				"assert-plus": "1.0.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"dateformat": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-			"integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-			"dev": true,
-			"requires": {
-				"get-stdin": "4.0.1",
-				"meow": "3.7.0"
-			}
-		},
-		"ddp-ejson": {
-			"version": "0.8.1-3",
-			"resolved": "https://registry.npmjs.org/ddp-ejson/-/ddp-ejson-0.8.1-3.tgz",
-			"integrity": "sha1-6dZ0Zqt4m9dOfZcHSjbiQGkO7sI=",
-			"dev": true,
-			"requires": {
-				"ddp-underscore-patched": "0.8.1-2"
-			}
-		},
-		"ddp-underscore-patched": {
-			"version": "0.8.1-2",
-			"resolved": "https://registry.npmjs.org/ddp-underscore-patched/-/ddp-underscore-patched-0.8.1-2.tgz",
-			"integrity": "sha1-ZaQU6fIuxagqoWOG40NmtI/Ozx0=",
-			"dev": true
-		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-			"dev": true
-		},
-		"deep-eql": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-			"integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
-			"dev": true,
-			"requires": {
-				"type-detect": "0.1.1"
-			},
-			"dependencies": {
-				"type-detect": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
-					"integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
-					"dev": true
-				}
-			}
-		},
-		"deep-extend": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-			"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
-		},
-		"deep-is": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
-		},
-		"deepmerge": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
-			"integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
-			"dev": true
-		},
-		"define-properties": {
-			"version": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-			"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-			"requires": {
-				"foreach": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-				"object-keys": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"
-			}
-		},
-		"del": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-			"dev": true,
-			"requires": {
-				"globby": "6.1.0",
-				"is-path-cwd": "1.0.0",
-				"is-path-in-cwd": "1.0.0",
-				"p-map": "1.2.0",
-				"pify": "3.0.0",
-				"rimraf": "2.6.1"
-			}
-		},
-		"delayed-stream": {
-			"version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-		},
-		"delegates": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-		},
-		"diff": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-			"dev": true
-		},
-		"doctrine": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-			"integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
-			"dev": true,
-			"requires": {
-				"esutils": "2.0.2",
-				"isarray": "1.0.0"
-			},
-			"dependencies": {
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				}
-			}
-		},
-		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-			"requires": {
-				"domelementtype": "1.1.3",
-				"entities": "1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
-				}
-			}
-		},
-		"domelementtype": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
-		},
-		"domhandler": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-			"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-			"requires": {
-				"domelementtype": "1.3.0"
-			}
-		},
-		"domutils": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
-			"integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
-			"requires": {
-				"dom-serializer": "0.1.0",
-				"domelementtype": "1.3.0"
-			}
-		},
-		"dot-prop": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-			"integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-			"requires": {
-				"is-obj": "1.0.1"
-			}
-		},
-		"dtrace-provider": {
-			"version": "0.8.5",
-			"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz",
-			"integrity": "sha1-mOu6Ihr6xG4cOf02hY2Pk2dSS5I=",
-			"optional": true,
-			"requires": {
-				"nan": "2.6.2"
-			}
-		},
-		"duplexify": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-			"integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
-			"requires": {
-				"end-of-stream": "1.4.0",
-				"inherits": "2.0.3",
-				"readable-stream": "2.3.3",
-				"stream-shift": "1.0.0"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-				}
-			}
-		},
-		"duration": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/duration/-/duration-0.2.0.tgz",
-			"integrity": "sha1-X5xN+q//ZV3phhEu/iXFl43YUUY=",
-			"dev": true,
-			"requires": {
-				"d": "0.1.1",
-				"es5-ext": "0.10.35"
-			}
-		},
-		"ecc-jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-			"optional": true,
-			"requires": {
-				"jsbn": "0.1.1"
-			}
-		},
-		"ecdsa-sig-formatter": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-			"integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-			"requires": {
-				"base64url": "2.0.0",
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
-		"ejs": {
-			"version": "2.5.7",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
-			"integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
-			"dev": true
-		},
-		"electron-to-chromium": {
-			"version": "1.3.27",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-			"integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
-			"dev": true
-		},
-		"emailreplyparser": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
-			"integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
-		},
-		"end-of-stream": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-			"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-			"requires": {
-				"once": "1.4.0"
-			}
-		},
-		"ent": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-			"integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
-		},
-		"entities": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-		},
-		"error-ex": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-			"integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-			"dev": true,
-			"requires": {
-				"is-arrayish": "0.2.1"
-			}
-		},
-		"error-stack-parser": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
-			"integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
-			"dev": true,
-			"requires": {
-				"stackframe": "0.3.1"
-			}
-		},
-		"es-abstract": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
-			"integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
-			"requires": {
-				"es-to-primitive": "1.1.1",
-				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-				"is-callable": "1.1.3",
-				"is-regex": "1.0.4"
-			}
-		},
-		"es-to-primitive": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-			"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-			"requires": {
-				"is-callable": "1.1.3",
-				"is-date-object": "1.0.1",
-				"is-symbol": "1.0.1"
-			}
-		},
-		"es5-ext": {
-			"version": "0.10.35",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
-			"integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
-			"dev": true,
-			"requires": {
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1"
-			}
-		},
-		"es6-iterator": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.35",
-				"es6-symbol": "3.1.1"
-			},
-			"dependencies": {
-				"d": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-					"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-					"dev": true,
-					"requires": {
-						"es5-ext": "0.10.35"
-					}
-				}
-			}
-		},
-		"es6-promise": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
-			"integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI=",
-			"dev": true
-		},
-		"es6-symbol": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.35"
-			},
-			"dependencies": {
-				"d": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-					"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-					"dev": true,
-					"requires": {
-						"es5-ext": "0.10.35"
-					}
-				}
-			}
-		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-			"dev": true
-		},
-		"eslint": {
-			"version": "4.10.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz",
-			"integrity": "sha512-MMVl8P/dYUFZEvolL8PYt7qc5LNdS2lwheq9BYa5Y07FblhcZqFyaUqlS8TW5QITGex21tV4Lk0a3fK8lsJIkA==",
-			"dev": true,
-			"requires": {
-				"ajv": "5.3.0",
-				"babel-code-frame": "6.26.0",
-				"chalk": "2.3.0",
-				"concat-stream": "1.6.0",
-				"cross-spawn": "5.1.0",
-				"debug": "3.1.0",
-				"doctrine": "2.0.0",
-				"eslint-scope": "3.7.1",
-				"espree": "3.5.1",
-				"esquery": "1.0.0",
-				"estraverse": "4.2.0",
-				"esutils": "2.0.2",
-				"file-entry-cache": "2.0.0",
-				"functional-red-black-tree": "1.0.1",
-				"glob": "7.1.2",
-				"globals": "9.18.0",
-				"ignore": "3.3.7",
-				"imurmurhash": "0.1.4",
-				"inquirer": "3.0.6",
-				"is-resolvable": "1.0.0",
-				"js-yaml": "3.10.0",
-				"json-stable-stringify": "1.0.1",
-				"levn": "0.3.0",
-				"lodash": "4.17.4",
-				"minimatch": "3.0.4",
-				"mkdirp": "0.5.1",
-				"natural-compare": "1.4.0",
-				"optionator": "0.8.2",
-				"path-is-inside": "1.0.2",
-				"pluralize": "7.0.0",
-				"progress": "2.0.0",
-				"require-uncached": "1.0.3",
-				"semver": "5.4.1",
-				"strip-ansi": "4.0.0",
-				"strip-json-comments": "2.0.1",
-				"table": "4.0.2",
-				"text-table": "0.2.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-					"integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-					"dev": true,
-					"requires": {
-						"co": "4.6.0",
-						"fast-deep-equal": "1.0.0",
-						"fast-json-stable-stringify": "2.0.0",
-						"json-schema-traverse": "0.3.1"
-					}
-				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"babel-code-frame": {
-					"version": "6.26.0",
-					"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-					"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"esutils": "2.0.2",
-						"js-tokens": "3.0.2"
-					},
-					"dependencies": {
-						"chalk": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-							"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "2.2.1",
-								"escape-string-regexp": "1.0.5",
-								"has-ansi": "2.0.0",
-								"strip-ansi": "3.0.1",
-								"supports-color": "2.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "3.0.1",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-							"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "2.1.1"
-							}
-						}
-					}
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"brace-expansion": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-					"dev": true,
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					},
-					"dependencies": {
-						"ansi-styles": {
-							"version": "3.2.0",
-							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-							"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-							"dev": true,
-							"requires": {
-								"color-convert": "1.9.0"
-							}
-						},
-						"supports-color": {
-							"version": "4.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-							"dev": true,
-							"requires": {
-								"has-flag": "2.0.0"
-							}
-						}
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-					"dev": true
-				},
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"esutils": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-					"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-					"dev": true
-				},
-				"globals": {
-					"version": "9.18.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-					"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"js-tokens": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-					"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"progress": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-					"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "3.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						}
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				}
-			}
-		},
-		"eslint-scope": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-			"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
-			"dev": true,
-			"requires": {
-				"esrecurse": "4.2.0",
-				"estraverse": "4.2.0"
-			}
-		},
-		"espree": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
-			"integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
-			"dev": true,
-			"requires": {
-				"acorn": "5.2.1",
-				"acorn-jsx": "3.0.1"
-			}
-		},
-		"esprima": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-			"integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-			"dev": true
-		},
-		"esquery": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-			"integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-			"dev": true,
-			"requires": {
-				"estraverse": "4.2.0"
-			}
-		},
-		"esrecurse": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-			"integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
-			"dev": true,
-			"requires": {
-				"estraverse": "4.2.0",
-				"object-assign": "4.1.1"
-			}
-		},
-		"estraverse": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-			"dev": true
-		},
-		"events": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-		},
-		"execall": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
-			"integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
-			"dev": true,
-			"requires": {
-				"clone-regexp": "1.0.0"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-brackets": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-			"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-			"dev": true,
-			"requires": {
-				"is-posix-bracket": "0.1.1"
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "2.2.3"
-			}
-		},
-		"extend": {
-			"version": "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==",
-			"dev": true,
-			"requires": {
-				"iconv-lite": "0.4.19",
-				"jschardet": "1.6.0",
-				"tmp": "0.0.33"
-			}
-		},
-		"extglob": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-			"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "1.0.0"
-			}
-		},
-		"extract-zip": {
-			"version": "1.6.5",
-			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz",
-			"integrity": "sha1-maBnNbbqIOqbcF13ms/8yHz/BEA=",
-			"dev": true,
-			"requires": {
-				"concat-stream": "1.6.0",
-				"debug": "2.2.0",
-				"mkdirp": "0.5.0",
-				"yauzl": "2.4.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-					"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-					"dev": true,
-					"requires": {
-						"ms": "0.7.1"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "0.7.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-					"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-					"dev": true
-				}
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-		},
-		"fast-deep-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-			"integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-			"dev": true
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-			"dev": true
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
-		},
-		"faye-websocket": {
-			"version": "0.9.4",
-			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz",
-			"integrity": "sha1-iFk0x57/sECVSeDAo4Ae0XpAza0=",
-			"dev": true,
-			"requires": {
-				"websocket-driver": "0.7.0"
-			}
-		},
-		"fd-slicer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-			"dev": true,
-			"requires": {
-				"pend": "1.2.0"
-			}
-		},
-		"fg-lodash": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/fg-lodash/-/fg-lodash-0.0.2.tgz",
-			"integrity": "sha1-mINSU39CfaavIiEpu2OsyknmL6M=",
-			"dev": true,
-			"requires": {
-				"lodash": "2.4.2",
-				"underscore.string": "2.3.3"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-					"integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
-					"dev": true
-				},
-				"underscore.string": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
-					"integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=",
-					"dev": true
-				}
-			}
-		},
-		"fibers": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-			"integrity": "sha1-IvA5yPGLhWGQ+75N7PBWFUwerpw=",
-			"dev": true
-		},
-		"figures": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-			"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "1.0.5",
-				"object-assign": "4.1.1"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				}
-			}
-		},
-		"file-entry-cache": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-			"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-			"dev": true,
-			"requires": {
-				"flat-cache": "1.3.0",
-				"object-assign": "4.1.1"
-			}
-		},
-		"file-type": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-7.2.0.tgz",
-			"integrity": "sha1-ETz+1S4daVmrgCSJBuLyWozcy3Q="
-		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
-		"fill-keys": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
-			"integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=",
-			"dev": true,
-			"requires": {
-				"is-object": "1.0.1",
-				"merge-descriptors": "1.0.1"
-			}
-		},
-		"fill-range": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-			"dev": true,
-			"requires": {
-				"is-number": "2.1.0",
-				"isobject": "2.1.0",
-				"randomatic": "1.1.7",
-				"repeat-element": "1.1.2",
-				"repeat-string": "1.6.1"
-			}
-		},
-		"find-up": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-			"dev": true,
-			"requires": {
-				"path-exists": "2.1.0",
-				"pinkie-promise": "2.0.1"
-			},
-			"dependencies": {
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"dev": true,
-					"requires": {
-						"pinkie-promise": "2.0.1"
-					}
-				}
-			}
-		},
-		"flat-cache": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-			"integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-			"dev": true,
-			"requires": {
-				"circular-json": "0.3.3",
-				"del": "2.2.2",
-				"graceful-fs": "4.1.11",
-				"write": "0.2.1"
-			},
-			"dependencies": {
-				"del": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-					"integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-					"dev": true,
-					"requires": {
-						"globby": "5.0.0",
-						"is-path-cwd": "1.0.0",
-						"is-path-in-cwd": "1.0.0",
-						"object-assign": "4.1.1",
-						"pify": "2.3.0",
-						"pinkie-promise": "2.0.1",
-						"rimraf": "2.6.1"
-					}
-				},
-				"globby": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-					"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-					"dev": true,
-					"requires": {
-						"array-union": "1.0.2",
-						"arrify": "1.0.1",
-						"glob": "7.1.2",
-						"object-assign": "4.1.1",
-						"pify": "2.3.0",
-						"pinkie-promise": "2.0.1"
-					}
-				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
-			}
-		},
-		"flatten": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-			"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-			"dev": true
-		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true
-		},
-		"for-own": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-			"dev": true,
-			"requires": {
-				"for-in": "1.0.2"
-			}
-		},
-		"foreach": {
-			"version": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-		},
-		"form-data": {
-			"version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-			"requires": {
-				"asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-				"mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
-			}
-		},
-		"freeport": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/freeport/-/freeport-1.0.5.tgz",
-			"integrity": "sha1-JV6KuEFwwzuoXZkOghrl9KGpvF0=",
-			"dev": true
-		},
-		"fs-extra": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
-			"integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"jsonfile": "2.4.0",
-				"klaw": "1.3.1"
-			}
-		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-		},
-		"fsevents": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-			"integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"nan": "2.6.2",
-				"node-pre-gyp": "0.6.36"
-			},
-			"dependencies": {
-				"abbrev": {
-					"version": "1.1.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"ajv": {
-					"version": "4.11.8",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"co": "4.6.0",
-						"json-stable-stringify": "1.0.1"
-					}
-				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true,
-					"dev": true
-				},
-				"aproba": {
-					"version": "1.1.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"are-we-there-yet": {
-					"version": "1.1.4",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"delegates": "1.0.0",
-						"readable-stream": "2.2.9"
-					}
-				},
-				"asn1": {
-					"version": "0.2.3",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"assert-plus": {
-					"version": "0.2.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"asynckit": {
-					"version": "0.4.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"aws-sign2": {
-					"version": "0.6.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"aws4": {
-					"version": "1.6.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"balanced-match": {
-					"version": "0.4.2",
-					"bundled": true,
-					"dev": true
-				},
-				"bcrypt-pbkdf": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"tweetnacl": "0.14.5"
-					}
-				},
-				"block-stream": {
-					"version": "0.0.9",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"inherits": "2.0.3"
-					}
-				},
-				"boom": {
-					"version": "2.10.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"hoek": "2.16.3"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.7",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"balanced-match": "0.4.2",
-						"concat-map": "0.0.1"
-					}
-				},
-				"buffer-shims": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"caseless": {
-					"version": "0.12.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"co": {
-					"version": "4.6.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"code-point-at": {
-					"version": "1.1.0",
-					"bundled": true,
-					"dev": true
-				},
-				"combined-stream": {
-					"version": "1.0.5",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"delayed-stream": "1.0.0"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"console-control-strings": {
-					"version": "1.1.0",
-					"bundled": true,
-					"dev": true
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"cryptiles": {
-					"version": "2.0.5",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"boom": "2.10.1"
-					}
-				},
-				"dashdash": {
-					"version": "1.14.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "1.0.0"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"bundled": true,
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"debug": {
-					"version": "2.6.8",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"deep-extend": {
-					"version": "0.4.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"delayed-stream": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"delegates": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"ecc-jsbn": {
-					"version": "0.1.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"jsbn": "0.1.1"
-					}
-				},
-				"extend": {
-					"version": "3.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"extsprintf": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"forever-agent": {
-					"version": "0.6.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"form-data": {
-					"version": "2.1.4",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"asynckit": "0.4.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.15"
-					}
-				},
-				"fs.realpath": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"fstream": {
-					"version": "1.0.11",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"graceful-fs": "4.1.11",
-						"inherits": "2.0.3",
-						"mkdirp": "0.5.1",
-						"rimraf": "2.6.1"
-					}
-				},
-				"fstream-ignore": {
-					"version": "1.0.5",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"fstream": "1.0.11",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4"
-					}
-				},
-				"gauge": {
-					"version": "2.7.4",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aproba": "1.1.1",
-						"console-control-strings": "1.1.0",
-						"has-unicode": "2.0.1",
-						"object-assign": "4.1.1",
-						"signal-exit": "3.0.2",
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1",
-						"wide-align": "1.1.2"
-					}
-				},
-				"getpass": {
-					"version": "0.1.7",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "1.0.0"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"bundled": true,
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"glob": {
-					"version": "7.1.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"fs.realpath": "1.0.0",
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"bundled": true,
-					"dev": true
-				},
-				"har-schema": {
-					"version": "1.0.5",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"har-validator": {
-					"version": "4.2.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ajv": "4.11.8",
-						"har-schema": "1.0.5"
-					}
-				},
-				"has-unicode": {
-					"version": "2.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"hawk": {
-					"version": "3.1.3",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"boom": "2.10.1",
-						"cryptiles": "2.0.5",
-						"hoek": "2.16.3",
-						"sntp": "1.0.9"
-					}
-				},
-				"hoek": {
-					"version": "2.16.3",
-					"bundled": true,
-					"dev": true
-				},
-				"http-signature": {
-					"version": "1.1.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "0.2.0",
-						"jsprim": "1.4.0",
-						"sshpk": "1.13.0"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"once": "1.4.0",
-						"wrappy": "1.0.2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"bundled": true,
-					"dev": true
-				},
-				"ini": {
-					"version": "1.3.4",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"is-typedarray": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"isstream": {
-					"version": "0.1.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"jodid25519": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"jsbn": "0.1.1"
-					}
-				},
-				"jsbn": {
-					"version": "0.1.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"json-schema": {
-					"version": "0.2.3",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"json-stable-stringify": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"jsonify": "0.0.0"
-					}
-				},
-				"json-stringify-safe": {
-					"version": "5.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"jsonify": {
-					"version": "0.0.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"jsprim": {
-					"version": "1.4.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "1.0.0",
-						"extsprintf": "1.0.2",
-						"json-schema": "0.2.3",
-						"verror": "1.3.6"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"bundled": true,
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"mime-db": {
-					"version": "1.27.0",
-					"bundled": true,
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.1.15",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"mime-db": "1.27.0"
-					}
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"bundled": true,
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"node-pre-gyp": {
-					"version": "0.6.36",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"mkdirp": "0.5.1",
-						"nopt": "4.0.1",
-						"npmlog": "4.1.0",
-						"rc": "1.2.1",
-						"request": "2.81.0",
-						"rimraf": "2.6.1",
-						"semver": "5.3.0",
-						"tar": "2.2.1",
-						"tar-pack": "3.4.0"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"abbrev": "1.1.0",
-						"osenv": "0.1.4"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"are-we-there-yet": "1.1.4",
-						"console-control-strings": "1.1.0",
-						"gauge": "2.7.4",
-						"set-blocking": "2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"oauth-sign": {
-					"version": "0.8.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"wrappy": "1.0.2"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"osenv": {
-					"version": "0.1.4",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"os-homedir": "1.0.2",
-						"os-tmpdir": "1.0.2"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"performance-now": {
-					"version": "0.2.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"bundled": true,
-					"dev": true
-				},
-				"punycode": {
-					"version": "1.4.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"qs": {
-					"version": "6.4.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"rc": {
-					"version": "1.2.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"deep-extend": "0.4.2",
-						"ini": "1.3.4",
-						"minimist": "1.2.0",
-						"strip-json-comments": "2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"bundled": true,
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.2.9",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"buffer-shims": "1.0.0",
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"string_decoder": "1.0.1",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"request": {
-					"version": "2.81.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aws-sign2": "0.6.0",
-						"aws4": "1.6.0",
-						"caseless": "0.12.0",
-						"combined-stream": "1.0.5",
-						"extend": "3.0.1",
-						"forever-agent": "0.6.1",
-						"form-data": "2.1.4",
-						"har-validator": "4.2.1",
-						"hawk": "3.1.3",
-						"http-signature": "1.1.1",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.15",
-						"oauth-sign": "0.8.2",
-						"performance-now": "0.2.0",
-						"qs": "6.4.0",
-						"safe-buffer": "5.0.1",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.2",
-						"tunnel-agent": "0.6.0",
-						"uuid": "3.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"glob": "7.1.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.0.1",
-					"bundled": true,
-					"dev": true
-				},
-				"semver": {
-					"version": "5.3.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"sntp": {
-					"version": "1.0.9",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"hoek": "2.16.3"
-					}
-				},
-				"sshpk": {
-					"version": "1.13.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"asn1": "0.2.3",
-						"assert-plus": "1.0.0",
-						"bcrypt-pbkdf": "1.0.1",
-						"dashdash": "1.14.1",
-						"ecc-jsbn": "0.1.1",
-						"getpass": "0.1.7",
-						"jodid25519": "1.0.2",
-						"jsbn": "0.1.1",
-						"tweetnacl": "0.14.5"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"bundled": true,
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.0.1"
-					}
-				},
-				"stringstream": {
-					"version": "0.0.5",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"tar": {
-					"version": "2.2.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"block-stream": "0.0.9",
-						"fstream": "1.0.11",
-						"inherits": "2.0.3"
-					}
-				},
-				"tar-pack": {
-					"version": "3.4.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"debug": "2.6.8",
-						"fstream": "1.0.11",
-						"fstream-ignore": "1.0.5",
-						"once": "1.4.0",
-						"readable-stream": "2.2.9",
-						"rimraf": "2.6.1",
-						"tar": "2.2.1",
-						"uid-number": "0.0.6"
-					}
-				},
-				"tough-cookie": {
-					"version": "2.3.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"punycode": "1.4.1"
-					}
-				},
-				"tunnel-agent": {
-					"version": "0.6.0",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"safe-buffer": "5.0.1"
-					}
-				},
-				"tweetnacl": {
-					"version": "0.14.5",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"uid-number": {
-					"version": "0.0.6",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				},
-				"uuid": {
-					"version": "3.0.1",
-					"bundled": true,
-					"dev": true,
-					"optional": true
-				},
-				"verror": {
-					"version": "1.3.6",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"extsprintf": "1.0.2"
-					}
-				},
-				"wide-align": {
-					"version": "1.1.2",
-					"bundled": true,
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"string-width": "1.0.2"
-					}
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true,
-					"dev": true
-				}
-			}
-		},
-		"fstream": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"rimraf": "2.6.1"
-			}
-		},
-		"fstream-ignore": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-			"integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-			"requires": {
-				"fstream": "1.0.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-			}
-		},
-		"function-bind": {
-			"version": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-			"integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E="
-		},
-		"functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
-		"gauge": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-			"requires": {
-				"aproba": "1.1.2",
-				"console-control-strings": "1.1.0",
-				"has-unicode": "2.0.1",
-				"object-assign": "4.1.1",
-				"signal-exit": "3.0.2",
-				"string-width": "1.0.2",
-				"strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-				"wide-align": "1.1.2"
-			}
-		},
-		"gaze": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
-			"integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-			"dev": true,
-			"requires": {
-				"globule": "1.2.0"
-			}
-		},
-		"gcp-metadata": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-			"integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
-			"requires": {
-				"extend": "3.0.1",
-				"retry-request": "3.1.0"
-			},
-			"dependencies": {
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-				}
-			}
-		},
-		"gcs-resumable-upload": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-			"integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
-			"requires": {
-				"buffer-equal": "1.0.0",
-				"configstore": "3.1.1",
-				"google-auto-auth": "0.7.2",
-				"pumpify": "1.3.5",
-				"request": "2.81.0",
-				"stream-events": "1.0.2",
-				"through2": "2.0.3"
-			}
-		},
-		"generate-function": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-			"integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-			"dev": true
-		},
-		"generate-object-property": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-			"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-			"dev": true,
-			"requires": {
-				"is-property": "1.0.2"
-			}
-		},
-		"get-pkg-repo": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
-			"integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "2.5.0",
-				"meow": "3.7.0",
-				"normalize-package-data": "2.4.0",
-				"parse-github-repo-url": "1.4.1",
-				"through2": "2.0.3"
-			}
-		},
-		"get-stdin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-			"dev": true
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "1.0.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"gherkin": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/gherkin/-/gherkin-4.0.0.tgz",
-			"integrity": "sha1-edzgTRIj6kO0hip2vlzo+JwSwyw=",
-			"dev": true
-		},
-		"git-raw-commits": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz",
-			"integrity": "sha1-DzqL/ZmuDy2LkiTViJKXXppS0Dw=",
-			"dev": true,
-			"requires": {
-				"dargs": "4.1.0",
-				"lodash.template": "4.4.0",
-				"meow": "3.7.0",
-				"split2": "2.2.0",
-				"through2": "2.0.3"
-			}
-		},
-		"git-remote-origin-url": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-			"integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-			"dev": true,
-			"requires": {
-				"gitconfiglocal": "1.0.0",
-				"pify": "2.3.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
-			}
-		},
-		"git-semver-tags": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
-			"integrity": "sha512-fhINopzKBQ8m6YlQt7gPf6T6hFnTF84O7U+8kYJmfjjKk7gbmKGj+BLcKNWi+japPbBwCeXXnfKwThpJpR9ZnQ==",
-			"dev": true,
-			"requires": {
-				"meow": "3.7.0",
-				"semver": "5.4.1"
-			}
-		},
-		"gitconfiglocal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-			"integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
-			"dev": true,
-			"requires": {
-				"ini": "1.3.4"
-			}
-		},
-		"glob": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-			"requires": {
-				"fs.realpath": "1.0.0",
-				"inflight": "1.0.6",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"once": "1.4.0",
-				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "2.0.0",
-				"is-glob": "2.0.1"
-			}
-		},
-		"glob-parent": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-			"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-			"dev": true,
-			"requires": {
-				"is-glob": "2.0.1"
-			}
-		},
-		"globby": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-			"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-			"dev": true,
-			"requires": {
-				"array-union": "1.0.2",
-				"glob": "7.1.2",
-				"object-assign": "4.1.1",
-				"pify": "2.3.0",
-				"pinkie-promise": "2.0.1"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
-			}
-		},
-		"globjoin": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-			"dev": true
-		},
-		"globule": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
-			"integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
-			"dev": true,
-			"requires": {
-				"glob": "7.1.2",
-				"lodash": "4.17.4",
-				"minimatch": "3.0.4"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"brace-expansion": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-					"dev": true,
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				}
-			}
-		},
-		"google-auth-library": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-			"integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-			"requires": {
-				"gtoken": "1.2.3",
-				"jws": "3.1.4",
-				"lodash.noop": "3.0.1",
-				"request": "2.81.0"
-			}
-		},
-		"google-auto-auth": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-			"integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
-			"requires": {
-				"async": "2.5.0",
-				"gcp-metadata": "0.3.1",
-				"google-auth-library": "0.10.0",
-				"request": "2.81.0"
-			}
-		},
-		"google-p12-pem": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-			"integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-			"requires": {
-				"node-forge": "0.7.1"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.1.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-		},
-		"graceful-readlink": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-			"integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-			"dev": true
-		},
-		"growl": {
-			"version": "1.9.2",
-			"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-			"dev": true
-		},
-		"gtoken": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz",
-			"integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==",
-			"requires": {
-				"google-p12-pem": "0.1.2",
-				"jws": "3.1.4",
-				"mime": "1.4.1",
-				"request": "2.81.0"
-			},
-			"dependencies": {
-				"mime": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
-				}
-			}
-		},
-		"handlebars": {
-			"version": "4.0.11",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
-			"integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
-			"dev": true,
-			"requires": {
-				"async": "1.5.2",
-				"optimist": "0.6.1",
-				"source-map": "0.4.4",
-				"uglify-js": "2.8.29"
-			},
-			"dependencies": {
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
-				},
-				"minimist": {
-					"version": "0.0.10",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-					"integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-					"dev": true
-				},
-				"optimist": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-					"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.10",
-						"wordwrap": "0.0.3"
-					}
-				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-					"dev": true,
-					"requires": {
-						"amdefine": "1.0.1"
-					}
-				},
-				"wordwrap": {
-					"version": "0.0.3",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-					"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-					"dev": true
-				}
-			}
-		},
-		"hapi": {
-			"version": "8.8.0",
-			"resolved": "https://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
-			"integrity": "sha1-h+N6Bum0meiXkOLcERqpZotuYX8=",
-			"dev": true,
-			"requires": {
-				"accept": "1.0.0",
-				"ammo": "1.0.0",
-				"boom": "2.7.2",
-				"call": "2.0.1",
-				"catbox": "4.3.0",
-				"catbox-memory": "1.1.1",
-				"cryptiles": "2.0.4",
-				"h2o2": "4.0.1",
-				"heavy": "3.0.0",
-				"hoek": "2.14.0",
-				"inert": "2.1.5",
-				"iron": "2.1.2",
-				"items": "1.1.0",
-				"joi": "6.4.1",
-				"kilt": "1.1.1",
-				"mimos": "2.0.2",
-				"peekaboo": "1.0.0",
-				"qs": "4.0.0",
-				"shot": "1.5.3",
-				"statehood": "2.1.1",
-				"subtext": "1.1.1",
-				"topo": "1.0.2",
-				"vision": "2.0.1"
-			},
-			"dependencies": {
-				"accept": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/accept/-/accept-1.0.0.tgz",
-					"integrity": "sha1-g++IOWi4WkDFARYEKCoiD/AeYq0=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0"
-					}
-				},
-				"ammo": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/ammo/-/ammo-1.0.0.tgz",
-					"integrity": "sha1-4FlIG/aAhzj66G1GT3L6DBLWeoU=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0"
-					}
-				},
-				"boom": {
-					"version": "2.7.2",
-					"resolved": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
-					"integrity": "sha1-2tYo2Jf3/S4yzIIZfxMweXHPg1Q=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.14.0"
-					}
-				},
-				"call": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/call/-/call-2.0.1.tgz",
-					"integrity": "sha1-SbQnCZQ96JoyJYqpEbWHUeI3eg4=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0"
-					}
-				},
-				"catbox": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/catbox/-/catbox-4.3.0.tgz",
-					"integrity": "sha1-IiN3vWfxKRrA4l0AAC0GWp3385o=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0",
-						"joi": "6.4.1"
-					}
-				},
-				"catbox-memory": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-1.1.1.tgz",
-					"integrity": "sha1-QqUvgLye+nJmAeltQBYDNhJIGig=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.14.0"
-					}
-				},
-				"cryptiles": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz",
-					"integrity": "sha1-CeoXdbnhx95+YKmdQqtvCM4aEoU=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2"
-					}
-				},
-				"h2o2": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/h2o2/-/h2o2-4.0.1.tgz",
-					"integrity": "sha1-eg4rztHZcXjsVs48ykjgxW3un40=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0",
-						"joi": "6.4.1",
-						"wreck": "6.0.0"
-					}
-				},
-				"heavy": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/heavy/-/heavy-3.0.0.tgz",
-					"integrity": "sha1-/QEIdiExYy+IVIontVQSws9SKwA=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0",
-						"joi": "6.4.1"
-					}
-				},
-				"hoek": {
-					"version": "2.14.0",
-					"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
-					"integrity": "sha1-gSEWkfUqWoNa5J7b8eickANHaqQ=",
-					"dev": true
-				},
-				"inert": {
-					"version": "2.1.5",
-					"resolved": "https://registry.npmjs.org/inert/-/inert-2.1.5.tgz",
-					"integrity": "sha1-eybZTEHGLAPsHU726LRe1WuDSFk=",
-					"dev": true,
-					"requires": {
-						"ammo": "1.0.0",
-						"boom": "2.7.2",
-						"hoek": "2.14.0",
-						"items": "1.1.0",
-						"joi": "6.4.1",
-						"lru-cache": "2.6.4"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "2.6.4",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
-							"integrity": "sha1-JnUZDM0bBwHsL2UqTQ09QA12wN0=",
-							"dev": true
-						}
-					}
-				},
-				"iron": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/iron/-/iron-2.1.2.tgz",
-					"integrity": "sha1-WR2RiiVAdTxEbY5DfNzwz6gBEU8=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"cryptiles": "2.0.4",
-						"hoek": "2.14.0"
-					}
-				},
-				"items": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
-					"integrity": "sha1-rZ1VhAsimGDLPRYLMidMLUvZ4mI=",
-					"dev": true
-				},
-				"joi": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
-					"integrity": "sha1-9Q9CRTVgBo5jg9oVrC0w3Xzra24=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.14.0",
-						"isemail": "1.1.1",
-						"moment": "2.10.3",
-						"topo": "1.0.2"
-					},
-					"dependencies": {
-						"isemail": {
-							"version": "1.1.1",
-							"resolved": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz",
-							"integrity": "sha1-4Mj23D9HCX53dzlcaJYnGqJWw7U=",
-							"dev": true
-						},
-						"moment": {
-							"version": "2.10.3",
-							"resolved": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz",
-							"integrity": "sha1-CruZ8wf2UhgwjGk17+KcV7Ggon8=",
-							"dev": true
-						}
-					}
-				},
-				"kilt": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/kilt/-/kilt-1.1.1.tgz",
-					"integrity": "sha1-d7SmFjyn+lshN6iMFzNCFuwj1ds=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.14.0"
-					}
-				},
-				"mimos": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/mimos/-/mimos-2.0.2.tgz",
-					"integrity": "sha1-wyQXF+dblZkr54esfdbbGptTmx4=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.14.0",
-						"mime-db": "1.14.0"
-					},
-					"dependencies": {
-						"mime-db": {
-							"version": "1.14.0",
-							"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz",
-							"integrity": "sha1-1WHxC27mbbUflK5leilRp0IX7YM=",
-							"dev": true
-						}
-					}
-				},
-				"peekaboo": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/peekaboo/-/peekaboo-1.0.0.tgz",
-					"integrity": "sha1-wNspJq1lTSygH3ymUKtFkadk/EI=",
-					"dev": true
-				},
-				"qs": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
-					"integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=",
-					"dev": true
-				},
-				"shot": {
-					"version": "1.5.3",
-					"resolved": "https://registry.npmjs.org/shot/-/shot-1.5.3.tgz",
-					"integrity": "sha1-SGEHREO8VHLCNRthpGtOrsAH9Xo=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.14.0"
-					}
-				},
-				"statehood": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/statehood/-/statehood-2.1.1.tgz",
-					"integrity": "sha1-AfFwtmxeklqvZ5qdMiulkYb8AAk=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"cryptiles": "2.0.4",
-						"hoek": "2.14.0",
-						"iron": "2.1.2",
-						"items": "1.1.0",
-						"joi": "6.4.1"
-					}
-				},
-				"subtext": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/subtext/-/subtext-1.1.1.tgz",
-					"integrity": "sha1-DJGCWuZdUXhVWT2DHjPvdaKEFWs=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"content": "1.0.1",
-						"hoek": "2.14.0",
-						"pez": "1.0.0",
-						"qs": "4.0.0",
-						"wreck": "6.0.0"
-					},
-					"dependencies": {
-						"content": {
-							"version": "1.0.1",
-							"resolved": "https://registry.npmjs.org/content/-/content-1.0.1.tgz",
-							"integrity": "sha1-gD60s7eJVGD9jGnGhMd1RmmvG6E=",
-							"dev": true,
-							"requires": {
-								"boom": "2.7.2",
-								"hoek": "2.14.0"
-							}
-						},
-						"pez": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/pez/-/pez-1.0.0.tgz",
-							"integrity": "sha1-hEMYpc5wku7d/6KV4YB5rHefoBg=",
-							"dev": true,
-							"requires": {
-								"b64": "2.0.0",
-								"boom": "2.7.2",
-								"content": "1.0.1",
-								"hoek": "2.14.0",
-								"nigel": "1.0.1"
-							},
-							"dependencies": {
-								"b64": {
-									"version": "2.0.0",
-									"resolved": "https://registry.npmjs.org/b64/-/b64-2.0.0.tgz",
-									"integrity": "sha1-tZlbJPR+v9nxMQF6bntdZHVvtvM=",
-									"dev": true,
-									"requires": {
-										"hoek": "2.14.0"
-									}
-								},
-								"nigel": {
-									"version": "1.0.1",
-									"resolved": "https://registry.npmjs.org/nigel/-/nigel-1.0.1.tgz",
-									"integrity": "sha1-RjmJr4gSePuqHTzJOCPb0XtDYKE=",
-									"dev": true,
-									"requires": {
-										"hoek": "2.14.0",
-										"vise": "1.0.0"
-									},
-									"dependencies": {
-										"vise": {
-											"version": "1.0.0",
-											"resolved": "https://registry.npmjs.org/vise/-/vise-1.0.0.tgz",
-											"integrity": "sha1-KDRb5N5aNB4V/SgW/Z6j5zA+jfM=",
-											"dev": true,
-											"requires": {
-												"hoek": "2.14.0"
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				},
-				"topo": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz",
-					"integrity": "sha1-QhV8N8HeTTeIPM3R1skChHqGDbk=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.14.0"
-					}
-				},
-				"vision": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/vision/-/vision-2.0.1.tgz",
-					"integrity": "sha1-0BIlW6buQm0GlqNOHfMy/sVeZzw=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0",
-						"items": "1.1.0",
-						"joi": "6.4.1"
-					}
-				},
-				"wreck": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/wreck/-/wreck-6.0.0.tgz",
-					"integrity": "sha1-T0CGaWHl14rOBPMqa38x8/PFFjg=",
-					"dev": true,
-					"requires": {
-						"boom": "2.7.2",
-						"hoek": "2.14.0"
-					}
-				}
-			}
-		},
-		"har-schema": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-			"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
-		},
-		"har-validator": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-			"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-			"requires": {
-				"ajv": "4.11.8",
-				"har-schema": "1.0.5"
-			}
-		},
-		"has": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-			"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-			"requires": {
-				"function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"
-			}
-		},
-		"has-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-			"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-			"dev": true
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-		},
-		"hash-stream-validation": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-			"integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
-			"requires": {
-				"through2": "2.0.3"
-			}
-		},
-		"hasha": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
-			"integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
-			"dev": true,
-			"requires": {
-				"is-stream": "1.1.0",
-				"pinkie-promise": "2.0.1"
-			}
-		},
-		"hawk": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-			"requires": {
-				"boom": "2.10.1",
-				"cryptiles": "2.0.5",
-				"hoek": "2.16.3",
-				"sntp": "1.0.9"
-			}
-		},
-		"he": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
-		},
-		"highlight.js": {
-			"version": "9.12.0",
-			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
-			"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
-		},
-		"hoek": {
-			"version": "2.16.3",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-		},
-		"hosted-git-info": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-			"integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-			"dev": true
-		},
-		"html-tags": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-			"integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
-			"dev": true
-		},
-		"html-to-text": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.1.0.tgz",
-			"integrity": "sha1-fwfvIXPloEQecxXBkgE6AKUtXko=",
-			"requires": {
-				"he": "1.1.1",
-				"htmlparser2": "3.9.2",
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-				"underscore": "1.8.3",
-				"underscore.string": "3.3.4"
-			},
-			"dependencies": {
-				"underscore.string": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
-					"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
-					"requires": {
-						"sprintf-js": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				}
-			}
-		},
-		"htmlparser2": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-			"requires": {
-				"domelementtype": "1.3.0",
-				"domhandler": "2.4.1",
-				"domutils": "1.6.2",
-				"entities": "1.1.1",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"http-parser-js": {
-			"version": "0.4.9",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
-			"integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
-			"dev": true
-		},
-		"http-signature": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-			"requires": {
-				"assert-plus": "0.2.0",
-				"jsprim": "1.4.1",
-				"sshpk": "1.13.1"
-			}
-		},
-		"https-proxy-agent": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
-			"integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
-			"dev": true,
-			"requires": {
-				"agent-base": "2.1.1",
-				"debug": "2.6.9",
-				"extend": "3.0.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				}
-			}
-		},
-		"iconv-lite": {
-			"version": "0.4.19",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-			"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-			"dev": true
-		},
-		"ieee754": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-			"integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
-		},
-		"ignore": {
-			"version": "3.3.7",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-			"integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
-			"dev": true
-		},
-		"imap": {
-			"version": "0.8.19",
-			"resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
-			"integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
-			"requires": {
-				"readable-stream": "1.1.14",
-				"utf7": "1.0.2"
-			},
-			"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": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"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="
-				}
-			}
-		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-		},
-		"indent-string": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-			"dev": true,
-			"requires": {
-				"repeating": "2.0.1"
-			},
-			"dependencies": {
-				"is-finite": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-					"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-					"dev": true
-				},
-				"repeating": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-					"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-					"dev": true,
-					"requires": {
-						"is-finite": "1.0.2"
-					}
-				}
-			}
-		},
-		"indexes-of": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-			"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-			"dev": true
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"requires": {
-				"once": "1.4.0",
-				"wrappy": "1.0.2"
-			}
-		},
-		"inherits": {
-			"version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-		},
-		"ini": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-			"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
-		},
-		"inquirer": {
-			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
-			"integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "1.4.0",
-				"chalk": "1.1.3",
-				"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": "4.1.0",
-				"string-width": "2.1.1",
-				"strip-ansi": "3.0.1",
-				"through": "2.3.8"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"figures": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-					"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "1.0.5"
-					}
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "3.0.0"
-							}
-						}
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				}
-			}
-		},
-		"is": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
-		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-			"dev": true
-		},
-		"is-binary-path": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-			"dev": true,
-			"requires": {
-				"binary-extensions": "1.10.0"
-			}
-		},
-		"is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"is-builtin-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-			"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-			"dev": true,
-			"requires": {
-				"builtin-modules": "1.1.1"
-			}
-		},
-		"is-callable": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-			"integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
-		},
-		"is-date-object": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-		},
-		"is-directory": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-			"dev": true
-		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "2.0.0"
-			}
-		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
-		},
-		"is-extglob": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-			"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-			"dev": true
-		},
-		"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": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-			}
-		},
-		"is-generator": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
-			"integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=",
-			"dev": true
-		},
-		"is-glob": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-			"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "1.0.0"
-			}
-		},
-		"is-my-json-valid": {
-			"version": "2.16.1",
-			"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-			"integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
-			"dev": true,
-			"requires": {
-				"generate-function": "2.0.0",
-				"generate-object-property": "1.2.0",
-				"jsonpointer": "4.0.1",
-				"xtend": "4.0.1"
-			},
-			"dependencies": {
-				"xtend": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-					"dev": true
-				}
-			}
-		},
-		"is-number": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-			"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-			"dev": true,
-			"requires": {
-				"kind-of": "3.2.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-		},
-		"is-object": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-			"integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-			"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-			"integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "1.0.2"
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-property": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-			"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-			"dev": true
-		},
-		"is-regex": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-			"requires": {
-				"has": "1.0.1"
-			}
-		},
-		"is-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-			"integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
-			"dev": true
-		},
-		"is-resolvable": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-			"integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-			"dev": true,
-			"requires": {
-				"tryit": "1.0.3"
-			}
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-			"dev": true
-		},
-		"is-stream-ended": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-			"integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
-		},
-		"is-subset": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-			"integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
-			"dev": true
-		},
-		"is-supported-regexp-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz",
-			"integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=",
-			"dev": true
-		},
-		"is-symbol": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-			"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
-		},
-		"is-text-path": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-			"integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-			"dev": true,
-			"requires": {
-				"text-extensions": "1.7.0"
-			}
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"isobject": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-			"dev": true,
-			"requires": {
-				"isarray": "1.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				}
-			}
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"jasmine": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
-			"integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
-			"dev": true,
-			"requires": {
-				"exit": "0.1.2",
-				"glob": "7.1.2",
-				"jasmine-core": "2.8.0"
-			}
-		},
-		"jasmine-core": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
-			"integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
-			"dev": true
-		},
-		"jmespath": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-			"integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
-		},
-		"jquery": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-			"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
-		},
-		"js-base64": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
-			"integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
-			"dev": true
-		},
-		"js-yaml": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-			"integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-			"dev": true,
-			"requires": {
-				"argparse": "1.0.9",
-				"esprima": "4.0.0"
-			}
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"optional": true
-		},
-		"jschardet": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz",
-			"integrity": "sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-schema-traverse": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-			"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-			"dev": true
-		},
-		"json-stable-stringify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-			"requires": {
-				"jsonify": "0.0.0"
-			}
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
-		},
-		"jsonfile": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-			"integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11"
-			}
-		},
-		"jsonify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-			"dev": true
-		},
-		"jsonpointer": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-			"dev": true
-		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"jwa": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-			"integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
-			"requires": {
-				"base64url": "2.0.0",
-				"buffer-equal-constant-time": "1.0.1",
-				"ecdsa-sig-formatter": "1.0.9",
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
-		"jws": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-			"integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
-			"requires": {
-				"base64url": "2.0.0",
-				"jwa": "1.1.5",
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
-		"kew": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
-			"integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
-			"dev": true
-		},
-		"kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"requires": {
-				"is-buffer": "1.1.6"
-			}
-		},
-		"klaw": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-			"integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11"
-			}
-		},
-		"known-css-properties": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.4.1.tgz",
-			"integrity": "sha512-n+ThoCKhyMFKkMfksdLMP5ndp+VzwDRzQdH6JlmZ2GTpUenYB2EeEKjOue2SErAAG/MmBSUISpwvawDhydWQdQ==",
-			"dev": true
-		},
-		"lazy-cache": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-			"integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-			"dev": true,
-			"optional": true
-		},
-		"lazystream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"ldap-filter": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz",
-			"integrity": "sha1-8rhCvguG2jNSeYUFsx68rlkNd9A=",
-			"requires": {
-				"assert-plus": "0.1.5"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-					"integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA="
-				}
-			}
-		},
-		"ldapjs": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.1.tgz",
-			"integrity": "sha1-NSuBKudLCo6WVJpLiWBg7uG5pUY=",
-			"requires": {
-				"asn1": "0.2.3",
-				"assert-plus": "1.0.0",
-				"backoff": "2.5.0",
-				"bunyan": "1.8.12",
-				"dashdash": "1.14.1",
-				"dtrace-provider": "0.7.1",
-				"ldap-filter": "0.2.2",
-				"once": "1.4.0",
-				"vasync": "1.6.4",
-				"verror": "1.10.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				},
-				"dtrace-provider": {
-					"version": "0.7.1",
-					"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz",
-					"integrity": "sha1-wGswjy8Q1dWDiuycVx5dWI3HHQQ=",
-					"optional": true,
-					"requires": {
-						"nan": "2.6.2"
-					}
-				}
-			}
-		},
-		"levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "1.1.2",
-				"type-check": "0.3.2"
-			}
-		},
-		"libbase64": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
-			"integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
-		},
-		"libmime": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/libmime/-/libmime-3.1.0.tgz",
-			"integrity": "sha1-EVAS8WcgUa3IgJqPk5Vf/DZI7fk=",
-			"requires": {
-				"iconv-lite": "0.4.15",
-				"libbase64": "0.1.0",
-				"libqp": "1.1.0"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.15",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
-				}
-			}
-		},
-		"libqp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
-			"integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
-		},
-		"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=",
-			"dev": true,
-			"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"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
-			}
-		},
-		"lodash._baseassign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "3.0.1",
-				"lodash.keys": "3.1.2"
-			}
-		},
-		"lodash._basecopy": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-			"dev": true
-		},
-		"lodash._basecreate": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-			"integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-			"dev": true
-		},
-		"lodash._getnative": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
-		},
-		"lodash._isiterateecall": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-			"dev": true
-		},
-		"lodash._reinterpolate": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-			"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-			"dev": true
-		},
-		"lodash.create": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-			"integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-			"dev": true,
-			"requires": {
-				"lodash._baseassign": "3.2.0",
-				"lodash._basecreate": "3.0.3",
-				"lodash._isiterateecall": "3.0.9"
-			}
-		},
-		"lodash.isarguments": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
-		},
-		"lodash.isarray": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-			"dev": true
-		},
-		"lodash.keys": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
-			"requires": {
-				"lodash._getnative": "3.9.1",
-				"lodash.isarguments": "3.1.0",
-				"lodash.isarray": "3.0.4"
-			}
-		},
-		"lodash.noop": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-			"integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
-		},
-		"lodash.template": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-			"integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-			"dev": true,
-			"requires": {
-				"lodash._reinterpolate": "3.0.0",
-				"lodash.templatesettings": "4.1.0"
-			}
-		},
-		"lodash.templatesettings": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-			"integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-			"dev": true,
-			"requires": {
-				"lodash._reinterpolate": "3.0.0"
-			}
-		},
-		"log-driver": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-			"integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
-		},
-		"log-symbols": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
-			"integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
-			"dev": true,
-			"requires": {
-				"chalk": "2.3.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"loglevel": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz",
-			"integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80=",
-			"dev": true
-		},
-		"longest": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-			"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-			"dev": true
-		},
-		"loud-rejection": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-			"dev": true,
-			"requires": {
-				"currently-unhandled": "0.4.1",
-				"signal-exit": "3.0.2"
-			}
-		},
-		"lower-case": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-			"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-			"dev": true
-		},
-		"lru-cache": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-			"integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-			"dev": true,
-			"requires": {
-				"pseudomap": "1.0.2",
-				"yallist": "2.1.2"
-			}
-		},
-		"mailparser-node4": {
-			"version": "2.0.2-2",
-			"resolved": "https://registry.npmjs.org/mailparser-node4/-/mailparser-node4-2.0.2-2.tgz",
-			"integrity": "sha1-IK4hESKWWldb3a6bTADTwtgkR/U=",
-			"requires": {
-				"addressparser": "1.0.1",
-				"array-includes": "3.0.3",
-				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-				"he": "1.1.1",
-				"html-to-text": "3.1.0",
-				"iconv-lite": "0.4.15",
-				"libmime": "3.1.0",
-				"mailsplit-node4": "4.0.1",
-				"marked": "0.3.6"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.15",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-					"integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
-				}
-			}
-		},
-		"mailsplit-node4": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/mailsplit-node4/-/mailsplit-node4-4.0.1.tgz",
-			"integrity": "sha1-XVEiiDVA/Ac/fQcWwv9ntlDP1oI=",
-			"requires": {
-				"buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-				"libbase64": "0.1.0",
-				"libmime": "3.1.0",
-				"libqp": "1.1.0"
-			}
-		},
-		"make-dir": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
-			"integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
-			"requires": {
-				"pify": "3.0.0"
-			}
-		},
-		"map-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-			"dev": true
-		},
-		"marked": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
-			"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
-		},
-		"mathml-tag-names": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz",
-			"integrity": "sha1-jUEmgWi/htEQK5gQnijlMeejRXg=",
-			"dev": true
-		},
-		"meow": {
-			"version": "3.7.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-			"dev": true,
-			"requires": {
-				"camelcase-keys": "2.1.0",
-				"decamelize": "1.2.0",
-				"loud-rejection": "1.6.0",
-				"map-obj": "1.0.1",
-				"minimist": "1.2.0",
-				"normalize-package-data": "2.4.0",
-				"object-assign": "4.1.1",
-				"read-pkg-up": "1.0.1",
-				"redent": "1.0.0",
-				"trim-newlines": "1.0.0"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				}
-			}
-		},
-		"merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-			"dev": true
-		},
-		"meteor-promise": {
-			"version": "0.8.6",
-			"resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.6.tgz",
-			"integrity": "sha512-HP6tOr67z/9XU2Dr0F2SSr8WRTuE23AG9Dj578DCJPEYHs67OLKBviU8A8rwvbwMD7Lu2+Of+yAMz2Wd8r4yxg==",
-			"dev": true
-		},
-		"methmeth": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-			"integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
-		},
-		"micromatch": {
-			"version": "2.3.11",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-			"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-			"dev": true,
-			"requires": {
-				"arr-diff": "2.0.0",
-				"array-unique": "0.2.1",
-				"braces": "1.8.5",
-				"expand-brackets": "0.1.5",
-				"extglob": "0.3.2",
-				"filename-regex": "2.0.1",
-				"is-extglob": "1.0.0",
-				"is-glob": "2.0.1",
-				"kind-of": "3.2.2",
-				"normalize-path": "2.1.1",
-				"object.omit": "2.0.1",
-				"parse-glob": "3.0.4",
-				"regex-cache": "0.4.4"
-			}
-		},
-		"mime-db": {
-			"version": "1.31.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz",
-			"integrity": "sha512-oB3w9lx50CMd6nfonoV5rBRUbJtjMifUHaFb5MfzjC8ksAIfVjT0BsX46SjjqBz7n9JGTrTX3paIeLSK+rS5fQ=="
-		},
-		"mime-type": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/mime-type/-/mime-type-3.0.5.tgz",
-			"integrity": "sha1-ftKSan2oImifgSVPWYf+lQNiLpo=",
-			"requires": {
-				"media-typer": "0.3.0",
-				"minimatch": "3.0.4",
-				"path.js": "1.0.7",
-				"util-ex": "0.3.15"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-				},
-				"brace-expansion": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-				},
-				"inherits-ex": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.2.0.tgz",
-					"integrity": "sha1-MVlON25zgZjvdUD9V1lBCl1CQDg=",
-					"requires": {
-						"xtend": "4.0.1"
-					}
-				},
-				"media-typer": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-					"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				},
-				"path.js": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
-					"integrity": "sha1-fRNrYH3hm/2YugaIdJJih+ZTSTk=",
-					"requires": {
-						"escape-string-regexp": "1.0.5",
-						"inherits-ex": "1.2.0",
-						"util-ex": "0.3.15"
-					}
-				},
-				"util-ex": {
-					"version": "0.3.15",
-					"resolved": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz",
-					"integrity": "sha1-+SYc2hPEMn0HQMvme+Eife2LAFg=",
-					"requires": {
-						"inherits-ex": "1.2.0",
-						"xtend": "4.0.1"
-					}
-				},
-				"xtend": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-				}
-			}
-		},
-		"mime-types": {
-			"version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-			"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-			"requires": {
-				"mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-					"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE="
-				}
-			}
-		},
-		"mimic-fn": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-			"integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
-			"dev": true
-		},
-		"minimatch": {
-			"version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-			"requires": {
-				"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
-			}
-		},
-		"minimist": {
-			"version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-		},
-		"mkdirp": {
-			"version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-			"requires": {
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-			}
-		},
-		"mocha": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
-			"integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
-			"dev": true,
-			"requires": {
-				"browser-stdout": "1.3.0",
-				"commander": "2.9.0",
-				"debug": "2.6.8",
-				"diff": "3.2.0",
-				"escape-string-regexp": "1.0.5",
-				"glob": "7.1.1",
-				"growl": "1.9.2",
-				"he": "1.1.1",
-				"json3": "3.3.2",
-				"lodash.create": "3.1.1",
-				"mkdirp": "0.5.1",
-				"supports-color": "3.1.2"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"brace-expansion": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-					"dev": true,
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"commander": {
-					"version": "2.9.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-					"integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-					"dev": true,
-					"requires": {
-						"graceful-readlink": "1.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.8",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"glob": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-					"integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "1.0.0",
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-					"integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-					"dev": true,
-					"requires": {
-						"has-flag": "1.0.0"
-					}
-				}
-			}
-		},
-		"mock-require": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/mock-require/-/mock-require-2.0.2.tgz",
-			"integrity": "sha1-HqpxqtIwE3c9En3H6Ro/u0g31g0=",
-			"dev": true,
-			"requires": {
-				"caller-id": "0.1.0"
-			}
-		},
-		"modelo": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-			"integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
-		},
-		"modify-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz",
-			"integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
-			"dev": true
-		},
-		"module-not-found-error": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
-			"integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=",
-			"dev": true
-		},
-		"moment": {
-			"version": "2.19.1",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
-			"integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
-		},
-		"moment-timezone": {
-			"version": "0.5.13",
-			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
-			"integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
-			"requires": {
-				"moment": "2.19.1"
-			}
-		},
-		"mute-stream": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-			"dev": true
-		},
-		"mv": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-			"integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
-			"optional": true,
-			"requires": {
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"ncp": "2.0.0",
-				"rimraf": "2.4.5"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "6.0.4",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-					"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-					"optional": true,
-					"requires": {
-						"inflight": "1.0.6",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "1.4.0",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"rimraf": {
-					"version": "2.4.5",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-					"integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
-					"optional": true,
-					"requires": {
-						"glob": "6.0.4"
-					}
-				}
-			}
-		},
-		"nan": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-			"integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
-		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
-		"ncp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-			"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-			"optional": true
-		},
-		"no-case": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-			"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-			"dev": true,
-			"requires": {
-				"lower-case": "1.1.4"
-			}
-		},
-		"node-forge": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-			"integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
-		},
-		"node-pre-gyp": {
-			"version": "0.6.36",
-			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-			"integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
-			"requires": {
-				"mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-				"nopt": "4.0.1",
-				"npmlog": "4.1.2",
-				"rc": "1.2.1",
-				"request": "2.81.0",
-				"rimraf": "2.6.1",
-				"semver": "5.4.1",
-				"tar": "2.2.1",
-				"tar-pack": "3.4.0"
-			}
-		},
-		"node-uuid": {
-			"version": "1.4.8",
-			"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-			"integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
-			"dev": true
-		},
-		"nopt": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-			"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-			"requires": {
-				"abbrev": "1.1.0",
-				"osenv": "0.1.4"
-			}
-		},
-		"normalize-package-data": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-			"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "2.5.0",
-				"is-builtin-module": "1.0.0",
-				"semver": "5.4.1",
-				"validate-npm-package-license": "3.0.1"
-			}
-		},
-		"normalize-path": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-			"dev": true,
-			"requires": {
-				"remove-trailing-separator": "1.1.0"
-			}
-		},
-		"normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-			"dev": true
-		},
-		"normalize-selector": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-			"dev": true
-		},
-		"npm-install-package": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
-			"integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
-			"dev": true
-		},
-		"npmlog": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-			"requires": {
-				"are-we-there-yet": "1.1.4",
-				"console-control-strings": "1.1.0",
-				"gauge": "2.7.4",
-				"set-blocking": "2.0.0"
-			}
-		},
-		"num2fraction": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-			"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-			"dev": true
-		},
-		"number-is-nan": {
-			"version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-		},
-		"oauth-sign": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-		},
-		"object-keys": {
-			"version": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-			"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
-		},
-		"object.assign": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
-			"integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
-			"dev": true,
-			"requires": {
-				"define-properties": "1.1.2",
-				"function-bind": "1.1.1",
-				"object-keys": "1.0.11"
-			},
-			"dependencies": {
-				"define-properties": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-					"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-					"dev": true,
-					"requires": {
-						"foreach": "2.0.5",
-						"object-keys": "1.0.11"
-					}
-				},
-				"foreach": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-					"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-					"dev": true
-				},
-				"function-bind": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-					"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-					"dev": true
-				},
-				"object-keys": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-					"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-					"dev": true
-				}
-			}
-		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "0.1.5",
-				"is-extendable": "0.1.1"
-			}
-		},
-		"once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"requires": {
-				"wrappy": "1.0.2"
-			}
-		},
-		"onetime": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-			"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-			"dev": true,
-			"requires": {
-				"mimic-fn": "1.1.0"
-			}
-		},
-		"optimist": {
-			"version": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-			"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-			"requires": {
-				"minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-				"wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-			}
-		},
-		"optionator": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-			"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-			"dev": true,
-			"requires": {
-				"deep-is": "0.1.3",
-				"fast-levenshtein": "2.0.6",
-				"levn": "0.3.0",
-				"prelude-ls": "1.1.2",
-				"type-check": "0.3.2",
-				"wordwrap": "1.0.0"
-			},
-			"dependencies": {
-				"wordwrap": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-					"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-					"dev": true
-				}
-			}
-		},
-		"os-homedir": {
-			"version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-		},
-		"os-tmpdir": {
-			"version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-		},
-		"osenv": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-			"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-			"requires": {
-				"os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-				"os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-			}
-		},
-		"p-map": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-			"dev": true
-		},
-		"parse-github-repo-url": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
-			"integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
-			"dev": true
-		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "0.3.0",
-				"is-dotfile": "1.0.3",
-				"is-extglob": "1.0.0",
-				"is-glob": "2.0.1"
-			}
-		},
-		"parse-json": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-			"dev": true,
-			"requires": {
-				"error-ex": "1.3.1"
-			}
-		},
-		"path-is-absolute": {
-			"version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-		},
-		"path-is-inside": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-			"dev": true
-		},
-		"path-parse": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-			"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-			"dev": true
-		},
-		"path-type": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"pify": "2.3.0",
-				"pinkie-promise": "2.0.1"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
-			}
-		},
-		"pend": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-			"dev": true
-		},
-		"performance-now": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-			"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-		},
-		"phantomjs-prebuilt": {
-			"version": "2.1.13",
-			"resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz",
-			"integrity": "sha1-ZlVq2ell2JPKWn3J52PffoaX920=",
-			"dev": true,
-			"requires": {
-				"es6-promise": "4.0.5",
-				"extract-zip": "1.5.0",
-				"fs-extra": "0.30.0",
-				"hasha": "2.2.0",
-				"kew": "0.7.0",
-				"progress": "1.1.8",
-				"request": "2.74.0",
-				"request-progress": "2.0.1",
-				"which": "1.2.14"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"caseless": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-					"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"combined-stream": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "1.0.0"
-					}
-				},
-				"concat-stream": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
-					"integrity": "sha1-U/fUPFHF5D+ByP3QMyHGMb5o1hE=",
-					"dev": true,
-					"requires": {
-						"inherits": "2.0.3",
-						"readable-stream": "2.0.6",
-						"typedarray": "0.0.6"
-					}
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"debug": {
-					"version": "0.7.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-					"integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=",
-					"dev": true
-				},
-				"delayed-stream": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-					"dev": true
-				},
-				"extract-zip": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
-					"integrity": "sha1-ksz22B73Cp+kwXRxFMzvbYaIpsQ=",
-					"dev": true,
-					"requires": {
-						"concat-stream": "1.5.0",
-						"debug": "0.7.4",
-						"mkdirp": "0.5.0",
-						"yauzl": "2.4.1"
-					}
-				},
-				"form-data": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
-					"integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
-					"dev": true,
-					"requires": {
-						"async": "2.5.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.17"
-					}
-				},
-				"fs-extra": {
-					"version": "0.30.0",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-					"integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "4.1.11",
-						"jsonfile": "2.4.0",
-						"klaw": "1.3.1",
-						"path-is-absolute": "1.0.1",
-						"rimraf": "2.6.1"
-					}
-				},
-				"har-validator": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-					"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"commander": "2.11.0",
-						"is-my-json-valid": "2.16.1",
-						"pinkie-promise": "2.0.1"
-					}
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-					"dev": true
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.2.3",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
-					"integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-					"integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"string_decoder": "0.10.31",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"request": {
-					"version": "2.74.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
-					"integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "0.6.0",
-						"aws4": "1.6.0",
-						"bl": "1.1.2",
-						"caseless": "0.11.0",
-						"combined-stream": "1.0.5",
-						"extend": "3.0.1",
-						"forever-agent": "0.6.1",
-						"form-data": "1.0.1",
-						"har-validator": "2.0.6",
-						"hawk": "3.1.3",
-						"http-signature": "1.1.1",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.17",
-						"node-uuid": "1.4.8",
-						"oauth-sign": "0.8.2",
-						"qs": "6.2.3",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.2",
-						"tunnel-agent": "0.4.3"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				},
-				"tunnel-agent": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-					"dev": true
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"photoswipe": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.2.tgz",
-			"integrity": "sha1-lcIKdc6iO3DWKZZBytguA8rn95c="
-		},
-		"pify": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-		},
-		"pinkie": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-			"dev": true
-		},
-		"pinkie-promise": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-			"dev": true,
-			"requires": {
-				"pinkie": "2.0.4"
-			}
-		},
-		"pluralize": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-			"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-			"dev": true
-		},
-		"poplib": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
-			"integrity": "sha1-L0tYtVkpcjUM2X9IKrpo+OBVdLw=",
-			"requires": {
-				"optimist": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"
-			}
-		},
-		"postcss": {
-			"version": "5.2.18",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-			"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"js-base64": "2.3.2",
-				"source-map": "0.5.7",
-				"supports-color": "3.2.3"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					},
-					"dependencies": {
-						"supports-color": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-							"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-							"dev": true
-						}
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "1.0.0"
-					}
-				}
-			}
-		},
-		"postcss-calc": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.1.tgz",
-			"integrity": "sha1-PSQXG79udinUIqQ26/5t2VEfQzA=",
-			"dev": true,
-			"requires": {
-				"css-unit-converter": "1.1.1",
-				"postcss": "6.0.13",
-				"postcss-selector-parser": "2.2.3",
-				"reduce-css-calc": "2.1.1"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"reduce-css-calc": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.1.tgz",
-					"integrity": "sha1-9OzXoA7D5Wg3c/IIBnrX2hF7nbA=",
-					"dev": true,
-					"requires": {
-						"css-unit-converter": "1.1.1",
-						"postcss-value-parser": "3.3.0"
-					}
-				}
-			}
-		},
-		"postcss-custom-properties": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz",
-			"integrity": "sha512-eNR2h9T9ciKMoQEORrPjH33XeN/nuvVuxArOKmHtsFbGbNss631tgTrKou3/pmjAZbA4QQkhLIkPQkIk3WW+8w==",
-			"dev": true,
-			"requires": {
-				"balanced-match": "1.0.0",
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				}
-			}
-		},
-		"postcss-import": {
-			"version": "11.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.0.0.tgz",
-			"integrity": "sha1-qWLi34LTvFptpqOGhBdHIE9B71s=",
-			"dev": true,
-			"requires": {
-				"postcss": "6.0.13",
-				"postcss-value-parser": "3.3.0",
-				"read-cache": "1.0.0",
-				"resolve": "1.5.0"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				}
-			}
-		},
-		"postcss-less": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.1.tgz",
-			"integrity": "sha512-zl0EEqq8Urh37Ppdv9zzhpZpLHrgkxmt6e3O4ftRa7/b8Uq2LV+/KBVM8/KuzmHNu+mthhOArg1lxbfqQ3NUdg==",
-			"dev": true,
-			"requires": {
-				"postcss": "5.2.18"
-			}
-		},
-		"postcss-media-minmax": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
-			"integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
-			"dev": true,
-			"requires": {
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				}
-			}
-		},
-		"postcss-media-query-parser": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-			"dev": true
-		},
-		"postcss-nesting": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-3.0.0.tgz",
-			"integrity": "sha512-ijQlEXUcYXXNPdLMFcMEr4i5SEPRKR8fq/Iya4L0mQbNOCz+szTGCBlf0Cvu2HiQLjCNqLnGO4fKFLbNnXe7Ag==",
-			"dev": true,
-			"requires": {
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				}
-			}
-		},
-		"postcss-reporter": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
-			"integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==",
-			"dev": true,
-			"requires": {
-				"chalk": "2.3.0",
-				"lodash": "4.17.4",
-				"log-symbols": "2.1.0",
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-			"dev": true
-		},
-		"postcss-safe-parser": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz",
-			"integrity": "sha1-t1Pv9sfArqXoN1++TN6L+QY/8UI=",
-			"dev": true,
-			"requires": {
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"postcss-scss": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz",
-			"integrity": "sha1-/0XPM1S4ee6JpOtoaA9GrJuxT5Q=",
-			"dev": true,
-			"requires": {
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"postcss-selector-not": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
-			"integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
-			"dev": true,
-			"requires": {
-				"balanced-match": "0.4.2",
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				}
-			}
-		},
-		"postcss-selector-parser": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-			"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-			"dev": true,
-			"requires": {
-				"flatten": "1.0.2",
-				"indexes-of": "1.0.1",
-				"uniq": "1.0.1"
-			}
-		},
-		"postcss-sorting": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-3.1.0.tgz",
-			"integrity": "sha512-YCPTcJwGIInF1LpMD1lIYvMHTGUL4s97o/OraA6eKvoauhhk6vjwOWDDjm6uRKqug/kyDPMKEzmYZ6FtW6RDgw==",
-			"dev": true,
-			"requires": {
-				"lodash": "4.17.4",
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"postcss-value-parser": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-			"integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
-			"dev": true
-		},
-		"precond": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
-			"integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw="
-		},
-		"prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-			"dev": true
-		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
-		"process-nextick-args": {
-			"version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-		},
-		"progress": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-			"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-			"dev": true
-		},
-		"prom-client": {
-			"version": "10.2.1",
-			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.2.1.tgz",
-			"integrity": "sha512-avZAdOCg/fCVmB1gBJnlYDHsBBoj7Kf8Dlz47KD3w32d6SONbarnzflCNbgdBTM5XATiD3+oJ9RQsIFgAxOUag==",
-			"requires": {
-				"tdigest": "0.1.1"
-			}
-		},
-		"proxyquire": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
-			"integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=",
-			"dev": true,
-			"requires": {
-				"fill-keys": "1.0.2",
-				"module-not-found-error": "1.0.1",
-				"resolve": "1.1.7"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-					"dev": true
-				}
-			}
-		},
-		"pseudomap": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-			"dev": true
-		},
-		"pump": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-			"integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
-			"requires": {
-				"end-of-stream": "1.4.0",
-				"once": "1.4.0"
-			}
-		},
-		"pumpify": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-			"integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
-			"requires": {
-				"duplexify": "3.5.1",
-				"inherits": "2.0.3",
-				"pump": "1.0.2"
-			},
-			"dependencies": {
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-				}
-			}
-		},
-		"punycode": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-		},
-		"q": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-			"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-			"dev": true
-		},
-		"qs": {
-			"version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-			"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
-		},
-		"querystring": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-			"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-		},
-		"randomatic": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-			"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-			"dev": true,
-			"requires": {
-				"is-number": "3.0.0",
-				"kind-of": "4.0.0"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-					"dev": true,
-					"requires": {
-						"kind-of": "3.2.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "1.1.6"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "1.1.6"
-					}
-				}
-			}
-		},
-		"rc": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-			"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-			"requires": {
-				"deep-extend": "0.4.2",
-				"ini": "1.3.4",
-				"minimist": "1.2.0",
-				"strip-json-comments": "2.0.1"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-				}
-			}
-		},
-		"read-cache": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
-			"dev": true,
-			"requires": {
-				"pify": "2.3.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
-			}
-		},
-		"read-pkg": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-			"dev": true,
-			"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=",
-			"dev": true,
-			"requires": {
-				"find-up": "1.1.2",
-				"read-pkg": "1.1.0"
-			}
-		},
-		"readdirp": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-			"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"minimatch": "3.0.4",
-				"readable-stream": "2.3.3",
-				"set-immediate-shim": "1.0.1"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"brace-expansion": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-					"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-					"dev": true,
-					"requires": {
-						"balanced-match": "1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-					"dev": true
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"redent": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-			"dev": true,
-			"requires": {
-				"indent-string": "2.1.0",
-				"strip-indent": "1.0.1"
-			}
-		},
-		"regenerator-runtime": {
-			"version": "0.10.5",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-			"integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-			"dev": true
-		},
-		"regex-cache": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "0.1.3"
-			}
-		},
-		"remove-trailing-separator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
-		},
-		"repeat-element": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-			"dev": true
-		},
-		"repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true
-		},
-		"request": {
-			"version": "2.81.0",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-			"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-			"requires": {
-				"aws-sign2": "0.6.0",
-				"aws4": "1.6.0",
-				"caseless": "0.12.0",
-				"combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"forever-agent": "0.6.1",
-				"form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-				"har-validator": "4.2.1",
-				"hawk": "3.1.3",
-				"http-signature": "1.1.1",
-				"is-typedarray": "1.0.0",
-				"isstream": "0.1.2",
-				"json-stringify-safe": "5.0.1",
-				"mime-types": "2.1.17",
-				"oauth-sign": "0.8.2",
-				"performance-now": "0.2.0",
-				"qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-				"safe-buffer": "5.1.1",
-				"stringstream": "0.0.5",
-				"tough-cookie": "2.3.2",
-				"tunnel-agent": "0.6.0",
-				"uuid": "3.1.0"
-			},
-			"dependencies": {
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo="
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
-				}
-			}
-		},
-		"request-progress": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
-			"integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
-			"dev": true,
-			"requires": {
-				"throttleit": "1.0.0"
-			}
-		},
-		"requestretry": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.5.0.tgz",
-			"integrity": "sha1-7RV7ulNSbt6z7DKo5wSkmYvs5ic=",
-			"dev": true,
-			"requires": {
-				"fg-lodash": "0.0.2",
-				"request": "2.81.0"
-			}
-		},
-		"require-from-string": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.1.tgz",
-			"integrity": "sha1-xUUjPp19pmFunVmt+zn8n1iGdv8=",
-			"dev": true
-		},
-		"require-uncached": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-			"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-			"dev": true,
-			"requires": {
-				"caller-path": "0.1.0",
-				"resolve-from": "1.0.1"
-			}
-		},
-		"resolve": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-			"integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-			"dev": true,
-			"requires": {
-				"path-parse": "1.0.5"
-			}
-		},
-		"resolve-from": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-			"integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-			"dev": true
-		},
-		"resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
-		},
-		"restore-cursor": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-			"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-			"dev": true,
-			"requires": {
-				"onetime": "2.0.1",
-				"signal-exit": "3.0.2"
-			}
-		},
-		"retry-request": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
-			"integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg==",
-			"requires": {
-				"request": "2.81.0",
-				"through2": "2.0.3"
-			}
-		},
-		"rgb2hex": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
-			"integrity": "sha1-zNVfhgrgxcTqN1BLlY5ELY0SMls=",
-			"dev": true
-		},
-		"right-align": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-			"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"align-text": "0.1.4"
-			}
-		},
-		"rimraf": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-			"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-			"requires": {
-				"glob": "7.1.2"
-			}
-		},
-		"run-async": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-			"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-			"dev": true,
-			"requires": {
-				"is-promise": "2.1.0"
-			}
-		},
-		"rx": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-			"integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
-			"dev": true
-		},
-		"safe-json-stringify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz",
-			"integrity": "sha1-gaCY9Efku8P/MxKiQ1IbwGDvWRE=",
-			"optional": true
-		},
-		"saucelabs": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.4.0.tgz",
-			"integrity": "sha1-uTSpr52ih0s/QKrh/N5QpEZvXzg=",
-			"dev": true,
-			"requires": {
-				"https-proxy-agent": "1.0.0"
-			}
-		},
-		"sax": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-			"integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
-		},
-		"selenium-standalone": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.11.0.tgz",
-			"integrity": "sha512-MedSwbiyLkv/nxr7JpI9zFNSAmSDpcz+bCaVSJC1krXYeIzFuj6tKMMss57xwu4VHgfInTy3IIMM2HdjN87xXQ==",
-			"dev": true,
-			"requires": {
-				"async": "2.5.0",
-				"commander": "2.11.0",
-				"cross-spawn": "5.1.0",
-				"debug": "2.6.9",
-				"lodash": "4.17.4",
-				"minimist": "1.2.0",
-				"mkdirp": "0.5.1",
-				"progress": "1.1.8",
-				"request": "2.79.0",
-				"tar-stream": "1.5.2",
-				"urijs": "1.19.0",
-				"which": "1.2.14",
-				"yauzl": "2.9.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"asynckit": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-					"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-					"dev": true
-				},
-				"caseless": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-					"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "2.2.1",
-						"escape-string-regexp": "1.0.5",
-						"has-ansi": "2.0.0",
-						"strip-ansi": "3.0.1",
-						"supports-color": "2.0.0"
-					}
-				},
-				"combined-stream": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "1.0.0"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"delayed-stream": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-					"dev": true
-				},
-				"form-data": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-					"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-					"dev": true,
-					"requires": {
-						"asynckit": "0.4.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.17"
-					}
-				},
-				"har-validator": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-					"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-					"dev": true,
-					"requires": {
-						"chalk": "1.1.3",
-						"commander": "2.11.0",
-						"is-my-json-valid": "2.16.1",
-						"pinkie-promise": "2.0.1"
-					}
-				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-					"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-					"dev": true
-				},
-				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "0.0.8",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-							"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-							"dev": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.3.2",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-					"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-					"dev": true
-				},
-				"request": {
-					"version": "2.79.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-					"integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "0.6.0",
-						"aws4": "1.6.0",
-						"caseless": "0.11.0",
-						"combined-stream": "1.0.5",
-						"extend": "3.0.1",
-						"forever-agent": "0.6.1",
-						"form-data": "2.1.4",
-						"har-validator": "2.0.6",
-						"hawk": "3.1.3",
-						"http-signature": "1.1.1",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.17",
-						"oauth-sign": "0.8.2",
-						"qs": "6.3.2",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.2",
-						"tunnel-agent": "0.4.3",
-						"uuid": "3.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				},
-				"tunnel-agent": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-					"dev": true
-				},
-				"yauzl": {
-					"version": "2.9.1",
-					"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
-					"integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
-					"dev": true,
-					"requires": {
-						"buffer-crc32": "0.2.13",
-						"fd-slicer": "1.0.1"
-					}
-				}
-			}
-		},
-		"semver": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-			"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
-		},
-		"set-blocking": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-		},
-		"set-immediate-shim": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-			"integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-			"dev": true
-		},
-		"shebang-command": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-			"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-			"dev": true,
-			"requires": {
-				"shebang-regex": "1.0.0"
-			},
-			"dependencies": {
-				"shebang-regex": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-					"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-					"dev": true
-				}
-			}
-		},
-		"signal-exit": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-		},
-		"simple-git": {
-			"version": "1.80.1",
-			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.80.1.tgz",
-			"integrity": "sha1-SBBMtKxyV2k3hT4a/R7v/cl6yyk=",
-			"dev": true,
-			"requires": {
-				"debug": "2.6.9"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				}
-			}
-		},
-		"slice-ansi": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-			"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-			"dev": true,
-			"requires": {
-				"is-fullwidth-code-point": "2.0.0"
-			},
-			"dependencies": {
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				}
-			}
-		},
-		"snakeize": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz",
-			"integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0="
-		},
-		"sntp": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-			"requires": {
-				"hoek": "2.16.3"
-			}
-		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true
-		},
-		"source-map-resolve": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-			"integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
-			"dev": true,
-			"requires": {
-				"atob": "1.1.3",
-				"resolve-url": "0.2.1",
-				"source-map-url": "0.3.0",
-				"urix": "0.1.0"
-			}
-		},
-		"source-map-url": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-			"integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
-			"dev": true
-		},
-		"spdx-correct": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-			"integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-			"dev": true,
-			"requires": {
-				"spdx-license-ids": "1.2.2"
-			}
-		},
-		"spdx-expression-parse": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-			"integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-			"dev": true
-		},
-		"spdx-license-ids": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-			"integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-			"dev": true
-		},
-		"specificity": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz",
-			"integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==",
-			"dev": true
-		},
-		"split": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-			"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-			"dev": true,
-			"requires": {
-				"through": "2.3.8"
-			}
-		},
-		"split-array-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
-			"integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
-			"requires": {
-				"async": "2.5.0",
-				"is-stream-ended": "0.1.3"
-			}
-		},
-		"split2": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-			"integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-			"dev": true,
-			"requires": {
-				"through2": "2.0.3"
-			}
-		},
-		"sprintf-js": {
-			"version": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-		},
-		"sshpk": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-			"requires": {
-				"asn1": "0.2.3",
-				"assert-plus": "1.0.0",
-				"bcrypt-pbkdf": "1.0.1",
-				"dashdash": "1.14.1",
-				"ecc-jsbn": "0.1.1",
-				"getpass": "0.1.7",
-				"jsbn": "0.1.1",
-				"tweetnacl": "0.14.5"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"stack-chain": {
-			"version": "1.3.7",
-			"resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
-			"integrity": "sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=",
-			"dev": true
-		},
-		"stack-generator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-1.1.0.tgz",
-			"integrity": "sha1-NvapIHUabBD0maE8Msu19RoLiyU=",
-			"dev": true,
-			"requires": {
-				"stackframe": "1.0.4"
-			},
-			"dependencies": {
-				"stackframe": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-					"integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
-					"dev": true
-				}
-			}
-		},
-		"stack-trace": {
-			"version": "0.0.10",
-			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-			"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-			"dev": true
-		},
-		"stackframe": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
-			"integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
-			"dev": true
-		},
-		"stacktrace-gps": {
-			"version": "2.4.4",
-			"resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-2.4.4.tgz",
-			"integrity": "sha1-acgn6dbW9Bz0ONfxleLjy/zyjEQ=",
-			"dev": true,
-			"requires": {
-				"source-map": "0.5.6",
-				"stackframe": "0.3.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-					"integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-					"dev": true
-				}
-			}
-		},
-		"stacktrace-js": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-1.3.1.tgz",
-			"integrity": "sha1-Z8qyWJr1xBe5Yvc2mUAne7O2oYs=",
-			"dev": true,
-			"requires": {
-				"error-stack-parser": "1.3.6",
-				"stack-generator": "1.1.0",
-				"stacktrace-gps": "2.4.4"
-			}
-		},
-		"stream-events": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-			"integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
-			"requires": {
-				"stubs": "3.0.0"
-			}
-		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
-		},
-		"string-format-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-			"integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
-		},
-		"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": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-			}
-		},
-		"stringstream": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-		},
-		"strip-ansi": {
-			"version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-			"requires": {
-				"ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
-			}
-		},
-		"strip-bom": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-			"dev": true,
-			"requires": {
-				"is-utf8": "0.2.1"
-			}
-		},
-		"strip-indent": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-			"dev": true,
-			"requires": {
-				"get-stdin": "4.0.1"
-			}
-		},
-		"strip-json-comments": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-		},
-		"stubs": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-			"integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
-		},
-		"style-search": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-			"integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-			"dev": true
-		},
-		"stylelint": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-8.2.0.tgz",
-			"integrity": "sha512-57JWIz/1Uh9ehZMZyAqlFC0EDfQrMXCH8yqt8ZuJQQvV3LBKgAM/JYd+CWi1hC4eJtRODSPbIIBYKdGjkPZdMg==",
-			"dev": true,
-			"requires": {
-				"autoprefixer": "7.1.6",
-				"balanced-match": "1.0.0",
-				"chalk": "2.3.0",
-				"cosmiconfig": "3.1.0",
-				"debug": "3.1.0",
-				"execall": "1.0.0",
-				"file-entry-cache": "2.0.0",
-				"get-stdin": "5.0.1",
-				"globby": "6.1.0",
-				"globjoin": "0.1.4",
-				"html-tags": "2.0.0",
-				"ignore": "3.3.7",
-				"imurmurhash": "0.1.4",
-				"known-css-properties": "0.4.1",
-				"lodash": "4.17.4",
-				"log-symbols": "2.1.0",
-				"mathml-tag-names": "2.0.1",
-				"meow": "3.7.0",
-				"micromatch": "2.3.11",
-				"normalize-selector": "0.2.0",
-				"pify": "3.0.0",
-				"postcss": "6.0.13",
-				"postcss-less": "1.1.1",
-				"postcss-media-query-parser": "0.2.3",
-				"postcss-reporter": "5.0.0",
-				"postcss-resolve-nested-selector": "0.1.1",
-				"postcss-safe-parser": "3.0.1",
-				"postcss-scss": "1.0.2",
-				"postcss-selector-parser": "2.2.3",
-				"postcss-value-parser": "3.3.0",
-				"resolve-from": "4.0.0",
-				"specificity": "0.3.2",
-				"string-width": "2.1.1",
-				"style-search": "0.1.0",
-				"sugarss": "1.0.0",
-				"svg-tags": "1.0.0",
-				"table": "4.0.2"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"autoprefixer": {
-					"version": "7.1.6",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
-					"integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==",
-					"dev": true,
-					"requires": {
-						"browserslist": "2.6.1",
-						"caniuse-lite": "1.0.30000756",
-						"normalize-range": "0.1.2",
-						"num2fraction": "1.2.2",
-						"postcss": "6.0.13",
-						"postcss-value-parser": "3.3.0"
-					}
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-					"dev": true
-				},
-				"browserslist": {
-					"version": "2.6.1",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz",
-					"integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "1.0.30000756",
-						"electron-to-chromium": "1.3.27"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"get-stdin": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-					"integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"resolve-from": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-					"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "3.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"stylelint-order": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-0.7.0.tgz",
-			"integrity": "sha1-zqtcviSqM/pjWQAkmVOV9u38mrc=",
-			"dev": true,
-			"requires": {
-				"lodash": "4.17.4",
-				"postcss": "6.0.13",
-				"postcss-sorting": "3.1.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"sugarss": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.0.tgz",
-			"integrity": "sha1-ZeUbOVhDL7cNVFGmi7M+MtDPHvc=",
-			"dev": true,
-			"requires": {
-				"postcss": "6.0.13"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.13",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-					"integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-					"dev": true,
-					"requires": {
-						"chalk": "2.3.0",
-						"source-map": "0.6.1",
-						"supports-color": "4.5.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"supertest": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz",
-			"integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=",
-			"dev": true,
-			"requires": {
-				"methods": "1.1.2",
-				"superagent": "3.8.0"
-			},
-			"dependencies": {
-				"asynckit": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-					"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-					"dev": true
-				},
-				"combined-stream": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "1.0.0"
-					}
-				},
-				"component-emitter": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-					"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-					"dev": true
-				},
-				"cookiejar": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
-					"integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
-					"dev": true
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"delayed-stream": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-					"dev": true
-				},
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-					"dev": true
-				},
-				"form-data": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-					"integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-					"dev": true,
-					"requires": {
-						"asynckit": "0.4.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.17"
-					}
-				},
-				"formidable": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
-					"integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"methods": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-					"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-					"dev": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.1.17",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-					"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.5.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-					"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"superagent": {
-					"version": "3.8.0",
-					"resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.0.tgz",
-					"integrity": "sha512-71XGWgtn70TNwgmgYa69dPOYg55aU9FCahjUNY03rOrKvaTCaU3b9MeZmqonmf9Od96SCxr3vGfEAnhM7dtxCw==",
-					"dev": true,
-					"requires": {
-						"component-emitter": "1.2.1",
-						"cookiejar": "2.1.1",
-						"debug": "3.1.0",
-						"extend": "3.0.1",
-						"form-data": "2.3.1",
-						"formidable": "1.1.1",
-						"methods": "1.1.2",
-						"mime": "1.4.1",
-						"qs": "6.5.1",
-						"readable-stream": "2.3.3"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		},
-		"supports-color": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-			"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-			"dev": true,
-			"requires": {
-				"has-flag": "2.0.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				}
-			}
-		},
-		"svg-tags": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-			"dev": true
-		},
-		"table": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-			"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
-			"dev": true,
-			"requires": {
-				"ajv": "5.3.0",
-				"ajv-keywords": "2.1.1",
-				"chalk": "2.3.0",
-				"lodash": "4.17.4",
-				"slice-ansi": "1.0.0",
-				"string-width": "2.1.1"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-					"integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-					"dev": true,
-					"requires": {
-						"co": "4.6.0",
-						"fast-deep-equal": "1.0.0",
-						"fast-json-stable-stringify": "2.0.0",
-						"json-schema-traverse": "0.3.1"
-					}
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "3.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"tar": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-			"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-			"requires": {
-				"block-stream": "0.0.9",
-				"fstream": "1.0.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-			}
-		},
-		"tar-pack": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-			"integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-			"requires": {
-				"debug": "2.6.8",
-				"fstream": "1.0.11",
-				"fstream-ignore": "1.0.5",
-				"once": "1.4.0",
-				"readable-stream": "2.3.3",
-				"rimraf": "2.6.1",
-				"tar": "2.2.1",
-				"uid-number": "0.0.6"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.8",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-						"process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"tar-stream": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
-			"integrity": "sha1-+8bG6DwaGdTLSMfZYXH8JI7/x78=",
-			"dev": true,
-			"requires": {
-				"bl": "1.1.2",
-				"end-of-stream": "1.4.0",
-				"readable-stream": "2.3.3",
-				"xtend": "4.0.1"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				},
-				"xtend": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-					"dev": true
-				}
-			}
-		},
-		"tdigest": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
-			"integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=",
-			"requires": {
-				"bintrees": "1.0.1"
-			}
-		},
-		"tempfile": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
-			"integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "1.0.2",
-				"uuid": "2.0.3"
-			},
-			"dependencies": {
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"dev": true
-				},
-				"uuid": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-					"integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-					"dev": true
-				}
-			}
-		},
-		"text-extensions": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-			"integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
-			"dev": true
-		},
-		"text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-			"dev": true
-		},
-		"throttleit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-			"integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
-			"dev": true
-		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-			"dev": true
-		},
-		"through2": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-			"requires": {
-				"readable-stream": "2.3.3",
-				"xtend": "4.0.1"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-				},
-				"xtend": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-				}
-			}
-		},
-		"tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "1.0.2"
-			},
-			"dependencies": {
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"dev": true
-				}
-			}
-		},
-		"toastr": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
-			"integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
-		},
-		"tough-cookie": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-			"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-			"requires": {
-				"punycode": "1.4.1"
-			}
-		},
-		"trim-newlines": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-			"dev": true
-		},
-		"trim-off-newlines": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
-			"integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
-			"dev": true
-		},
-		"tryit": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-			"integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-			"dev": true
-		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"requires": {
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-				}
-			}
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"optional": true
-		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "1.1.2"
-			}
-		},
-		"type-detect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
-			"integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
-			"dev": true
-		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-		},
-		"uglify-js": {
-			"version": "2.8.29",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-			"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"source-map": "0.5.7",
-				"uglify-to-browserify": "1.0.2",
-				"yargs": "3.10.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true,
-					"optional": true
-				}
-			}
-		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-			"dev": true,
-			"optional": true
-		},
-		"uid-number": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-			"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
-		},
-		"underscore": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-			"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
-		},
-		"underscore.string": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
-			"integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
-			"requires": {
-				"sprintf-js": "1.1.1",
-				"util-deprecate": "1.0.2"
-			},
-			"dependencies": {
-				"sprintf-js": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
-					"integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-				}
-			}
-		},
-		"uniq": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-			"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-			"dev": true
-		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"requires": {
-				"crypto-random-string": "1.0.0"
-			}
-		},
-		"upper-case": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-			"integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-			"dev": true
-		},
-		"urijs": {
-			"version": "1.19.0",
-			"resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.0.tgz",
-			"integrity": "sha512-Qs2odXn0hST5VSPVjpi73CMqtbAoanahaqWBujGU+IyMrMqpWcIhDewxQRhCkmqYxuyvICDcSuLdv2O7ncWBGw==",
-			"dev": true
-		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
-		},
-		"url": {
-			"version": "0.10.3",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-			"integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-				}
-			}
-		},
-		"utf7": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
-			"integrity": "sha1-lV9JCq5lO6IguUVqCod2wZk2CZE=",
-			"requires": {
-				"semver": "5.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-				}
-			}
-		},
-		"util-deprecate": {
-			"version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
-		"uuid": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-			"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-			"integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-			"dev": true,
-			"requires": {
-				"spdx-correct": "1.0.2",
-				"spdx-expression-parse": "1.0.4"
-			}
-		},
-		"validator": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/validator/-/validator-7.0.0.tgz",
-			"integrity": "sha1-x03rgGNRL6w1VHk45vCxUEooL9I=",
-			"dev": true
-		},
-		"vasync": {
-			"version": "1.6.4",
-			"resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz",
-			"integrity": "sha1-3+k2Fq0OeugBszKp2Iv8XNyOHR8=",
-			"requires": {
-				"verror": "1.6.0"
-			},
-			"dependencies": {
-				"extsprintf": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz",
-					"integrity": "sha1-WtlGwi9bMrp/jNdCZxHG6KP8JSk="
-				},
-				"verror": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz",
-					"integrity": "sha1-fROyex+swuLakEBetepuW90lLqU=",
-					"requires": {
-						"extsprintf": "1.2.0"
-					}
-				}
-			}
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-				"extsprintf": "1.3.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-				}
-			}
-		},
-		"walkdir": {
-			"version": "0.0.11",
-			"resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
-			"integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
-			"dev": true
-		},
-		"wdio-dot-reporter": {
-			"version": "0.0.9",
-			"resolved": "https://registry.npmjs.org/wdio-dot-reporter/-/wdio-dot-reporter-0.0.9.tgz",
-			"integrity": "sha1-kpsq2v1J1rBTT9oGjocxm0fjj+U=",
-			"dev": true
-		},
-		"wdio-sync": {
-			"version": "0.6.14",
-			"resolved": "https://registry.npmjs.org/wdio-sync/-/wdio-sync-0.6.14.tgz",
-			"integrity": "sha1-odzVkHuh0EFUquYXbGItkQw8qbM=",
-			"dev": true,
-			"requires": {
-				"babel-runtime": "6.23.0",
-				"fibers": "1.0.15",
-				"object.assign": "4.0.4"
-			},
-			"dependencies": {
-				"babel-runtime": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-					"integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
-					"dev": true,
-					"requires": {
-						"core-js": "2.5.1",
-						"regenerator-runtime": "0.10.5"
-					}
-				},
-				"core-js": {
-					"version": "2.5.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-					"dev": true
-				}
-			}
-		},
-		"webdriverio": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.8.0.tgz",
-			"integrity": "sha1-1Skpt0kID4mWf24WFAUcvIFy0TI=",
-			"dev": true,
-			"requires": {
-				"archiver": "1.3.0",
-				"babel-runtime": "6.23.0",
-				"css-parse": "2.0.0",
-				"css-value": "0.0.1",
-				"deepmerge": "1.3.2",
-				"ejs": "2.5.7",
-				"gaze": "1.1.2",
-				"glob": "7.1.2",
-				"inquirer": "3.0.6",
-				"json-stringify-safe": "5.0.1",
-				"mkdirp": "0.5.1",
-				"npm-install-package": "2.1.0",
-				"optimist": "0.6.1",
-				"q": "1.5.1",
-				"request": "2.81.0",
-				"rgb2hex": "0.1.0",
-				"safe-buffer": "5.0.1",
-				"supports-color": "3.2.3",
-				"url": "0.11.0",
-				"validator": "7.0.0",
-				"wdio-dot-reporter": "0.0.9",
-				"wgxpath": "1.0.0"
-			},
-			"dependencies": {
-				"babel-runtime": {
-					"version": "6.23.0",
-					"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-					"integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
-					"dev": true,
-					"requires": {
-						"core-js": "2.5.1",
-						"regenerator-runtime": "0.10.5"
-					}
-				},
-				"core-js": {
-					"version": "2.5.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-					"integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-					"dev": true
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"optimist": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-					"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8",
-						"wordwrap": "0.0.3"
-					}
-				},
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-					"dev": true
-				},
-				"safe-buffer": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-					"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
-					"requires": {
-						"has-flag": "1.0.0"
-					}
-				},
-				"url": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-					"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-					"dev": true,
-					"requires": {
-						"punycode": "1.3.2",
-						"querystring": "0.2.0"
-					}
-				},
-				"wordwrap": {
-					"version": "0.0.3",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-					"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-					"dev": true
-				}
-			}
-		},
-		"websocket-driver": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-			"integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
-			"dev": true,
-			"requires": {
-				"http-parser-js": "0.4.9",
-				"websocket-extensions": "0.1.2"
-			}
-		},
-		"websocket-extensions": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
-			"integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
-			"dev": true
-		},
-		"wgxpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz",
-			"integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
-			"dev": true
-		},
-		"which": {
-			"version": "1.2.14",
-			"resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-			"integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
-			"dev": true,
-			"requires": {
-				"isexe": "2.0.0"
-			}
-		},
-		"wide-align": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-			"integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
-			"requires": {
-				"string-width": "1.0.2"
-			}
-		},
-		"window-size": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-			"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-			"dev": true,
-			"optional": true
-		},
-		"wolfy87-eventemitter": {
-			"version": "5.2.3",
-			"resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.3.tgz",
-			"integrity": "sha512-jCUVjlRkpuoU9vQa1cyynPJhvR8ymNLwfvdkGYjIWwR0STLc0LJQG+yFy1JlQ73vjbtlNiC8xNqZQMJDdpYMeA=="
-		},
-		"wordwrap": {
-			"version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-			"integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-		},
-		"wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-		},
-		"write": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-			"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-			"dev": true,
-			"requires": {
-				"mkdirp": "0.5.1"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				}
-			}
-		},
-		"write-file-atomic": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-			"integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"imurmurhash": "0.1.4",
-				"signal-exit": "3.0.2"
-			}
-		},
-		"xdg-basedir": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-			"integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
-		},
-		"xml2js": {
-			"version": "0.4.17",
-			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
-			"integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
-			"requires": {
-				"sax": "1.2.1",
-				"xmlbuilder": "4.2.1"
-			}
-		},
-		"xmlbuilder": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
-			"integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
-			"requires": {
-				"lodash": "4.17.4"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-				}
-			}
-		},
-		"xolvio-ddp": {
-			"version": "0.12.3",
-			"resolved": "https://registry.npmjs.org/xolvio-ddp/-/xolvio-ddp-0.12.3.tgz",
-			"integrity": "sha1-NqarlhKyQLWg0cCoNJCK8XwLjwI=",
-			"dev": true,
-			"requires": {
-				"bluebird": "2.11.0",
-				"ddp-ejson": "0.8.1-3",
-				"ddp-underscore-patched": "0.8.1-2",
-				"faye-websocket": "0.9.4",
-				"request": "2.53.0"
-			},
-			"dependencies": {
-				"asn1": {
-					"version": "0.1.11",
-					"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-					"integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
-					"dev": true
-				},
-				"assert-plus": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-					"integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
-					"dev": true
-				},
-				"async": {
-					"version": "0.9.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-					"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-					"dev": true
-				},
-				"aws-sign2": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-					"integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
-					"dev": true
-				},
-				"bl": {
-					"version": "0.9.5",
-					"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
-					"integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34"
-					}
-				},
-				"bluebird": {
-					"version": "2.11.0",
-					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-					"integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
-					"dev": true
-				},
-				"caseless": {
-					"version": "0.9.0",
-					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
-					"integrity": "sha1-t7Zc5r8UE4hlOc/VM/CzDv+pz4g=",
-					"dev": true
-				},
-				"combined-stream": {
-					"version": "0.0.7",
-					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-					"integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "0.0.5"
-					}
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"delayed-stream": {
-					"version": "0.0.5",
-					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-					"integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
-					"dev": true
-				},
-				"forever-agent": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-					"integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=",
-					"dev": true
-				},
-				"form-data": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-					"integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
-					"dev": true,
-					"requires": {
-						"async": "0.9.2",
-						"combined-stream": "0.0.7",
-						"mime-types": "2.0.14"
-					}
-				},
-				"hawk": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
-					"integrity": "sha1-HnMc45RH+h0PbXB/e87r7A/R7B8=",
-					"dev": true,
-					"requires": {
-						"boom": "2.10.1",
-						"cryptiles": "2.0.5",
-						"hoek": "2.16.3",
-						"sntp": "1.0.9"
-					}
-				},
-				"http-signature": {
-					"version": "0.10.1",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-					"integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
-					"dev": true,
-					"requires": {
-						"asn1": "0.1.11",
-						"assert-plus": "0.1.5",
-						"ctype": "0.5.3"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"mime-db": {
-					"version": "1.12.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
-					"integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.0.14",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-					"integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
-					"dev": true,
-					"requires": {
-						"mime-db": "1.12.0"
-					}
-				},
-				"oauth-sign": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
-					"integrity": "sha1-fb6uRPbKRU4fFoRR1jB0ZzWBPOM=",
-					"dev": true
-				},
-				"qs": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
-					"integrity": "sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"request": {
-					"version": "2.53.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.53.0.tgz",
-					"integrity": "sha1-GAo66St7Y5gC5PlUXdj83rcddgw=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "0.5.0",
-						"bl": "0.9.5",
-						"caseless": "0.9.0",
-						"combined-stream": "0.0.7",
-						"forever-agent": "0.5.2",
-						"form-data": "0.2.0",
-						"hawk": "2.3.1",
-						"http-signature": "0.10.1",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.0.14",
-						"node-uuid": "1.4.8",
-						"oauth-sign": "0.6.0",
-						"qs": "2.3.3",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.2",
-						"tunnel-agent": "0.4.3"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"tunnel-agent": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-					"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-					"dev": true
-				}
-			}
-		},
-		"xolvio-fiber-utils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/xolvio-fiber-utils/-/xolvio-fiber-utils-2.0.3.tgz",
-			"integrity": "sha1-vsjXDHQGGjFjFbun0w0lyz6C3FA=",
-			"dev": true,
-			"requires": {
-				"fibers": "1.0.15",
-				"underscore": "1.8.3"
-			}
-		},
-		"xolvio-jasmine-expect": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/xolvio-jasmine-expect/-/xolvio-jasmine-expect-1.1.0.tgz",
-			"integrity": "sha1-vCud1ghCMR8EV59agtzqaisxnH0=",
-			"dev": true,
-			"requires": {
-				"jasmine-core": "2.8.0"
-			}
-		},
-		"xolvio-sync-webdriverio": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/xolvio-sync-webdriverio/-/xolvio-sync-webdriverio-9.0.1.tgz",
-			"integrity": "sha1-WRri2MiqynQiZJWfzM+QtPndUWA=",
-			"dev": true,
-			"requires": {
-				"fibers": "1.0.15",
-				"meteor-promise": "0.8.6",
-				"underscore": "1.8.3",
-				"wdio-sync": "0.6.14",
-				"webdriverio": "4.8.0",
-				"xolvio-fiber-utils": "2.0.3"
-			}
-		},
-		"yallist": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-			"dev": true
-		},
-		"yargs": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-			"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"camelcase": "1.2.1",
-				"cliui": "2.1.0",
-				"decamelize": "1.2.0",
-				"window-size": "0.1.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true,
-					"optional": true
-				}
-			}
-		},
-		"yauzl": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-			"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
-			"dev": true,
-			"requires": {
-				"fd-slicer": "1.0.1"
-			}
-		},
-		"zip-stream": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
-			"integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
-			"dev": true,
-			"requires": {
-				"archiver-utils": "1.3.0",
-				"compress-commons": "1.2.2",
-				"lodash": "4.17.4",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				}
-			}
-		}
-	}
+  "name": "Rocket.Chat",
+  "version": "0.59.0-develop",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@google-cloud/common": {
+      "version": "0.13.6",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
+      "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
+      "requires": {
+        "array-uniq": "1.0.3",
+        "arrify": "1.0.1",
+        "concat-stream": "1.6.0",
+        "create-error-class": "3.0.2",
+        "duplexify": "3.5.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "google-auto-auth": "0.7.2",
+        "is": "3.2.1",
+        "log-driver": "1.2.5",
+        "methmeth": "1.1.0",
+        "modelo": "4.2.0",
+        "request": "2.83.0",
+        "retry-request": "3.1.0",
+        "split-array-stream": "1.0.3",
+        "stream-events": "1.0.2",
+        "string-format-obj": "1.1.0",
+        "through2": "2.0.3"
+      }
+    },
+    "@google-cloud/storage": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.4.0.tgz",
+      "integrity": "sha512-vt1NU7D12OGYPhWfwBD1Q2qFS6Suykorlp3NLaES2W9CW6sEBWLwScxElXt8nPvonYBCFt99jP4g1AqY+0hefw==",
+      "requires": {
+        "@google-cloud/common": "0.13.6",
+        "arrify": "1.0.1",
+        "async": "2.5.0",
+        "concat-stream": "1.6.0",
+        "create-error-class": "3.0.2",
+        "duplexify": "3.5.1",
+        "extend": "3.0.1",
+        "gcs-resumable-upload": "0.8.2",
+        "hash-stream-validation": "0.2.1",
+        "is": "3.2.1",
+        "mime-types": "2.1.17",
+        "once": "1.4.0",
+        "pumpify": "1.3.5",
+        "safe-buffer": "5.1.1",
+        "snakeize": "0.1.0",
+        "stream-events": "1.0.2",
+        "string-format-obj": "1.1.0",
+        "through2": "2.0.3"
+      }
+    },
+    "JSONStream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
+      "dev": true,
+      "requires": {
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
+      }
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
+    "acorn": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
+      "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "add-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
+      "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
+      "dev": true
+    },
+    "addressparser": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
+      "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
+    },
+    "agent-base": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
+      "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "semver": "5.0.3"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "dev": true
+        }
+      }
+    },
+    "ajv": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+      "dev": true
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+      "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+      "dev": true,
+      "requires": {
+        "color-convert": "1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "archiver": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz",
+      "integrity": "sha1-TyGU1tj5nfP1MeaIHxTxXVX6ryI=",
+      "dev": true,
+      "requires": {
+        "archiver-utils": "1.3.0",
+        "async": "2.5.0",
+        "buffer-crc32": "0.2.13",
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "readable-stream": "2.3.3",
+        "tar-stream": "1.5.2",
+        "walkdir": "0.0.11",
+        "zip-stream": "1.2.0"
+      }
+    },
+    "archiver-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lazystream": "1.0.0",
+        "lodash": "4.17.4",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "are-we-there-yet": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "requires": {
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+          "dev": true
+        }
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-ify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
+      "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.9.0"
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "assertion-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
+      "integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
+      "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
+      "integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "2.6.1",
+        "caniuse-lite": "1.0.30000756",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "6.0.13",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "aws-sdk": {
+      "version": "2.141.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz",
+      "integrity": "sha1-PZallw/Z9UDOq8wdS66zO3FYOqc=",
+      "requires": {
+        "buffer": "4.9.1",
+        "crypto-browserify": "1.0.9",
+        "events": "1.1.1",
+        "jmespath": "0.15.0",
+        "querystring": "0.2.0",
+        "sax": "1.2.1",
+        "url": "0.10.3",
+        "uuid": "3.1.0",
+        "xml2js": "0.4.17",
+        "xmlbuilder": "4.2.1"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "babel-core": {
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.9.1.tgz",
+      "integrity": "sha1-SNRx7r9N5GngqUL+RW3MlLGL6A0=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.0",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.5.0",
+        "debug": "2.6.9",
+        "json5": "0.4.0",
+        "lodash": "4.17.4",
+        "minimatch": "2.0.10",
+        "path-exists": "1.0.0",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.8",
+        "shebang-regex": "1.0.0",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
+      "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
+      "dev": true,
+      "requires": {
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.4",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-bindify-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-assignable-expression": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-builder-react-jsx": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
+      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "esutils": "2.0.2"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-explode-class": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+      "dev": true,
+      "requires": {
+        "babel-helper-bindify-decorators": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-mocha-es6-compiler": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/babel-mocha-es6-compiler/-/babel-mocha-es6-compiler-0.1.0.tgz",
+      "integrity": "sha1-QMnkBoCvRhWP7usntJQUtrgOxDg=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.9.1",
+        "babel-plugin-add-module-exports": "0.2.1",
+        "babel-preset-es2015": "6.3.13",
+        "babel-preset-react": "6.3.13",
+        "babel-preset-stage-0": "6.3.13"
+      }
+    },
+    "babel-plugin-add-module-exports": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
+      "integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
+      "dev": true
+    },
+    "babel-plugin-array-includes": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-array-includes/-/babel-plugin-array-includes-2.0.3.tgz",
+      "integrity": "sha1-z1RS6Bx7gD+3lZ8QRayI4uwo/3Y=",
+      "dev": true
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "babel-plugin-syntax-async-generators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-constructor-call": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-properties": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+      "dev": true
+    },
+    "babel-plugin-syntax-decorators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+      "dev": true
+    },
+    "babel-plugin-syntax-do-expressions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
+      "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
+      "dev": true
+    },
+    "babel-plugin-syntax-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+      "dev": true
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "babel-plugin-syntax-export-extensions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
+      "dev": true
+    },
+    "babel-plugin-syntax-flow": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+      "dev": true
+    },
+    "babel-plugin-syntax-function-bind": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
+      "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
+      "dev": true
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+      "dev": true
+    },
+    "babel-plugin-syntax-object-rest-spread": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+      "dev": true
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "babel-plugin-transform-async-generator-functions": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-generators": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-class-constructor-call": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
+      "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-class-constructor-call": "6.18.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-plugin-syntax-class-properties": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-class": "6.24.1",
+        "babel-plugin-syntax-decorators": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-do-expressions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
+      "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-do-expressions": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "6.26.0",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
+      "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "regexpu-core": "2.0.0"
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-export-extensions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
+      "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-export-extensions": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-flow-strip-types": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-flow": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-function-bind": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
+      "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-function-bind": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-object-rest-spread": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-display-name": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
+      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
+      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-react-jsx": "6.26.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-source": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
+      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "0.10.1"
+      }
+    },
+    "babel-plugin-transform-runtime": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-polyfill": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.10.5"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
+        }
+      }
+    },
+    "babel-preset-es2015": {
+      "version": "6.3.13",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
+      "integrity": "sha1-l9zn7ykuGMubK3VF2AxZPCjZUX8=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0"
+      }
+    },
+    "babel-preset-react": {
+      "version": "6.3.13",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.3.13.tgz",
+      "integrity": "sha1-E9VeBqZfqqoHw5v2Op2DbgMhFvo=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-flow": "6.18.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-plugin-transform-flow-strip-types": "6.22.0",
+        "babel-plugin-transform-react-display-name": "6.25.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-source": "6.22.0"
+      }
+    },
+    "babel-preset-stage-0": {
+      "version": "6.3.13",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.3.13.tgz",
+      "integrity": "sha1-eKN8VvCzmI8qeZMtywzrj/N3sNE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-do-expressions": "6.22.0",
+        "babel-plugin-transform-function-bind": "6.22.0",
+        "babel-preset-stage-1": "6.24.1"
+      }
+    },
+    "babel-preset-stage-1": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
+      "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-class-constructor-call": "6.24.1",
+        "babel-plugin-transform-export-extensions": "6.22.0",
+        "babel-preset-stage-2": "6.24.1"
+      }
+    },
+    "babel-preset-stage-2": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-class-properties": "6.24.1",
+        "babel-plugin-transform-decorators": "6.24.1",
+        "babel-preset-stage-3": "6.24.1"
+      }
+    },
+    "babel-preset-stage-3": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-generator-functions": "6.24.1",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-object-rest-spread": "6.26.0"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.1",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18"
+      },
+      "dependencies": {
+        "babel-core": {
+          "version": "6.26.0",
+          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
+          "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+          "dev": true,
+          "requires": {
+            "babel-code-frame": "6.26.0",
+            "babel-generator": "6.26.0",
+            "babel-helpers": "6.24.1",
+            "babel-messages": "6.23.0",
+            "babel-register": "6.26.0",
+            "babel-runtime": "6.26.0",
+            "babel-template": "6.26.0",
+            "babel-traverse": "6.26.0",
+            "babel-types": "6.26.0",
+            "babylon": "6.18.0",
+            "convert-source-map": "1.5.0",
+            "debug": "2.6.9",
+            "json5": "0.5.1",
+            "lodash": "4.17.4",
+            "minimatch": "3.0.4",
+            "path-is-absolute": "1.0.1",
+            "private": "0.1.8",
+            "slash": "1.0.0",
+            "source-map": "0.5.7"
+          }
+        },
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.0"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
+    "backoff": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
+      "integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=",
+      "requires": {
+        "precond": "0.2.3"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base64-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
+      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
+    },
+    "base64url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+      "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
+    },
+    "bcrypt": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
+      "integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
+      "requires": {
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
+      }
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "binary-extensions": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+      "dev": true
+    },
+    "bintrees": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
+      "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
+    },
+    "bl": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
+    },
+    "boom": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+      "dev": true
+    },
+    "browserslist": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz",
+      "integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "1.0.30000756",
+        "electron-to-chromium": "1.3.27"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "requires": {
+        "base64-js": "1.2.1",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
+    },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "bunyan": {
+      "version": "1.8.12",
+      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
+      "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
+      "requires": {
+        "dtrace-provider": "0.8.5",
+        "moment": "2.19.1",
+        "mv": "2.1.1",
+        "safe-json-stringify": "1.0.4"
+      }
+    },
+    "caller-id": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz",
+      "integrity": "sha1-Wb2sCJPRLDhxQIJ5Ix+XRYNk8Hs=",
+      "dev": true,
+      "requires": {
+        "stack-trace": "0.0.10"
+      }
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
+      }
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000756",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz",
+      "integrity": "sha1-PacBwVIbn6uHAExt58l/pH2+qtI=",
+      "dev": true
+    },
+    "capture-stack-trace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
+    },
+    "chai": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+      "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
+      "dev": true,
+      "requires": {
+        "assertion-error": "1.0.2",
+        "deep-eql": "0.1.3",
+        "type-detect": "1.0.0"
+      }
+    },
+    "chai-as-promised": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-6.0.0.tgz",
+      "integrity": "sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY=",
+      "dev": true,
+      "requires": {
+        "check-error": "1.0.2"
+      }
+    },
+    "chalk": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+      "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "3.2.0",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "4.5.0"
+      }
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "child-process-debug": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/child-process-debug/-/child-process-debug-0.0.7.tgz",
+      "integrity": "sha1-VOEfuBw7b5Spa2MfrKk+0a9/itA=",
+      "dev": true
+    },
+    "chimp": {
+      "version": "0.50.2",
+      "resolved": "https://registry.npmjs.org/chimp/-/chimp-0.50.2.tgz",
+      "integrity": "sha1-XI2JnVbdOls1TlH0MoDjkVXnpZI=",
+      "dev": true,
+      "requires": {
+        "async": "0.9.2",
+        "babel-core": "6.9.1",
+        "babel-plugin-transform-runtime": "6.23.0",
+        "babel-polyfill": "6.26.0",
+        "babel-preset-es2015": "6.3.13",
+        "babel-preset-stage-2": "6.24.1",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "bluebird": "3.5.1",
+        "chai": "3.5.0",
+        "chai-as-promised": "6.0.0",
+        "child-process-debug": "0.0.7",
+        "chokidar": "1.6.1",
+        "chromedriver": "2.33.2",
+        "colors": "1.1.2",
+        "commander": "2.11.0",
+        "cucumber": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
+        "deep-extend": "0.4.2",
+        "exit": "0.1.2",
+        "fibers": "1.0.15",
+        "freeport": "1.0.5",
+        "fs-extra": "1.0.0",
+        "glob": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+        "hapi": "8.8.0",
+        "jasmine": "2.8.0",
+        "loglevel": "1.4.1",
+        "minimist": "1.2.0",
+        "mocha": "3.5.3",
+        "phantomjs-prebuilt": "2.1.13",
+        "progress": "1.1.8",
+        "request": "2.83.0",
+        "requestretry": "1.5.0",
+        "saucelabs": "1.4.0",
+        "selenium-standalone": "6.11.0",
+        "underscore": "1.8.3",
+        "xolvio-ddp": "0.12.3",
+        "xolvio-jasmine-expect": "1.1.0",
+        "xolvio-sync-webdriverio": "9.0.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true
+        },
+        "glob": {
+          "version": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.3.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "once": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz",
+          "integrity": "sha1-FRr4a/wfCMS58H0GqyUP/L61ZYE=",
+          "dev": true
+        }
+      }
+    },
+    "chokidar": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
+      "integrity": "sha1-L0RHq16W5Q+z14n9kNTHLg5McMI=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "fsevents": "1.1.2",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
+      }
+    },
+    "chromedriver": {
+      "version": "2.33.2",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.33.2.tgz",
+      "integrity": "sha512-etnQeM8Mqiys50ZB4IiuNqeB1WS2/EKFhVXwkPQ1qjzKMMAJUyrLjaRUcoZoHrbjGscnhBrWkRR+p3zcTGMhDg==",
+      "dev": true,
+      "requires": {
+        "del": "3.0.0",
+        "extract-zip": "1.6.6",
+        "kew": "0.7.0",
+        "mkdirp": "0.5.1",
+        "request": "2.83.0"
+      }
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "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=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "2.0.0"
+      }
+    },
+    "cli-table": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+      "dev": true,
+      "requires": {
+        "colors": "1.0.3"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "dev": true
+        }
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "center-align": "0.1.3",
+        "right-align": "0.1.3",
+        "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "clone-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
+      "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
+      "dev": true,
+      "requires": {
+        "is-regexp": "1.0.0",
+        "is-supported-regexp-flag": "1.0.0"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "codemirror": {
+      "version": "5.31.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.31.0.tgz",
+      "integrity": "sha512-LKbMZKoAz7pMmWuSEl253G6yyloSulj1kXfvYv+3n3I8wMiI7QwnCHwKM3Zw5S9ItNV28Layq0/ihQXWmn9T9w=="
+    },
+    "color-convert": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
+      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "dev": true
+    },
+    "compare-func": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
+      "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
+      "dev": true,
+      "requires": {
+        "array-ify": "1.0.0",
+        "dot-prop": "3.0.0"
+      },
+      "dependencies": {
+        "dot-prop": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
+          "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+          "dev": true,
+          "requires": {
+            "is-obj": "1.0.1"
+          }
+        }
+      }
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "dev": true
+    },
+    "compress-commons": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+      "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "crc32-stream": "2.0.0",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
+      }
+    },
+    "configstore": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+      "requires": {
+        "dot-prop": "4.2.0",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.1.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.3.0",
+        "xdg-basedir": "3.0.0"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
+    "conventional-changelog": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
+      "integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "1.5.1",
+        "conventional-changelog-atom": "0.1.1",
+        "conventional-changelog-codemirror": "0.2.0",
+        "conventional-changelog-core": "1.9.2",
+        "conventional-changelog-ember": "0.2.8",
+        "conventional-changelog-eslint": "0.2.0",
+        "conventional-changelog-express": "0.2.0",
+        "conventional-changelog-jquery": "0.1.0",
+        "conventional-changelog-jscs": "0.1.0",
+        "conventional-changelog-jshint": "0.2.0"
+      }
+    },
+    "conventional-changelog-angular": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
+      "integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-atom": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
+      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
+      "dev": true,
+      "requires": {
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-cli": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz",
+      "integrity": "sha512-b8B1i01df+Lq5t16L3g8uoEGdzViChIKmIo7TComL4DqqrjrtasRaT+/4OPGcApEgX86JkBqb4KVt85ytQinUw==",
+      "dev": true,
+      "requires": {
+        "add-stream": "1.0.0",
+        "conventional-changelog": "1.1.6",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "tempfile": "1.1.1"
+      }
+    },
+    "conventional-changelog-codemirror": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
+      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
+      "dev": true,
+      "requires": {
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-core": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
+      "integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-writer": "2.0.1",
+        "conventional-commits-parser": "2.0.0",
+        "dateformat": "1.0.12",
+        "get-pkg-repo": "1.4.0",
+        "git-raw-commits": "1.2.0",
+        "git-remote-origin-url": "2.0.0",
+        "git-semver-tags": "1.2.2",
+        "lodash": "4.17.4",
+        "normalize-package-data": "2.4.0",
+        "q": "1.5.1",
+        "read-pkg": "1.1.0",
+        "read-pkg-up": "1.0.1",
+        "through2": "2.0.3"
+      }
+    },
+    "conventional-changelog-ember": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
+      "integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
+      "dev": true,
+      "requires": {
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-eslint": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
+      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
+      "dev": true,
+      "requires": {
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-express": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
+      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
+      "dev": true,
+      "requires": {
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-jquery": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz",
+      "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
+      "dev": true,
+      "requires": {
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-jscs": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz",
+      "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
+      "dev": true,
+      "requires": {
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-jshint": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
+      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "q": "1.5.1"
+      }
+    },
+    "conventional-changelog-writer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
+      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "conventional-commits-filter": "1.0.0",
+        "dateformat": "1.0.12",
+        "handlebars": "4.0.11",
+        "json-stringify-safe": "5.0.1",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "semver": "5.4.1",
+        "split": "1.0.1",
+        "through2": "2.0.3"
+      }
+    },
+    "conventional-commits-filter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz",
+      "integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=",
+      "dev": true,
+      "requires": {
+        "is-subset": "0.1.1",
+        "modify-values": "1.0.0"
+      }
+    },
+    "conventional-commits-parser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
+      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
+      "dev": true,
+      "requires": {
+        "JSONStream": "1.3.1",
+        "is-text-path": "1.0.1",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "split2": "2.2.0",
+        "through2": "2.0.3",
+        "trim-off-newlines": "1.0.1"
+      }
+    },
+    "convert-source-map": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+      "dev": true
+    },
+    "cookiejar": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
+      "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
+      "dev": true
+    },
+    "core-js": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cosmiconfig": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz",
+      "integrity": "sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==",
+      "dev": true,
+      "requires": {
+        "is-directory": "0.3.1",
+        "js-yaml": "3.10.0",
+        "parse-json": "3.0.0",
+        "require-from-string": "2.0.1"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
+          "integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.1"
+          }
+        }
+      }
+    },
+    "crc": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+      "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
+      "dev": true
+    },
+    "crc32-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
+      "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
+      "dev": true,
+      "requires": {
+        "crc": "3.5.0",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "requires": {
+        "capture-stack-trace": "1.0.0"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.1",
+        "shebang-command": "1.2.0",
+        "which": "1.2.14"
+      }
+    },
+    "cryptiles": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "requires": {
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
+      }
+    },
+    "crypto-browserify": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz",
+      "integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA="
+    },
+    "crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+    },
+    "css": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
+      "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "source-map": "0.1.43",
+        "source-map-resolve": "0.3.1",
+        "urix": "0.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "css-parse": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
+      "requires": {
+        "css": "2.2.1"
+      }
+    },
+    "css-unit-converter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
+      "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
+      "dev": true
+    },
+    "css-value": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
+      "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
+      "dev": true
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
+      "dev": true
+    },
+    "cucumber": {
+      "version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "cli-table": "0.3.1",
+        "co": "4.6.0",
+        "colors": "1.1.2",
+        "commander": "2.11.0",
+        "duration": "0.2.0",
+        "fibers": "1.0.15",
+        "figures": "1.7.0",
+        "gherkin": "4.0.0",
+        "glob": "7.1.2",
+        "is-generator": "1.0.3",
+        "lodash": "4.17.4",
+        "meteor-promise": "0.8.6",
+        "stack-chain": "1.3.7",
+        "stacktrace-js": "1.3.1"
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "d": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+      "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.35"
+      }
+    },
+    "dargs": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
+      "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "dateformat": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+      "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1",
+        "meow": "3.7.0"
+      }
+    },
+    "ddp-ejson": {
+      "version": "0.8.1-3",
+      "resolved": "https://registry.npmjs.org/ddp-ejson/-/ddp-ejson-0.8.1-3.tgz",
+      "integrity": "sha1-6dZ0Zqt4m9dOfZcHSjbiQGkO7sI=",
+      "dev": true,
+      "requires": {
+        "ddp-underscore-patched": "0.8.1-2"
+      }
+    },
+    "ddp-underscore-patched": {
+      "version": "0.8.1-2",
+      "resolved": "https://registry.npmjs.org/ddp-underscore-patched/-/ddp-underscore-patched-0.8.1-2.tgz",
+      "integrity": "sha1-ZaQU6fIuxagqoWOG40NmtI/Ozx0=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-eql": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+      "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
+      "dev": true,
+      "requires": {
+        "type-detect": "0.1.1"
+      },
+      "dependencies": {
+        "type-detect": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
+          "integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
+          "dev": true
+        }
+      }
+    },
+    "deep-extend": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
+      "integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "requires": {
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
+      }
+    },
+    "del": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "dev": true,
+      "requires": {
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.0",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.2"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "diff": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
+      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
+      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2",
+        "isarray": "1.0.0"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "requires": {
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
+        }
+      }
+    },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
+    },
+    "domhandler": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
+      "requires": {
+        "domelementtype": "1.3.0"
+      }
+    },
+    "domutils": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
+      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
+      "requires": {
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
+      }
+    },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "requires": {
+        "is-obj": "1.0.1"
+      }
+    },
+    "dtrace-provider": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz",
+      "integrity": "sha1-mOu6Ihr6xG4cOf02hY2Pk2dSS5I=",
+      "optional": true,
+      "requires": {
+        "nan": "2.6.2"
+      }
+    },
+    "duplexify": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+      "requires": {
+        "end-of-stream": "1.4.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "stream-shift": "1.0.0"
+      }
+    },
+    "duration": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.0.tgz",
+      "integrity": "sha1-X5xN+q//ZV3phhEu/iXFl43YUUY=",
+      "dev": true,
+      "requires": {
+        "d": "0.1.1",
+        "es5-ext": "0.10.35"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "ecdsa-sig-formatter": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+      "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+      "requires": {
+        "base64url": "2.0.0",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "ejs": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
+      "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.27",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
+      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+      "dev": true
+    },
+    "emailreplyparser": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
+      "integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
+    },
+    "end-of-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
+    },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+    },
+    "error-ex": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "error-stack-parser": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
+      "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
+      "dev": true,
+      "requires": {
+        "stackframe": "0.3.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz",
+      "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
+      "requires": {
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.1",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "requires": {
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.35",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
+      "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-symbol": "3.1.1"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.35"
+          }
+        }
+      }
+    },
+    "es6-promise": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
+      "integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI=",
+      "dev": true
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.35"
+          }
+        }
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "eslint": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz",
+      "integrity": "sha512-MMVl8P/dYUFZEvolL8PYt7qc5LNdS2lwheq9BYa5Y07FblhcZqFyaUqlS8TW5QITGex21tV4Lk0a3fK8lsJIkA==",
+      "dev": true,
+      "requires": {
+        "ajv": "5.3.0",
+        "babel-code-frame": "6.26.0",
+        "chalk": "2.3.0",
+        "concat-stream": "1.6.0",
+        "cross-spawn": "5.1.0",
+        "debug": "3.1.0",
+        "doctrine": "2.0.0",
+        "eslint-scope": "3.7.1",
+        "espree": "3.5.1",
+        "esquery": "1.0.0",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "file-entry-cache": "2.0.0",
+        "functional-red-black-tree": "1.0.1",
+        "glob": "7.1.2",
+        "globals": "9.18.0",
+        "ignore": "3.3.7",
+        "imurmurhash": "0.1.4",
+        "inquirer": "3.0.6",
+        "is-resolvable": "1.0.0",
+        "js-yaml": "3.10.0",
+        "json-stable-stringify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "pluralize": "7.0.0",
+        "progress": "2.0.0",
+        "require-uncached": "1.0.3",
+        "semver": "5.4.1",
+        "strip-ansi": "4.0.0",
+        "strip-json-comments": "2.0.1",
+        "table": "4.0.2",
+        "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "progress": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+          "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+      "dev": true,
+      "requires": {
+        "esrecurse": "4.2.0",
+        "estraverse": "4.2.0"
+      }
+    },
+    "espree": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
+      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
+      "dev": true,
+      "requires": {
+        "acorn": "5.2.1",
+        "acorn-jsx": "3.0.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
+      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
+      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0",
+        "object-assign": "4.1.1"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+    },
+    "execall": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
+      "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
+      "dev": true,
+      "requires": {
+        "clone-regexp": "1.0.0"
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "2.2.3"
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "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==",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.19",
+        "jschardet": "1.6.0",
+        "tmp": "0.0.33"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.19",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+          "dev": true
+        }
+      }
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extract-zip": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz",
+      "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.0",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.0",
+        "yauzl": "2.4.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz",
+      "integrity": "sha1-iFk0x57/sECVSeDAo4Ae0XpAza0=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": "0.7.0"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "dev": true,
+      "requires": {
+        "pend": "1.2.0"
+      }
+    },
+    "fg-lodash": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/fg-lodash/-/fg-lodash-0.0.2.tgz",
+      "integrity": "sha1-mINSU39CfaavIiEpu2OsyknmL6M=",
+      "dev": true,
+      "requires": {
+        "lodash": "2.4.2",
+        "underscore.string": "2.3.3"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
+          "dev": true
+        },
+        "underscore.string": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
+          "integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=",
+          "dev": true
+        }
+      }
+    },
+    "fibers": {
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
+      "integrity": "sha1-IvA5yPGLhWGQ+75N7PBWFUwerpw=",
+      "dev": true
+    },
+    "figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-type": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.2.0.tgz",
+      "integrity": "sha1-ETz+1S4daVmrgCSJBuLyWozcy3Q="
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fill-keys": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+      "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=",
+      "dev": true,
+      "requires": {
+        "is-object": "1.0.1",
+        "merge-descriptors": "1.0.1"
+      }
+    },
+    "fill-range": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "2.0.1"
+          }
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      },
+      "dependencies": {
+        "del": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+          "dev": true,
+          "requires": {
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.0",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.2"
+          }
+        },
+        "globby": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "dev": true
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "formidable": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
+      "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
+      "dev": true
+    },
+    "freeport": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/freeport/-/freeport-1.0.5.tgz",
+      "integrity": "sha1-JV6KuEFwwzuoXZkOghrl9KGpvF0=",
+      "dev": true
+    },
+    "fs-extra": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+      "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "2.4.0",
+        "klaw": "1.3.1"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "fstream-ignore": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "requires": {
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "requires": {
+        "aproba": "1.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
+      }
+    },
+    "gaze": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+      "dev": true,
+      "requires": {
+        "globule": "1.2.0"
+      }
+    },
+    "gcp-metadata": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+      "requires": {
+        "extend": "3.0.1",
+        "retry-request": "3.1.0"
+      }
+    },
+    "gcs-resumable-upload": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+      "requires": {
+        "buffer-equal": "1.0.0",
+        "configstore": "3.1.1",
+        "google-auto-auth": "0.7.2",
+        "pumpify": "1.3.5",
+        "request": "2.83.0",
+        "stream-events": "1.0.2",
+        "through2": "2.0.3"
+      }
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "requires": {
+        "is-property": "1.0.2"
+      }
+    },
+    "get-pkg-repo": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
+      "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "meow": "3.7.0",
+        "normalize-package-data": "2.4.0",
+        "parse-github-repo-url": "1.4.1",
+        "through2": "2.0.3"
+      }
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "gherkin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/gherkin/-/gherkin-4.0.0.tgz",
+      "integrity": "sha1-edzgTRIj6kO0hip2vlzo+JwSwyw=",
+      "dev": true
+    },
+    "git-raw-commits": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz",
+      "integrity": "sha1-DzqL/ZmuDy2LkiTViJKXXppS0Dw=",
+      "dev": true,
+      "requires": {
+        "dargs": "4.1.0",
+        "lodash.template": "4.4.0",
+        "meow": "3.7.0",
+        "split2": "2.2.0",
+        "through2": "2.0.3"
+      }
+    },
+    "git-remote-origin-url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
+      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
+      "dev": true,
+      "requires": {
+        "gitconfiglocal": "1.0.0",
+        "pify": "2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "git-semver-tags": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
+      "integrity": "sha512-fhINopzKBQ8m6YlQt7gPf6T6hFnTF84O7U+8kYJmfjjKk7gbmKGj+BLcKNWi+japPbBwCeXXnfKwThpJpR9ZnQ==",
+      "dev": true,
+      "requires": {
+        "meow": "3.7.0",
+        "semver": "5.4.1"
+      }
+    },
+    "gitconfiglocal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
+      "dev": true,
+      "requires": {
+        "ini": "1.3.4"
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+      "dev": true
+    },
+    "globule": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4"
+      }
+    },
+    "google-auth-library": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+      "requires": {
+        "gtoken": "1.2.3",
+        "jws": "3.1.4",
+        "lodash.noop": "3.0.1",
+        "request": "2.83.0"
+      }
+    },
+    "google-auto-auth": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+      "requires": {
+        "async": "2.5.0",
+        "gcp-metadata": "0.3.1",
+        "google-auth-library": "0.10.0",
+        "request": "2.83.0"
+      }
+    },
+    "google-p12-pem": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+      "requires": {
+        "node-forge": "0.7.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+      "dev": true
+    },
+    "gtoken": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz",
+      "integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==",
+      "requires": {
+        "google-p12-pem": "0.1.2",
+        "jws": "3.1.4",
+        "mime": "1.4.1",
+        "request": "2.83.0"
+      }
+    },
+    "handlebars": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
+      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "optimist": "0.6.1",
+        "source-map": "0.4.4",
+        "uglify-js": "2.8.29"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "hapi": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
+      "integrity": "sha1-h+N6Bum0meiXkOLcERqpZotuYX8=",
+      "dev": true,
+      "requires": {
+        "accept": "1.0.0",
+        "ammo": "1.0.0",
+        "boom": "2.7.2",
+        "call": "2.0.1",
+        "catbox": "4.3.0",
+        "catbox-memory": "1.1.1",
+        "cryptiles": "2.0.4",
+        "h2o2": "4.0.1",
+        "heavy": "3.0.0",
+        "hoek": "2.14.0",
+        "inert": "2.1.5",
+        "iron": "2.1.2",
+        "items": "1.1.0",
+        "joi": "6.4.1",
+        "kilt": "1.1.1",
+        "mimos": "2.0.2",
+        "peekaboo": "1.0.0",
+        "qs": "4.0.0",
+        "shot": "1.5.3",
+        "statehood": "2.1.1",
+        "subtext": "1.1.1",
+        "topo": "1.0.2",
+        "vision": "2.0.1"
+      },
+      "dependencies": {
+        "accept": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/accept/-/accept-1.0.0.tgz",
+          "integrity": "sha1-g++IOWi4WkDFARYEKCoiD/AeYq0=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0"
+          }
+        },
+        "ammo": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/ammo/-/ammo-1.0.0.tgz",
+          "integrity": "sha1-4FlIG/aAhzj66G1GT3L6DBLWeoU=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0"
+          }
+        },
+        "boom": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz",
+          "integrity": "sha1-2tYo2Jf3/S4yzIIZfxMweXHPg1Q=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.14.0"
+          }
+        },
+        "call": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/call/-/call-2.0.1.tgz",
+          "integrity": "sha1-SbQnCZQ96JoyJYqpEbWHUeI3eg4=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0"
+          }
+        },
+        "catbox": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/catbox/-/catbox-4.3.0.tgz",
+          "integrity": "sha1-IiN3vWfxKRrA4l0AAC0GWp3385o=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0",
+            "joi": "6.4.1"
+          }
+        },
+        "catbox-memory": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-1.1.1.tgz",
+          "integrity": "sha1-QqUvgLye+nJmAeltQBYDNhJIGig=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.14.0"
+          }
+        },
+        "cryptiles": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz",
+          "integrity": "sha1-CeoXdbnhx95+YKmdQqtvCM4aEoU=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2"
+          }
+        },
+        "h2o2": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/h2o2/-/h2o2-4.0.1.tgz",
+          "integrity": "sha1-eg4rztHZcXjsVs48ykjgxW3un40=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0",
+            "joi": "6.4.1",
+            "wreck": "6.0.0"
+          }
+        },
+        "heavy": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/heavy/-/heavy-3.0.0.tgz",
+          "integrity": "sha1-/QEIdiExYy+IVIontVQSws9SKwA=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0",
+            "joi": "6.4.1"
+          }
+        },
+        "hoek": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz",
+          "integrity": "sha1-gSEWkfUqWoNa5J7b8eickANHaqQ=",
+          "dev": true
+        },
+        "inert": {
+          "version": "2.1.5",
+          "resolved": "https://registry.npmjs.org/inert/-/inert-2.1.5.tgz",
+          "integrity": "sha1-eybZTEHGLAPsHU726LRe1WuDSFk=",
+          "dev": true,
+          "requires": {
+            "ammo": "1.0.0",
+            "boom": "2.7.2",
+            "hoek": "2.14.0",
+            "items": "1.1.0",
+            "joi": "6.4.1",
+            "lru-cache": "2.6.4"
+          },
+          "dependencies": {
+            "lru-cache": {
+              "version": "2.6.4",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
+              "integrity": "sha1-JnUZDM0bBwHsL2UqTQ09QA12wN0=",
+              "dev": true
+            }
+          }
+        },
+        "iron": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/iron/-/iron-2.1.2.tgz",
+          "integrity": "sha1-WR2RiiVAdTxEbY5DfNzwz6gBEU8=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "cryptiles": "2.0.4",
+            "hoek": "2.14.0"
+          }
+        },
+        "items": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/items/-/items-1.1.0.tgz",
+          "integrity": "sha1-rZ1VhAsimGDLPRYLMidMLUvZ4mI=",
+          "dev": true
+        },
+        "joi": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
+          "integrity": "sha1-9Q9CRTVgBo5jg9oVrC0w3Xzra24=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.14.0",
+            "isemail": "1.1.1",
+            "moment": "2.10.3",
+            "topo": "1.0.2"
+          },
+          "dependencies": {
+            "isemail": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz",
+              "integrity": "sha1-4Mj23D9HCX53dzlcaJYnGqJWw7U=",
+              "dev": true
+            },
+            "moment": {
+              "version": "2.10.3",
+              "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz",
+              "integrity": "sha1-CruZ8wf2UhgwjGk17+KcV7Ggon8=",
+              "dev": true
+            }
+          }
+        },
+        "kilt": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/kilt/-/kilt-1.1.1.tgz",
+          "integrity": "sha1-d7SmFjyn+lshN6iMFzNCFuwj1ds=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.14.0"
+          }
+        },
+        "mimos": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/mimos/-/mimos-2.0.2.tgz",
+          "integrity": "sha1-wyQXF+dblZkr54esfdbbGptTmx4=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.14.0",
+            "mime-db": "1.14.0"
+          },
+          "dependencies": {
+            "mime-db": {
+              "version": "1.14.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz",
+              "integrity": "sha1-1WHxC27mbbUflK5leilRp0IX7YM=",
+              "dev": true
+            }
+          }
+        },
+        "peekaboo": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/peekaboo/-/peekaboo-1.0.0.tgz",
+          "integrity": "sha1-wNspJq1lTSygH3ymUKtFkadk/EI=",
+          "dev": true
+        },
+        "qs": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz",
+          "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=",
+          "dev": true
+        },
+        "shot": {
+          "version": "1.5.3",
+          "resolved": "https://registry.npmjs.org/shot/-/shot-1.5.3.tgz",
+          "integrity": "sha1-SGEHREO8VHLCNRthpGtOrsAH9Xo=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.14.0"
+          }
+        },
+        "statehood": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/statehood/-/statehood-2.1.1.tgz",
+          "integrity": "sha1-AfFwtmxeklqvZ5qdMiulkYb8AAk=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "cryptiles": "2.0.4",
+            "hoek": "2.14.0",
+            "iron": "2.1.2",
+            "items": "1.1.0",
+            "joi": "6.4.1"
+          }
+        },
+        "subtext": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/subtext/-/subtext-1.1.1.tgz",
+          "integrity": "sha1-DJGCWuZdUXhVWT2DHjPvdaKEFWs=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "content": "1.0.1",
+            "hoek": "2.14.0",
+            "pez": "1.0.0",
+            "qs": "4.0.0",
+            "wreck": "6.0.0"
+          },
+          "dependencies": {
+            "content": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/content/-/content-1.0.1.tgz",
+              "integrity": "sha1-gD60s7eJVGD9jGnGhMd1RmmvG6E=",
+              "dev": true,
+              "requires": {
+                "boom": "2.7.2",
+                "hoek": "2.14.0"
+              }
+            },
+            "pez": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/pez/-/pez-1.0.0.tgz",
+              "integrity": "sha1-hEMYpc5wku7d/6KV4YB5rHefoBg=",
+              "dev": true,
+              "requires": {
+                "b64": "2.0.0",
+                "boom": "2.7.2",
+                "content": "1.0.1",
+                "hoek": "2.14.0",
+                "nigel": "1.0.1"
+              },
+              "dependencies": {
+                "b64": {
+                  "version": "2.0.0",
+                  "resolved": "https://registry.npmjs.org/b64/-/b64-2.0.0.tgz",
+                  "integrity": "sha1-tZlbJPR+v9nxMQF6bntdZHVvtvM=",
+                  "dev": true,
+                  "requires": {
+                    "hoek": "2.14.0"
+                  }
+                },
+                "nigel": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npmjs.org/nigel/-/nigel-1.0.1.tgz",
+                  "integrity": "sha1-RjmJr4gSePuqHTzJOCPb0XtDYKE=",
+                  "dev": true,
+                  "requires": {
+                    "hoek": "2.14.0",
+                    "vise": "1.0.0"
+                  },
+                  "dependencies": {
+                    "vise": {
+                      "version": "1.0.0",
+                      "resolved": "https://registry.npmjs.org/vise/-/vise-1.0.0.tgz",
+                      "integrity": "sha1-KDRb5N5aNB4V/SgW/Z6j5zA+jfM=",
+                      "dev": true,
+                      "requires": {
+                        "hoek": "2.14.0"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "topo": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz",
+          "integrity": "sha1-QhV8N8HeTTeIPM3R1skChHqGDbk=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.14.0"
+          }
+        },
+        "vision": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/vision/-/vision-2.0.1.tgz",
+          "integrity": "sha1-0BIlW6buQm0GlqNOHfMy/sVeZzw=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0",
+            "items": "1.1.0",
+            "joi": "6.4.1"
+          }
+        },
+        "wreck": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/wreck/-/wreck-6.0.0.tgz",
+          "integrity": "sha1-T0CGaWHl14rOBPMqa38x8/PFFjg=",
+          "dev": true,
+          "requires": {
+            "boom": "2.7.2",
+            "hoek": "2.14.0"
+          }
+        }
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "requires": {
+        "ajv": "5.3.0",
+        "har-schema": "2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+      "requires": {
+        "function-bind": "1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+      "dev": true
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
+    "hash-stream-validation": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+      "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+      "requires": {
+        "through2": "2.0.3"
+      }
+    },
+    "hasha": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+      "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
+      "dev": true,
+      "requires": {
+        "is-stream": "1.1.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "hawk": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+      "requires": {
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.1.0"
+      }
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0="
+    },
+    "highlight.js": {
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
+    },
+    "hoek": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "dev": true
+    },
+    "html-tags": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+      "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
+      "dev": true
+    },
+    "html-to-text": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.1.0.tgz",
+      "integrity": "sha1-fwfvIXPloEQecxXBkgE6AKUtXko=",
+      "requires": {
+        "he": "1.1.1",
+        "htmlparser2": "3.9.2",
+        "optimist": "0.6.1",
+        "underscore": "1.8.3",
+        "underscore.string": "3.3.4"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+      "requires": {
+        "domelementtype": "1.3.0",
+        "domhandler": "2.4.1",
+        "domutils": "1.6.2",
+        "entities": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+      "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+      "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
+      "dev": true,
+      "requires": {
+        "agent-base": "2.1.1",
+        "debug": "2.6.9",
+        "extend": "3.0.1"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
+    },
+    "ieee754": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+    },
+    "ignore": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
+      "dev": true
+    },
+    "imap": {
+      "version": "0.8.19",
+      "resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
+      "integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
+      "requires": {
+        "readable-stream": "1.1.14",
+        "utf7": "1.0.2"
+      },
+      "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="
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inherits-ex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/inherits-ex/-/inherits-ex-1.2.0.tgz",
+      "integrity": "sha1-MVlON25zgZjvdUD9V1lBCl1CQDg=",
+      "requires": {
+        "xtend": "4.0.1"
+      }
+    },
+    "ini": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+    },
+    "inquirer": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz",
+      "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "chalk": "1.1.3",
+        "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": "4.1.0",
+        "string-width": "2.1.1",
+        "strip-ansi": "3.0.1",
+        "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=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "1.0.5"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "invariant": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+      "dev": true,
+      "requires": {
+        "loose-envify": "1.3.1"
+      }
+    },
+    "is": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+      "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.10.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "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-generator": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
+      "integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-my-json-valid": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
+      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+      "dev": true,
+      "requires": {
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
+      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "1.0.1"
+      }
+    },
+    "is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
+      "dev": true
+    },
+    "is-resolvable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
+      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
+      "dev": true,
+      "requires": {
+        "tryit": "1.0.3"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-stream-ended": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
+      "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
+    },
+    "is-subset": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
+      "dev": true
+    },
+    "is-supported-regexp-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz",
+      "integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
+    },
+    "is-text-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
+      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
+      "dev": true,
+      "requires": {
+        "text-extensions": "1.7.0"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jasmine": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
+      "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
+      "dev": true,
+      "requires": {
+        "exit": "0.1.2",
+        "glob": "7.1.2",
+        "jasmine-core": "2.8.0"
+      }
+    },
+    "jasmine-core": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+      "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
+      "dev": true
+    },
+    "jmespath": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+    },
+    "jquery": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
+      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
+    },
+    "js-base64": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
+      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "jschardet": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz",
+      "integrity": "sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
+      "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "dev": true
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jwa": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+      "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+      "requires": {
+        "base64url": "2.0.0",
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.9",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "jws": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+      "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+      "requires": {
+        "base64url": "2.0.0",
+        "jwa": "1.1.5",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "kew": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.6"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "known-css-properties": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.4.1.tgz",
+      "integrity": "sha512-n+ThoCKhyMFKkMfksdLMP5ndp+VzwDRzQdH6JlmZ2GTpUenYB2EeEKjOue2SErAAG/MmBSUISpwvawDhydWQdQ==",
+      "dev": true
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true,
+      "optional": true
+    },
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "ldap-filter": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz",
+      "integrity": "sha1-8rhCvguG2jNSeYUFsx68rlkNd9A=",
+      "requires": {
+        "assert-plus": "0.1.5"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+          "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA="
+        }
+      }
+    },
+    "ldapjs": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.1.tgz",
+      "integrity": "sha1-NSuBKudLCo6WVJpLiWBg7uG5pUY=",
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "backoff": "2.5.0",
+        "bunyan": "1.8.12",
+        "dashdash": "1.14.1",
+        "dtrace-provider": "0.7.1",
+        "ldap-filter": "0.2.2",
+        "once": "1.4.0",
+        "vasync": "1.6.4",
+        "verror": "1.10.0"
+      },
+      "dependencies": {
+        "dtrace-provider": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz",
+          "integrity": "sha1-wGswjy8Q1dWDiuycVx5dWI3HHQQ=",
+          "optional": true,
+          "requires": {
+            "nan": "2.6.2"
+          }
+        }
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
+      }
+    },
+    "libbase64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
+      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
+    },
+    "libmime": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-3.1.0.tgz",
+      "integrity": "sha1-EVAS8WcgUa3IgJqPk5Vf/DZI7fk=",
+      "requires": {
+        "iconv-lite": "0.4.15",
+        "libbase64": "0.1.0",
+        "libqp": "1.1.0"
+      }
+    },
+    "libqp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
+      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
+    },
+    "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=",
+      "dev": true,
+      "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"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+    },
+    "lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "3.0.1",
+        "lodash.keys": "3.1.2"
+      }
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._basecreate": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
+      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
+      "dev": true
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "lodash.create": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
+      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
+      "dev": true,
+      "requires": {
+        "lodash._baseassign": "3.2.0",
+        "lodash._basecreate": "3.0.3",
+        "lodash._isiterateecall": "3.0.9"
+      }
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
+      }
+    },
+    "lodash.noop": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
+      "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
+    },
+    "lodash.template": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.templatesettings": "4.1.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0"
+      }
+    },
+    "log-driver": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
+      "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
+    },
+    "log-symbols": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
+      "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.0"
+      }
+    },
+    "loglevel": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz",
+      "integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80=",
+      "dev": true
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "dev": true,
+      "requires": {
+        "js-tokens": "3.0.2"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "mailparser-node4": {
+      "version": "2.0.2-2",
+      "resolved": "https://registry.npmjs.org/mailparser-node4/-/mailparser-node4-2.0.2-2.tgz",
+      "integrity": "sha1-IK4hESKWWldb3a6bTADTwtgkR/U=",
+      "requires": {
+        "addressparser": "1.0.1",
+        "array-includes": "3.0.3",
+        "buffer-shims": "1.0.0",
+        "he": "1.1.1",
+        "html-to-text": "3.1.0",
+        "iconv-lite": "0.4.15",
+        "libmime": "3.1.0",
+        "mailsplit-node4": "4.0.1",
+        "marked": "0.3.6"
+      }
+    },
+    "mailsplit-node4": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/mailsplit-node4/-/mailsplit-node4-4.0.1.tgz",
+      "integrity": "sha1-XVEiiDVA/Ac/fQcWwv9ntlDP1oI=",
+      "requires": {
+        "buffer-shims": "1.0.0",
+        "libbase64": "0.1.0",
+        "libmime": "3.1.0",
+        "libqp": "1.1.0"
+      }
+    },
+    "make-dir": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
+      "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
+      "requires": {
+        "pify": "3.0.0"
+      }
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "marked": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
+    },
+    "mathml-tag-names": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz",
+      "integrity": "sha1-jUEmgWi/htEQK5gQnijlMeejRXg=",
+      "dev": true
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "meteor-promise": {
+      "version": "0.8.6",
+      "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.6.tgz",
+      "integrity": "sha512-HP6tOr67z/9XU2Dr0F2SSr8WRTuE23AG9Dj578DCJPEYHs67OLKBviU8A8rwvbwMD7Lu2+Of+yAMz2Wd8r4yxg==",
+      "dev": true
+    },
+    "methmeth": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
+      "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.4"
+      }
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+    },
+    "mime-db": {
+      "version": "1.31.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz",
+      "integrity": "sha512-oB3w9lx50CMd6nfonoV5rBRUbJtjMifUHaFb5MfzjC8ksAIfVjT0BsX46SjjqBz7n9JGTrTX3paIeLSK+rS5fQ=="
+    },
+    "mime-type": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/mime-type/-/mime-type-3.0.5.tgz",
+      "integrity": "sha1-ftKSan2oImifgSVPWYf+lQNiLpo=",
+      "requires": {
+        "media-typer": "0.3.0",
+        "minimatch": "3.0.4",
+        "path.js": "1.0.7",
+        "util-ex": "0.3.15"
+      }
+    },
+    "mime-types": {
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "requires": {
+        "mime-db": "1.30.0"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+        }
+      }
+    },
+    "mimic-fn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
+      "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.0",
+        "commander": "2.9.0",
+        "debug": "2.6.8",
+        "diff": "3.2.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.1",
+        "growl": "1.9.2",
+        "he": "1.1.1",
+        "json3": "3.3.2",
+        "lodash.create": "3.1.1",
+        "mkdirp": "0.5.1",
+        "supports-color": "3.1.2"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": "1.0.1"
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+          "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "mock-require": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-2.0.2.tgz",
+      "integrity": "sha1-HqpxqtIwE3c9En3H6Ro/u0g31g0=",
+      "dev": true,
+      "requires": {
+        "caller-id": "0.1.0"
+      }
+    },
+    "modelo": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
+      "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
+    },
+    "modify-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz",
+      "integrity": "sha1-4rbN65zhn5kxelNyLz2/XfXqqrI=",
+      "dev": true
+    },
+    "module-not-found-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+      "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=",
+      "dev": true
+    },
+    "moment": {
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
+      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
+    },
+    "moment-timezone": {
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz",
+      "integrity": "sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=",
+      "requires": {
+        "moment": "2.19.1"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "mv": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+      "optional": true,
+      "requires": {
+        "mkdirp": "0.5.1",
+        "ncp": "2.0.0",
+        "rimraf": "2.4.5"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "optional": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+          "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+          "optional": true,
+          "requires": {
+            "glob": "6.0.4"
+          }
+        }
+      }
+    },
+    "nan": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "ncp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+      "optional": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
+    "node-forge": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+      "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
+    },
+    "node-pre-gyp": {
+      "version": "0.6.36",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+      "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
+      "requires": {
+        "mkdirp": "0.5.1",
+        "nopt": "4.0.1",
+        "npmlog": "4.1.2",
+        "rc": "1.2.2",
+        "request": "2.83.0",
+        "rimraf": "2.6.2",
+        "semver": "5.4.1",
+        "tar": "2.2.1",
+        "tar-pack": "3.4.1"
+      }
+    },
+    "nopt": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+      "requires": {
+        "abbrev": "1.1.1",
+        "osenv": "0.1.4"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.4.1",
+        "validate-npm-package-license": "3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-selector": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+      "dev": true
+    },
+    "npm-install-package": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
+      "integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
+      "dev": true
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "requires": {
+        "are-we-there-yet": "1.1.4",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-keys": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+    },
+    "object.assign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
+      "integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "function-bind": "1.1.1",
+        "object-keys": "1.0.11"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.1.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "requires": {
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+          "dev": true
+        }
+      }
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "osenv": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
+    "parse-github-repo-url": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
+      "dev": true
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "1.3.1"
+      }
+    },
+    "path-exists": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
+      "integrity": "sha1-1aiZjrce83p0w06w2eum6HjuoIE=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "path.js": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path.js/-/path.js-1.0.7.tgz",
+      "integrity": "sha1-fRNrYH3hm/2YugaIdJJih+ZTSTk=",
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "inherits-ex": "1.2.0",
+        "util-ex": "0.3.15"
+      }
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "phantomjs-prebuilt": {
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz",
+      "integrity": "sha1-ZlVq2ell2JPKWn3J52PffoaX920=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "4.0.5",
+        "extract-zip": "1.5.0",
+        "fs-extra": "0.30.0",
+        "hasha": "2.2.0",
+        "kew": "0.7.0",
+        "progress": "1.1.8",
+        "request": "2.74.0",
+        "request-progress": "2.0.1",
+        "which": "1.2.14"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true
+        },
+        "boom": {
+          "version": "2.10.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "concat-stream": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+          "integrity": "sha1-U/fUPFHF5D+ByP3QMyHGMb5o1hE=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "readable-stream": "2.0.6",
+            "typedarray": "0.0.6"
+          }
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "debug": {
+          "version": "0.7.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+          "integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=",
+          "dev": true
+        },
+        "extract-zip": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
+          "integrity": "sha1-ksz22B73Cp+kwXRxFMzvbYaIpsQ=",
+          "dev": true,
+          "requires": {
+            "concat-stream": "1.5.0",
+            "debug": "0.7.4",
+            "mkdirp": "0.5.0",
+            "yauzl": "2.4.1"
+          }
+        },
+        "form-data": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
+          "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=",
+          "dev": true,
+          "requires": {
+            "async": "2.5.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
+          }
+        },
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "klaw": "1.3.1",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.2"
+          }
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "commander": "2.11.0",
+            "is-my-json-valid": "2.16.1",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+          "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.74.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
+          "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "bl": "1.1.2",
+            "caseless": "0.11.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "1.0.1",
+            "har-validator": "2.0.6",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "node-uuid": "1.4.8",
+            "oauth-sign": "0.8.2",
+            "qs": "6.2.3",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.4.3"
+          }
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
+        }
+      }
+    },
+    "photoswipe": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.2.tgz",
+      "integrity": "sha1-lcIKdc6iO3DWKZZBytguA8rn95c="
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "dev": true
+    },
+    "poplib": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
+      "integrity": "sha1-L0tYtVkpcjUM2X9IKrpo+OBVdLw=",
+      "requires": {
+        "optimist": "0.6.1"
+      }
+    },
+    "postcss": {
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+      "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.0",
+        "source-map": "0.6.1",
+        "supports-color": "4.5.0"
+      }
+    },
+    "postcss-calc": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.1.tgz",
+      "integrity": "sha1-PSQXG79udinUIqQ26/5t2VEfQzA=",
+      "dev": true,
+      "requires": {
+        "css-unit-converter": "1.1.1",
+        "postcss": "6.0.13",
+        "postcss-selector-parser": "2.2.3",
+        "reduce-css-calc": "2.1.1"
+      }
+    },
+    "postcss-custom-properties": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz",
+      "integrity": "sha512-eNR2h9T9ciKMoQEORrPjH33XeN/nuvVuxArOKmHtsFbGbNss631tgTrKou3/pmjAZbA4QQkhLIkPQkIk3WW+8w==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "1.0.0",
+        "postcss": "6.0.13"
+      }
+    },
+    "postcss-import": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.0.0.tgz",
+      "integrity": "sha1-qWLi34LTvFptpqOGhBdHIE9B71s=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.13",
+        "postcss-value-parser": "3.3.0",
+        "read-cache": "1.0.0",
+        "resolve": "1.5.0"
+      }
+    },
+    "postcss-less": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.1.tgz",
+      "integrity": "sha512-zl0EEqq8Urh37Ppdv9zzhpZpLHrgkxmt6e3O4ftRa7/b8Uq2LV+/KBVM8/KuzmHNu+mthhOArg1lxbfqQ3NUdg==",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.18"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.3.2",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-media-minmax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
+      "integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.13"
+      }
+    },
+    "postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
+      "dev": true
+    },
+    "postcss-nesting": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-3.0.0.tgz",
+      "integrity": "sha512-ijQlEXUcYXXNPdLMFcMEr4i5SEPRKR8fq/Iya4L0mQbNOCz+szTGCBlf0Cvu2HiQLjCNqLnGO4fKFLbNnXe7Ag==",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.13"
+      }
+    },
+    "postcss-reporter": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
+      "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.0",
+        "lodash": "4.17.4",
+        "log-symbols": "2.1.0",
+        "postcss": "6.0.13"
+      }
+    },
+    "postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+      "dev": true
+    },
+    "postcss-safe-parser": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz",
+      "integrity": "sha1-t1Pv9sfArqXoN1++TN6L+QY/8UI=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.13"
+      }
+    },
+    "postcss-scss": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz",
+      "integrity": "sha1-/0XPM1S4ee6JpOtoaA9GrJuxT5Q=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.13"
+      }
+    },
+    "postcss-selector-not": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
+      "integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "0.4.2",
+        "postcss": "6.0.13"
+      },
+      "dependencies": {
+        "balanced-match": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+          "dev": true
+        }
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "requires": {
+        "flatten": "1.0.2",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
+      }
+    },
+    "postcss-sorting": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-3.1.0.tgz",
+      "integrity": "sha512-YCPTcJwGIInF1LpMD1lIYvMHTGUL4s97o/OraA6eKvoauhhk6vjwOWDDjm6uRKqug/kyDPMKEzmYZ6FtW6RDgw==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4",
+        "postcss": "6.0.13"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+      "dev": true
+    },
+    "precond": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
+      "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+    },
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+      "dev": true
+    },
+    "prom-client": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.2.1.tgz",
+      "integrity": "sha512-avZAdOCg/fCVmB1gBJnlYDHsBBoj7Kf8Dlz47KD3w32d6SONbarnzflCNbgdBTM5XATiD3+oJ9RQsIFgAxOUag==",
+      "requires": {
+        "tdigest": "0.1.1"
+      }
+    },
+    "proxyquire": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
+      "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=",
+      "dev": true,
+      "requires": {
+        "fill-keys": "1.0.2",
+        "module-not-found-error": "1.0.1",
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+          "dev": true
+        }
+      }
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "pump": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+      "requires": {
+        "end-of-stream": "1.4.0",
+        "once": "1.4.0"
+      }
+    },
+    "pumpify": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+      "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+      "requires": {
+        "duplexify": "3.5.1",
+        "inherits": "2.0.3",
+        "pump": "1.0.2"
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "randomatic": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "rc": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
+      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.4",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "requires": {
+        "pify": "2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "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=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.3",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "reduce-css-calc": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.1.tgz",
+      "integrity": "sha1-9OzXoA7D5Wg3c/IIBnrX2hF7nbA=",
+      "dev": true,
+      "requires": {
+        "css-unit-converter": "1.1.1",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "regenerate": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
+      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+    },
+    "regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "private": "0.1.8"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3"
+      }
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "requires": {
+        "regenerate": "1.3.3",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "request-progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+      "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
+      "dev": true,
+      "requires": {
+        "throttleit": "1.0.0"
+      }
+    },
+    "requestretry": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.5.0.tgz",
+      "integrity": "sha1-7RV7ulNSbt6z7DKo5wSkmYvs5ic=",
+      "dev": true,
+      "requires": {
+        "fg-lodash": "0.0.2",
+        "request": "2.83.0"
+      }
+    },
+    "require-from-string": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.1.tgz",
+      "integrity": "sha1-xUUjPp19pmFunVmt+zn8n1iGdv8=",
+      "dev": true
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
+      }
+    },
+    "resolve": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.5"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "retry-request": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
+      "integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg==",
+      "requires": {
+        "request": "2.83.0",
+        "through2": "2.0.3"
+      }
+    },
+    "rgb2hex": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
+      "integrity": "sha1-zNVfhgrgxcTqN1BLlY5ELY0SMls=",
+      "dev": true
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "align-text": "0.1.4"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "2.1.0"
+      }
+    },
+    "rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+    },
+    "safe-json-stringify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz",
+      "integrity": "sha1-gaCY9Efku8P/MxKiQ1IbwGDvWRE=",
+      "optional": true
+    },
+    "saucelabs": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.4.0.tgz",
+      "integrity": "sha1-uTSpr52ih0s/QKrh/N5QpEZvXzg=",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "1.0.0"
+      }
+    },
+    "sax": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+    },
+    "selenium-standalone": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.11.0.tgz",
+      "integrity": "sha512-MedSwbiyLkv/nxr7JpI9zFNSAmSDpcz+bCaVSJC1krXYeIzFuj6tKMMss57xwu4VHgfInTy3IIMM2HdjN87xXQ==",
+      "dev": true,
+      "requires": {
+        "async": "2.5.0",
+        "commander": "2.11.0",
+        "cross-spawn": "5.1.0",
+        "debug": "2.6.9",
+        "lodash": "4.17.4",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "progress": "1.1.8",
+        "request": "2.79.0",
+        "tar-stream": "1.5.2",
+        "urijs": "1.19.0",
+        "which": "1.2.14",
+        "yauzl": "2.9.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true
+        },
+        "boom": {
+          "version": "2.10.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+          "dev": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
+          }
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "commander": "2.11.0",
+            "is-my-json-valid": "2.16.1",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.3.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
+          "dev": true
+        },
+        "request": {
+          "version": "2.79.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+          "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.11.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "2.0.6",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "qs": "6.3.2",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.4.3",
+            "uuid": "3.1.0"
+          }
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
+        },
+        "yauzl": {
+          "version": "2.9.1",
+          "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+          "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
+          "dev": true,
+          "requires": {
+            "buffer-crc32": "0.2.13",
+            "fd-slicer": "1.0.1"
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "simple-git": {
+      "version": "1.80.1",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.80.1.tgz",
+      "integrity": "sha1-SBBMtKxyV2k3hT4a/R7v/cl6yyk=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9"
+      }
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        }
+      }
+    },
+    "snakeize": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz",
+      "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0="
+    },
+    "sntp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
+      "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
+      "dev": true,
+      "requires": {
+        "atob": "1.1.3",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.3.0",
+        "urix": "0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
+      "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "dev": true,
+      "requires": {
+        "spdx-license-ids": "1.2.2"
+      }
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+      "dev": true
+    },
+    "spdx-license-ids": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "dev": true
+    },
+    "specificity": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz",
+      "integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==",
+      "dev": true
+    },
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "dev": true,
+      "requires": {
+        "through": "2.3.8"
+      }
+    },
+    "split-array-stream": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
+      "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
+      "requires": {
+        "async": "2.5.0",
+        "is-stream-ended": "0.1.3"
+      }
+    },
+    "split2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "dev": true,
+      "requires": {
+        "through2": "2.0.3"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
+      "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "stack-chain": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
+      "integrity": "sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=",
+      "dev": true
+    },
+    "stack-generator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-1.1.0.tgz",
+      "integrity": "sha1-NvapIHUabBD0maE8Msu19RoLiyU=",
+      "dev": true,
+      "requires": {
+        "stackframe": "1.0.4"
+      },
+      "dependencies": {
+        "stackframe": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
+          "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+          "dev": true
+        }
+      }
+    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
+    "stackframe": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
+      "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
+      "dev": true
+    },
+    "stacktrace-gps": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-2.4.4.tgz",
+      "integrity": "sha1-acgn6dbW9Bz0ONfxleLjy/zyjEQ=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6",
+        "stackframe": "0.3.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+          "dev": true
+        }
+      }
+    },
+    "stacktrace-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-1.3.1.tgz",
+      "integrity": "sha1-Z8qyWJr1xBe5Yvc2mUAne7O2oYs=",
+      "dev": true,
+      "requires": {
+        "error-stack-parser": "1.3.6",
+        "stack-generator": "1.1.0",
+        "stacktrace-gps": "2.4.4"
+      }
+    },
+    "stream-events": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
+      "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+      "requires": {
+        "stubs": "3.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+    },
+    "string-format-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+      "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
+    },
+    "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"
+      }
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "stubs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+      "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
+    },
+    "style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
+      "dev": true
+    },
+    "stylelint": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-8.2.0.tgz",
+      "integrity": "sha512-57JWIz/1Uh9ehZMZyAqlFC0EDfQrMXCH8yqt8ZuJQQvV3LBKgAM/JYd+CWi1hC4eJtRODSPbIIBYKdGjkPZdMg==",
+      "dev": true,
+      "requires": {
+        "autoprefixer": "7.1.6",
+        "balanced-match": "1.0.0",
+        "chalk": "2.3.0",
+        "cosmiconfig": "3.1.0",
+        "debug": "3.1.0",
+        "execall": "1.0.0",
+        "file-entry-cache": "2.0.0",
+        "get-stdin": "5.0.1",
+        "globby": "6.1.0",
+        "globjoin": "0.1.4",
+        "html-tags": "2.0.0",
+        "ignore": "3.3.7",
+        "imurmurhash": "0.1.4",
+        "known-css-properties": "0.4.1",
+        "lodash": "4.17.4",
+        "log-symbols": "2.1.0",
+        "mathml-tag-names": "2.0.1",
+        "meow": "3.7.0",
+        "micromatch": "2.3.11",
+        "normalize-selector": "0.2.0",
+        "pify": "3.0.0",
+        "postcss": "6.0.13",
+        "postcss-less": "1.1.1",
+        "postcss-media-query-parser": "0.2.3",
+        "postcss-reporter": "5.0.0",
+        "postcss-resolve-nested-selector": "0.1.1",
+        "postcss-safe-parser": "3.0.1",
+        "postcss-scss": "1.0.2",
+        "postcss-selector-parser": "2.2.3",
+        "postcss-value-parser": "3.3.0",
+        "resolve-from": "4.0.0",
+        "specificity": "0.3.2",
+        "string-width": "2.1.1",
+        "style-search": "0.1.0",
+        "sugarss": "1.0.0",
+        "svg-tags": "1.0.0",
+        "table": "4.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "get-stdin": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
+          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
+    "stylelint-order": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-0.7.0.tgz",
+      "integrity": "sha1-zqtcviSqM/pjWQAkmVOV9u38mrc=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4",
+        "postcss": "6.0.13",
+        "postcss-sorting": "3.1.0"
+      }
+    },
+    "sugarss": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.0.tgz",
+      "integrity": "sha1-ZeUbOVhDL7cNVFGmi7M+MtDPHvc=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.13"
+      }
+    },
+    "superagent": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.0.tgz",
+      "integrity": "sha512-71XGWgtn70TNwgmgYa69dPOYg55aU9FCahjUNY03rOrKvaTCaU3b9MeZmqonmf9Od96SCxr3vGfEAnhM7dtxCw==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "cookiejar": "2.1.1",
+        "debug": "3.1.0",
+        "extend": "3.0.1",
+        "form-data": "2.3.1",
+        "formidable": "1.1.1",
+        "methods": "1.1.2",
+        "mime": "1.4.1",
+        "qs": "6.5.1",
+        "readable-stream": "2.3.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "supertest": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz",
+      "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=",
+      "dev": true,
+      "requires": {
+        "methods": "1.1.2",
+        "superagent": "3.8.0"
+      }
+    },
+    "supports-color": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+      "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+      "dev": true,
+      "requires": {
+        "has-flag": "2.0.0"
+      }
+    },
+    "svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
+      "dev": true
+    },
+    "table": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "dev": true,
+      "requires": {
+        "ajv": "5.3.0",
+        "ajv-keywords": "2.1.1",
+        "chalk": "2.3.0",
+        "lodash": "4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "requires": {
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
+      }
+    },
+    "tar-pack": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz",
+      "integrity": "sha512-PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg==",
+      "requires": {
+        "debug": "2.6.9",
+        "fstream": "1.0.11",
+        "fstream-ignore": "1.0.5",
+        "once": "1.4.0",
+        "readable-stream": "2.3.3",
+        "rimraf": "2.6.2",
+        "tar": "2.2.1",
+        "uid-number": "0.0.6"
+      }
+    },
+    "tar-stream": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
+      "integrity": "sha1-+8bG6DwaGdTLSMfZYXH8JI7/x78=",
+      "dev": true,
+      "requires": {
+        "bl": "1.1.2",
+        "end-of-stream": "1.4.0",
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "tdigest": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
+      "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=",
+      "requires": {
+        "bintrees": "1.0.1"
+      }
+    },
+    "tempfile": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
+      "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2",
+        "uuid": "2.0.3"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+          "dev": true
+        }
+      }
+    },
+    "text-extensions": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "throttleit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "requires": {
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "toastr": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
+      "integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
+    },
+    "tough-cookie": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-off-newlines": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
+      "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "tryit": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
+      "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "uglify-js": {
+      "version": "2.8.29",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "source-map": "0.5.7",
+        "uglify-to-browserify": "1.0.2",
+        "yargs": "3.10.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "uid-number": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+      "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
+    },
+    "underscore": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+    },
+    "underscore.string": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
+      "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
+      "requires": {
+        "sprintf-js": "1.1.1",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+      "requires": {
+        "crypto-random-string": "1.0.0"
+      }
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "urijs": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.0.tgz",
+      "integrity": "sha512-Qs2odXn0hST5VSPVjpi73CMqtbAoanahaqWBujGU+IyMrMqpWcIhDewxQRhCkmqYxuyvICDcSuLdv2O7ncWBGw==",
+      "dev": true
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+        }
+      }
+    },
+    "utf7": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
+      "integrity": "sha1-lV9JCq5lO6IguUVqCod2wZk2CZE=",
+      "requires": {
+        "semver": "5.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "util-ex": {
+      "version": "0.3.15",
+      "resolved": "https://registry.npmjs.org/util-ex/-/util-ex-0.3.15.tgz",
+      "integrity": "sha1-+SYc2hPEMn0HQMvme+Eife2LAFg=",
+      "requires": {
+        "inherits-ex": "1.2.0",
+        "xtend": "4.0.1"
+      }
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
+      }
+    },
+    "validator": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-7.0.0.tgz",
+      "integrity": "sha1-x03rgGNRL6w1VHk45vCxUEooL9I=",
+      "dev": true
+    },
+    "vasync": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz",
+      "integrity": "sha1-3+k2Fq0OeugBszKp2Iv8XNyOHR8=",
+      "requires": {
+        "verror": "1.6.0"
+      },
+      "dependencies": {
+        "extsprintf": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz",
+          "integrity": "sha1-WtlGwi9bMrp/jNdCZxHG6KP8JSk="
+        },
+        "verror": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz",
+          "integrity": "sha1-fROyex+swuLakEBetepuW90lLqU=",
+          "requires": {
+            "extsprintf": "1.2.0"
+          }
+        }
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      }
+    },
+    "walkdir": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
+      "integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
+      "dev": true
+    },
+    "wdio-dot-reporter": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/wdio-dot-reporter/-/wdio-dot-reporter-0.0.9.tgz",
+      "integrity": "sha1-kpsq2v1J1rBTT9oGjocxm0fjj+U=",
+      "dev": true
+    },
+    "wdio-sync": {
+      "version": "0.6.14",
+      "resolved": "https://registry.npmjs.org/wdio-sync/-/wdio-sync-0.6.14.tgz",
+      "integrity": "sha1-odzVkHuh0EFUquYXbGItkQw8qbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "fibers": "1.0.15",
+        "object.assign": "4.0.4"
+      },
+      "dependencies": {
+        "babel-runtime": {
+          "version": "6.23.0",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+          "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
+          "dev": true,
+          "requires": {
+            "core-js": "2.5.1",
+            "regenerator-runtime": "0.10.5"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
+        }
+      }
+    },
+    "webdriverio": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.8.0.tgz",
+      "integrity": "sha1-1Skpt0kID4mWf24WFAUcvIFy0TI=",
+      "dev": true,
+      "requires": {
+        "archiver": "1.3.0",
+        "babel-runtime": "6.23.0",
+        "css-parse": "2.0.0",
+        "css-value": "0.0.1",
+        "deepmerge": "1.3.2",
+        "ejs": "2.5.7",
+        "gaze": "1.1.2",
+        "glob": "7.1.2",
+        "inquirer": "3.0.6",
+        "json-stringify-safe": "5.0.1",
+        "mkdirp": "0.5.1",
+        "npm-install-package": "2.1.0",
+        "optimist": "0.6.1",
+        "q": "1.5.1",
+        "request": "2.81.0",
+        "rgb2hex": "0.1.0",
+        "safe-buffer": "5.0.1",
+        "supports-color": "3.2.3",
+        "url": "0.11.0",
+        "validator": "7.0.0",
+        "wdio-dot-reporter": "0.0.9",
+        "wgxpath": "1.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true
+        },
+        "babel-runtime": {
+          "version": "6.23.0",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+          "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
+          "dev": true,
+          "requires": {
+            "core-js": "2.5.1",
+            "regenerator-runtime": "0.10.5"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+          "dev": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
+          }
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+          "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+          "dev": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
+          }
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
+        },
+        "request": {
+          "version": "2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+          "dev": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        },
+        "url": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
+          }
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "dev": true,
+      "requires": {
+        "http-parser-js": "0.4.9",
+        "websocket-extensions": "0.1.2"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+      "dev": true
+    },
+    "wgxpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz",
+      "integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
+      "dev": true
+    },
+    "which": {
+      "version": "1.2.14",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "wide-align": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true,
+      "optional": true
+    },
+    "wolfy87-eventemitter": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.3.tgz",
+      "integrity": "sha512-jCUVjlRkpuoU9vQa1cyynPJhvR8ymNLwfvdkGYjIWwR0STLc0LJQG+yFy1JlQ73vjbtlNiC8xNqZQMJDdpYMeA=="
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.5.1"
+      }
+    },
+    "write-file-atomic": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "imurmurhash": "0.1.4",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "xdg-basedir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
+    },
+    "xml2js": {
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
+      "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
+      "requires": {
+        "sax": "1.2.1",
+        "xmlbuilder": "4.2.1"
+      }
+    },
+    "xmlbuilder": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
+      "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "xolvio-ddp": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/xolvio-ddp/-/xolvio-ddp-0.12.3.tgz",
+      "integrity": "sha1-NqarlhKyQLWg0cCoNJCK8XwLjwI=",
+      "dev": true,
+      "requires": {
+        "bluebird": "2.11.0",
+        "ddp-ejson": "0.8.1-3",
+        "ddp-underscore-patched": "0.8.1-2",
+        "faye-websocket": "0.9.4",
+        "request": "2.53.0"
+      },
+      "dependencies": {
+        "asn1": {
+          "version": "0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+          "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
+          "dev": true
+        },
+        "assert-plus": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+          "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
+          "dev": true
+        },
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+          "dev": true
+        },
+        "bl": {
+          "version": "0.9.5",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
+          "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34"
+          }
+        },
+        "bluebird": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
+          "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
+          "dev": true
+        },
+        "boom": {
+          "version": "2.10.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "caseless": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
+          "integrity": "sha1-t7Zc5r8UE4hlOc/VM/CzDv+pz4g=",
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+          "dev": true,
+          "requires": {
+            "delayed-stream": "0.0.5"
+          }
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "delayed-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+          "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
+          "dev": true,
+          "requires": {
+            "async": "0.9.2",
+            "combined-stream": "0.0.7",
+            "mime-types": "2.0.14"
+          }
+        },
+        "hawk": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
+          "integrity": "sha1-HnMc45RH+h0PbXB/e87r7A/R7B8=",
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+          "dev": true,
+          "requires": {
+            "asn1": "0.1.11",
+            "assert-plus": "0.1.5",
+            "ctype": "0.5.3"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
+          "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.0.14",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+          "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.12.0"
+          }
+        },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
+          "integrity": "sha1-fb6uRPbKRU4fFoRR1jB0ZzWBPOM=",
+          "dev": true
+        },
+        "qs": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+          "integrity": "sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "request": {
+          "version": "2.53.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.53.0.tgz",
+          "integrity": "sha1-GAo66St7Y5gC5PlUXdj83rcddgw=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.5.0",
+            "bl": "0.9.5",
+            "caseless": "0.9.0",
+            "combined-stream": "0.0.7",
+            "forever-agent": "0.5.2",
+            "form-data": "0.2.0",
+            "hawk": "2.3.1",
+            "http-signature": "0.10.1",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.0.14",
+            "node-uuid": "1.4.8",
+            "oauth-sign": "0.6.0",
+            "qs": "2.3.3",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.4.3"
+          }
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
+        }
+      }
+    },
+    "xolvio-fiber-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/xolvio-fiber-utils/-/xolvio-fiber-utils-2.0.3.tgz",
+      "integrity": "sha1-vsjXDHQGGjFjFbun0w0lyz6C3FA=",
+      "dev": true,
+      "requires": {
+        "fibers": "1.0.15",
+        "underscore": "1.8.3"
+      }
+    },
+    "xolvio-jasmine-expect": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xolvio-jasmine-expect/-/xolvio-jasmine-expect-1.1.0.tgz",
+      "integrity": "sha1-vCud1ghCMR8EV59agtzqaisxnH0=",
+      "dev": true,
+      "requires": {
+        "jasmine-core": "2.8.0"
+      }
+    },
+    "xolvio-sync-webdriverio": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/xolvio-sync-webdriverio/-/xolvio-sync-webdriverio-9.0.1.tgz",
+      "integrity": "sha1-WRri2MiqynQiZJWfzM+QtPndUWA=",
+      "dev": true,
+      "requires": {
+        "fibers": "1.0.15",
+        "meteor-promise": "0.8.6",
+        "underscore": "1.8.3",
+        "wdio-sync": "0.6.14",
+        "webdriverio": "4.8.0",
+        "xolvio-fiber-utils": "2.0.3"
+      }
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase": "1.2.1",
+        "cliui": "2.1.0",
+        "decamelize": "1.2.0",
+        "window-size": "0.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "yauzl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "dev": true,
+      "requires": {
+        "fd-slicer": "1.0.1"
+      }
+    },
+    "zip-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
+      "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
+      "dev": true,
+      "requires": {
+        "archiver-utils": "1.3.0",
+        "compress-commons": "1.2.2",
+        "lodash": "4.17.4",
+        "readable-stream": "2.3.3"
+      }
+    }
+  }
 }
diff --git a/packages/rocketchat-livechat/app/package-lock.json b/packages/rocketchat-livechat/app/package-lock.json
index f30977ae886..aeb329e7a28 100644
--- a/packages/rocketchat-livechat/app/package-lock.json
+++ b/packages/rocketchat-livechat/app/package-lock.json
@@ -5,43 +5,53 @@
   "requires": true,
   "dependencies": {
     "abbrev": {
-      "version": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "ajv": {
-      "version": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
       "requires": {
-        "co": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-        "json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
       }
     },
     "ansi-regex": {
-      "version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "aproba": {
-      "version": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-      "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "are-we-there-yet": {
-      "version": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
       "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
       "requires": {
-        "delegates": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.3"
       }
     },
     "asn1": {
-      "version": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
       "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "assert-plus": {
-      "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "asynckit": {
-      "version": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "autolinker": {
@@ -50,377 +60,431 @@
       "integrity": "sha1-hKqqm7B8eU8IVc1wQaMe7G9vqMo="
     },
     "aws-sign2": {
-      "version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
       "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
     },
     "babel-runtime": {
-      "version": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz",
-        "regenerator-runtime": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.0"
       }
     },
     "balanced-match": {
-      "version": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "bcrypt": {
-      "version": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
-      "integrity": "sha1-sC3cbAtS6ha40883XVoy54DatUg=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
+      "integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
       "requires": {
-        "nan": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-        "node-pre-gyp": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
       }
     },
     "bcrypt-pbkdf": {
-      "version": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
       "optional": true,
       "requires": {
-        "tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+        "tweetnacl": "0.14.5"
       }
     },
     "block-stream": {
-      "version": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "requires": {
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+        "inherits": "2.0.3"
       }
     },
     "boom": {
-      "version": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "requires": {
-        "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+        "hoek": "4.2.0"
       }
     },
     "brace-expansion": {
-      "version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "requires": {
-        "balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-        "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
       }
     },
     "caseless": {
-      "version": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "co": {
-      "version": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "code-point-at": {
-      "version": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "combined-stream": {
-      "version": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
       "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
       "requires": {
-        "delayed-stream": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+        "delayed-stream": "1.0.0"
       }
     },
     "concat-map": {
-      "version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "console-control-strings": {
-      "version": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "core-js": {
-      "version": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz",
-      "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
     },
     "core-util-is": {
-      "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cryptiles": {
-      "version": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
       "requires": {
-        "boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
       }
     },
     "dashdash": {
-      "version": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
-        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+        "assert-plus": "1.0.0"
       }
     },
     "debug": {
-      "version": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "requires": {
-        "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+        "ms": "2.0.0"
       }
     },
     "deep-extend": {
-      "version": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
       "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
     },
     "delayed-stream": {
-      "version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
-      "version": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "ecc-jsbn": {
-      "version": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
       "optional": true,
       "requires": {
-        "jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+        "jsbn": "0.1.1"
       }
     },
     "extend": {
-      "version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
       "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
     },
     "extsprintf": {
-      "version": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
     "forever-agent": {
-      "version": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
       "requires": {
-        "asynckit": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-        "combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-        "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
       }
     },
     "fs.realpath": {
-      "version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fstream": {
-      "version": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "requires": {
-        "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
       }
     },
     "fstream-ignore": {
-      "version": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
       "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
       "requires": {
-        "fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
       }
     },
     "gauge": {
-      "version": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "requires": {
-        "aproba": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-        "console-control-strings": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-        "has-unicode": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-        "signal-exit": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-        "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-        "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-        "wide-align": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"
+        "aproba": "1.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
       }
     },
     "getpass": {
-      "version": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
-        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+        "assert-plus": "1.0.0"
       }
     },
     "glob": {
-      "version": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "requires": {
-        "fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-        "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-        "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
       }
     },
     "graceful-fs": {
-      "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "har-schema": {
-      "version": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-        "har-schema": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"
+        "ajv": "5.3.0",
+        "har-schema": "2.0.0"
       }
     },
     "has-unicode": {
-      "version": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "hawk": {
-      "version": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
       "requires": {
-        "boom": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-        "cryptiles": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-        "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-        "sntp": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.1.0"
       }
     },
     "hoek": {
-      "version": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
     },
     "http-signature": {
-      "version": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "requires": {
-        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-        "jsprim": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-        "sshpk": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
       }
     },
     "inflight": {
-      "version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
-        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-        "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
-      "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
       "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
     },
     "is-fullwidth-code-point": {
-      "version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "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": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-typedarray": {
-      "version": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "isarray": {
-      "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isstream": {
-      "version": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jquery": {
-      "version": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
       "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
     },
     "jsbn": {
-      "version": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "optional": true
     },
     "json-schema": {
-      "version": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
-    "json-stable-stringify": {
-      "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "requires": {
-        "jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-      }
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
     },
     "json-stringify-safe": {
-      "version": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
-    "jsonify": {
-      "version": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
     "jsprim": {
-      "version": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
       "requires": {
-        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-        "extsprintf": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-        "json-schema": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-        "verror": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
       }
     },
     "mime-db": {
-      "version": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
     },
     "mime-types": {
-      "version": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
-      "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "requires": {
-        "mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"
+        "mime-db": "1.30.0"
       }
     },
     "minimatch": {
-      "version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
+        "brace-expansion": "1.1.8"
       }
     },
     "minimist": {
-      "version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "mkdirp": {
-      "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "requires": {
-        "minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+        "minimist": "0.0.8"
       }
     },
     "moment": {
@@ -429,190 +493,218 @@
       "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
     },
     "ms": {
-      "version": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "nan": {
-      "version": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
       "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
     },
     "node-pre-gyp": {
-      "version": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+      "version": "0.6.36",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
       "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
       "requires": {
-        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-        "nopt": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-        "npmlog": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-        "rc": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-        "request": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-        "semver": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-        "tar": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-        "tar-pack": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz"
+        "mkdirp": "0.5.1",
+        "nopt": "4.0.1",
+        "npmlog": "4.1.2",
+        "rc": "1.2.2",
+        "request": "2.83.0",
+        "rimraf": "2.6.2",
+        "semver": "5.4.1",
+        "tar": "2.2.1",
+        "tar-pack": "3.4.1"
       }
     },
     "nopt": {
-      "version": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
       "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
       "requires": {
-        "abbrev": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-        "osenv": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"
+        "abbrev": "1.1.1",
+        "osenv": "0.1.4"
       }
     },
     "npmlog": {
-      "version": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
-        "are-we-there-yet": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-        "console-control-strings": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-        "gauge": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-        "set-blocking": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+        "are-we-there-yet": "1.1.4",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
       }
     },
     "number-is-nan": {
-      "version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
-      "version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
       "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "object-assign": {
-      "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "once": {
-      "version": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+        "wrappy": "1.0.2"
       }
     },
     "os-homedir": {
-      "version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-tmpdir": {
-      "version": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
-      "version": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
       "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
       "requires": {
-        "os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-        "os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "path-is-absolute": {
-      "version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "performance-now": {
-      "version": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "process-nextick-args": {
-      "version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
       "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
     "punycode": {
-      "version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
-      "version": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
     },
     "rc": {
-      "version": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-      "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-      "requires": {
-        "deep-extend": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-        "ini": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-        "minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-        "strip-json-comments": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
+      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.4",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "minimist": {
-          "version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
     "readable-stream": {
-      "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "requires": {
-        "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-        "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-        "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-        "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
       }
     },
     "regenerator-runtime": {
-      "version": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
     },
     "request": {
-      "version": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-      "requires": {
-        "aws-sign2": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-        "aws4": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-        "caseless": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-        "combined-stream": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-        "extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-        "forever-agent": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-        "form-data": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-        "har-validator": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-        "hawk": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-        "http-signature": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-        "is-typedarray": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-        "isstream": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-        "json-stringify-safe": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-        "mime-types": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
-        "oauth-sign": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-        "performance-now": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-        "qs": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-        "stringstream": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-        "tough-cookie": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-        "tunnel-agent": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-        "uuid": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
       }
     },
     "rimraf": {
-      "version": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "requires": {
-        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
+        "glob": "7.1.2"
       }
     },
     "safe-buffer": {
-      "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "semver": {
-      "version": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
     },
     "set-blocking": {
-      "version": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "signal-exit": {
-      "version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "sntp": {
-      "version": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
       "requires": {
-        "hoek": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+        "hoek": "4.2.0"
       }
     },
     "sprintf-js": {
@@ -621,104 +713,111 @@
       "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
     },
     "sshpk": {
-      "version": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
       "requires": {
-        "asn1": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-        "bcrypt-pbkdf": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-        "dashdash": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-        "ecc-jsbn": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-        "getpass": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-        "jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-        "tweetnacl": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
       }
     },
     "string-width": {
-      "version": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "requires": {
-        "code-point-at": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-        "is-fullwidth-code-point": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-        "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
       }
     },
     "string_decoder": {
-      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "requires": {
-        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+        "safe-buffer": "5.1.1"
       }
     },
     "stringstream": {
-      "version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
       "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
-      "version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
-        "ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+        "ansi-regex": "2.1.1"
       }
     },
     "strip-json-comments": {
-      "version": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
     "tar": {
-      "version": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "requires": {
-        "block-stream": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-        "fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
       }
     },
     "tar-pack": {
-      "version": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-      "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz",
+      "integrity": "sha512-PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg==",
       "requires": {
-        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-        "fstream": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-        "fstream-ignore": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-        "tar": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-        "uid-number": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+        "debug": "2.6.9",
+        "fstream": "1.0.11",
+        "fstream-ignore": "1.0.5",
+        "once": "1.4.0",
+        "readable-stream": "2.3.3",
+        "rimraf": "2.6.2",
+        "tar": "2.2.1",
+        "uid-number": "0.0.6"
       }
     },
     "toastr": {
-      "version": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
       "integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
     },
     "tough-cookie": {
-      "version": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "requires": {
-        "punycode": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+        "punycode": "1.4.1"
       }
     },
     "tunnel-agent": {
-      "version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
-        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+        "safe-buffer": "5.1.1"
       }
     },
     "tweetnacl": {
-      "version": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
       "optional": true
     },
     "uid-number": {
-      "version": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
       "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
     },
     "underscore": {
@@ -732,41 +831,40 @@
       "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=",
       "requires": {
         "sprintf-js": "1.1.1",
-        "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+        "util-deprecate": "1.0.2"
       }
     },
     "util-deprecate": {
-      "version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
-      "version": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
     },
     "verror": {
-      "version": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
-        "assert-plus": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-        "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-        "extsprintf": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
       }
     },
     "wide-align": {
-      "version": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
       "requires": {
-        "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+        "string-width": "1.0.2"
       }
     },
     "wrappy": {
-      "version": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     }
   }

From 8b9e351e37f64deba5d68071ba7f7df5dde6933e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 31 Oct 2017 15:33:43 -0200
Subject: [PATCH 218/244] Fix tests

---
 packages/rocketchat-api/server/v1/integrations.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/integrations.js b/packages/rocketchat-api/server/v1/integrations.js
index bd82fc250c5..ee53f29d265 100644
--- a/packages/rocketchat-api/server/v1/integrations.js
+++ b/packages/rocketchat-api/server/v1/integrations.js
@@ -108,10 +108,9 @@ RocketChat.API.v1.addRoute('integrations.remove', { authRequired: true }, {
 			return RocketChat.API.v1.failure('An integrationId or target_url needs to be provided.');
 		}
 
+		let integration;
 		switch (this.bodyParams.type) {
 			case 'webhook-outgoing':
-				let integration;
-
 				if (this.bodyParams.target_url) {
 					integration = RocketChat.models.Integrations.findOne({ urls: this.bodyParams.target_url });
 				} else if (this.bodyParams.integrationId) {

From 5d83bbdcf86bf019db44f6959e36da4ae986ff81 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 1 Nov 2017 00:21:15 -0200
Subject: [PATCH 219/244] Reorder .meteor/packages file

---
 .meteor/packages | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.meteor/packages b/.meteor/packages
index 75080384110..d658fff1c1b 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -4,6 +4,7 @@
 # but you can also edit it by hand.
 
 rocketchat:cors
+
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0
@@ -13,6 +14,7 @@ accounts-twitter@1.3.0
 blaze-html-templates
 check@1.2.5
 ddp-rate-limiter@1.0.7
+dynamic-import@0.1.3
 ecmascript@0.8.3
 ejson@1.0.14
 email@1.2.3
@@ -53,6 +55,7 @@ rocketchat:crowd
 rocketchat:custom-oauth
 rocketchat:custom-sounds
 rocketchat:dolphin
+rocketchat:drupal
 rocketchat:emoji
 rocketchat:emoji-custom
 rocketchat:emoji-emojione
@@ -62,6 +65,7 @@ rocketchat:file
 rocketchat:file-upload
 rocketchat:github-enterprise
 rocketchat:gitlab
+#rocketchat:google-natural-language
 rocketchat:google-vision
 rocketchat:highlight-words
 rocketchat:iframe-login
@@ -88,11 +92,14 @@ rocketchat:mentions-flextab
 rocketchat:message-attachments
 rocketchat:message-mark-as-unread
 rocketchat:message-pin
+rocketchat:message-snippet
 rocketchat:message-star
 rocketchat:migrations
+rocketchat:monitoring
 rocketchat:oauth2-server-config
 rocketchat:oembed
 rocketchat:otr
+rocketchat:postcss
 rocketchat:push-notifications
 rocketchat:reactions
 rocketchat:sandstorm
@@ -133,10 +140,6 @@ rocketchat:version
 rocketchat:videobridge
 rocketchat:webrtc
 rocketchat:wordpress
-rocketchat:message-snippet
-#rocketchat:google-natural-language
-rocketchat:drupal
-rocketchat:monitoring
 #rocketchat:chatops
 
 konecty:change-case
@@ -146,6 +149,7 @@ konecty:multiple-instances-status
 konecty:nrr
 konecty:user-presence
 
+deepwell:bootstrap-datepicker2
 dispatch:run-as-user
 francocatena:status
 jalik:ufs
@@ -153,6 +157,7 @@ jalik:ufs-gridfs
 jparker:gravatar
 kadira:blaze-layout
 kadira:flow-router
+keepnox:perfect-scrollbar
 #kenton:accounts-sandstorm
 mizzao:autocomplete
 mizzao:timesync
@@ -173,7 +178,3 @@ todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
-deepwell:bootstrap-datepicker2
-rocketchat:postcss
-dynamic-import@0.1.3
-keepnox:perfect-scrollbar

From e5eff6a9d379c9d47ea715b3782e95f05a01c799 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 1 Nov 2017 00:22:19 -0200
Subject: [PATCH 220/244] Removed sample chatops package

---
 .meteor/packages                              |  1 -
 packages/rocketchat-chatops/client/startup.js |  5 ---
 packages/rocketchat-chatops/client/tabBar.js  | 29 ----------------
 .../client/views/chatops.html                 |  8 -----
 .../client/views/chatops.js                   |  1 -
 .../client/views/codemirror.html              | 23 -------------
 .../client/views/codemirror.js                |  9 -----
 .../client/views/droneflight.html             | 19 -----------
 .../client/views/droneflight.js               | 23 -------------
 .../client/views/dynamicUI.html               | 27 ---------------
 .../client/views/stylesheets/chatops.css      | 15 ---------
 packages/rocketchat-chatops/package.js        | 33 -------------------
 .../rocketchat-chatops/server/settings.js     |  5 ---
 13 files changed, 198 deletions(-)
 delete mode 100644 packages/rocketchat-chatops/client/startup.js
 delete mode 100644 packages/rocketchat-chatops/client/tabBar.js
 delete mode 100644 packages/rocketchat-chatops/client/views/chatops.html
 delete mode 100644 packages/rocketchat-chatops/client/views/chatops.js
 delete mode 100644 packages/rocketchat-chatops/client/views/codemirror.html
 delete mode 100644 packages/rocketchat-chatops/client/views/codemirror.js
 delete mode 100644 packages/rocketchat-chatops/client/views/droneflight.html
 delete mode 100644 packages/rocketchat-chatops/client/views/droneflight.js
 delete mode 100644 packages/rocketchat-chatops/client/views/dynamicUI.html
 delete mode 100644 packages/rocketchat-chatops/client/views/stylesheets/chatops.css
 delete mode 100644 packages/rocketchat-chatops/package.js
 delete mode 100644 packages/rocketchat-chatops/server/settings.js

diff --git a/.meteor/packages b/.meteor/packages
index d658fff1c1b..ca91534d462 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -140,7 +140,6 @@ rocketchat:version
 rocketchat:videobridge
 rocketchat:webrtc
 rocketchat:wordpress
-#rocketchat:chatops
 
 konecty:change-case
 konecty:delayed-task
diff --git a/packages/rocketchat-chatops/client/startup.js b/packages/rocketchat-chatops/client/startup.js
deleted file mode 100644
index 1fc0e06dc4f..00000000000
--- a/packages/rocketchat-chatops/client/startup.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* globals GoogleMaps */
-Meteor.startup(function() {
-	console.log('startup hooked');
-	return GoogleMaps.load();
-});
diff --git a/packages/rocketchat-chatops/client/tabBar.js b/packages/rocketchat-chatops/client/tabBar.js
deleted file mode 100644
index 90343ff17b0..00000000000
--- a/packages/rocketchat-chatops/client/tabBar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-Meteor.startup(() =>
-	Tracker.autorun(function() {
-		if (RocketChat.TabBar) {
-			if (RocketChat.settings && RocketChat.settings.get('Chatops_Enabled')) {
-				RocketChat.TabBar.addButton({
-					groups: ['channel', 'group', 'direct'],
-					id: 'chatops-button2',
-					i18nTitle: 'rocketchat-chatops:Chatops_Title',
-					icon: 'hubot',
-					template: 'chatops-dynamicUI',
-					order: 4
-				});
-
-				RocketChat.TabBar.addButton({
-					groups: ['channel', 'group', 'direct'],
-					id: 'chatops-button3',
-					i18nTitle: 'rocketchat-chatops:Chatops_Title',
-					icon: 'inbox',
-					template: 'chatops_droneflight',
-					width: 675,
-					order: 5
-				});
-			} else {
-				RocketChat.TabBar.removeButton('chatops-button2');
-				RocketChat.TabBar.removeButton('chatops-button3');
-			}
-		}
-	})
-);
diff --git a/packages/rocketchat-chatops/client/views/chatops.html b/packages/rocketchat-chatops/client/views/chatops.html
deleted file mode 100644
index d1a90aaad0b..00000000000
--- a/packages/rocketchat-chatops/client/views/chatops.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<template name="chatops">
-	<div class="control">
-		<div class="header">
-			<h2>{{_ "Chatops_Title"}}</h2>
-		</div>
-	</div>
-		{{_ "Loading..."}}
-</template>
diff --git a/packages/rocketchat-chatops/client/views/chatops.js b/packages/rocketchat-chatops/client/views/chatops.js
deleted file mode 100644
index 569d5630d0b..00000000000
--- a/packages/rocketchat-chatops/client/views/chatops.js
+++ /dev/null
@@ -1 +0,0 @@
-Template.chatops.helpers;
diff --git a/packages/rocketchat-chatops/client/views/codemirror.html b/packages/rocketchat-chatops/client/views/codemirror.html
deleted file mode 100644
index 6333d841680..00000000000
--- a/packages/rocketchat-chatops/client/views/codemirror.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<template name="chatops_codemirror">
-	<div class="control">
-		<button class="more"><span class="icon-code" title="{{#if flex3Opened}}{{_ 'Close'}}{{/if}}"></span></button>
-		<form class="search-form" role="form">
-			<div class="input-line search">
-				<input type="text" id="room-search" class="search" placeholder="{{tQuickSearch}}" autocomplete="off" />
-				<i class="icon-search secondary-font-color"></i>
-			</div>
-		</form>
-	</div>
-
-	<div class="content">
-		{{> CodeMirror id="flyineditor" name="flyineditor" options=editorOptions code=editorCode }}
-
-		<div class="codeEditor">
-			<button class='button'><span> {{_ "Save"}}</span></button>
-			<button class='button'><span> {{_ "Commit"}}</span></button>
-			<button class='button'><span> {{_ "Cancel"}}</span></button>
-		</div>
-
-	</div>
-
-</template>
diff --git a/packages/rocketchat-chatops/client/views/codemirror.js b/packages/rocketchat-chatops/client/views/codemirror.js
deleted file mode 100644
index f9aa8331a25..00000000000
--- a/packages/rocketchat-chatops/client/views/codemirror.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Template.chatops_codemirror.helpers({
-	editorOptions() {
-		return {lineNumbers: true, mode:'javascript'};
-	},
-
-	editorCode() {
-		return '# This is a full featured, syntax highlighted editor\n# BOTs can fetch, edit, commit, and save source code\n#\n\nvar express = require("express");\nvar app = express();\n// respond with \"hello world\" when a GET request is made to the homepage \ +\napp.get("/", function(req, res) {\nres.send("hello world");\n});';
-	}
-});
diff --git a/packages/rocketchat-chatops/client/views/droneflight.html b/packages/rocketchat-chatops/client/views/droneflight.html
deleted file mode 100644
index 9f6957ef90f..00000000000
--- a/packages/rocketchat-chatops/client/views/droneflight.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<template name="chatops_droneflight">
-	<div class="control">
-		<div> <b>Drone 1:</b>  mission <b>A3</b>   waypoint <b>7</b>   <span class="red">fuel 30%</span>  </div>
-		<div> <b>Drone 2:</b>  mission <b>A7</b>   waypoint <b>2</b>   <span class="green">fuel 100%</span> </div>
-	</div>
-
-	<div class="content">
-	    <div class="map-container">
-		{{> googleMap name="flightMap" options=flightMapOptions }}
-		</div>
-
-		<div class="droneFlight">
-			<button class='button'><span> {{_ "Return to base"}}</span></button>
-			<button class='button'><span> {{_ "Cancel"}}</span></button>
-		</div>
-
-	</div>
-
-</template>
diff --git a/packages/rocketchat-chatops/client/views/droneflight.js b/packages/rocketchat-chatops/client/views/droneflight.js
deleted file mode 100644
index 099cd3e0cf1..00000000000
--- a/packages/rocketchat-chatops/client/views/droneflight.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* globals GoogleMaps google*/
-Template.chatops_droneflight.helpers({
-	flightMapOptions() {
-		if (GoogleMaps.loaded()) {
-			console.log('helper run');
-			return {center: new google.maps.LatLng(35.6609285, -78.8456125), zoom: 17};
-		}
-	}
-});
-
-
-Template.chatops_droneflight.onCreated(() =>
-	GoogleMaps.ready('flightMap', function(map) {
-		console.log('ready');
-		const redicon = { path: google.maps.SymbolPath.CIRCLE, fillColor: 'red', fillOpacity: 0.8, strokeColor: 'gold', strokeWeight: 2, scale: 10};
-		const greenicon = {path: google.maps.SymbolPath.CIRCLE, fillColor: 'green', fillOpacity: 0.8, strokeColor: 'gold', strokeWeight: 2, scale: 10};
-
-		const marker = new google.maps.Marker({position: new google.maps.LatLng(35.661848, -78.843165), icon: redicon, map: map.instance});
-		marker.setLabel('1');
-		const marker2 = new google.maps.Marker({position: new google.maps.LatLng(35.660537, -78.846959), icon: greenicon, map: map.instance});
-		return marker2.setLabel('2');
-	})
-);
diff --git a/packages/rocketchat-chatops/client/views/dynamicUI.html b/packages/rocketchat-chatops/client/views/dynamicUI.html
deleted file mode 100644
index af941df7bfd..00000000000
--- a/packages/rocketchat-chatops/client/views/dynamicUI.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<template name="chatops-dynamicUI">
-	<div class="control">
-		<h3>Bot Controlled UI</h3>
-		<div>
-		UI is dynamically generated based on DSL message from BOT. DSL also specifies command sent back.
-		</div>
-
-	 </div>
-
-	<div class="control">
-		<div class="botgen" style="margin-bottom: 10px;">
-			   <input type="text" id="gistbutton" class="search" placeholder="Gist Id or Url" autocomplete="off" />
-		</div>
-
-		<div class="botgen" style="margin-bottom: 10px;">
-			<button class='button'><span> {{_ "Get Gist"}}</span></button>
-		</div>
-
-		<div class="botgen" style="margin-bottom: 10px;">
-			<button class='button'><span> {{_ "Show history"}}</span></button>
-		</div>
-		<div class="botgen" style="margin-bottom: 10px;">
-			<button class='button'><span> {{_ "Blame"}}</span></button>
-		</div>
-
-	</div>
-</template>
diff --git a/packages/rocketchat-chatops/client/views/stylesheets/chatops.css b/packages/rocketchat-chatops/client/views/stylesheets/chatops.css
deleted file mode 100644
index de78b640954..00000000000
--- a/packages/rocketchat-chatops/client/views/stylesheets/chatops.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-.map-container {
-	width: 670px;
-	max-width: 100%;
-	height: 500px;
-	padding: 5px;
-}
-
-.red {
-	color: red;
-}
-
-.green {
-	color: green;
-}
diff --git a/packages/rocketchat-chatops/package.js b/packages/rocketchat-chatops/package.js
deleted file mode 100644
index d6c26ff2540..00000000000
--- a/packages/rocketchat-chatops/package.js
+++ /dev/null
@@ -1,33 +0,0 @@
-Package.describe({
-	name: 'rocketchat:chatops',
-	version: '0.0.1',
-	summary: 'Chatops Panel',
-	git: ''
-});
-
-Package.onUse(function(api) {
-	api.use([
-		'ecmascript',
-		'rocketchat:lib',
-		'dburles:google-maps@1.1.5'
-	]);
-
-	api.use('templating', 'client');
-
-	api.addFiles([
-		'client/startup.js',
-		'client/tabBar.js',
-		'client/views/chatops.html',
-		'client/views/chatops.js',
-		'client/views/codemirror.html',
-		'client/views/codemirror.js',
-		'client/views/droneflight.html',
-		'client/views/droneflight.js',
-		'client/views/dynamicUI.html',
-		'client/views/stylesheets/chatops.css'
-	], 'client');
-
-	api.addFiles([
-		'server/settings.js'
-	], 'server');
-});
diff --git a/packages/rocketchat-chatops/server/settings.js b/packages/rocketchat-chatops/server/settings.js
deleted file mode 100644
index 0fcd4d2db0c..00000000000
--- a/packages/rocketchat-chatops/server/settings.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Meteor.startup(function() {
-	RocketChat.settings.addGroup('Chatops');
-	RocketChat.settings.add('Chatops_Enabled', false, { type: 'boolean', group: 'Chatops', public: true });
-	return RocketChat.settings.add('Chatops_Username', false, { type: 'string', group: 'Chatops', public: true });
-});

From 78aa5d32a1f102ca1678d15b561d40ced53a65d9 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 1 Nov 2017 00:51:07 -0200
Subject: [PATCH 221/244] Removed tmeasday:crypto-md5

---
 .meteor/packages                                              | 1 -
 .meteor/versions                                              | 2 --
 packages/rocketchat-livechat/server/methods/startVideoCall.js | 2 +-
 packages/rocketchat-videobridge/client/views/videoFlexTab.js  | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.meteor/packages b/.meteor/packages
index 75080384110..ee5a6872e02 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -168,7 +168,6 @@ raix:push
 raix:ui-dropped-event
 smoral:sweetalert
 steffo:meteor-accounts-saml
-tmeasday:crypto-md5
 todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
diff --git a/.meteor/versions b/.meteor/versions
index ceda5fa8cbb..be8b300b3fa 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -245,8 +245,6 @@ templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
-tmeasday:crypto-base@3.1.2
-tmeasday:crypto-md5@3.1.2
 todda00:friendly-slugs@0.6.0
 tracker@1.1.3
 twitter-oauth@1.2.0
diff --git a/packages/rocketchat-livechat/server/methods/startVideoCall.js b/packages/rocketchat-livechat/server/methods/startVideoCall.js
index fc23e1dd07f..5180ee5e44a 100644
--- a/packages/rocketchat-livechat/server/methods/startVideoCall.js
+++ b/packages/rocketchat-livechat/server/methods/startVideoCall.js
@@ -27,7 +27,7 @@ Meteor.methods({
 		return {
 			roomId: room._id,
 			domain: RocketChat.settings.get('Jitsi_Domain'),
-			jitsiRoom: RocketChat.settings.get('Jitsi_URL_Room_Prefix') + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString()
+			jitsiRoom: RocketChat.settings.get('Jitsi_URL_Room_Prefix') + RocketChat.settings.get('uniqueID') + roomId
 		};
 	}
 });
diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/packages/rocketchat-videobridge/client/views/videoFlexTab.js
index 43c707c3f65..cafbfe8d153 100644
--- a/packages/rocketchat-videobridge/client/views/videoFlexTab.js
+++ b/packages/rocketchat-videobridge/client/views/videoFlexTab.js
@@ -59,7 +59,7 @@ Template.videoFlexTab.onRendered(function() {
 					const roomId = Session.get('openedRoom');
 
 					const domain = RocketChat.settings.get('Jitsi_Domain');
-					const jitsiRoom = RocketChat.settings.get('Jitsi_URL_Room_Prefix') + CryptoJS.MD5(RocketChat.settings.get('uniqueID') + roomId).toString();
+					const jitsiRoom = RocketChat.settings.get('Jitsi_URL_Room_Prefix') + RocketChat.settings.get('uniqueID') + roomId;
 					const noSsl = RocketChat.settings.get('Jitsi_SSL') ? false : true;
 
 					if (jitsiRoomActive !== null && jitsiRoomActive !== jitsiRoom) {

From 793440feb39d3615149d35cd1b313358063e126c Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 1 Nov 2017 01:22:38 -0200
Subject: [PATCH 222/244] meteor update

---
 .meteor/versions                                  | 4 ++--
 package.json                                      | 2 +-
 packages/rocketchat-livechat/app/.meteor/versions | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.meteor/versions b/.meteor/versions
index 9f0d470bede..f90c9eb83b0 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -84,7 +84,7 @@ meteorhacks:inject-initial@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.2.0
+minifier-js@2.2.1
 minimongo@1.4.0
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
@@ -238,7 +238,7 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-js@2.2.0
+standard-minifier-js@2.2.1
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.2
diff --git a/package.json b/package.json
index 768ebeca98b..34a259f4ed2 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "mime-db": "^1.31.0",
     "mime-type": "^3.0.5",
     "moment": "^2.19.1",
-    "moment-timezone": "^0.5.13",
+    "moment-timezone": "^0.5.14",
     "photoswipe": "^4.1.2",
     "poplib": "^0.1.7",
     "prom-client": "^10.2.1",
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index 7411b8c654d..4a58b854426 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -48,7 +48,7 @@ mdg:validation-error@0.5.1
 meteor@1.8.0
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.2.0
+minifier-js@2.2.1
 minimongo@1.4.0
 mizzao:timesync@0.5.0
 modules@0.11.0
@@ -79,7 +79,7 @@ spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
 standard-minifier-css@1.3.5
-standard-minifier-js@2.2.0
+standard-minifier-js@2.2.1
 tap:i18n@1.8.2
 templating@1.3.2
 templating-compiler@1.3.3

From 3c87d9a07e504e701f29f978fbb2d3b5713fb906 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 1 Nov 2017 10:21:27 -0200
Subject: [PATCH 223/244] Try to find error

---
 tests/end-to-end/api/04-direct-message.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/end-to-end/api/04-direct-message.js b/tests/end-to-end/api/04-direct-message.js
index a8b22723e0f..c4d3622fc09 100644
--- a/tests/end-to-end/api/04-direct-message.js
+++ b/tests/end-to-end/api/04-direct-message.js
@@ -109,6 +109,9 @@ describe('[Direct Messages]', function() {
 				userId: 'rocket.cat'
 			})
 			.expect('Content-Type', 'application/json')
+			.expect((...args) => {
+				console.log(...args);
+			})
 			.expect(200)
 			.expect((res) => {
 				expect(res.body).to.have.property('success', true);

From 07af166e720aeda14e5f9f9ddbb9609764bdb77e Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 1 Nov 2017 13:25:25 -0200
Subject: [PATCH 224/244] Fix build

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b273a174da2..0a6de2a114a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,7 @@ before_script:
   echo "  replSetName: \"rs0\"" | sudo tee -a /etc/mongod.conf
 - sudo service mongod restart
 - mkdir /tmp/build
+- meteor --version
 - travis_retry meteor npm install
 - |-
   mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
@@ -57,16 +58,15 @@ before_script:
 - mkdir /tmp/build-test
 - tar -xf /tmp/build/Rocket.Chat.tar.gz -C /tmp/build-test/
 - cd /tmp/build-test/bundle/programs/server
-- meteor npm install -g node-gyp node-pre-gyp
-- meteor npm install
+- npm install
 - cd -
 - mongo --eval 'rs.status()'
 - mongo meteor --eval 'db.getCollectionNames()'
 script:
-- travis_retry meteor npm test
+- travis_retry npm test
 - mongo meteor --eval 'db.dropDatabase()'
 - unset MONGO_OPLOG_URL
-- travis_retry meteor npm test
+- travis_retry npm test
 before_deploy:
 - source ".travis/setartname.sh"
 - source ".travis/setdeploydir.sh"

From f446291ce7996705554931190c003db2fc06ec27 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 3 Nov 2017 20:03:17 -0200
Subject: [PATCH 225/244] Add CircleCI (#8685)

---
 .circleci/config.yml                     | 289 +++++++++++++++++++++++
 .circleci/docker.sh                      |  13 +
 .circleci/namefiles.sh                   |   8 +
 .circleci/setartname.sh                  |  23 ++
 .circleci/setdeploydir.sh                |   2 +
 .circleci/setupsig.sh                    |   8 +
 .circleci/sign.key.gpg                   | Bin 0 -> 5117 bytes
 .circleci/snap.sh                        |  37 +++
 .circleci/update-releases.sh             |  17 ++
 .docker/Dockerfile                       |   4 +-
 .scripts/set-version.js                  |   2 +
 .scripts/start.js                        |   2 +-
 .snapcraft/snapcraft.yaml                |   2 +-
 tests/chimp-config.js                    |   8 +-
 tests/pageobjects/administration.page.js |   6 +-
 15 files changed, 412 insertions(+), 9 deletions(-)
 create mode 100644 .circleci/config.yml
 create mode 100644 .circleci/docker.sh
 create mode 100644 .circleci/namefiles.sh
 create mode 100644 .circleci/setartname.sh
 create mode 100644 .circleci/setdeploydir.sh
 create mode 100644 .circleci/setupsig.sh
 create mode 100644 .circleci/sign.key.gpg
 create mode 100644 .circleci/snap.sh
 create mode 100644 .circleci/update-releases.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000000..9fb2a7f6017
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,289 @@
+defaults: &defaults
+  working_directory: ~/repo
+
+version: 2
+jobs:
+  build:
+    <<: *defaults
+    docker:
+      - image: circleci/node:4.8
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+
+      - restore_cache:
+          keys:
+            - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
+
+      - run:
+          name: Install Meteor
+          command: |
+            # Restore bin from cache
+            set +e
+            METEOR_SYMLINK_TARGET=$(readlink ~/.meteor/meteor)
+            METEOR_TOOL_DIRECTORY=$(dirname "$METEOR_SYMLINK_TARGET")
+            set -e
+            LAUNCHER=$HOME/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor
+            if [ -e $LAUNCHER ]
+            then
+              echo "Cached Meteor bin found, restoring it"
+              sudo cp "$LAUNCHER" "/usr/local/bin/meteor"
+            else
+              echo "No cached Meteor bin found."
+            fi
+
+            # only install meteor if bin isn't found
+            command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh
+
+      - run:
+          name: Versions
+          command: |
+            npm --versions
+            node -v
+            meteor --version
+            meteor npm --versions
+            meteor node -v
+            git version
+
+      - run:
+          name: Meteor npm install
+          command: |
+            # rm -rf node_modules
+            # rm -f package-lock.json
+            meteor npm install
+
+      - run:
+          name: Lint
+          command: |
+            meteor npm run lint
+            meteor npm run stylelint
+
+      - run:
+          name: Unit Test
+          command: |
+            meteor npm run testunit
+
+      - restore_cache:
+          keys:
+            - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
+
+      - restore_cache:
+          keys:
+            - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
+
+      - restore_cache:
+          keys:
+            - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
+
+      - run:
+          name: Build Rocket.Chat
+          command: |
+            if [[ $CIRCLE_TAG ]]; then meteor reset; fi
+            set +e
+            meteor add rocketchat:lib
+            set -e
+            meteor build --server-only --directory /tmp/build-test
+
+      - run:
+          name: Prepare build
+          command: |
+            mkdir /tmp/build/
+            cd /tmp/build-test
+            tar czf /tmp/build/Rocket.Chat.tar.gz bundle
+            cd /tmp/build-test/bundle/programs/server
+            npm install
+
+      - save_cache:
+          key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+          paths:
+            - ./node_modules
+
+      - save_cache:
+          key: meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
+          paths:
+            - ./.meteor/local
+
+      - save_cache:
+          key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
+          paths:
+            - ./packages/rocketchat-livechat/app/node_modules
+
+      - save_cache:
+          key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
+          paths:
+            - ./packages/rocketchat-livechat/app/.meteor/local
+
+      - save_cache:
+          key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
+          paths:
+            - ~/.meteor
+
+      - persist_to_workspace:
+          root: /tmp/
+          paths:
+            - build-test
+            - build
+
+      - store_artifacts:
+          path: /tmp/build
+
+  test-with-oplog:
+    <<: *defaults
+    docker:
+      - image: circleci/node:4.8-browsers
+      - image: mongo:3.4
+        command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]
+
+    environment:
+      TEST_MODE: "true"
+      MONGO_URL: mongodb://localhost:27017/testwithoplog
+      MONGO_OPLOG_URL: mongodb://localhost:27017/local
+
+    steps:
+      - attach_workspace:
+          at: /tmp
+
+      - checkout
+
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
+            echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
+            sudo apt-get update
+            sudo apt-get install -y mongodb-org-shell
+
+      - run:
+          name: Configure Replica Set
+          command: |
+            mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
+            mongo --eval 'rs.status()'
+
+      - run:
+          name: Update NPM
+          command: |
+            sudo npm install -g npm
+
+      - run:
+          name: NPM install
+          command: |
+            npm install
+
+      - run:
+          name: Run Tests
+          command: |
+            for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)
+
+      - store_artifacts:
+          path: ~/repo/.screenshots
+
+  test-without-oplog:
+    <<: *defaults
+    docker:
+      - image: circleci/node:4.8-browsers
+      - image: circleci/mongo:3.4
+
+    environment:
+      TEST_MODE: "true"
+      MONGO_URL: mongodb://localhost:27017/testwithoplog
+
+    steps:
+      - attach_workspace:
+          at: /tmp
+
+      - checkout
+
+      - run:
+          name: Update NPM
+          command: |
+            sudo npm install -g npm
+
+      - run:
+          name: NPM install
+          command: |
+            npm install
+
+      - run:
+          name: Run Tests
+          command: |
+            for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)
+
+      # - run:
+      #     name: Build Failed
+      #     when: on_fail
+      #     command: |
+      #       cp -R .screenshots /tmp/screenshots
+
+      # - store_artifacts:
+      #     path: ~/repo/.screenshots
+
+  deploy:
+    <<: *defaults
+    docker:
+      - image: circleci/node:4.8
+
+    steps:
+      - attach_workspace:
+          at: /tmp
+
+      - checkout
+
+      - run:
+          name: Install AWS cli
+          command: |
+            if [[ $CIRCLE_PULL_REQUESTS ]]; then exit 0; fi;
+
+            sudo apt-get -y -qq update
+            sudo apt-get -y -qq install python3.4-dev
+            curl -O https://bootstrap.pypa.io/get-pip.py
+            python3.4 get-pip.py --user
+            export PATH=~/.local/bin:$PATH
+            pip install awscli --upgrade --user
+
+      - run:
+          name: Publish assets
+          command: |
+            if [[ $CIRCLE_PULL_REQUESTS ]]; then exit 0; fi;
+
+            export PATH=~/.local/bin:$PATH
+            export CIRCLE_TAG=${CIRCLE_TAG:=}
+
+            source .circleci/setartname.sh
+            source .circleci/setdeploydir.sh
+            bash .circleci/setupsig.sh
+            bash .circleci/namefiles.sh
+            # echo ".circleci/sandstorm.sh"
+
+            aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive
+
+            bash .circleci/update-releases.sh
+            bash .circleci/docker.sh
+            bash .circleci/snap.sh
+
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - build
+      - test-with-oplog:
+          requires:
+            - build
+      - test-without-oplog:
+          requires:
+            - build
+      - deploy:
+          requires:
+            - test-with-oplog
+            - test-without-oplog
+          filters:
+            branches:
+              only:
+                - develop
+                - circle-ci
+            tags:
+              only:
+                - "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/"
diff --git a/.circleci/docker.sh b/.circleci/docker.sh
new file mode 100644
index 00000000000..4edf27c2177
--- /dev/null
+++ b/.circleci/docker.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -euvo pipefail
+IFS=$'\n\t'
+
+CURL_URL="https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$DOCKER_TRIGGER_TOKEN/"
+
+if [[ $CIRCLE_TAG ]]; then
+  CURL_DATA='{"source_type":"Tag","source_name":"'"$CIRCLE_TAG"'"}';
+else
+  CURL_DATA='{"source_type":"Branch","source_name":"'"$CIRCLE_BRANCH"'"}';
+fi
+
+curl -H "Content-Type: application/json" --data "$CURL_DATA" -X POST "$CURL_URL"
diff --git a/.circleci/namefiles.sh b/.circleci/namefiles.sh
new file mode 100644
index 00000000000..f2fd572105f
--- /dev/null
+++ b/.circleci/namefiles.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euvo pipefail
+IFS=$'\n\t'
+
+FILENAME="$ROCKET_DEPLOY_DIR/rocket.chat-$ARTIFACT_NAME.tgz";
+
+ln -s /tmp/build/Rocket.Chat.tar.gz "$FILENAME"
+gpg --armor --detach-sign "$FILENAME"
diff --git a/.circleci/setartname.sh b/.circleci/setartname.sh
new file mode 100644
index 00000000000..d1fa44fbab9
--- /dev/null
+++ b/.circleci/setartname.sh
@@ -0,0 +1,23 @@
+if [[ $CIRCLE_TAG ]]; then
+  export ARTIFACT_NAME="$(npm run version --silent)"
+else
+  export ARTIFACT_NAME="$(npm run version --silent).circleci-$CIRCLE_BUILD_NUM"
+fi
+
+if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+ ]]; then
+  SNAP_CHANNEL=candidate
+  RC_RELEASE=candidate
+  RC_VERSION=$CIRCLE_TAG
+elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  SNAP_CHANNEL=stable
+  RC_RELEASE=stable
+  RC_VERSION=$CIRCLE_TAG
+else
+  SNAP_CHANNEL=edge
+  RC_RELEASE=develop
+  RC_VERSION=0.59.0-develop
+fi
+
+export SNAP_CHANNEL
+export RC_RELEASE
+export RC_VERSION
diff --git a/.circleci/setdeploydir.sh b/.circleci/setdeploydir.sh
new file mode 100644
index 00000000000..2c49e4a7027
--- /dev/null
+++ b/.circleci/setdeploydir.sh
@@ -0,0 +1,2 @@
+export ROCKET_DEPLOY_DIR="/tmp/deploy"
+mkdir -p $ROCKET_DEPLOY_DIR
diff --git a/.circleci/setupsig.sh b/.circleci/setupsig.sh
new file mode 100644
index 00000000000..7b8f3820d74
--- /dev/null
+++ b/.circleci/setupsig.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euvo pipefail
+IFS=$'\n\t'
+
+cp .circleci/sign.key.gpg /tmp
+gpg --yes --batch --passphrase=$GPG_PASSWORD /tmp/sign.key.gpg
+gpg --allow-secret-key-import --import /tmp/sign.key
+rm /tmp/sign.key
diff --git a/.circleci/sign.key.gpg b/.circleci/sign.key.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..488e275998d505474fd6a93c263b4931885d7d00
GIT binary patch
literal 5117
zcmV<Z69Vjv4Fm%N0;J9ribN7r=itfgq8_Y3F9q3C=_rnb$WD<&&WSXdBeqiUBkYTi
zgx86C1<BxiY?uwd9>n>(*BrtSEM&sK?(j_<A1!CSd)uo?wZ@0v<0QJ+K-JxE+iE87
zb7Csah$H-)f!R&|dT|m-M+ky|GJypyg>8)%Q}kOP!Q#a*ys4&dDr+%)U1<ul2X=Kt
zc%YFdtKl~W8_Cbg8rPjwc^C+D?{B@vi;#t%b&dx!bne?N89swqmBdR9ktvN%7aiGc
zE`@dIK4p@@)=#lo!m2om3m3}>{~(%kAlO289lN-4-EE*!EVEY7;(4My9XcSTvuwYo
zy0S@~xo(NJSD7oYnJBg|F@8lIi(8KnEyRy2FU^k*Yop9`DEKZ{4Na3{ElPJ~`)+tX
zGKak59}L;U%meaDMf9t@cp$NzSX^d?$+n=lS&&4FD3!w)WMdq({#Rw|ZFnMh;#ff%
zF^GS+dif10i}(^`C@;sl`EgwH*2|m~;E<k@Ky}3PEDj++vQRh`#3Iav=*cgDWH2IT
z(kjvuj;@~2^W;Oa`cCQ%aEyhrn{>10O$(M@aKKO;keJyy$ksfNTZ!L2hIQcGCt4lH
z>&(TTlR+?~H2BMXhxl(Q#MU&^2OUDkh~!<<9SM>*7%ktXCjOCa*!Jv?((rOc))!$4
zl+-t)N%*pPY4Hw-e)10g9Q%6Ci*TR%=eh^!GdhrNfI=-iU4ps~Mf%o8?VefCjI&md
zi$hSld}BA%^MPY3`)=2ezR|Kt%b2XI_r0oZ4yJ#ojG*NV+i`>-AAY@H#y76>{CaI`
zEy`jmOlxodZX9)Wxe<yx@?{h3+KG`aqWu7!<9KHB$~$?CwI*k77Y_h7LeUwW;qT7k
z&sDMOy&9+s8?K@h&dxb3A3ae4S;Nzmx)N3fLY<@;S6|8E1Njz+Xae_$^DDa-@D=Q5
z@#^1A3(?aW_&C$rXf=OSbXsK8em$b5#%=%Q!I#SY*U5UJ!e8Cjd%Fcg91|rhUFK1W
z5-9)&l3YvaHm$^evLM3J&k_KSu+*N0{}_?NZN6Ot7Fltitm*CR4NOM1x#|0fs+m^h
z1rfH{rd144Wy|hetvb(gmg6La9-Ogg%#?lVQ%PQPXz1|I@=z9?=Y-%V&Q6gBT2)RZ
zYMh`k6>6~ti+@{_?C5+8L8v#ehlX3lVwVR)<>WNZc%z5*dcsc}GP~p7xkY$q+e2JU
zi#vUo)m$vADS33%8@}5Oh_^D`?eHARGw}mIoRPvB@!jZC{BZRmT<Vc&4HFX64k9=l
zcKrd56%0azr{E*jPN!Wg%BGy1R(v#%4=EWQ@^7ei_n;!nVPOFS+AXYiZbQS5CPSGY
zfHPbC8Xh%&R_{ydy1CYi)q!)QX+gNzlPl%K^|_;dWpY(VEP6M%IGGl?Tz3JI6X+oR
zw^$dJqEqrD)|V467+K2iFx%0Rp4n*3c|~!BIE=3g;t*&7R*gH5AI&>;v)yr_*f_5~
zD~_PY>F9s6mmS()h_EeX!6n7ywb1>ZV$k;<e6UVjX$x<@5d24;-!4vyWz595q~eek
z#-%E-so}l5{hja}`DswI6x&`L1#ZE#94E+lfWb*s0+#It<K!`_);zTwJZllSioO>5
z8P>!22~6)}BiarcrkHT@*0`3ew*2tTr$RhaAm>xz003(IfhfPjH^5ATaiTCpfL&f{
z4C}3<z9IG3<?2TXi>3=BKlPD+;BQe=9toR&V4Bxh5;CAAw*aRU&D`(zVl#5GF#KFt
z(O7(1#*izPxw#p|0$TwdyiZJHJ6eSY*Z)&34X-J=>+wL5(*7g)X%`E*#&h&U@(4?0
zz0eW)?7EW^uS@PE7*I6Ymb51LQ6sz9WLc5Ma)Fgu>B&>HmKTV;(DzB73$6p!M~4-z
zN<|^(Wum5k5xsJn@HI`iiQ*jO5%(yt>!Eh?i_uY^nqBPJSm|?X2p9i@@m>70MMW8$
z#y5orvThPrfUT((VtTO14zdKpPI}uL+rd{7i7ZVpv@)WPOdRP5AvaR%L+kDospgkv
zE6A>!PVBzYB!;AQ!CPzYDZM#rf87HUTI7Eebn@H^)<-Pqs4`W5*I$uxj&uxwbwg3l
z^VwhbbJ;5+K8C+r90cf{69|h>H6qc_iwFwjgq$L?YQMm?Kj1dVR%yc7__f4GR!a&y
z(awZi>m99QRwUE};^7ELK$i-+8yjXB|8S1+h2L_H?F%B%M{hEY2ky?BQE`S|GHG7J
zCE!c=sHnzUf7ewd2#oLOoE-w0&<HW2UFbiuyv)u5S!Zq2#hb^^5^pxI!mLBWk65a8
z&1(4&c=#E4H`p)Z5hsb%77S>-M0EDj8@e;5KRtL^n6RyET9?Z(yTAe+o|x9C60rrX
z8BB~r(!p%V70a@1u%FAI8$UllPPQ%6Sbg7_89&w|w)y)W?O|4aVK3Lmoo;6iK|R0$
z!;A2BW}xu5*uL%na+YEs=ZIpPoP6ri-$n1AOTye-sVMPZ)rIG9L$?!DXT)t0;JO32
zh!o>0F+XjTgng6D8)<^DnhZ0@&Wl9Dr=$b=BHNm@<B@1|S~o&Q|34yb<KV&f78dq?
z2_k!m>YHfwUj0}riS|R|u!5%j){VC=Uf=yThms(;Q;7AYw)SuK)UeJrqRwDwP0lxS
zTNsr!OuhPhPEzic@v^cDdhrUl;N{<QacFrcQ5ky79!B-CV)oZ+98z}M`x*THJ4d<!
z3-ad$yO*)U;~W`0{m;v%z~dZpQqU<Y46j3vCdMcz0gq#Y71IhEs|G7`b>iK)J=Z}E
zBtjW>)phSW56T>+$jw1+@(+^g8?`9I4J!Hn0?*7n4hWFL7`5zXTw5cj5PpoVibe6^
z*P6;aUKN5KnUmFkZ$-B!{la*v_z)7nm;4~&r<+`?Hp~~jrw1~c#+~3`(A%OE^o$D>
z7jv4v$2u&k{4+Takv$(ZQ5bBayq5;~@0^wgEt2S{&s&H~$Si2;j=+cm=2gkd=A%W<
zG}5|7i|$5QoWC<J0i=Jnh-x)Ias;Cl2tbrQpWyX#G5=~zM6<2ZDq8ex0EmAPj%(s%
z5M_0m(!6=F>&?u{XBLia<IudyQ4(9)(?`n19N-JpUXr1`xCP;qD8e2;%zgm3K^LjC
zy=v>eRZVQYZbrm}0DPYbO{&IF@>;8+-32VJd}X<2cH^OYxW~*(#qqlP3u%}Z-+SH6
zK&9W&a-x&cpBp8ObaNxfy5dfZVlO?nNI~sCy+JUyE^kq*Bn6x!vf(E+s{N*H?sJ-W
z2T1dcbg@tKkG~TJF%0Gk%~0S(=i{Taey%8k;=O+1BLenez#^t5L(D1WOFn^K5d4Zg
z66QFR%x0{?ZqQv{(00bY!)>HDr-zvnevGv!^4FT`!%2m#2a#qI-yz%S2SSl<|J8X7
z;XI>hxF<tWnvf>9&oG^p@JH;jD0U`{GJD^$@AzA=T4k6yE8qX)a*7f}`2m{6aD}iG
zl125dY^flk!ezSC4n)!1EuIn3$?W_Tc8DN&JfQhw7ObDU@)D1b=lbqXoB5pe-Nc=!
zSBrg`HOQ7ZHdZphAyw2~cQ~g}pNRjkd)z=x9@HH!!?>o7*WEE1M5h{wFVMoHKJpiX
z`*IG=QTjVVxn<1>bg=2L6KhT}THx7ZA`>n+8s{K(0Ap}2-csN{Q{!&Ct_KZM_dwZU
zued#B|H^gVWayJ(*e<mwJ`3+=S*Y7_v=R4-Z#a?c1qBZWZu#a(xC-L4zSnBx-e=_W
ziZ9m``b3c3zC2ZKbtW+5MoO}9!l;dejO3giFdJTRi+o|R#zd1kfMFBSOSrXMTF7>S
zlOqJV%U^*kjCW=ke;>ESzD*T=d<;9sUM8(E13$Hntu|C>hxR?|3AKlL>kuHBN3gkS
zE~#*d2geSXk3fzePUdYa_=3656eHXo7gFWQ-{lWafz2RjFRUJ=w58Gr6KO9?6$Ze7
zvQ||80`(|Aapc7o(6Nd#za~lwQt9|*xJvQmorK1{iR^n~uU)hggi&QFp}c3Rm|9Ld
z+@p#+0p0R~hd?c<Ft4im_<2A+b*J^SZFvvk8dCIt=<2t=I_*m{eP7v(N~{qLUOHAF
z4VuM7cx|A+C2Lg&UN9nEHax(MtPoiLi0vD7Sv|r=3I1#$p9|ZgvSfZwY1u-|y<6w6
zee>UgiNSxUSC}aS=eClEPnn68egm@*BqIa?HR^&>5~`((*Rj)1#WqoztTPB2@=co=
z!*-@%k>VGm$~OaJ=B@H(ueyT)`nIe1$=(sh!uJqz)-R?n*_gs%TlcK3V@VBkWjFfv
zg5!MS!8f9<*MM|G@Y%7M!&lnysv906>h1)VwP5Rp(Kz0F7ZvEQht-1*e8-oa%wAt0
z4{+Z3g@t4mJM-$LF+e!MCjw#+JRS&^2X#EgFFT8UZ|e0Dzo;M3Q$VyT1p!#&6c#2{
z0<68OIfZkO@bz3ymOyg#O!$H@1WhKDt=&(|GA)ld&b4fvanbg?7|Qf+p?uvA{1>()
zgnGf)h8OiT`2P|3p<EFBK@8L;tbD*8aNNtqWeW@Vokt1~Hr0c%m<^TtdL_LID{^IS
z=_JDC;@&<b@S`Q3+O5!3o(A^-Nl}t8_;<6*K@LF8Z%-@dsA>mu)>bImJc(fB>uX*C
z-*M&O0AfQn-mgC-goDE>)BtO@hux4pn3hmD2wQ#zn6Y?CI3D2qjupo7B}7l*o!Rj)
zau$!BdZP9^Jx8U>*e*7jy3>#r?)!CYe`9fYgV-dapg_W@{VRMac`FjjhYSlVBCX%S
zoKg8M6Fx$4D{oUte>m$}Uc4;X=R-Zf-;tnKp{Hzwu8ETGvqPQ(uXl)J@&ptW1V!4u
zB&GZ;GaMV#<U_qsjVEPIAZr0V01uGq9L*4L3(i+m@A8g;TzAZcq@bG*q@=ie$kf)U
z*PPhBknl$j+%a5!n1mdG(H?O;!W(P|R7jVOY+CDCfs)dYoO#4Ixq_f<PDfzt*lj_}
zHX&?O2FP_FymQ}JRs`0Gyk^uRfO#rMY+U5nJQ3<oj^&JDJ6i9OMuQTe&)<=^YIE;f
z*ZXU1HN-^$hjgo|Jw-MAaHtFtP6ZgNF;{ZCgSKtS57G>j7TYJTHQAK_vd((7G~_>r
z6-?tN1L;}$ST79QK?GNS-E*HVI2yWURL5Uo=rkHBIT(7L@V4BMR#qae?C+6U2$^ZX
z-RFpjufs=H2galGmc0zsC-ZOeeVUFolH1K;fo>yZ3!Xh%d>`LoJG@GLE8@iIpiNTr
zxT3I~%qs(Sx-zf$mQ!~eRu8?xFbBz_gh_H=xH8Os=~({V+mjt5VXnHZ?rPm#^X_|Q
z9g(#zCMj0y_&-H3joV=+vqQ`0n*iKP-VlXI`uYILaz@g6z!%b!P1<{bFv9wdPEWV}
zAF9xF`!@7Cxtw34>COxZ5L~X!T0l{MFq%&Jg#(y&lPn7%pFv<v0Rl7JjSQ_i3`Is8
zjWT^mUM$zN`IOR+081}YLt>H$q}!M04J0)7VZaE*#By-+I?xn^E>=SF2z92wjpN7g
zW!VQ#{-_O&JedEQf8PdZ76G`xmW||-O@cpHbliBXL_TgYP&lPet7pk5f*<O`IIff%
z&Ez-Bzp<ksp}s6oHyZ69z|C()G93z>bb*Uy!pLH5rmI9crecD`e|I_gt>q;>FuYvc
z&`x#7h=MX-p*>crH|R}b&d7pk#$y)B%nGX}6q7DZ+xD>5AIR7hnIgZ=b7xIF>P?3@
z>fKj1=$2p49`^8UkLCn_0-cCn(qb4l?Wr^Cd6BJ|+>ArNf~V`fgnpv?Q``sswVC<G
z_Vh!;)aJAISl{_5!}=&LNN%UU!}XGE-0q)mfo#7$Uy^A~!@i#j`mUV(Qgsxh;3Iq)
z6UwgsxM~tC)esPC4Lh5Ecv}vQ%j?m<c&F1;y?u{aXaN-e6pO2@4mV&JjinMM4LEg+
zW_9#zC2c6n(#kv+11Ol6tg5c!LlIi-3B+-;$fku8!)_(S4MJ;}C#<R=1ktK7^?~V3
zEkhrmL7;Wyb#$HpEoJDov0~ukyPo$&q9uhvlR7>$+mn|rsW+Du#m7o{u|*5Yb$ay8
z-ETg9M8PRZWZayNZ3<5s^}n{LQX)!Tf*osV1qf;UhBiwO*X!=4`Nj+>yDCZw(O+^F
zij8QF#>y@f(ph!cfE0l>*MzAtsC=u~^sNgeUOA^iB2)9Sm*sfvzUlG`VvzX-w60qU
z4G<@)fD^P1lTM%WwJWD{aU$atM=fvpR>=8A0|CX*#oG`Z`7uIEaOrGWnmU_~8IrsF
zlvzFtV_DwA5qdtw2@C1R20hY)MKnW4V?c%eP&Tzc-9YTR{Ni$f1v|3-zad=gtz`)9
zA_*c$Ru3&|i1L<5sftyu+m_BDVy~fDA@9V*Z_`6Xl(EZ=K!K?r*IzvT_GLu*UV7(}
zBqIr4lS0^!prXu#C1HKm>ZIfI1jQk<r*pW+SG4GF*ru}aAkgo4f4t(k+9WVF>PgJn
zc+{>xeAEMWbji1oco!`gGdXqNB)ApPN3TVDP#99n!Z^6Z9KrJ+npAk;D0LOTjXL~R
z)Y}qui8+8Yc3?A^szY0|W}2&4u1EtGC}}FgF5dIGx#hYhV>{&4Sk_kvSK%w*zIkYe
z(i)Gd*pslHxSn_UL1C-%n<#H>Tg_kfpdI0DAbQh&8SQ_myL<A^m-|_$Vc1wmj;S_Y
f(?VJV@6ywtX_wR?*;9qSU6wv%weNEN7@KapJ*xii

literal 0
HcmV?d00001

diff --git a/.circleci/snap.sh b/.circleci/snap.sh
new file mode 100644
index 00000000000..cd733d85209
--- /dev/null
+++ b/.circleci/snap.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -euvo pipefail
+IFS=$'\n\t'
+
+# Add launchpad to known hosts
+ssh-keyscan -t rsa -H git.launchpad.net > ~/.ssh/known_hosts
+
+echo "Preparing to trigger a snap release for $SNAP_CHANNEL channel"
+
+cd $PWD/.snapcraft
+
+# We need some meta data so it'll actually commit.  This could be useful to have for debugging later.
+echo -e "Tag: $CIRCLE_TAG\r\nBranch: $CIRCLE_BRANCH\r\nBuild: $CIRCLE_BUILD_NUM\r\nCommit: $CIRCLE_SHA1" > buildinfo
+
+# Clone launchpad repo for the channel down.
+git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad
+
+# Rarely will change, but just incase we copy it all
+cp -r resources buildinfo launchpad/
+sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
+
+cd launchpad
+git add resources snapcraft.yaml buildinfo
+
+# Set commit author details
+git config user.email "buildmaster@rocket.chat"
+git config user.name "CircleCI"
+
+# Another place where basic meta data will live for at a glance info
+git commit -m "CircleCI Build: $CIRCLE_BUILD_NUM CircleCI Commit: $CIRCLE_SHA1"
+
+# Push up up to the branch of choice.
+git push origin $SNAP_CHANNEL
+
+# Clean up
+cd ..
+rm -rf launchpad
diff --git a/.circleci/update-releases.sh b/.circleci/update-releases.sh
new file mode 100644
index 00000000000..57e01ceb357
--- /dev/null
+++ b/.circleci/update-releases.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -euvo pipefail
+IFS=$'\n\t'
+
+if [[ $RC_RELEASE = "develop" ]]; then
+    aws s3api put-object \
+    --acl public-read \
+    --website-redirect-location "https://download.rocket.chat/build/$ARTIFACT_NAME" \
+    --bucket download.rocket.chat \
+    --key "build/rocket.chat-$RC_VERSION.tgz"
+fi
+
+aws s3api put-object \
+--acl public-read \
+--website-redirect-location "https://download.rocket.chat/build/$ARTIFACT_NAME" \
+--bucket download.rocket.chat \
+--key "$RC_RELEASE"
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 71d4153d0ec..bab3a8f80c4 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,8 +5,8 @@ ENV RC_VERSION 0.59.0-develop
 MAINTAINER buildmaster@rocket.chat
 
 RUN set -x \
- && curl -SLf "https://download.rocket.chat/build/${RC_VERSION}.tgz" -o rocket.chat.tgz \
- && curl -SLf "https://download.rocket.chat/build/${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
+ && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz" -o rocket.chat.tgz \
+ && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
  && gpg --verify rocket.chat.tgz.asc \
  && mkdir -p /app \
  && tar -zxf rocket.chat.tgz -C /app \
diff --git a/.scripts/set-version.js b/.scripts/set-version.js
index 1c5037c92cd..74a1024168f 100644
--- a/.scripts/set-version.js
+++ b/.scripts/set-version.js
@@ -22,6 +22,8 @@ const files = [
 	'./package.json',
 	'./.sandstorm/sandstorm-pkgdef.capnp',
 	'./.travis/snap.sh',
+	'./.circleci/snap.sh',
+	'./.circleci/update-releases.sh',
 	'./.docker/Dockerfile',
 	'./packages/rocketchat-lib/rocketchat.info'
 ];
diff --git a/.scripts/start.js b/.scripts/start.js
index fee3f78b90e..eb506f6c225 100644
--- a/.scripts/start.js
+++ b/.scripts/start.js
@@ -67,7 +67,7 @@ function startApp(callback) {
 function startChimp() {
 	startProcess({
 		name: 'Chimp',
-		command: 'meteor npm run chimp-test',
+		command: 'npm run chimp-test',
 		options: {
 			env: Object.assign({}, process.env, {
 				NODE_PATH: process.env.NODE_PATH +
diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index bc1b90aafb5..6484563839c 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -49,7 +49,7 @@ parts:
         plugin: dump
         prepare: cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc
         after: [node]
-        source: https://download.rocket.chat/build/#{RC_VERSION}.tgz
+        source: https://download.rocket.chat/build/rocket.chat-#{RC_VERSION}.tgz
         source-type: tar
         stage-packages:
             - graphicsmagick
diff --git a/tests/chimp-config.js b/tests/chimp-config.js
index 057b3f94ce2..5e01594a635 100644
--- a/tests/chimp-config.js
+++ b/tests/chimp-config.js
@@ -27,7 +27,7 @@ module.exports = {
 	// 	chai: false,
 	screenshotsOnError: true,
 	screenshotsPath: '.screenshots',
-	captureAllStepScreenshots: false,
+	captureAllStepScreenshots: true,
 	saveScreenshotsToDisk: true,
 	// 	// Note: With a large viewport size and captureAllStepScreenshots enabled,
 	// 	// you may run out of memory. Use browser.setViewportSize to make the
@@ -70,21 +70,21 @@ module.exports = {
 	// 		baseURL: 'https://selenium-release.storage.googleapis.com',
 	// 		drivers: {
 	// 			chrome: {
-	// 				// check for more recent versions of Chrome driver here:
+	// 				// check for more recent versions of chrome driver here:
 	// 				// http://chromedriver.storage.googleapis.com/index.html
 	// 				version: '2.25',
 	// 				arch: process.arch,
 	// 				baseURL: 'https://chromedriver.storage.googleapis.com'
 	// 			},
 	// 			ie: {
-	// 				// check for more recent versions of Internet Explorer driver here:
+	// 				// check for more recent versions of internet explorer driver here:
 	// 				// http://selenium-release.storage.googleapis.com/index.html
 	// 				version: '2.50.0',
 	// 				arch: 'ia32',
 	// 				baseURL: 'https://selenium-release.storage.googleapis.com'
 	// 			},
 	// 			firefox: {
-	// 				// check for more recent versions of Gecko driver here:
+	// 				// check for more recent versions of gecko  driver here:
 	// 				// https://github.com/mozilla/geckodriver/releases
 	// 				version: '0.11.1',
 	// 				arch: process.arch,
diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index eeaeb620416..518ad11bdbd 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -124,7 +124,11 @@ class Administration extends Page {
 		element.waitForVisible(5000);
 		browser.pause(500);
 		const result = element.isVisible();
-		return result[0];
+		if (Array.isArray(result)) {
+			return result[0];
+		}
+
+		return result;
 	}
 
 	getUserFromList(user) {

From 5339e7b46fa75464234d16c835f479794cb479cb Mon Sep 17 00:00:00 2001
From: TheReal1604 <th3r3al@cloudreboot.de>
Date: Mon, 6 Nov 2017 08:26:54 +0100
Subject: [PATCH 226/244] fixed some typos

---
 packages/rocketchat-i18n/i18n/de.i18n.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index a5f91d7bfdd..9c58835c921 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -357,7 +357,7 @@
   "Chat_button": "Chat-Button",
   "Chat_closed": "Chat geschlossen",
   "Chat_closed_successfully": "Chat erfolgreich geschlossen",
-  "Chat_Now": "Jetzt chaten",
+  "Chat_Now": "Jetzt chatten",
   "Chat_window": "Chatfenster",
   "Chatops_Enabled": "ChatOps aktivieren",
   "Chatops_Title": "ChatOps-Panel",
@@ -1877,7 +1877,7 @@
   "Username_invalid": "<strong>%s</strong> ist kein zulässiger Benutzername.<br/> Verwenden Sie nur Buchstaben, Zahlen, Punkte oder Binde- und Unterstriche.",
   "Username_is_already_in_here": "`@%s` wurde bereits hinzugefügt",
   "Username_is_not_in_this_room": "Benutzer `#%s` ist nicht in diesem Raum",
-  "Username_Placeholder": "Bitte geben sie Benutzernamen ein",
+  "Username_Placeholder": "Bitte geben Sie Benutzernamen ein",
   "Username_title": "Benutzernamen festlegen",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ möchte ein OTR-Gespräch starten. Möchten Sie es annehmen?",
   "Users": "Benutzer",
@@ -2006,4 +2006,4 @@
   "your_message_optional": "ihre optionale Nachricht",
   "Your_password_is_wrong": "Falsches Passwort",
   "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
-}
\ No newline at end of file
+}

From 01118cfa94940a3a7be55e026efde8460dd9371f Mon Sep 17 00:00:00 2001
From: TheReal1604 <th3r3al@cloudreboot.de>
Date: Mon, 6 Nov 2017 09:42:39 +0100
Subject: [PATCH 227/244] fixed another typo..

---
 packages/rocketchat-i18n/i18n/de.i18n.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index 9c58835c921..cc899a78565 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -173,7 +173,7 @@
   "All_channels": "Alle Kanäle",
   "All_logs": "Alle Protokolle",
   "All_messages": "Alle Nachrichten",
-  "All_users_in_the_channel_can_write_new_messages": "Alle Benutzer in diesem Kanal könne neue Nachrichten verfassen",
+  "All_users_in_the_channel_can_write_new_messages": "Alle Benutzer in diesem Kanal können neue Nachrichten verfassen",
   "Allow_Invalid_SelfSigned_Certs": "Ungültige und selbstsignierte SSL-Zertifikate erlauben",
   "Allow_Invalid_SelfSigned_Certs_Description": "Ungültige und selbstsignierte SSL-Zertifikate für die Link-Validierung und die Vorschau zulassen.",
   "Allow_switching_departments": "Erlaube Besuchern, Abteilungen zu wechseln",

From ce66b55f28f60c73a8099d65b14e8123b4a7ced7 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 6 Nov 2017 12:00:56 -0200
Subject: [PATCH 228/244] Add CircleCI

---
 .circleci/config.yml                      |  88 ++++---
 package.json                              | 268 +++++++++++-----------
 packages/rocketchat-api/server/v1/im.js   |  10 +-
 tests/end-to-end/api/04-direct-message.js |   3 -
 4 files changed, 177 insertions(+), 192 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9fb2a7f6017..92207f0277a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,18 +6,18 @@ jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8
+      - image: circleci/node:8
 
     steps:
       - checkout
 
-      - restore_cache:
-          keys:
-            - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+      # - restore_cache:
+      #     keys:
+      #       - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
 
-      - restore_cache:
-          keys:
-            - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
+      # - restore_cache:
+      #     keys:
+      #       - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
 
       - run:
           name: Install Meteor
@@ -67,17 +67,17 @@ jobs:
           command: |
             meteor npm run testunit
 
-      - restore_cache:
-          keys:
-            - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
+      # - restore_cache:
+      #     keys:
+      #       - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
 
-      - restore_cache:
-          keys:
-            - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
+      # - restore_cache:
+      #     keys:
+      #       - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
 
-      - restore_cache:
-          keys:
-            - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
+      # - restore_cache:
+      #     keys:
+      #       - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
 
       - run:
           name: Build Rocket.Chat
@@ -97,30 +97,30 @@ jobs:
             cd /tmp/build-test/bundle/programs/server
             npm install
 
-      - save_cache:
-          key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
-          paths:
-            - ./node_modules
+      # - save_cache:
+      #     key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+      #     paths:
+      #       - ./node_modules
 
-      - save_cache:
-          key: meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
-          paths:
-            - ./.meteor/local
+      # - save_cache:
+      #     key: meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
+      #     paths:
+      #       - ./.meteor/local
 
-      - save_cache:
-          key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
-          paths:
-            - ./packages/rocketchat-livechat/app/node_modules
+      # - save_cache:
+      #     key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
+      #     paths:
+      #       - ./packages/rocketchat-livechat/app/node_modules
 
-      - save_cache:
-          key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
-          paths:
-            - ./packages/rocketchat-livechat/app/.meteor/local
+      # - save_cache:
+      #     key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
+      #     paths:
+      #       - ./packages/rocketchat-livechat/app/.meteor/local
 
-      - save_cache:
-          key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
-          paths:
-            - ~/.meteor
+      # - save_cache:
+      #     key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
+      #     paths:
+      #       - ~/.meteor
 
       - persist_to_workspace:
           root: /tmp/
@@ -134,7 +134,7 @@ jobs:
   test-with-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8-browsers
+      - image: circleci/node:8-browsers
       - image: mongo:3.4
         command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]
 
@@ -163,11 +163,6 @@ jobs:
             mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
             mongo --eval 'rs.status()'
 
-      - run:
-          name: Update NPM
-          command: |
-            sudo npm install -g npm
-
       - run:
           name: NPM install
           command: |
@@ -179,12 +174,12 @@ jobs:
             for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)
 
       - store_artifacts:
-          path: ~/repo/.screenshots
+          path: .screenshots/
 
   test-without-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8-browsers
+      - image: circleci/node:8-browsers
       - image: circleci/mongo:3.4
 
     environment:
@@ -197,11 +192,6 @@ jobs:
 
       - checkout
 
-      - run:
-          name: Update NPM
-          command: |
-            sudo npm install -g npm
-
       - run:
           name: NPM install
           command: |
diff --git a/package.json b/package.json
index 34a259f4ed2..82955b92b22 100644
--- a/package.json
+++ b/package.json
@@ -1,136 +1,136 @@
 {
-  "name": "Rocket.Chat",
-  "description": "The Ultimate Open Source WebChat Platform",
-  "version": "0.59.0-develop",
-  "author": {
-    "name": "Rocket.Chat",
-    "url": "https://rocket.chat/"
-  },
-  "contributors": [
-    {
-      "name": "Aaron Ogle",
-      "email": "aaron.ogle@rocket.chat"
-    },
-    {
-      "name": "Bradley Hilton",
-      "email": "bradley.hilton@rocket.chat"
-    },
-    {
-      "name": "Diego Sampaio",
-      "email": "diego.sampaio@rocket.chat"
-    },
-    {
-      "name": "Gabriel Engel",
-      "email": "gabriel.engel@rocket.chat"
-    },
-    {
-      "name": "Guilherme Gazzo",
-      "email": "guilherme.gazzo@rocket.chat"
-    },
-    {
-      "name": "Karl Prieb",
-      "email": "karl.priebk@rocket.chat"
-    },
-    {
-      "name": "Marcelo Schmidt",
-      "email": "marcelo.schmidt@rocket.chat"
-    },
-    {
-      "name": "Rodrigo Nascimento",
-      "email": "rodrigo.nascimento@rocket.chat"
-    },
-    {
-      "name": "Sing Li",
-      "email": "sing.li@rocket.chat"
-    }
-  ],
-  "mocha": {
-    "tests": [
-      "packages/**/*.tests.js"
-    ],
-    "files": [
-      "packages/**/*.mocks.js",
-      "packages/**/*.js",
-      "!packages/**/*.tests.js"
-    ]
-  },
-  "keywords": [
-    "rocketchat",
-    "rocket",
-    "chat"
-  ],
-  "scripts": {
-    "start": "meteor npm i && meteor",
-    "lint": "eslint .",
-    "lint-fix": "eslint . --fix",
-    "stylelint": "stylelint packages/**/*.css",
-    "test": "node .scripts/start.js",
-    "deploy": "npm run build && pm2 startOrRestart pm2.json",
-    "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
-    "chimp-test": "chimp tests/chimp-config.js",
-    "postinstall": "cd packages/rocketchat-katex && npm i",
-    "testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
-    "coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
-    "testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
-    "version": "node .scripts/version.js",
-    "set-version": "node .scripts/set-version.js",
-    "release": "npm run set-version --silent"
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/RocketChat/Rocket.Chat.git"
-  },
-  "bugs": {
-    "url": "https://github.com/RocketChat/Rocket.Chat/issues",
-    "email": "support@rocket.chat"
-  },
-  "devDependencies": {
-    "autoprefixer": "^7.1.6",
-    "babel-mocha-es6-compiler": "^0.1.0",
-    "babel-plugin-array-includes": "^2.0.3",
-    "chimp": "^0.50.2",
-    "conventional-changelog-cli": "^1.3.4",
-    "eslint": "^4.10.0",
-    "mock-require": "^2.0.2",
-    "postcss-calc": "^6.0.1",
-    "postcss-custom-properties": "^6.2.0",
-    "postcss-import": "^11.0.0",
-    "postcss-media-minmax": "^3.0.0",
-    "postcss-nesting": "^3.0.0",
-    "postcss-selector-not": "^3.0.1",
-    "proxyquire": "^1.8.0",
-    "simple-git": "^1.80.1",
-    "stylelint": "^8.2.0",
-    "stylelint-order": "^0.7.0",
-    "supertest": "^3.0.0"
-  },
-  "dependencies": {
-    "@google-cloud/storage": "^1.4.0",
-    "aws-sdk": "^2.141.0",
-    "babel-runtime": "^6.26.0",
-    "bcrypt": "^1.0.3",
-    "bunyan": "^1.8.12",
-    "codemirror": "^5.31.0",
-    "core-js": "2.5.1",
-    "emailreplyparser": "0.0.5",
-    "file-type": "^7.2.0",
-    "highlight.js": "^9.12.0",
-    "imap": "^0.8.19",
-    "jquery": "^3.2.1",
-    "ldapjs": "^1.0.1",
-    "mailparser-node4": "^2.0.2-2",
-    "mime-db": "^1.31.0",
-    "mime-type": "^3.0.5",
-    "moment": "^2.19.1",
-    "moment-timezone": "^0.5.14",
-    "photoswipe": "^4.1.2",
-    "poplib": "^0.1.7",
-    "prom-client": "^10.2.1",
-    "semver": "^5.4.1",
-    "toastr": "^2.1.2",
-    "underscore": "^1.8.3",
-    "underscore.string": "^3.3.4",
-    "wolfy87-eventemitter": "^5.2.3"
-  }
+	"name": "Rocket.Chat",
+	"description": "The Ultimate Open Source WebChat Platform",
+	"version": "0.59.0-develop",
+	"author": {
+		"name": "Rocket.Chat",
+		"url": "https://rocket.chat/"
+	},
+	"contributors": [
+		{
+			"name": "Aaron Ogle",
+			"email": "aaron.ogle@rocket.chat"
+		},
+		{
+			"name": "Bradley Hilton",
+			"email": "bradley.hilton@rocket.chat"
+		},
+		{
+			"name": "Diego Sampaio",
+			"email": "diego.sampaio@rocket.chat"
+		},
+		{
+			"name": "Gabriel Engel",
+			"email": "gabriel.engel@rocket.chat"
+		},
+		{
+			"name": "Guilherme Gazzo",
+			"email": "guilherme.gazzo@rocket.chat"
+		},
+		{
+			"name": "Karl Prieb",
+			"email": "karl.priebk@rocket.chat"
+		},
+		{
+			"name": "Marcelo Schmidt",
+			"email": "marcelo.schmidt@rocket.chat"
+		},
+		{
+			"name": "Rodrigo Nascimento",
+			"email": "rodrigo.nascimento@rocket.chat"
+		},
+		{
+			"name": "Sing Li",
+			"email": "sing.li@rocket.chat"
+		}
+	],
+	"mocha": {
+		"tests": [
+			"packages/**/*.tests.js"
+		],
+		"files": [
+			"packages/**/*.mocks.js",
+			"packages/**/*.js",
+			"!packages/**/*.tests.js"
+		]
+	},
+	"keywords": [
+		"rocketchat",
+		"rocket",
+		"chat"
+	],
+	"scripts": {
+		"start": "meteor npm i && meteor",
+		"lint": "eslint .",
+		"lint-fix": "eslint . --fix",
+		"stylelint": "stylelint packages/**/*.css",
+		"test": "node .scripts/start.js",
+		"deploy": "npm run build && pm2 startOrRestart pm2.json",
+		"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
+		"chimp-test": "chimp tests/chimp-config.js",
+		"postinstall": "cd packages/rocketchat-katex && npm i",
+		"testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+		"coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+		"testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+		"version": "node .scripts/version.js",
+		"set-version": "node .scripts/set-version.js",
+		"release": "npm run set-version --silent"
+	},
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/RocketChat/Rocket.Chat.git"
+	},
+	"bugs": {
+		"url": "https://github.com/RocketChat/Rocket.Chat/issues",
+		"email": "support@rocket.chat"
+	},
+	"devDependencies": {
+		"autoprefixer": "^7.1.6",
+		"babel-mocha-es6-compiler": "^0.1.0",
+		"babel-plugin-array-includes": "^2.0.3",
+		"chimp": "^0.50.2",
+		"conventional-changelog-cli": "^1.3.4",
+		"eslint": "^4.10.0",
+		"mock-require": "^2.0.2",
+		"postcss-calc": "^6.0.1",
+		"postcss-custom-properties": "^6.2.0",
+		"postcss-import": "^11.0.0",
+		"postcss-media-minmax": "^3.0.0",
+		"postcss-nesting": "^3.0.0",
+		"postcss-selector-not": "^3.0.1",
+		"proxyquire": "^1.8.0",
+		"simple-git": "^1.80.1",
+		"stylelint": "^8.2.0",
+		"stylelint-order": "^0.7.0",
+		"supertest": "^3.0.0"
+	},
+	"dependencies": {
+		"@google-cloud/storage": "^1.4.0",
+		"aws-sdk": "^2.141.0",
+		"babel-runtime": "^6.26.0",
+		"bcrypt": "^1.0.3",
+		"bunyan": "^1.8.12",
+		"codemirror": "^5.31.0",
+		"core-js": "2.5.1",
+		"emailreplyparser": "0.0.5",
+		"file-type": "^7.2.0",
+		"highlight.js": "^9.12.0",
+		"imap": "^0.8.19",
+		"jquery": "^3.2.1",
+		"ldapjs": "^1.0.1",
+		"mailparser-node4": "^2.0.2-2",
+		"mime-db": "^1.31.0",
+		"mime-type": "^3.0.5",
+		"moment": "^2.19.1",
+		"moment-timezone": "^0.5.14",
+		"photoswipe": "^4.1.2",
+		"poplib": "^0.1.7",
+		"prom-client": "^10.2.1",
+		"semver": "^5.4.1",
+		"toastr": "^2.1.2",
+		"underscore": "^1.8.3",
+		"underscore.string": "^3.3.4",
+		"wolfy87-eventemitter": "^5.2.3"
+	}
 }
diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
index 42ddbad9c9c..f5bff08b80c 100644
--- a/packages/rocketchat-api/server/v1/im.js
+++ b/packages/rocketchat-api/server/v1/im.js
@@ -268,14 +268,12 @@ RocketChat.API.v1.addRoute(['dm.open', 'im.open'], { authRequired: true }, {
 	post() {
 		const findResult = findDirectMessageRoom(this.requestParams(), this.user);
 
-		if (findResult.subscription.open) {
-			return RocketChat.API.v1.failure(`The direct message room, ${ this.bodyParams.name }, is already open for the sender`);
+		if (!findResult.subscription.open) {
+			Meteor.runAsUser(this.userId, () => {
+				Meteor.call('openRoom', findResult.room._id);
+			});
 		}
 
-		Meteor.runAsUser(this.userId, () => {
-			Meteor.call('openRoom', findResult.room._id);
-		});
-
 		return RocketChat.API.v1.success();
 	}
 });
diff --git a/tests/end-to-end/api/04-direct-message.js b/tests/end-to-end/api/04-direct-message.js
index c4d3622fc09..a8b22723e0f 100644
--- a/tests/end-to-end/api/04-direct-message.js
+++ b/tests/end-to-end/api/04-direct-message.js
@@ -109,9 +109,6 @@ describe('[Direct Messages]', function() {
 				userId: 'rocket.cat'
 			})
 			.expect('Content-Type', 'application/json')
-			.expect((...args) => {
-				console.log(...args);
-			})
 			.expect(200)
 			.expect((res) => {
 				expect(res.body).to.have.property('success', true);

From 1dc96dd6f79665495a276b5f9c4436313c32b616 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 6 Nov 2017 12:30:27 -0200
Subject: [PATCH 229/244] Update DEMO to OPEN links

---
 example-pm2.json                              | 16 +++++-----
 nginx-multi-config.txt                        | 14 ++++----
 packages/rocketchat-i18n/i18n/ar.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ca.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/cs.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/de-AT.i18n.json |  2 +-
 packages/rocketchat-i18n/i18n/de.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/el.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/es.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/fa.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/fr.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/he.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/hr.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/hu.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/id.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/it.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ja.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/km.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ko.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ku.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/lo.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ms-MY.i18n.json |  2 +-
 packages/rocketchat-i18n/i18n/nl.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/pl.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  2 +-
 packages/rocketchat-i18n/i18n/pt.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ro.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ru.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/sq.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/sv.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ta-IN.i18n.json |  2 +-
 packages/rocketchat-i18n/i18n/tr.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/ug.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/uk.i18n.json    |  2 +-
 packages/rocketchat-i18n/i18n/zh-TW.i18n.json |  2 +-
 packages/rocketchat-i18n/i18n/zh.i18n.json    |  2 +-
 .../rocketchat-markdown/tests/client.tests.js | 32 +++++++++----------
 server/startup/migrations/v015.js             |  6 ++--
 39 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/example-pm2.json b/example-pm2.json
index 7e0d731a1bd..354f0f4c00a 100644
--- a/example-pm2.json
+++ b/example-pm2.json
@@ -10,8 +10,8 @@
 		"env": {
 			"MONGO_URL": "mongodb://localhost:27017/rocketchat",
 			"MONGO_OPLOG_URL": "mongodb://localhost:27017/local",
-			"ROOT_URL": "https://demo.rocket.chat",
-			"DDP_DEFAULT_CONNECTION_URL": "https://demo.rocket.chat",
+			"ROOT_URL": "https://open.rocket.chat",
+			"DDP_DEFAULT_CONNECTION_URL": "https://open.rocket.chat",
 			"PORT": "8080"
 		}
 	}, {
@@ -25,8 +25,8 @@
 		"env": {
 			"MONGO_URL": "mongodb://localhost:27017/rocketchat",
 			"MONGO_OPLOG_URL": "mongodb://localhost:27017/local",
-			"ROOT_URL": "https://demo.rocket.chat",
-			"DDP_DEFAULT_CONNECTION_URL": "https://demo.rocket.chat",
+			"ROOT_URL": "https://open.rocket.chat",
+			"DDP_DEFAULT_CONNECTION_URL": "https://open.rocket.chat",
 			"PORT": "8081"
 		}
 	}, {
@@ -40,8 +40,8 @@
 		"env": {
 			"MONGO_URL": "mongodb://localhost:27017/rocketchat",
 			"MONGO_OPLOG_URL": "mongodb://localhost:27017/local",
-			"ROOT_URL": "https://demo.rocket.chat",
-			"DDP_DEFAULT_CONNECTION_URL": "https://demo.rocket.chat",
+			"ROOT_URL": "https://open.rocket.chat",
+			"DDP_DEFAULT_CONNECTION_URL": "https://open.rocket.chat",
 			"PORT": "8082"
 		}
 	}, {
@@ -55,8 +55,8 @@
 		"env": {
 			"MONGO_URL": "mongodb://localhost:27017/rocketchat",
 			"MONGO_OPLOG_URL": "mongodb://localhost:27017/local",
-			"ROOT_URL": "https://demo.rocket.chat",
-			"DDP_DEFAULT_CONNECTION_URL": "https://demo.rocket.chat",
+			"ROOT_URL": "https://open.rocket.chat",
+			"DDP_DEFAULT_CONNECTION_URL": "https://open.rocket.chat",
 			"PORT": "8083"
 		}
 	}]
diff --git a/nginx-multi-config.txt b/nginx-multi-config.txt
index c7772e933a8..b56ec14c133 100644
--- a/nginx-multi-config.txt
+++ b/nginx-multi-config.txt
@@ -1,6 +1,6 @@
 Example configuration fragment for front-end nginx with round-robin multiple Rocket.Chat instances
 
-upstream demo.rocket.chat {
+upstream open.rocket.chat {
     server localhost:8080 weight=1;
     server localhost:8081 weight=1;
     server localhost:8082 weight=1;
@@ -10,18 +10,18 @@ upstream demo.rocket.chat {
 server {
     listen 80 default_server;
     listen [::]:80 default_server ipv6only=on;
-    server_name demo.rocket.chat;
-    return 301 https://demo.rocket.chat$request_uri;
+    server_name open.rocket.chat;
+    return 301 https://open.rocket.chat$request_uri;
 }
 
 server {
     listen 443 default_server;
     listen [::]:443 default_server ipv6only=on;
-    server_name demo.rocket.chat;
+    server_name open.rocket.chat;
     root /var/www/rocket.chat/bundle/programs/web.browser/app/;
     ssl on;
-    ssl_certificate /var/www/rocket.chat/ssl/demo/demo.rocket.chat.chained.crt;
-    ssl_certificate_key /var/www/rocket.chat/ssl/demo/demo.rocket.chat.key;
+    ssl_certificate /var/www/rocket.chat/ssl/demo/open.rocket.chat.chained.crt;
+    ssl_certificate_key /var/www/rocket.chat/ssl/demo/open.rocket.chat.key;
     ssl_ciphers         'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
     ssl_prefer_server_ciphers on;
     ssl_dhparam         /etc/nginx/dhparams.pem;
@@ -40,6 +40,6 @@ server {
     proxy_set_header   X-Nginx-Proxy     true;
     proxy_redirect     off;
     location / {
-        proxy_pass     http://demo.rocket.chat;
+        proxy_pass     http://open.rocket.chat;
     }
 }
diff --git a/packages/rocketchat-i18n/i18n/ar.i18n.json b/packages/rocketchat-i18n/i18n/ar.i18n.json
index ff03126a58a..9cd9ad78dcd 100644
--- a/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -115,7 +115,7 @@
   "Accounts_RegistrationForm_Public": "عام",
   "Accounts_RegistrationForm_Secret_URL": "رابط سري",
   "Accounts_RegistrationForm_SecretURL": "رابط استمارة التسجيل السري",
-  "Accounts_RegistrationForm_SecretURL_Description": "يجب توفير سلسلة العشوائية التي ستضاف إلى URL تسجيلك. على سبيل المثال: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "يجب توفير سلسلة العشوائية التي ستضاف إلى URL تسجيلك. على سبيل المثال: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "تتطلب اسم للاشتراك",
   "Accounts_RequirePasswordConfirmation": "يتطلب تأكيد كلمة المرور",
   "Accounts_SetDefaultAvatar": "ضبط إعدادات الصورة الرمزية",
diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json
index ba196b96933..d16c875f9b3 100644
--- a/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -120,7 +120,7 @@
   "Accounts_RegistrationForm_Public": "Públic",
   "Accounts_RegistrationForm_Secret_URL": "URL secret",
   "Accounts_RegistrationForm_SecretURL": "URL secret del fomulari de registre",
-  "Accounts_RegistrationForm_SecretURL_Description": "Cal proporcionar una cadena de text aleatori que s'afegirà a l'URL de registre. Exemple: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Cal proporcionar una cadena de text aleatori que s'afegirà a l'URL de registre. Exemple: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Requerir el nom per registrar-se",
   "Accounts_RequirePasswordConfirmation": "Requereix confirmació de la contrasenya",
   "Accounts_SearchFields": "Camps a considerar a la cerca",
diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json
index 6b01b17785e..92df341d7d4 100644
--- a/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -120,7 +120,7 @@
   "Accounts_RegistrationForm_Public": "Veřejný",
   "Accounts_RegistrationForm_Secret_URL": "Tajná URL",
   "Accounts_RegistrationForm_SecretURL": "Tajná URL pro registracI",
-  "Accounts_RegistrationForm_SecretURL_Description": "Vložte náhodný retězec, který bude přidán do vaší registrační URL. Příklad: https://demo.rocket.chat/register/[tajny_kod]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Vložte náhodný retězec, který bude přidán do vaší registrační URL. Příklad: https://open.rocket.chat/register/[tajny_kod]",
   "Accounts_RequireNameForSignUp": "Vyžadovat jméno",
   "Accounts_RequirePasswordConfirmation": "Vyžadovat potvrzení hesla",
   "Accounts_SearchFields": "Pole zohledněná ve vyhledávání",
diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index 507fb07a83c..23311fdba94 100644
--- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -102,7 +102,7 @@
   "Accounts_RegistrationForm_Public": "Öffentlich",
   "Accounts_RegistrationForm_Secret_URL": "Geheime URL",
   "Accounts_RegistrationForm_SecretURL": "Geheime URL für die Registrierungsseite",
-  "Accounts_RegistrationForm_SecretURL_Description": "Sie müssen eine zufällige Zeichenfolge, die der Registrierungs-URL hinzugefügt wird, verwenden. Beispiel: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Sie müssen eine zufällige Zeichenfolge, die der Registrierungs-URL hinzugefügt wird, verwenden. Beispiel: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Namen für die Anmeldung verlangen",
   "Accounts_RequirePasswordConfirmation": "Passwortbestätigung erforderlich",
   "Accounts_ShowFormLogin": "Anmeldeformular zeigen",
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index a5f91d7bfdd..4ef4024b74e 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -120,7 +120,7 @@
   "Accounts_RegistrationForm_Public": "Öffentlich",
   "Accounts_RegistrationForm_Secret_URL": "Geheime URL",
   "Accounts_RegistrationForm_SecretURL": "Geheime URL für die Registrierungsseite",
-  "Accounts_RegistrationForm_SecretURL_Description": "Sie müssen eine zufällige Zeichenfolge, die der Registrierungs-URL hinzugefügt wird, angeben. Beispiel: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Sie müssen eine zufällige Zeichenfolge, die der Registrierungs-URL hinzugefügt wird, angeben. Beispiel: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Namen für die Anmeldung verlangen",
   "Accounts_RequirePasswordConfirmation": "Passwortbestätigung erforderlich",
   "Accounts_SearchFields": "Felder, die in der Suche berücksichtigt werden sollen",
diff --git a/packages/rocketchat-i18n/i18n/el.i18n.json b/packages/rocketchat-i18n/i18n/el.i18n.json
index 41268edd90a..366b69b1620 100644
--- a/packages/rocketchat-i18n/i18n/el.i18n.json
+++ b/packages/rocketchat-i18n/i18n/el.i18n.json
@@ -95,7 +95,7 @@
   "Accounts_RegistrationForm_Public": "Δημόσιο",
   "Accounts_RegistrationForm_Secret_URL": "μυστική URL",
   "Accounts_RegistrationForm_SecretURL": "Αίτηση Εγγραφής μυστικό URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Πρέπει να δώσετε μια τυχαία σειρά που θα προστεθούν στο URL της εγγραφής σας. Παράδειγμα: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Πρέπει να δώσετε μια τυχαία σειρά που θα προστεθούν στο URL της εγγραφής σας. Παράδειγμα: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Απαιτούν Όνομα Για Εγγραφή",
   "Accounts_ShowFormLogin": "Εμφάνιση μορφής βασίζεται Σύνδεση",
   "Accounts_UseDefaultBlockedDomainsList": "Χρήση προεπιλεγμένων λίστα αποκλεισμένων τομέων",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index da4d5b12fa3..82d5d8e5ae4 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -120,7 +120,7 @@
   "Accounts_RegistrationForm_Public": "Public",
   "Accounts_RegistrationForm_Secret_URL": "Secret URL",
   "Accounts_RegistrationForm_SecretURL": "Registration Form Secret URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "You must provide a random string that will be added to your registration URL. Example: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "You must provide a random string that will be added to your registration URL. Example: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Require Name For Signup",
   "Accounts_RequirePasswordConfirmation": "Require Password Confirmation",
   "Accounts_SearchFields": "Fields to consider in search",
diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index 39227238a83..d0c21051d39 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -107,7 +107,7 @@
   "Accounts_RegistrationForm_Public": "Publico",
   "Accounts_RegistrationForm_Secret_URL": "URL Secreto",
   "Accounts_RegistrationForm_SecretURL": "URL Secreto del Fomulario de Registro",
-  "Accounts_RegistrationForm_SecretURL_Description": "Debe proporcionar una cadena de texto aleatorio que se añadirá al URL de registro. Ejemplo: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Debe proporcionar una cadena de texto aleatorio que se añadirá al URL de registro. Ejemplo: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Requerir un Nombre para el Registro",
   "Accounts_RequirePasswordConfirmation": "Solicitar Confirmación de Contraseña",
   "Accounts_SetDefaultAvatar": "Establecer avatar predeterminado",
diff --git a/packages/rocketchat-i18n/i18n/fa.i18n.json b/packages/rocketchat-i18n/i18n/fa.i18n.json
index 5411735b52a..f14600df13b 100644
--- a/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -100,7 +100,7 @@
   "Accounts_RegistrationForm_Public": "عمومی",
   "Accounts_RegistrationForm_Secret_URL": "URL راز",
   "Accounts_RegistrationForm_SecretURL": "فرم ثبت نام راز URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "شما باید یک رشته تصادفی است که به URL ثبت نام خود را اضافه فراهم می کند. به عنوان مثال: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "شما باید یک رشته تصادفی است که به URL ثبت نام خود را اضافه فراهم می کند. به عنوان مثال: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "نیاز به نام برای ثبت نام",
   "Accounts_ShowFormLogin": "ورود مبتنی بر فرم نمایش",
   "Accounts_UseDefaultBlockedDomainsList": "استفاده از پیش فرض مسدود شده فهرست دامنه",
diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json
index f50ece8d6af..0b3a8434422 100644
--- a/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -110,7 +110,7 @@
   "Accounts_RegistrationForm_Public": "Public",
   "Accounts_RegistrationForm_Secret_URL": "URL secrète",
   "Accounts_RegistrationForm_SecretURL": "URL secrète du formulaire d'inscription",
-  "Accounts_RegistrationForm_SecretURL_Description": "Vous devez fournir une chaîne de caractères aléatoire qui sera ajoutée à votre URL d'inscription. Exemple: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Vous devez fournir une chaîne de caractères aléatoire qui sera ajoutée à votre URL d'inscription. Exemple: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Exiger un nom pour s'inscrire",
   "Accounts_RequirePasswordConfirmation": "Confirmation du mot de passe requise",
   "Accounts_SetDefaultAvatar": "Définir l'avatar par défaut",
diff --git a/packages/rocketchat-i18n/i18n/he.i18n.json b/packages/rocketchat-i18n/i18n/he.i18n.json
index 6188f79ab18..1406c294e0b 100644
--- a/packages/rocketchat-i18n/i18n/he.i18n.json
+++ b/packages/rocketchat-i18n/i18n/he.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "ציבורי",
   "Accounts_RegistrationForm_Secret_URL": "כתובת סודית",
   "Accounts_RegistrationForm_SecretURL": "סיסמת כתובת טופס הרישום",
-  "Accounts_RegistrationForm_SecretURL_Description": "אתה חייב לספק מחרוזת אקראית שתתווסף לכתובת הרישום שלך. לדוגמה:https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "אתה חייב לספק מחרוזת אקראית שתתווסף לכתובת הרישום שלך. לדוגמה:https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "נדרש שם לרישום",
   "Accounts_ShowFormLogin": "טופס מבוסס צג כניסה",
   "Accounts_UseDefaultBlockedDomainsList": "השתמש בברירת מחדל רשימת Domains חסימה",
diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json
index 1c80698260f..42a8ccf2b55 100644
--- a/packages/rocketchat-i18n/i18n/hr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hr.i18n.json
@@ -104,7 +104,7 @@
   "Accounts_RegistrationForm_Public": "Javan",
   "Accounts_RegistrationForm_Secret_URL": "Tajni URL",
   "Accounts_RegistrationForm_SecretURL": "Tajni URL za registracijski obrazac",
-  "Accounts_RegistrationForm_SecretURL_Description": "Morate navesti nasumični niz znakova koji će biti dodan u vašu registracijski URL. Na primjer: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Morate navesti nasumični niz znakova koji će biti dodan u vašu registracijski URL. Na primjer: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Zahtijevaj ime pri prijavi",
   "Accounts_RequirePasswordConfirmation": "Zahtjevaj potvrdu lozinke",
   "Accounts_SetDefaultAvatar": "Namjesti zadani Avatar",
diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json
index 09192f521e3..b6c804871b9 100644
--- a/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -103,7 +103,7 @@
   "Accounts_RegistrationForm_Public": "Nyilvános",
   "Accounts_RegistrationForm_Secret_URL": "titkos URL",
   "Accounts_RegistrationForm_SecretURL": "Regisztrációs űrlap titkos URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Meg kell adnia egy véletlenszerű karaktersorozat, amely hozzáadódik a regisztrációs URL-t. Példa: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Meg kell adnia egy véletlenszerű karaktersorozat, amely hozzáadódik a regisztrációs URL-t. Példa: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Igényel elnevezése Regisztráció",
   "Accounts_RequirePasswordConfirmation": "Igényelt jelszó megerősítése",
   "Accounts_SetDefaultAvatar": "alapértelmezett Avatar beállítása",
diff --git a/packages/rocketchat-i18n/i18n/id.i18n.json b/packages/rocketchat-i18n/i18n/id.i18n.json
index 1f51b993089..c57aed9605c 100644
--- a/packages/rocketchat-i18n/i18n/id.i18n.json
+++ b/packages/rocketchat-i18n/i18n/id.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "Publik",
   "Accounts_RegistrationForm_Secret_URL": "URL rahasia",
   "Accounts_RegistrationForm_SecretURL": "Formulir Pendaftaran Rahasia URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Anda harus memberikan string acak yang akan ditambahkan ke URL pendaftaran Anda. Contoh: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Anda harus memberikan string acak yang akan ditambahkan ke URL pendaftaran Anda. Contoh: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Membutuhkan Nama Untuk Pendaftaran",
   "Accounts_ShowFormLogin": "berbasis bentuk acara Login",
   "Accounts_UseDefaultBlockedDomainsList": "Gunakan Default Diblokir Daftar Domain",
diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json
index 3af3d63505e..8ae71b3e766 100644
--- a/packages/rocketchat-i18n/i18n/it.i18n.json
+++ b/packages/rocketchat-i18n/i18n/it.i18n.json
@@ -115,7 +115,7 @@
   "Accounts_RegistrationForm_Public": "Pubblico",
   "Accounts_RegistrationForm_Secret_URL": "URL segreto",
   "Accounts_RegistrationForm_SecretURL": "URL segreto del modulo di registrazione ",
-  "Accounts_RegistrationForm_SecretURL_Description": "È necessario fornire una stringa casuale che verrà aggiunta all'URL di registrazione. Esempio: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "È necessario fornire una stringa casuale che verrà aggiunta all'URL di registrazione. Esempio: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Richiedi il nome per la registrazione",
   "Accounts_RequirePasswordConfirmation": "Richiede conferma della password",
   "Accounts_SetDefaultAvatar": "Imposta Avatar Predefinito",
diff --git a/packages/rocketchat-i18n/i18n/ja.i18n.json b/packages/rocketchat-i18n/i18n/ja.i18n.json
index c092fd60676..82d835f5b8a 100644
--- a/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "公開",
   "Accounts_RegistrationForm_Secret_URL": "非公開 URL",
   "Accounts_RegistrationForm_SecretURL": "登録フォームの非公開 URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "ランダムな文字列を入力してください。この文字列は、登録フォームの URL に使用されます。 例: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "ランダムな文字列を入力してください。この文字列は、登録フォームの URL に使用されます。 例: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "登録時にユーザー名を必須にする",
   "Accounts_ShowFormLogin": "ログインフォームを表示する",
   "Accounts_UseDefaultBlockedDomainsList": "既定のブロックされたドメイン一覧を利用する",
diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json
index 20c1746dc6d..84ad0b1e4eb 100644
--- a/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "សាធារណៈ",
   "Accounts_RegistrationForm_Secret_URL": "URL ដែលជាការសម្ងាត់",
   "Accounts_RegistrationForm_SecretURL": "ទម្រង់បែបបទចុះឈ្មោះរបស់ URL សម្ងាត់",
-  "Accounts_RegistrationForm_SecretURL_Description": "អ្នកត្រូវតែផ្ដល់ខ្សែអក្សរចៃដន្យដែលនឹងត្រូវបានបន្ថែមទៅ URL ចុះឈ្មោះរបស់អ្នក។ ឧទាហរណ៍: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "អ្នកត្រូវតែផ្ដល់ខ្សែអក្សរចៃដន្យដែលនឹងត្រូវបានបន្ថែមទៅ URL ចុះឈ្មោះរបស់អ្នក។ ឧទាហរណ៍: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "ត្រូវការ Name សម្រាប់ការចុះឈ្មោះ",
   "Accounts_ShowFormLogin": "ការចូលជាទម្រង់ដែលមានមូលដ្ឋានបង្ហាញ",
   "Accounts_UseDefaultBlockedDomainsList": "បញ្ជីដែនប្រើលំនាំដើម",
diff --git a/packages/rocketchat-i18n/i18n/ko.i18n.json b/packages/rocketchat-i18n/i18n/ko.i18n.json
index bd24ed7152a..eeae161e481 100644
--- a/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -115,7 +115,7 @@
   "Accounts_RegistrationForm_Public": "공개",
   "Accounts_RegistrationForm_Secret_URL": "비밀 URL",
   "Accounts_RegistrationForm_SecretURL": "등록 양식 비밀 URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "등록 URL에 추가될 임의의 문자열을 제공해야 합니다. 예 : https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "등록 URL에 추가될 임의의 문자열을 제공해야 합니다. 예 : https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "회원 가입을 위한 이름이 필요합니다.",
   "Accounts_RequirePasswordConfirmation": "비밀번호 확인이 필요합니다.",
   "Accounts_SetDefaultAvatar": "기본 아바타 설정",
diff --git a/packages/rocketchat-i18n/i18n/ku.i18n.json b/packages/rocketchat-i18n/i18n/ku.i18n.json
index 971b80c1b12..db1ba2d3f35 100644
--- a/packages/rocketchat-i18n/i18n/ku.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ku.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "Alenî",
   "Accounts_RegistrationForm_Secret_URL": "URL Secret",
   "Accounts_RegistrationForm_SecretURL": "Formê Qeydkirina Secret URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Divê tu string random ku wê bê URL xwe qeyd added ne. Mînak: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Divê tu string random ku wê bê URL xwe qeyd added ne. Mînak: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Hewce Name Ji bo Signup",
   "Accounts_ShowFormLogin": "Login-bingeha forma nîşan",
   "Accounts_UseDefaultBlockedDomainsList": "Use Default astengkirin Lîsteya Domain",
diff --git a/packages/rocketchat-i18n/i18n/lo.i18n.json b/packages/rocketchat-i18n/i18n/lo.i18n.json
index 2e73877dac0..37f3a778bd3 100644
--- a/packages/rocketchat-i18n/i18n/lo.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lo.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "ສາທາລະນະ",
   "Accounts_RegistrationForm_Secret_URL": "URL Secret",
   "Accounts_RegistrationForm_SecretURL": "ການລົງທະບຽນແບບຟອມ URL Secret",
-  "Accounts_RegistrationForm_SecretURL_Description": "ທ່ານຕ້ອງໄດ້ສະຫນອງການຊ່ອຍແນ່ໄປທີ່ຈະໄດ້ຮັບການເພີ່ມ URL ລົງທະບຽນຂອງທ່ານ. ຍົກຕົວຢ່າງ: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "ທ່ານຕ້ອງໄດ້ສະຫນອງການຊ່ອຍແນ່ໄປທີ່ຈະໄດ້ຮັບການເພີ່ມ URL ລົງທະບຽນຂອງທ່ານ. ຍົກຕົວຢ່າງ: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "ຮຽກຮ້ອງໃຫ້ຊື່ສໍາລັບສະຫມັກ",
   "Accounts_ShowFormLogin": "ສະແດງໃຫ້ເຫັນຮູບແບບທີ່ເຂົ້າສູ່ລະບົບ",
   "Accounts_UseDefaultBlockedDomainsList": "ການນໍາໃຊ້ມາດຕະຖານສະກັດຊີ Domains",
diff --git a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
index 0b51dbbc479..101fb57ec93 100644
--- a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "awam",
   "Accounts_RegistrationForm_Secret_URL": "URL Secret",
   "Accounts_RegistrationForm_SecretURL": "Borang Pendaftaran URL Secret",
-  "Accounts_RegistrationForm_SecretURL_Description": "Anda mesti menyediakan rentetan rawak yang akan ditambah ke URL pendaftaran anda. Contoh: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Anda mesti menyediakan rentetan rawak yang akan ditambah ke URL pendaftaran anda. Contoh: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Memerlukan Nama Untuk Daftar",
   "Accounts_ShowFormLogin": "berasaskan Tunjukkan bentuk Login",
   "Accounts_UseDefaultBlockedDomainsList": "Penggunaan Lalai Disekat Senarai Domain",
diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json
index 8689fa5eb36..8292b91b157 100644
--- a/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "Openbaar",
   "Accounts_RegistrationForm_Secret_URL": "Geheime URL",
   "Accounts_RegistrationForm_SecretURL": "Registration Form Secret URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "You must provide a random string that will be added to your registration URL. Example: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "You must provide a random string that will be added to your registration URL. Example: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Vereis naam tijdens registratie",
   "Accounts_ShowFormLogin": "Laat formulier-gebaseerd loginscherm zien",
   "Accounts_UseDefaultBlockedDomainsList": "Gebruik Default geblokkeerde domeinen List",
diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json
index bc86b12135c..530f250a333 100644
--- a/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -105,7 +105,7 @@
   "Accounts_RegistrationForm_Public": "Publiczny",
   "Accounts_RegistrationForm_Secret_URL": "Sekretny adres URL",
   "Accounts_RegistrationForm_SecretURL": "Sekretny adres URL formularza rejestracyjnego",
-  "Accounts_RegistrationForm_SecretURL_Description": "Musisz podać losowy ciąg znaków, który zostanie dodany do adresu URL rejestracji. Przykład: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Musisz podać losowy ciąg znaków, który zostanie dodany do adresu URL rejestracji. Przykład: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Wymagaj podana nazwy podczas rejestracji",
   "Accounts_RequirePasswordConfirmation": "Wymagaj potwierdzenia hasła",
   "Accounts_SetDefaultAvatar": "Ustaw domyślny Avatar",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 55f3ac2d106..fbcdae123ba 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -102,7 +102,7 @@
   "Accounts_RegistrationForm_Public": "Público",
   "Accounts_RegistrationForm_Secret_URL": "URL Secreta",
   "Accounts_RegistrationForm_SecretURL": "URL Secreta para o Formulário de Registro",
-  "Accounts_RegistrationForm_SecretURL_Description": "Você deve fornecer uma seqüência aleatória que será adicionada à sua URL de registro. Exemplo: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Você deve fornecer uma seqüência aleatória que será adicionada à sua URL de registro. Exemplo: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Nome é obrigatório para cadastro",
   "Accounts_RequirePasswordConfirmation": "Requer Confirmação de Senha",
   "Accounts_SearchFields": "Campos a considerar na busca",
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index eae8c278465..39bced0b33f 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -110,7 +110,7 @@
   "Accounts_RegistrationForm_Public": "Público",
   "Accounts_RegistrationForm_Secret_URL": "URL Secreta",
   "Accounts_RegistrationForm_SecretURL": "URL Secreta para o Formulário de Registro",
-  "Accounts_RegistrationForm_SecretURL_Description": "Você deve fornecer uma seqüência aleatória que será adicionada à sua URL de registro. Exemplo: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Você deve fornecer uma seqüência aleatória que será adicionada à sua URL de registro. Exemplo: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Nome é obrigatório para cadastro",
   "Accounts_RequirePasswordConfirmation": "Requer Confirmação de Senha",
   "Accounts_SearchFields": "Campos a considerar na busca",
diff --git a/packages/rocketchat-i18n/i18n/ro.i18n.json b/packages/rocketchat-i18n/i18n/ro.i18n.json
index 1503681ab23..098f09b5d03 100644
--- a/packages/rocketchat-i18n/i18n/ro.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ro.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "Public",
   "Accounts_RegistrationForm_Secret_URL": "URL secret",
   "Accounts_RegistrationForm_SecretURL": "URL secret din formularul de înregistrare",
-  "Accounts_RegistrationForm_SecretURL_Description": "Trebuie să furnizați un șir aleatoriu care va fi adăugat la URL-ul dvs. de înregistrare. Exemplu: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Trebuie să furnizați un șir aleatoriu care va fi adăugat la URL-ul dvs. de înregistrare. Exemplu: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Cere nume pentru înregistrare",
   "Accounts_ShowFormLogin": "Arată formularul pentru autentificare",
   "Accounts_UseDefaultBlockedDomainsList": "Implicit utilizare blocate Listă Domenii",
diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json
index 30d683def51..8ff219e624f 100644
--- a/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -119,7 +119,7 @@
   "Accounts_RegistrationForm_Public": "Открытая",
   "Accounts_RegistrationForm_Secret_URL": "Секретный URL-адрес",
   "Accounts_RegistrationForm_SecretURL": "Секретный URL-адрес регистрационной формы",
-  "Accounts_RegistrationForm_SecretURL_Description": "Вы должны предоставить случайную строку, которая будет добавлена к вашему регистрационному URL-адресу. Например: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Вы должны предоставить случайную строку, которая будет добавлена к вашему регистрационному URL-адресу. Например: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Требуется имя для регистрации",
   "Accounts_RequirePasswordConfirmation": "Запрашивать подтверждение пароля",
   "Accounts_SetDefaultAvatar": "Установить аватар по-умолчанию",
diff --git a/packages/rocketchat-i18n/i18n/sq.i18n.json b/packages/rocketchat-i18n/i18n/sq.i18n.json
index b06613773c5..8d389179d9e 100644
--- a/packages/rocketchat-i18n/i18n/sq.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sq.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "publik",
   "Accounts_RegistrationForm_Secret_URL": "URL Secret",
   "Accounts_RegistrationForm_SecretURL": "Regjistrimi Form Secret URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Ju duhet të sigurojë një varg të rastit që do të shtohet në URL tuaj e regjistrimit. Shembull: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Ju duhet të sigurojë një varg të rastit që do të shtohet në URL tuaj e regjistrimit. Shembull: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Nevojitet emri për regjistrim",
   "Accounts_ShowFormLogin": "Tregojnë formë të bazuar Login",
   "Accounts_UseDefaultBlockedDomainsList": "Përdorimi Default Blocked Lista Domains",
diff --git a/packages/rocketchat-i18n/i18n/sv.i18n.json b/packages/rocketchat-i18n/i18n/sv.i18n.json
index 807ea0f6eba..7a9c8a9dcfa 100644
--- a/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -102,7 +102,7 @@
   "Accounts_RegistrationForm_Public": "Offentlig",
   "Accounts_RegistrationForm_Secret_URL": "hemliga URL",
   "Accounts_RegistrationForm_SecretURL": "Anmälningsblankett Secret URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Du måste ange en slumpmässig sträng som kommer att läggas till din registrerings URL. Exempel: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Du måste ange en slumpmässig sträng som kommer att läggas till din registrerings URL. Exempel: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Kräv namn för registrering",
   "Accounts_ShowFormLogin": "Visa formbaserad inloggning",
   "Accounts_UseDefaultBlockedDomainsList": "Använd standardlista för blockerade domäner",
diff --git a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
index 694596cbe8d..7896f616251 100644
--- a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "பொது",
   "Accounts_RegistrationForm_Secret_URL": "இரகசிய URL ஐ",
   "Accounts_RegistrationForm_SecretURL": "பதிவு படிவம் இரகசிய URL ஐ",
-  "Accounts_RegistrationForm_SecretURL_Description": "நீங்கள் உங்கள் பதிவு URL ஐ சேர்க்க வேண்டும் என்று ஒரு சீரற்ற சரமாக வழங்க வேண்டும். உதாரணம்: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "நீங்கள் உங்கள் பதிவு URL ஐ சேர்க்க வேண்டும் என்று ஒரு சீரற்ற சரமாக வழங்க வேண்டும். உதாரணம்: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "இணைந்ததற்கு பெயர் தேவை",
   "Accounts_ShowFormLogin": "காட்டு-சார்ந்த தேதி",
   "Accounts_UseDefaultBlockedDomainsList": "பயன்பாட்டு இயல்புநிலை தடுக்கப்பட்ட களங்கள் பட்டியல்",
diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json
index 5627914a5dd..63fa3267194 100644
--- a/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -119,7 +119,7 @@
   "Accounts_RegistrationForm_Public": "Genel",
   "Accounts_RegistrationForm_Secret_URL": "Gizli URL",
   "Accounts_RegistrationForm_SecretURL": "Kayıt Formu Gizli URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Kayıt URL'sine eklenmesi için rastgele bir harf dizisi sağlamalısınız. Örnek: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Kayıt URL'sine eklenmesi için rastgele bir harf dizisi sağlamalısınız. Örnek: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Üye Olmak İçin Ad İste",
   "Accounts_RequirePasswordConfirmation": "Şifre Doğrulaması Gerektir",
   "Accounts_SetDefaultAvatar": "Varsayılanı Avatar Seç",
diff --git a/packages/rocketchat-i18n/i18n/ug.i18n.json b/packages/rocketchat-i18n/i18n/ug.i18n.json
index c87d127725a..4256519d4c4 100644
--- a/packages/rocketchat-i18n/i18n/ug.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ug.i18n.json
@@ -93,7 +93,7 @@
   "Accounts_RegistrationForm_Public": "ئاشكارا",
   "Accounts_RegistrationForm_Secret_URL": "شەخسىي ئادرېسى",
   "Accounts_RegistrationForm_SecretURL": "شەخسىي تىزىملىتىش جەدۋىلى ",
-  "Accounts_RegistrationForm_SecretURL_Description": "https://demo.rocket.chat/register/[secret_hash] سىز چوقۇم خالىغان ھەرپ-بەلگە تىزىقى بىلەن تەمىنلىشىڭىز كېرەك ، ئۇ ھەرپ-بەلگە تىزىقى سىزنىڭ تىزىملىتىش ئادرېسىڭىزغا قېتىلىدۇ. مەسىلەن: مۇنداق",
+  "Accounts_RegistrationForm_SecretURL_Description": "https://open.rocket.chat/register/[secret_hash] سىز چوقۇم خالىغان ھەرپ-بەلگە تىزىقى بىلەن تەمىنلىشىڭىز كېرەك ، ئۇ ھەرپ-بەلگە تىزىقى سىزنىڭ تىزىملىتىش ئادرېسىڭىزغا قېتىلىدۇ. مەسىلەن: مۇنداق",
   "Accounts_RequireNameForSignUp": "ئىسىم_فامىلە يازغاندىن كېيىن ئاندىن تىزىملىتىلىدۇ",
   "Accounts_ShowFormLogin": "جەدۋەلنى ئاساس قىلغاندىكى كىرىش يۈزىنى كۆرسىتىدۇ",
   "Accounts_UseDefaultBlockedDomainsList": "بەلگىلەنگەن دائىرە نامى توسۇش تىزىملىكىنى ئىشلىتىش",
diff --git a/packages/rocketchat-i18n/i18n/uk.i18n.json b/packages/rocketchat-i18n/i18n/uk.i18n.json
index e6373e31d52..a957d28bfeb 100644
--- a/packages/rocketchat-i18n/i18n/uk.i18n.json
+++ b/packages/rocketchat-i18n/i18n/uk.i18n.json
@@ -97,7 +97,7 @@
   "Accounts_RegistrationForm_Public": "суспільного",
   "Accounts_RegistrationForm_Secret_URL": "секретний URL",
   "Accounts_RegistrationForm_SecretURL": "Форма реєстрації Секретний URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "Ви повинні забезпечити випадкову рядок, яка буде додана до вашої реєстрації URL. Приклад: https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Ви повинні забезпечити випадкову рядок, яка буде додана до вашої реєстрації URL. Приклад: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Вимагати ім'я для Signup",
   "Accounts_ShowFormLogin": "Показати на основі форм Ввійти",
   "Accounts_UseDefaultBlockedDomainsList": "Використовувати за замовчуванням Заблоковані Список доменів",
diff --git a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index 201bd8c9884..6486719d034 100644
--- a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -98,7 +98,7 @@
   "Accounts_RegistrationForm_Public": "公開",
   "Accounts_RegistrationForm_Secret_URL": "揭秘網址",
   "Accounts_RegistrationForm_SecretURL": "登記表秘密網址",
-  "Accounts_RegistrationForm_SecretURL_Description": "您必須提供將被添加到您的註冊URL隨機字符串。例如：https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "您必須提供將被添加到您的註冊URL隨機字符串。例如：https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "註冊需要名稱",
   "Accounts_ShowFormLogin": "顯示基於表單的登入",
   "Accounts_UseDefaultBlockedDomainsList": "使用預設的黑名單網域列表",
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index f5efc52c962..3c57240dad3 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -110,7 +110,7 @@
   "Accounts_RegistrationForm_Public": "公开",
   "Accounts_RegistrationForm_Secret_URL": "Secret URL",
   "Accounts_RegistrationForm_SecretURL": "注册表单 Secret URL",
-  "Accounts_RegistrationForm_SecretURL_Description": "您必须提供一个随机字符串，该字符串将被添加到您的注册地址中。例如：https://demo.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "您必须提供一个随机字符串，该字符串将被添加到您的注册地址中。例如：https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "姓名必须填写",
   "Accounts_RequirePasswordConfirmation": "请再次确认密码",
   "Accounts_SetDefaultAvatar": "设置默认头像",
diff --git a/packages/rocketchat-markdown/tests/client.tests.js b/packages/rocketchat-markdown/tests/client.tests.js
index 80822cc3be7..96c93d98d96 100644
--- a/packages/rocketchat-markdown/tests/client.tests.js
+++ b/packages/rocketchat-markdown/tests/client.tests.js
@@ -150,47 +150,47 @@ const quote = {
 
 const link = {
 	'&lt;http://link|Text&gt;': linkWrapped('http://link', 'Text'),
-	'&lt;https://demo.rocket.chat/|Demo Site For Rocket.Chat&gt;': linkWrapped('https://demo.rocket.chat/', 'Demo Site For Rocket.Chat'),
-	'&lt;https://demo.rocket.chat/ | Demo Site For Rocket.Chat&gt;': linkWrapped('https://demo.rocket.chat/ ', ' Demo Site For Rocket.Chat'),
+	'&lt;https://open.rocket.chat/|Open Site For Rocket.Chat&gt;': linkWrapped('https://open.rocket.chat/', 'Open Site For Rocket.Chat'),
+	'&lt;https://open.rocket.chat/ | Open Site For Rocket.Chat&gt;': linkWrapped('https://open.rocket.chat/ ', ' Open Site For Rocket.Chat'),
 	'&lt;https://rocket.chat/|Rocket.Chat Site&gt;': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
 	'&lt;https://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
 	'&lt;http://linkText&gt;': '&lt;http://linkText&gt;',
-	'&lt;https:demo.rocket.chat/ | Demo Site For Rocket.Chat&gt;': '&lt;https:demo.rocket.chat/ | Demo Site For Rocket.Chat&gt;',
-	'https://demo.rocket.chat/|Demo Site For Rocket.Chat': 'https://demo.rocket.chat/|Demo Site For Rocket.Chat',
-	'&lt;www.demo.rocket.chat/|Demo Site For Rocket.Chat&gt;': '&lt;www.demo.rocket.chat/|Demo Site For Rocket.Chat&gt;',
+	'&lt;https:open.rocket.chat/ | Open Site For Rocket.Chat&gt;': '&lt;https:open.rocket.chat/ | Open Site For Rocket.Chat&gt;',
+	'https://open.rocket.chat/|Open Site For Rocket.Chat': 'https://open.rocket.chat/|Open Site For Rocket.Chat',
+	'&lt;www.open.rocket.chat/|Open Site For Rocket.Chat&gt;': '&lt;www.open.rocket.chat/|Open Site For Rocket.Chat&gt;',
 	'&lt;htps://rocket.chat/|Rocket.Chat Site&gt;': '&lt;htps://rocket.chat/|Rocket.Chat Site&gt;',
 	'&lt;ttps://rocket.chat/|Rocket.Chat Site&gt;': '&lt;ttps://rocket.chat/|Rocket.Chat Site&gt;',
 	'&lt;tps://rocket.chat/|Rocket.Chat Site&gt;': '&lt;tps://rocket.chat/|Rocket.Chat Site&gt;',
-	'&lt;demo.rocket.chat/|Demo Site For Rocket.Chat&gt;': '&lt;demo.rocket.chat/|Demo Site For Rocket.Chat&gt;',
+	'&lt;open.rocket.chat/|Open Site For Rocket.Chat&gt;': '&lt;open.rocket.chat/|Open Site For Rocket.Chat&gt;',
 	'&lt;htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;': '&lt;htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site&gt;',
 
 	'<http://link|Text>': linkWrapped('http://link', 'Text'),
-	'<https://demo.rocket.chat/|Demo Site For Rocket.Chat>': linkWrapped('https://demo.rocket.chat/', 'Demo Site For Rocket.Chat'),
-	'<https://demo.rocket.chat/ | Demo Site For Rocket.Chat>': linkWrapped('https://demo.rocket.chat/ ', ' Demo Site For Rocket.Chat'),
+	'<https://open.rocket.chat/|Open Site For Rocket.Chat>': linkWrapped('https://open.rocket.chat/', 'Open Site For Rocket.Chat'),
+	'<https://open.rocket.chat/ | Open Site For Rocket.Chat>': linkWrapped('https://open.rocket.chat/ ', ' Open Site For Rocket.Chat'),
 	'<https://rocket.chat/|Rocket.Chat Site>': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
 	'<https://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
 	'<http://linkText>': '<http://linkText>',
-	'<https:demo.rocket.chat/ | Demo Site For Rocket.Chat>': '<https:demo.rocket.chat/ | Demo Site For Rocket.Chat>',
-	'<www.demo.rocket.chat/|Demo Site For Rocket.Chat>': '<www.demo.rocket.chat/|Demo Site For Rocket.Chat>',
+	'<https:open.rocket.chat/ | Open Site For Rocket.Chat>': '<https:open.rocket.chat/ | Open Site For Rocket.Chat>',
+	'<www.open.rocket.chat/|Open Site For Rocket.Chat>': '<www.open.rocket.chat/|Open Site For Rocket.Chat>',
 	'<htps://rocket.chat/|Rocket.Chat Site>': '<htps://rocket.chat/|Rocket.Chat Site>',
 	'<ttps://rocket.chat/|Rocket.Chat Site>': '<ttps://rocket.chat/|Rocket.Chat Site>',
 	'<tps://rocket.chat/|Rocket.Chat Site>': '<tps://rocket.chat/|Rocket.Chat Site>',
-	'<demo.rocket.chat/|Demo Site For Rocket.Chat>': '<demo.rocket.chat/|Demo Site For Rocket.Chat>',
+	'<open.rocket.chat/|Open Site For Rocket.Chat>': '<open.rocket.chat/|Open Site For Rocket.Chat>',
 	'<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>': '<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>',
 
 	'[Text](http://link)': linkWrapped('http://link', 'Text'),
-	'[Demo Site For Rocket.Chat](https://demo.rocket.chat/)': linkWrapped('https://demo.rocket.chat/', 'Demo Site For Rocket.Chat'),
-	'[ Demo Site For Rocket.Chat](https://demo.rocket.chat/ )': linkWrapped('https://demo.rocket.chat/ ', ' Demo Site For Rocket.Chat'),
+	'[Open Site For Rocket.Chat](https://open.rocket.chat/)': linkWrapped('https://open.rocket.chat/', 'Open Site For Rocket.Chat'),
+	'[ Open Site For Rocket.Chat](https://open.rocket.chat/ )': linkWrapped('https://open.rocket.chat/ ', ' Open Site For Rocket.Chat'),
 	'[Rocket.Chat Site](https://rocket.chat/)': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
 	'[Testing Entry on Rocket.Chat Docs Site](https://rocket.chat/docs/developer-guides/testing/#testing)': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
 	'[](http://linkText)': '[](http://linkText)',
 	'[text]': '[text]',
-	'[Demo Site For Rocket.Chat](https:demo.rocket.chat/)': '[Demo Site For Rocket.Chat](https:demo.rocket.chat/)',
-	'[Demo Site For Rocket.Chat](www.demo.rocket.chat/)': '[Demo Site For Rocket.Chat](www.demo.rocket.chat/)',
+	'[Open Site For Rocket.Chat](https:open.rocket.chat/)': '[Open Site For Rocket.Chat](https:open.rocket.chat/)',
+	'[Open Site For Rocket.Chat](www.open.rocket.chat/)': '[Open Site For Rocket.Chat](www.open.rocket.chat/)',
 	'[Rocket.Chat Site](htps://rocket.chat/)': '[Rocket.Chat Site](htps://rocket.chat/)',
 	'[Rocket.Chat Site](ttps://rocket.chat/)': '[Rocket.Chat Site](ttps://rocket.chat/)',
 	'[Rocket.Chat Site](tps://rocket.chat/)': '[Rocket.Chat Site](tps://rocket.chat/)',
-	'[Demo Site For Rocket.Chat](demo.rocket.chat/)': '[Demo Site For Rocket.Chat](demo.rocket.chat/)',
+	'[Open Site For Rocket.Chat](open.rocket.chat/)': '[Open Site For Rocket.Chat](open.rocket.chat/)',
 	'[Testing Entry on Rocket.Chat Docs Site](htts://rocket.chat/docs/developer-guides/testing/#testing)': '[Testing Entry on Rocket.Chat Docs Site](htts://rocket.chat/docs/developer-guides/testing/#testing)'
 };
 
diff --git a/server/startup/migrations/v015.js b/server/startup/migrations/v015.js
index f5076993b92..eaa8dcc90d8 100644
--- a/server/startup/migrations/v015.js
+++ b/server/startup/migrations/v015.js
@@ -70,18 +70,18 @@ RocketChat.Migrations.add({
 
 			RocketChat.models.Messages.find({
 				$or: [{
-					'urls.url': `https://demo.rocket.chat/cfs/files/Files/${ cfsRecord._id }`
+					'urls.url': `https://open.rocket.chat/cfs/files/Files/${ cfsRecord._id }`
 				}, {
 					'urls.url': `https://rocket.chat/cfs/files/Files/${ cfsRecord._id }`
 				}]
 			}).forEach((message) => {
 				for (const urlsItem of message.urls) {
-					if (urlsItem.url === (`https://demo.rocket.chat/cfs/files/Files/${ cfsRecord._id }`) || urlsItem.url === (`https://rocket.chat/cfs/files/Files/${ cfsRecord._id }`)) {
+					if (urlsItem.url === (`https://open.rocket.chat/cfs/files/Files/${ cfsRecord._id }`) || urlsItem.url === (`https://rocket.chat/cfs/files/Files/${ cfsRecord._id }`)) {
 						urlsItem.url = Meteor.absoluteUrl() + url;
 						if (urlsItem.parsedUrl && urlsItem.parsedUrl.pathname) {
 							urlsItem.parsedUrl.pathname = `/${ url }`;
 						}
-						message.msg = message.msg.replace(`https://demo.rocket.chat/cfs/files/Files/${ cfsRecord._id }`, Meteor.absoluteUrl() + url);
+						message.msg = message.msg.replace(`https://open.rocket.chat/cfs/files/Files/${ cfsRecord._id }`, Meteor.absoluteUrl() + url);
 						message.msg = message.msg.replace(`https://rocket.chat/cfs/files/Files/${ cfsRecord._id }`, Meteor.absoluteUrl() + url);
 					}
 				}

From 943bbb3c74bc0d0ddef6d22a10bd1757dd41cca1 Mon Sep 17 00:00:00 2001
From: Richard Metzler <richard@paadee.com>
Date: Mon, 30 Oct 2017 09:59:56 +0100
Subject: [PATCH 230/244] fix typo

---
 packages/rocketchat-i18n/i18n/de.i18n.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index a5f91d7bfdd..ea70663bd79 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -1299,7 +1299,7 @@
   "Open": "Öffnen",
   "Open_channel_user_search": "`%s` - Kanal öffnen / Nach Benutzer suchen",
   "Open_days_of_the_week": "Offene Wochentage",
-  "Open_Livechats": "Ofefne Livechats",
+  "Open_Livechats": "Offene Livechats",
   "Open_your_authentication_app_and_enter_the_code": "Öffnen Sie Ihre Authentifizierungs-App und geben Sie den Code ein. Sie können auch einen Ihrer Backup-Codes verwenden",
   "Opened": "Geöffnet",
   "Opened_in_a_new_window": "In einem neuem Fenster geöffnet",
@@ -2006,4 +2006,4 @@
   "your_message_optional": "ihre optionale Nachricht",
   "Your_password_is_wrong": "Falsches Passwort",
   "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
-}
\ No newline at end of file
+}

From 1a6b51498b2469758b2869b8c335ec02a9c3ec45 Mon Sep 17 00:00:00 2001
From: Hammy Havoc <hammy@splitanatom.com>
Date: Mon, 6 Nov 2017 20:49:20 +0000
Subject: [PATCH 231/244] Improved grammar and made it clearer to the user

The use of the word 'temper' was a little misleading for users as it's not in the common lexicon. In the interests of keeping the UX as simple as possible, I propose that we change the default. :- )
---
 packages/rocketchat-lib/server/startup/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index f8ee1fe5466..77d94e4a5b1 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -585,7 +585,7 @@ RocketChat.settings.addGroup('Email', function() {
 			multiline: true,
 			i18nLabel: 'Footer'
 		});
-		return this.add('Email_Footer_Direct_Reply', '</td></tr></table></td></tr><tr><td border="0" cellspacing="0" cellpadding="0" width="100%" style="font-family: Helvetica,Arial,sans-serif; max-width: 800px; margin: 0 auto; padding: 1.5em; text-align: center; font-size: 8pt; color: #999;">You can directly reply to this email.<br>Do not temper reply email<br>Powered by <a href="https://rocket.chat" target="_blank">Rocket.Chat</a></td></tr></table></td></tr></table></html>', {
+		return this.add('Email_Footer_Direct_Reply', '</td></tr></table></td></tr><tr><td border="0" cellspacing="0" cellpadding="0" width="100%" style="font-family: Helvetica,Arial,sans-serif; max-width: 800px; margin: 0 auto; padding: 1.5em; text-align: center; font-size: 8pt; color: #999;">You can directly reply to this email.<br>Do not modify previous emails in the thread.<br>Powered by <a href="https://rocket.chat" target="_blank">Rocket.Chat</a></td></tr></table></td></tr></table></html>', {
 			type: 'code',
 			code: 'text/html',
 			multiline: true,

From 14eac393b58f174e98109a06bd25cff9f7b7dea0 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 7 Nov 2017 00:43:37 -0200
Subject: [PATCH 232/244] Update meteor package to 1.8.1

---
 .meteor/versions                              |  2 +-
 package-lock.json                             | 12 +--
 package.json                                  |  4 +-
 .../.npm/package/npm-shrinkwrap.json          | 87 ++++++++++---------
 .../rocketchat-livechat/app/.meteor/versions  |  2 +-
 5 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/.meteor/versions b/.meteor/versions
index f90c9eb83b0..a0065e08ef3 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -77,7 +77,7 @@ localstorage@1.2.0
 logging@1.1.19
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.8.0
+meteor@1.8.1
 meteor-base@1.2.0
 meteor-developer-oauth@1.2.0
 meteorhacks:inject-initial@1.0.4
diff --git a/package-lock.json b/package-lock.json
index 7b000a40dd0..8b68be000f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -364,9 +364,9 @@
       }
     },
     "aws-sdk": {
-      "version": "2.141.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz",
-      "integrity": "sha1-PZallw/Z9UDOq8wdS66zO3FYOqc=",
+      "version": "2.146.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.146.0.tgz",
+      "integrity": "sha1-4tdVhaAw2uEWrjLL9CxJZojQTvs=",
       "requires": {
         "buffer": "4.9.1",
         "crypto-browserify": "1.0.9",
@@ -7157,9 +7157,9 @@
       "dev": true
     },
     "prom-client": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.2.1.tgz",
-      "integrity": "sha512-avZAdOCg/fCVmB1gBJnlYDHsBBoj7Kf8Dlz47KD3w32d6SONbarnzflCNbgdBTM5XATiD3+oJ9RQsIFgAxOUag==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.2.2.tgz",
+      "integrity": "sha512-d3qCBK41qZx00/WVzWOX4tau9FinCztqaECZiGuMI5vGYD//5VSdKMOZPRQKjVh5RkI4Ex98DI0YPsoFnEo1QQ==",
       "requires": {
         "tdigest": "0.1.1"
       }
diff --git a/package.json b/package.json
index 82955b92b22..7be6b5a5dec 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
 	},
 	"dependencies": {
 		"@google-cloud/storage": "^1.4.0",
-		"aws-sdk": "^2.141.0",
+		"aws-sdk": "^2.146.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
 		"bunyan": "^1.8.12",
@@ -126,7 +126,7 @@
 		"moment-timezone": "^0.5.14",
 		"photoswipe": "^4.1.2",
 		"poplib": "^0.1.7",
-		"prom-client": "^10.2.1",
+		"prom-client": "^10.2.2",
 		"semver": "^5.4.1",
 		"toastr": "^2.1.2",
 		"underscore": "^1.8.3",
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index b853584d630..27b919ce0bb 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -353,14 +353,14 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "grpc": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
-      "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.1.tgz",
+      "integrity": "sha512-lMgjZUzJx09VL5iCfs7rFagE5htikdv/9VzX/ji3zuwlzAhijqcU47bi5N5lbVw/UB2fxneeYg8sBTfQfd0c4A==",
       "dependencies": {
         "abbrev": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
         },
         "ajv": {
           "version": "4.11.8",
@@ -485,9 +485,9 @@
           }
         },
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw="
         },
         "deep-extend": {
           "version": "0.4.2",
@@ -504,6 +504,11 @@
           "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
         },
+        "detect-libc": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz",
+          "integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE="
+        },
         "ecc-jsbn": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -562,9 +567,9 @@
           }
         },
         "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg="
         },
         "graceful-fs": {
           "version": "4.1.11",
@@ -689,21 +694,14 @@
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="
         },
         "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         },
         "mkdirp": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-            }
-          }
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM="
         },
         "ms": {
           "version": "2.0.0",
@@ -711,14 +709,16 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "node-pre-gyp": {
-          "version": "0.6.38",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
-          "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0="
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00="
+          "version": "0.6.39",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz",
+          "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==",
+          "dependencies": {
+            "nopt": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00="
+            }
+          }
         },
         "npmlog": {
           "version": "4.1.2",
@@ -786,9 +786,16 @@
           "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
         },
         "rc": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-          "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU="
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
+          "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+            }
+          }
         },
         "readable-stream": {
           "version": "2.3.3",
@@ -873,9 +880,9 @@
           "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE="
         },
         "tar-pack": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-          "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ="
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz",
+          "integrity": "sha512-PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg=="
         },
         "tough-cookie": {
           "version": "2.3.3",
@@ -1232,9 +1239,9 @@
       "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw=="
     },
     "retry-request": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
-      "integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.1.tgz",
+      "integrity": "sha512-Sj3M3bC8ODJT+jfVxbTwvORRkFtc/AlDhhiMch5RJalLMAjz6+lIf5Q/Ox2esAM4tXcAYfG4ecNHPtaGNWIqvQ=="
     },
     "rgb-hex": {
       "version": "1.0.0",
diff --git a/packages/rocketchat-livechat/app/.meteor/versions b/packages/rocketchat-livechat/app/.meteor/versions
index 4a58b854426..3ac0ab1989a 100644
--- a/packages/rocketchat-livechat/app/.meteor/versions
+++ b/packages/rocketchat-livechat/app/.meteor/versions
@@ -45,7 +45,7 @@ livedata@1.0.18
 localstorage@1.2.0
 logging@1.1.19
 mdg:validation-error@0.5.1
-meteor@1.8.0
+meteor@1.8.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
 minifier-js@2.2.1

From 9ee541cc60e9d21f5423600599a0e2d18c0d6e33 Mon Sep 17 00:00:00 2001
From: Hammy Havoc <hammy@splitanatom.com>
Date: Tue, 7 Nov 2017 16:31:16 +0000
Subject: [PATCH 233/244] [FIX] Improving consistency of UX (#8796)

* Capitalized letters of 'Reset Section Settings'

Improves the consistency of UX; every other field title has capitalized letters, and this stands out and looks a little unpolished.

* [FIX] Capitalized more words in Administration

More consistent UX; far easier to read.

* [FIX] Capitalized more words in Administration

Looking even better. :- )

* [FIX] Capitalized field titles in Message

Capitalized field titles in Message in Administration.

* [FIX] Capitalized field titles in SlackBridge

Improved consistency of titles in SlackBridge in Administration.

* [FIX] Capitalized 1st letter of SAML field titles

Improved consistency of field titles of SAML in Administration.

* [FIX] Capitalized 1st letter of Message titles

Improved consistency of field titles in Message in Administration.

* [FIX] Capitalized 1st letter of Push titles

Improved consistency by capitalizing the first letter of the field titles in Push in Administration.

* [FIX] Capitalized 1st letter of titles in Livechat

Improved consistency of field titles in Livechat in Administration by capitalizing the first letters of each word.

* [FIX] Capitalized 1st letter of titles on Livechat

Further improved UX consistency of expandable configuration options in Livechat in Administration by capitalizing the first letter of each word in the field titles.

* [FIX] Capitalize 1st letter of titles on LDAP

Capitalized first letter of each word in the field titles on LDAP in Administration to improve consistency of UX.

* [FIX] Changed 'Videocall' to 'Video Call'

Switching between the two wasn't great for UX consistency. We'll have 'Direct Messages' and 'Video Calls'. :- )

* [FIX] Capitalized 1st letter of titles on Layout

Capitalized the first letter of each word in the field titles of Layout in Administration. Also corrected grammar of something. :- )

* [FIX] Capitalized 1st letter of titles on Internal Hubot

Capitalized first letter of each field title on Internal Hubot on Administration for the purposes of consistency of UX.

* [FIX] Capitalized 1st letter of titles on General

Capitalized the first letter of each word in the field titles of General in Administration for the purpose of consistency in terms of UX.

* [FIX] Capitalized 1st letter of File Upload titles

Capitalized the first letter of each word in the field titles of File Upload in Administration for the purpose of making the UX more consistent.

* [FIX] Capitalized 1st letter of titles in Email

Capitalized first letter of each word of the field titles in Email in Administration for the sake of UX consistency.

* [FIX] Capitalized 1st letters of titles in CAS

Capitalized first letters of field titles in CAS in Administration for the sake of UX consistency.

* [FIX] Capitalized 1st letter of Analytics titles

Capitalized first letter of each word of the field titles in Analytics in Administration for the sake of UX consistency.

* [FIX] Improved consistency of Accounts UX

* [FIX] Changed a mention of 'conversations'

Changed it to 'Direct Messages'.

* Changed a mention of 'conversation'

Changed another mention of 'Conversation' to 'Direct Message'.

* [FIX] Changed 'Show all' to 'Show All'

Looks far better in terms of UX.

* [FIX] Improved consistency of UX

Capitalized letters on field titles in Preferences.

* [FIX] Improved consistency of actions

Was the only thing not capitalized in this menu and stuck out like a sore thumb. :- )

* [FIX] Changed 'Hide room' to 'Hide Room'

Didn't match the rest of the action menus.

* [FIX] Added a word to modal

The 'back' action of 'View All' wasn't exactly intuitive as to what you were viewing; made it seem as if you were viewing more methods of interaction with that user rather than returning to a list of members, so changed it to 'View All Members'.

* [FIX] Grammar

:- )

* [FIX] Capitalized 'Name' in 'Channel Name'

Only field title that wasn't capitalized on the 'Create a New Channel' area.

* [FIX] Dropped unnecessary periods to clean up UX

Periods were unnecessary, and looks far cleaner without. Using periods isn't commonly done for this part of the UX.
---
 packages/rocketchat-i18n/i18n/en.i18n.json | 216 ++++++++++-----------
 1 file changed, 108 insertions(+), 108 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index da4d5b12fa3..2738f6e1186 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -11,7 +11,7 @@
   "__username__was_set__role__by__user_by_": "__username__ was set __role__ by __user_by__",
   "Accept": "Accept",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Accept incoming livechat requests even if there are no online agents",
-  "Accept_with_no_online_agents": "Accept with no online agents",
+  "Accept_with_no_online_agents": "Accept with No Online Agents",
   "access-mailer": "Access Mailer Screen",
   "access-mailer_description": "Permission to send mass email to all users.",
   "access-permissions": "Access Permissions Screen",
@@ -21,9 +21,9 @@
   "Accessing_permissions": "Accessing permissions",
   "Account_SID": "Account SID",
   "Accounts": "Accounts",
-  "Accounts_AllowAnonymousRead": "Allow anonymous read",
-  "Accounts_AllowAnonymousWrite": "Allow anonymous write",
-  "Accounts_AllowDeleteOwnAccount": "Allow users to delete own account",
+  "Accounts_AllowAnonymousRead": "Allow Anonymous Read",
+  "Accounts_AllowAnonymousWrite": "Allow Anonymous Write",
+  "Accounts_AllowDeleteOwnAccount": "Allow Users to Delete Own Account",
   "Accounts_AllowedDomainsList": "Allowed Domains List",
   "Accounts_AllowedDomainsList_Description": "Comma-separated list of allowed domains",
   "Accounts_AllowEmailChange": "Allow Email Change",
@@ -39,7 +39,7 @@
   "Accounts_BlockedUsernameList_Description": "Comma-separated list of blocked usernames (case-insensitive)",
   "Accounts_CustomFields_Description": "Should be a valid JSON where keys are the field names containing a dictionary of field settings. Example:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code> ",
   "Accounts_CustomFieldsToShowInUserInfo": "Custom Fields to Show in User Info",
-  "Accounts_DefaultUsernamePrefixSuggestion": "Default username prefix suggestion",
+  "Accounts_DefaultUsernamePrefixSuggestion": "Default Username Prefix Suggestion",
   "Accounts_denyUnverifiedEmail": "Deny unverified email",
   "Accounts_EmailVerification": "Email Verification",
   "Accounts_EmailVerification_Description": "Make sure you have correct SMTP settings to use this feature",
@@ -47,11 +47,11 @@
   "Accounts_Enrollment_Email_Default": "<h2>Welcome to <h1>[Site_Name]</h1></h2><p>Go to [Site_URL] and try the best open source chat solution available today!</p>",
   "Accounts_Enrollment_Email_Description": "You may use the following placeholders: <br /><ul><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Accounts_Enrollment_Email_Subject_Default": "Welcome to [Site_Name]",
-  "Accounts_ForgetUserSessionOnWindowClose": "Forget user session on window close",
+  "Accounts_ForgetUserSessionOnWindowClose": "Forget User Session on Window Close",
   "Accounts_Iframe_api_method": "Api Method",
   "Accounts_Iframe_api_url": "API URL",
   "Accounts_iframe_enabled": "Enabled",
-  "Accounts_iframe_url": "Iframe Url",
+  "Accounts_iframe_url": "Iframe URL",
   "Accounts_LoginExpiration": "Login Expiration in Days",
   "Accounts_ManuallyApproveNewUsers": "Manually Approve New Users",
   "Accounts_OAuth_Custom_Authorize_Path": "Authorize Path",
@@ -123,10 +123,10 @@
   "Accounts_RegistrationForm_SecretURL_Description": "You must provide a random string that will be added to your registration URL. Example: https://demo.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Require Name For Signup",
   "Accounts_RequirePasswordConfirmation": "Require Password Confirmation",
-  "Accounts_SearchFields": "Fields to consider in search",
+  "Accounts_SearchFields": "Fields to Consider in Search",
   "Accounts_SetDefaultAvatar": "Set Default Avatar",
   "Accounts_SetDefaultAvatar_Description": "Tries to determine default avatar based on OAuth Account or Gravatar",
-  "Accounts_ShowFormLogin": "Show form-based Login",
+  "Accounts_ShowFormLogin": "Show Form-Based Login",
   "Accounts_UseDefaultBlockedDomainsList": "Use Default Blocked Domains List",
   "Accounts_UseDNSDomainCheck": "Use DNS Domain Check",
   "Accounts_UserAddedEmail_Default": "<h2>Welcome to <h1>[Site_Name]</h1></h2><p>Go to [Site_URL] and try the best open source chat solution available today!</p><p>You may login using your email: [email] and password: [password]. You may be required to change it after your first login.",
@@ -166,7 +166,7 @@
   "Agent_added": "Agent added",
   "Agent_removed": "Agent removed",
   "Alias": "Alias",
-  "Alias_Format": "Alias format",
+  "Alias_Format": "Alias Format",
   "Alias_Format_Description": "Import messages from Slack with an alias; %s is replaced by the username of the user. If empty, no alias will be used.",
   "Alias_Set": "Alias Set",
   "All": "All",
@@ -176,8 +176,8 @@
   "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
   "Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs",
   "Allow_Invalid_SelfSigned_Certs_Description": "Allow invalid and self-signed SSL certificate's for link validation and previews.",
-  "Allow_switching_departments": "Allow visitor to switch departments",
-  "Always_open_in_new_window": "Always open in new window",
+  "Allow_switching_departments": "Allow Visitor to Switch Departments",
+  "Always_open_in_new_window": "Always Open in New Window",
   "Analytics_features_enabled": "Features Enabled",
   "Analytics_features_messages_Description": "Tracks custom events related to actions a user does on messages.",
   "Analytics_features_rooms_Description": "Tracks custom events related to actions on a channel or group (create, leave, delete).",
@@ -199,8 +199,8 @@
   "API_Drupal_URL_Description": "Example: https://domain.com (excluding trailing slash)",
   "API_Embed": "Embed Link Previews",
   "API_Embed_Description": "Whether embedded link previews are enabled or not when a user posts a link to a website.",
-  "API_Embed_UserAgent": "Embed request user agent",
-  "API_EmbedCacheExpirationDays": "Embed cache expiration days",
+  "API_Embed_UserAgent": "Embed Request User Agent",
+  "API_EmbedCacheExpirationDays": "Embed Cache Expiration Days",
   "API_EmbedDisabledFor": "Disable Embed for Users",
   "API_EmbedDisabledFor_Description": "Comma-separated list of usernames to disable the embedded link previews.",
   "API_EmbedIgnoredHosts": "Embed Ignored Hosts",
@@ -220,7 +220,7 @@
   "API_Token": "API Token",
   "API_Upper_Count_Limit": "Max Record Amount",
   "API_Upper_Count_Limit_Description": "What is the maximum number of records the REST API should return (when not unlimited)?",
-  "API_User_Limit": "User Limit for adding all Users to Channel",
+  "API_User_Limit": "User Limit for Adding All Users to Channel",
   "API_Wordpress_URL": "WordPress URL",
   "Apiai_Key": "Api.ai Key",
   "Apiai_Language": "Api.ai Language",
@@ -246,7 +246,7 @@
   "Audio_message": "Audio message",
   "Audio_Notification_Value_Description": "Can be any custom sound or the default ones: beep, chelle, ding, droplet, highbell, seasons",
   "Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
-  "Audio_Notifications_Value": "Default message notification audio",
+  "Audio_Notifications_Value": "Default Message Notification Audio",
   "Auth_Token": "Auth Token",
   "Author": "Author",
   "Authorization_URL": "Authorization URL",
@@ -316,22 +316,22 @@
   "Cancel": "Cancel",
   "Cancel_message_input": "Cancel",
   "Cannot_invite_users_to_direct_rooms": "Cannot invite users to direct rooms",
-  "Cannot_open_conversation_with_yourself": "Cannot open a conversation with yourself",
-  "CAS_autoclose": "Autoclose login popup",
+  "Cannot_open_conversation_with_yourself": "Cannot Direct Message with yourself",
+  "CAS_autoclose": "Autoclose Login Popup",
   "CAS_base_url": "SSO Base URL",
   "CAS_base_url_Description": "The base URL of your external SSO service e.g: https://sso.example.undef/sso/",
-  "CAS_button_color": "Login button background color",
-  "CAS_button_label_color": "Login button text color",
-  "CAS_button_label_text": "Login button label",
+  "CAS_button_color": "Login Button Background Color",
+  "CAS_button_label_color": "Login Button Text Color",
+  "CAS_button_label_text": "Login Button Label",
   "CAS_enabled": "Enabled",
   "CAS_Login_Layout": "CAS Login Layout",
   "CAS_login_url": "SSO Login URL",
   "CAS_login_url_Description": "The login URL of your external SSO service e.g: https://sso.example.undef/sso/login",
-  "CAS_popup_height": "Login popup height",
-  "CAS_popup_width": "Login popup width",
-  "CAS_Sync_User_Data_Enabled": "Always sync User data",
+  "CAS_popup_height": "Login Popup Height",
+  "CAS_popup_width": "Login Popup Width",
+  "CAS_Sync_User_Data_Enabled": "Always Sync User Data",
   "CAS_Sync_User_Data_Enabled_Description": "Always synchronize external CAS User data into available attributes upon login. Note: Attributes are always synced upon account creation anyway.",
-  "CAS_Sync_User_Data_FieldMap": "Attribute map",
+  "CAS_Sync_User_Data_FieldMap": "Attribute Map",
   "CAS_Sync_User_Data_FieldMap_Description": "Use this JSON input to build internal attributes (key) from external attributes (value). External attribute names enclosed with '%' will interpolated in value strings.<br/>Example, `{\"email\":\"%email%\", \"name\":\"%firstname%, %lastname%\"}`<br/><br/>The attribute map is always interpolated. In CAS 1.0 only the `username` attribute is available. Available internal attributes are: username, name, email, rooms; rooms is a comma separated list of rooms to join upon user creation e.g: {\"rooms\": \"%team%,%department%\"} would join CAS users on creation to their team and department channel.",
   "CAS_version": "CAS Version",
   "CAS_version_Description": "Only use a supported CAS version supported by your CAS SSO service.",
@@ -347,12 +347,12 @@
   "Channel_Archived": "Channel with name `#%s` has been archived successfully",
   "Channel_created": "Channel `#%s` created.",
   "Channel_doesnt_exist": "The channel `#%s` does not exist.",
-  "Channel_name": "Channel name",
+  "Channel_name": "Channel Name",
   "Channel_Name_Placeholder": "Please enter channel name...",
   "Channel_to_listen_on": "Channel to listen on",
   "Channel_Unarchived": "Channel with name `#%s` has been Unarchived successfully",
   "Channels": "Channels",
-  "Channels_are_where_your_team_communicate": "Channels are where your team communicate.",
+  "Channels_are_where_your_team_communicate": "Channels are where your team communicate",
   "Channels_list": "List of public channels",
   "Chat_button": "Chat button",
   "Chat_closed": "Chat closed",
@@ -370,7 +370,7 @@
   "clean-channel-history_description": "Permission to Clear the history from channels",
   "clear": "Clear",
   "Clear_all_unreads_question": "Clear all unreads?",
-  "clear_cache_now": "Clear cache now",
+  "clear_cache_now": "Clear Cache Now",
   "clear_history": "Clear History",
   "Click_here": "Click here",
   "Click_here_for_more_info": "Click here for more info",
@@ -387,10 +387,10 @@
   "Closed": "Closed",
   "Closed_by_visitor": "Closed by visitor",
   "Closing_chat": "Closing chat",
-  "Collapse_Embedded_Media_By_Default": "Collapse embedded media by default",
+  "Collapse_Embedded_Media_By_Default": "Collapse Embedded Media by Default",
   "Color": "Color",
   "Commands": "Commands",
-  "Comment_to_leave_on_closing_session": "Comment to leave on closing session",
+  "Comment_to_leave_on_closing_session": "Comment to Leave on Closing Session",
   "Compact": "Compact",
   "Confirm_password": "Confirm your password",
   "Content": "Content",
@@ -434,8 +434,8 @@
   "Custom_Fields": "Custom Fields",
   "Custom_oauth_helper": "When setting up your OAuth Provider, you'll have to inform a Callback URL. Use <pre>%s</pre> .",
   "Custom_oauth_unique_name": "Custom oauth unique name",
-  "Custom_Script_Logged_In": "Custom Script for logged in users",
-  "Custom_Script_Logged_Out": "Custom Script for logged out users",
+  "Custom_Script_Logged_In": "Custom Script for Logged In Users",
+  "Custom_Script_Logged_Out": "Custom Script for Logged Out Users",
   "Custom_Scripts": "Custom Scripts",
   "Custom_Sound_Add": "Add Custom Sound",
   "Custom_Sound_Delete_Warning": "Deleting a sound cannot be undone.",
@@ -493,7 +493,7 @@
   "Direct_Reply": "Direct Reply",
   "Direct_Reply_Debug": "Debug Direct Reply",
   "Direct_Reply_Debug_Description": "[Beware] Enabling Debug mode would display your 'Plain Text Password' in Admin console.",
-  "Direct_Reply_Delete": "Delete intercepted Emails",
+  "Direct_Reply_Delete": "Delete Intercepted Emails",
   "Direct_Reply_Enable": "Enable Direct Reply",
   "Direct_Reply_Frequency": "Email Check Frequency",
   "Direct_Reply_Frequency_Description": "(in minutes, default/minimum 2)",
@@ -508,7 +508,7 @@
   "Direct_Reply_Username_Description": "Please use absolute email, tagging is not allowed, it would be over-written",
   "Disable_Notifications": "Disable Notifications",
   "Disable_two-factor_authentication": "Disable two-factor authentication",
-  "Display_offline_form": "Display offline form",
+  "Display_offline_form": "Display Offline Form",
   "Displays_action_text": "Displays action text",
   "Do_you_want_to_change_to_s_question": "Do you want to change to <strong>%s</strong>?",
   "Domain": "Domain",
@@ -546,7 +546,7 @@
   "Editing_room": "Editing room",
   "Editing_user": "Editing user",
   "Email": "Email",
-  "Email_address_to_send_offline_messages": "Email address to send offline messages",
+  "Email_address_to_send_offline_messages": "Email Address to Send Offline Messages",
   "Email_already_exists": "Email already exists",
   "Email_body": "Email body",
   "Email_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of email",
@@ -664,7 +664,7 @@
   "every_six_hours": "Once every six hours",
   "Everyone_can_access_this_channel": "Everyone can access this channel",
   "Example_s": "Example: <code class=\"inline\">%s</code>",
-  "Exclude_Botnames": "Exclude bots",
+  "Exclude_Botnames": "Exclude Bots",
   "Exclude_Botnames_Description": "Do not propagate messages from bots whose name matches the regular expression above. If left empty, all messages from bots will be propagated.",
   "False": "False",
   "Favorite_Rooms": "Enable Favorite Rooms",
@@ -693,18 +693,18 @@
   "FileUpload_MediaType_NotAccepted": "Media Types Not Accepted",
   "FileUpload_MediaTypeWhiteList": "Accepted Media Types",
   "FileUpload_MediaTypeWhiteListDescription": "Comma-separated list of media types. Leave it blank for accepting all media types.",
-  "FileUpload_ProtectFiles": "Protect uploaded files",
+  "FileUpload_ProtectFiles": "Protect Uploaded Files",
   "FileUpload_ProtectFilesDescription": "Only authenticated users will have access",
   "FileUpload_S3_Acl": "Acl",
   "FileUpload_S3_AWSAccessKeyId": "Access Key",
   "FileUpload_S3_AWSSecretAccessKey": "Secret Key",
   "FileUpload_S3_Bucket": "Bucket name",
   "FileUpload_S3_BucketURL": "Bucket URL",
-  "FileUpload_S3_CDN": "CDN domain for downloads",
+  "FileUpload_S3_CDN": "CDN Domain for Downloads",
   "FileUpload_S3_ForcePathStyle": "Force Path Style",
   "FileUpload_S3_Region": "Region",
   "FileUpload_S3_SignatureVersion": "Signature Version",
-  "FileUpload_S3_URLExpiryTimeSpan": "URLs expiration timespan",
+  "FileUpload_S3_URLExpiryTimeSpan": "URLs Expiration Timespan",
   "FileUpload_S3_URLExpiryTimeSpan_Description": "Time after which Amazon S3 generated URLs will no longer be valid (in seconds). If set to less than 5 seconds, this field will be ignored.",
   "FileUpload_Storage_Type": "Storage Type",
   "First_Channel_After_Login": "First Channel After Login",
@@ -713,11 +713,11 @@
   "Fonts": "Fonts",
   "Food_and_Drink": "Food & Drink",
   "Footer": "Footer",
-  "Footer_Direct_Reply": "Footer when Direct Reply enabled",
+  "Footer_Direct_Reply": "Footer When Direct Reply is Enabled",
   "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your current password to continue",
   "force-delete-message": "Force Delete Message",
   "force-delete-message_description": "Permission to delete a message bypassing all restrictions",
-  "Force_Disable_OpLog_For_Cache": "Force disable OpLog for Cache",
+  "Force_Disable_OpLog_For_Cache": "Force Disable OpLog for Cache",
   "Force_Disable_OpLog_For_Cache_Description": "Will not use OpLog to sync cache even when it's available",
   "Force_SSL": "Force SSL",
   "Force_SSL_Description": "*Caution!* _Force SSL_ should never be used with reverse proxy. If you have a reverse proxy, you should do the redirect THERE. This option exists for deployments like Heroku, that does not allow the redirect configuration at the reverse proxy.",
@@ -757,7 +757,7 @@
   "GoogleVision_Type_Labels": "Labels Detection",
   "GoogleVision_Type_Landmarks": "Landmarks Detection",
   "GoogleVision_Type_Logos": "Logos Detection",
-  "GoogleVision_Type_Properties": "Properties (color) Detection",
+  "GoogleVision_Type_Properties": "Properties (Color) Detection",
   "GoogleVision_Type_SafeSearch": "SafeSearch Detection",
   "GoogleVision_Type_Similar": "Search Similar Images",
   "Group_mentions_only": "Group mentions only",
@@ -769,15 +769,15 @@
   "Hex_Color_Preview": "Hex Color Preview",
   "Hidden": "Hidden",
   "Hide_Avatars": "Hide Avatars",
-  "Hide_flextab": "Hide right side bar with click",
+  "Hide_flextab": "Hide Right Sidebar with Click",
   "Hide_Group_Warning": "Are you sure you want to hide the group \"%s\"?",
   "Hide_Livechat_Warning": "Are you sure you want to hide the livechat with \"%s\"?",
   "Hide_Private_Warning": "Are you sure you want to hide the discussion with \"%s\"?",
-  "Hide_roles": "Hide roles",
-  "Hide_room": "Hide room",
+  "Hide_roles": "Hide Roles",
+  "Hide_room": "Hide Room",
   "Hide_Room_Warning": "Are you sure you want to hide the room \"%s\"?",
   "Hide_Unread_Room_Status": "Hide Unread Room Status",
-  "Hide_usernames": "Hide usernames",
+  "Hide_usernames": "Hide Usernames",
   "Highlights": "Highlights",
   "Highlights_How_To": "To be notified when someone mentions a word or phrase, add it here. You can separate words or phrases with commas. Highlight Words are not case sensitive.",
   "Highlights_List": "Highlight words",
@@ -787,21 +787,21 @@
   "Hours": "Hours",
   "How_friendly_was_the_chat_agent": "How friendly was the chat agent?",
   "How_knowledgeable_was_the_chat_agent": "How knowledgeable was the chat agent?",
-  "How_long_to_wait_after_agent_goes_offline": "How long to wait after agent goes offline",
+  "How_long_to_wait_after_agent_goes_offline": "How Long to Wait After Agent Goes Offline",
   "How_responsive_was_the_chat_agent": "How responsive was the chat agent?",
   "How_satisfied_were_you_with_this_chat": "How satisfied were you with this chat?",
-  "How_to_handle_open_sessions_when_agent_goes_offline": "How to handle open sessions when agent goes offline",
+  "How_to_handle_open_sessions_when_agent_goes_offline": "How to Handle Open Sessions When Agent Goes Offline",
   "If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.",
   "If_you_are_sure_type_in_your_password": "If you are sure type in your password:",
   "If_you_are_sure_type_in_your_username": "If you are sure type in your username:",
   "Iframe_Integration": "Iframe Integration",
   "Iframe_Integration_receive_enable": "Enable Receive",
   "Iframe_Integration_receive_enable_Description": "Allow parent window to send commands to Rocket.Chat.",
-  "Iframe_Integration_receive_origin": "Receive origins",
+  "Iframe_Integration_receive_origin": "Receive Origins",
   "Iframe_Integration_receive_origin_Description": "Origins with protocol prefix, separated by commas, which are allowed to receive commands e.g. 'https://localhost, http://localhost', or * to allow receiving from anywhere.",
   "Iframe_Integration_send_enable": "Enable Send",
   "Iframe_Integration_send_enable_Description": "Send events to parent window",
-  "Iframe_Integration_send_target_origin": "Send target origin",
+  "Iframe_Integration_send_target_origin": "Send Target Origin",
   "Iframe_Integration_send_target_origin_Description": "Origin with protocol prefix, which commands are sent to e.g. 'https://localhost', or * to allow sending to anywhere.",
   "IMAP_intercepter_already_running": "IMAP intercepter already running",
   "IMAP_intercepter_Not_running": "IMAP intercepter Not running",
@@ -881,9 +881,9 @@
   "Integrations_Outgoing_Type_SendMessage": "Message Sent",
   "Integrations_Outgoing_Type_UserCreated": "User Created",
   "InternalHubot": "Internal Hubot",
-  "InternalHubot_PathToLoadCustomScripts": "Folder to load the scripts",
+  "InternalHubot_PathToLoadCustomScripts": "Folder to Load the Scripts",
   "InternalHubot_reload": "Reload the scripts",
-  "InternalHubot_ScriptsToLoad": "Scripts to load",
+  "InternalHubot_ScriptsToLoad": "Scripts to Load",
   "InternalHubot_ScriptsToLoad_Description": "Please enter a comma separated list of scripts to load from your custom folder",
   "InternalHubot_Username_Description": "This must be a valid username of a bot registered on your server.",
   "Invalid_confirm_pass": "The password confirmation does not match password",
@@ -950,7 +950,7 @@
   "Jump_to_first_unread": "Jump to first unread",
   "Jump_to_message": "Jump to message",
   "Jump_to_recent_messages": "Jump to recent messages",
-  "Just_invited_people_can_access_this_channel": "Just invited people can access this channel",
+  "Just_invited_people_can_access_this_channel": "Just invited people can access this channel.",
   "Katex_Dollar_Syntax": "Allow Dollar Syntax",
   "Katex_Dollar_Syntax_Description": "Allow using $$katex block$$ and $inline katex$ syntaxes",
   "Katex_Enabled": "Katex Enabled",
@@ -1007,7 +1007,7 @@
   "LDAP_Encryption": "Encryption",
   "LDAP_Encryption_Description": "The encryption method used to secure communications to the LDAP server. Examples include `plain` (no encryption), `SSL/LDAPS` (encrypted from the start), and `StartTLS` (upgrade to encrypted communication once connected).",
   "LDAP_Internal_Log_Level": "Internal Log Level",
-  "LDAP_Group_Filter_Enable": "Enable LDAP user group filter",
+  "LDAP_Group_Filter_Enable": "Enable LDAP User Group Filter",
   "LDAP_Group_Filter_Enable_Description": "Restrict access to users in a LDAP group<br/>Useful for OpenLDAP servers without overlays that not permit *memberOf* filter",
   "LDAP_Group_Filter_Group_Id_Attribute": "Group ID Attribute",
   "LDAP_Group_Filter_Group_Id_Attribute_Description": "E.g. *OpenLDAP:*cn",
@@ -1026,7 +1026,7 @@
   "LDAP_Import_Users_Description": "It True sync process will be import all LDAP users <br/> *Caution!* Specify search filter to not import excess users.",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "If the login on LDAP is not successful try to login in default/local account system. Helps when the LDAP is down for some reason.",
-  "LDAP_Merge_Existing_Users": "Merge existing users",
+  "LDAP_Merge_Existing_Users": "Merge Existing Users",
   "LDAP_Merge_Existing_Users_Description": "*Caution!* When importing an user from LDAP and an user with same username already exists the LDAP info and password will be set into the existing user.",
   "LDAP_Port": "Port",
   "LDAP_Port_Description": "Port to access LDAP. eg: `389` or `636` for LDAPS",
@@ -1071,19 +1071,19 @@
   "List_of_Channels": "List of Channels",
   "List_of_Direct_Messages": "List of Direct Messages",
   "Livechat_agents": "Livechat agents",
-  "Livechat_AllowedDomainsList": "Livechat allowed domains",
+  "Livechat_AllowedDomainsList": "Livechat Allowed Domains",
   "Livechat_Dashboard": "Livechat Dashboard",
   "Livechat_enabled": "Livechat enabled",
   "Livechat_forward_open_chats": "Forward open chats",
   "Livechat_forward_open_chats_timeout": "Timeout (in seconds) to forward chats",
-  "Livechat_guest_count": "Guest counter",
+  "Livechat_guest_count": "Guest Counter",
   "Livechat_Inquiry_Already_Taken": "Livechat inquiry already taken",
   "Livechat_managers": "Livechat managers",
   "Livechat_offline": "Livechat offline",
   "Livechat_online": "Livechat online",
-  "Livechat_open_inquiery_show_connecting": "Show connecting message instead of input when guest is not yet connected to an agent",
+  "Livechat_open_inquiery_show_connecting": "Show Connecting Message Instead of Input When Guest is Not Yet Connected to an Agent",
   "Livechat_Queue": "Livechat Queue",
-  "Livechat_room_count": "Livechat room count",
+  "Livechat_room_count": "Livechat Room Count",
   "Livechat_Routing_Method": "Livechat Routing Method",
   "Livechat_Take_Confirm": "Do you want to take this client?",
   "Livechat_title": "Livechat Title",
@@ -1138,8 +1138,8 @@
   "MapView_Enabled_Description": "Enabling mapview will display a location share button on the left of the chat input field.",
   "MapView_GMapsAPIKey": "Google Static Maps API Key",
   "MapView_GMapsAPIKey_Description": "This can be obtained from the Google Developers Console for free.",
-  "Mark_as_read": "Mark as read",
-  "Mark_as_unread": "Mark as unread",
+  "Mark_as_read": "Mark As Read",
+  "Mark_as_unread": "Mark As Unread",
   "Markdown_Headers": "Allow Markdown headers in messages",
   "Markdown_Marked_Breaks": "Enable Marked Breaks",
   "Markdown_Marked_GFM": "Enable Marked GFM",
@@ -1171,14 +1171,14 @@
   "Message_AllowSnippeting": "Allow Message Snippeting",
   "Message_AllowStarring": "Allow Message Starring",
   "Message_AllowUnrecognizedSlashCommand": "Allow Unrecognized Slash Commands",
-  "Message_AlwaysSearchRegExp": "Always search using RegExp",
+  "Message_AlwaysSearchRegExp": "Always Search Using RegExp",
   "Message_AlwaysSearchRegExp_Description": "We recommend to set `True` if your language is not supported on <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">MongoDB text search</a>.",
   "Message_Attachments": "Message Attachments",
   "Message_Attachments_GroupAttach": "Group Attachment Buttons",
   "Message_Attachments_GroupAttachDescription": "This groups the icons under an expandable menu. Takes up less screen space.",
   "Message_AudioRecorderEnabled": "Audio Recorder Enabled",
   "Message_AudioRecorderEnabledDescription": "Requires 'audio/wav' files to be an accepted media type within 'File Upload' settings.",
-  "Message_BadWordsFilterList": "Add bad words to the blacklist",
+  "Message_BadWordsFilterList": "Add Bad Words to the Blacklist",
   "Message_BadWordsFilterListDescription": "Add List of Comma-separated list of bad words to filter",
   "Message_DateFormat": "Date Format",
   "Message_DateFormat_Description": "See also: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
@@ -1191,14 +1191,14 @@
   "Message_HideType_ru": "Hide \"User Removed\" messages",
   "Message_HideType_uj": "Hide \"User Join\" messages",
   "Message_HideType_ul": "Hide \"User Leave\" messages",
-  "Message_KeepHistory": "Keep per message editing history",
-  "Message_MaxAll": "Maximum channel size for ALL message",
+  "Message_KeepHistory": "Keep Per Message Editing History",
+  "Message_MaxAll": "Maximum Channel Size for ALL Message",
   "Message_MaxAllowedSize": "Maximum Allowed Message Size",
   "Message_pinning": "Message pinning",
   "Message_QuoteChainLimit": "Maximum Number of Chained Quotes",
   "Message_removed": "Message removed",
   "Message_sent_by_email": "Message sent by Email",
-  "Message_SetNameToAliasEnabled": "Set a user name to alias in message",
+  "Message_SetNameToAliasEnabled": "Set a User Name to Alias in Message",
   "Message_SetNameToAliasEnabled_Description": "Only if not already set alias. The old messages alias not changed if user has changed the name.",
   "Message_ShowDeletedStatus": "Show Deleted Status",
   "Message_ShowEditedStatus": "Show Edited Status",
@@ -1225,7 +1225,7 @@
   "Mobile": "Mobile",
   "Mobile_Notifications_Default_Alert": "Mobile Notifications Default Alert",
   "Monday": "Monday",
-  "Monitor_history_for_changes_on": "Monitor history for changes on",
+  "Monitor_history_for_changes_on": "Monitor History for Changes on",
   "More_channels": "More channels",
   "More_direct_messages": "More direct messages",
   "More_groups": "More private groups",
@@ -1263,16 +1263,16 @@
   "New_role": "New role",
   "New_Room_Notification": "New Room Notification",
   "New_Trigger": "New Trigger",
-  "New_videocall_request": "New videocall request",
+  "New_videocall_request": "New Video Call Request",
   "No_available_agents_to_transfer": "No available agents to transfer",
   "No_channel_with_name_%s_was_found": "No channel with name <strong>\"%s\"</strong> was found!",
-  "No_channels_yet": "You aren't part of any channel yet.",
-  "No_direct_messages_yet": "You haven't started any conversations yet.",
+  "No_channels_yet": "You aren't part of any channel yet",
+  "No_direct_messages_yet": "No Direct Messages.",
   "No_Encryption": "No Encryption",
   "No_group_with_name_%s_was_found": "No private group with name <strong>\"%s\"</strong> was found!",
   "No_groups_yet": "You have no private groups yet.",
   "No_integration_found": "No integration found by the provided id.",
-  "No_livechats": "You have no livechats.",
+  "No_livechats": "You have no livechats",
   "No_mentions_found": "No mentions found",
   "No_pinned_messages": "No pinned messages",
   "No_results_found": "No results found",
@@ -1293,7 +1293,7 @@
   "Notification_Duration": "Notification Duration",
   "Notification_Mobile_Default_For": "Push Mobile Notifications For",
   "Notifications": "Notifications",
-  "Notifications_Max_Room_Members": "Max room members before disabling all message notifications",
+  "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
   "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
   "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
   "Notifications_Sound_Volume": "Notifications sound volume",
@@ -1308,18 +1308,18 @@
   "Off_the_record_conversation": "Off-the-record Conversation",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record conversation is not available for your browser or device.",
   "Office_Hours": "Office Hours",
-  "Office_hours_enabled": "Office hours enabled",
+  "Office_hours_enabled": "Office Hours Enabled",
   "Office_hours_updated": "Office hours updated",
   "Offline": "Offline",
   "Offline_DM_Email": "Direct Message Email Subject",
   "Offline_Email_Subject_Description": "You may use the following placeholders:<br/><ul><li>[Site_Name], [Site_URL], [User] & [Room] for the Application Name, URL, Username & Roomname respectively.<li/></ul>",
   "Offline_form": "Offline form",
-  "Offline_form_unavailable_message": "Offline form unavailable message",
+  "Offline_form_unavailable_message": "Offline Form Unavailable Message",
   "Offline_Link_Message": "GO TO MESSAGE",
   "Offline_Mention_All_Email": "Mention All Email Subject",
   "Offline_Mention_Email": "Mention Email Subject",
   "Offline_message": "Offline message",
-  "Offline_success_message": "Offline success message",
+  "Offline_success_message": "Offline Success Message",
   "Offline_unavailable": "Offline unavailable",
   "On": "On",
   "Online": "Online",
@@ -1370,18 +1370,18 @@
   "Pin_Message": "Pin Message",
   "Pinned_a_message": "Pinned a message:",
   "Pinned_Messages": "Pinned Messages",
-  "PiwikAdditionalTrackers": "Additional piwik sites",
+  "PiwikAdditionalTrackers": "Additional Piwik Sites",
   "PiwikAdditionalTrackers_Description": "Enter addtitional Piwik website URLs and SiteIDs in the following format, if you wnat to track the same data into different websites: [ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]",
-  "PiwikAnalytics_cookieDomain": "All subdomains",
+  "PiwikAnalytics_cookieDomain": "All Subdomains",
   "PiwikAnalytics_cookieDomain_Description": "Track visitors across all subdomains",
-  "PiwikAnalytics_domains": "Hide outgoing links",
+  "PiwikAnalytics_domains": "Hide Outgoing Links",
   "PiwikAnalytics_domains_Description": "In the 'Outlinks' report, hide clicks to known alias URLs. Please insert one domain per line and do not use any separators.",
-  "PiwikAnalytics_prependDomain": "Prepend domain",
+  "PiwikAnalytics_prependDomain": "Prepend Domain",
   "PiwikAnalytics_prependDomain_Description": "Prepend the site domain to the page title when tracking",
   "PiwikAnalytics_siteId_Description": "The site id to use for identifying this site. Example: 17",
   "PiwikAnalytics_url_Description": "The url where the Piwik resides, be sure to include the trailing slash. Example: //piwik.rocket.chat/",
-  "Placeholder_for_email_or_username_login_field": "Placeholder for email or username login field",
-  "Placeholder_for_password_login_field": "Placeholder for password login field",
+  "Placeholder_for_email_or_username_login_field": "Placeholder for Email or Username Login Field",
+  "Placeholder_for_password_login_field": "Placeholder for Password Login Field",
   "Please_add_a_comment": "Please add a comment",
   "Please_add_a_comment_to_close_the_room": "Please, add a comment to close the room",
   "Please_answer_survey": "Please take a moment to answer a quick survey about this chat",
@@ -1437,8 +1437,8 @@
   "Push_gcm_api_key": "GCM API Key",
   "Push_gcm_project_number": "GCM Project Number",
   "Push_production": "Production",
-  "Push_show_message": "Show message in notification",
-  "Push_show_username_room": "Show channel/group/username in notification",
+  "Push_show_message": "Show Message in Notification",
+  "Push_show_username_room": "Show Channel/Group/Username in Notification",
   "Push_test_push": "Test",
   "Query": "Query",
   "Query_description": "Additional conditions for determining which users to send the email to. Unsubscribed users are automatically removed from the query. It must be a valid JSON. Example: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
@@ -1490,7 +1490,7 @@
   "Resend_verification_email": "Resend verification email",
   "Reset": "Reset",
   "Reset_password": "Reset password",
-  "Reset_section_settings": "Reset section settings",
+  "Reset_section_settings": "Reset Section Settings",
   "Restart": "Restart",
   "Restart_the_server": "Restart the server",
   "Retry_Count": "Retry Count",
@@ -1540,9 +1540,9 @@
   "SAML_Custom_Generate_Username": "Generate Username",
   "SAML_Custom_IDP_SLO_Redirect_URL": "IDP SLO Redirect URL",
   "SAML_Custom_Issuer": "Custom Issuer",
-  "SAML_Custom_Private_Key": "Private key contents",
+  "SAML_Custom_Private_Key": "Private Key Contents",
   "SAML_Custom_Provider": "Custom Provider",
-  "SAML_Custom_Public_Cert": "Public cert contents",
+  "SAML_Custom_Public_Cert": "Public Cert Contents",
   "Sandstorm_Powerbox_Share": "Share a Sandstorm grain",
   "Saturday": "Saturday",
   "Save": "Save",
@@ -1563,7 +1563,7 @@
   "Search_Messages": "Search Messages",
   "Search_Private_Groups": "Search Private Groups",
   "seconds": "seconds",
-  "Secret_token": "Secret token",
+  "Secret_token": "Secret Token",
   "Security": "Security",
   "Select_a_department": "Select a department",
   "Select_a_user": "Select a user",
@@ -1585,8 +1585,8 @@
   "Send_invitation_email_error": "You haven't provided any valid email address.",
   "Send_invitation_email_info": "You can send multiple email invitations at once.",
   "Send_invitation_email_success": "You have successfully sent an invitation email to the following addresses:",
-  "Send_request_on_chat_close": "Send request on chat close",
-  "Send_request_on_offline_messages": "Send request on offline messages",
+  "Send_request_on_chat_close": "Send Request on Chat Close",
+  "Send_request_on_offline_messages": "Send Request on Offline Messages",
   "Send_Test": "Send Test",
   "Send_welcome_email": "Send welcome email",
   "Send_your_JSON_payloads_to_this_URL": "Send your JSON payloads to this URL.",
@@ -1611,18 +1611,18 @@
   "Shared_Location": "Shared Location",
   "Should_be_a_URL_of_an_image": "Should be a URL of an image.",
   "Should_exists_a_user_with_this_username": "The user must already exist.",
-  "Show_all": "Show all",
+  "Show_all": "Show All",
   "Show_more": "Show more",
   "show_offline_users": "show offline users",
   "Show_on_registration_page": "Show on registration page",
-  "Show_only_online": "Show only online",
-  "Show_preregistration_form": "Show pre-registration form",
-  "Show_queue_list_to_all_agents": "Show queue list to all agents",
+  "Show_only_online": "Show Online Only",
+  "Show_preregistration_form": "Show Pre-registration Form",
+  "Show_queue_list_to_all_agents": "Show Queue List to All Agents",
   "Show_the_keyboard_shortcut_list": "Show the keyboard shortcut list",
   "Showing_archived_results": "<p>Showing <b>%s</b> archived results</p>",
   "Showing_online_users": "Showing: <b>__total_showing__</b>, Online: __online__, Total: __total__ users",
   "Showing_results": "<p>Showing <b>%s</b> results</p>",
-  "Sidebar_list_mode": "Sidebar channel list mode",
+  "Sidebar_list_mode": "Sidebar Channel List Mode",
   "Sign_in_to_start_talking": "Sign in to start talking",
   "since_creation": "since %s",
   "Site_Name": "Site Name",
@@ -1684,7 +1684,7 @@
   "Started_At": "Started At",
   "Started_a_video_call": "Started a Video Call",
   "Statistics": "Statistics",
-  "Statistics_reporting": "Send statistics to Rocket.Chat",
+  "Statistics_reporting": "Send Statistics to Rocket.Chat",
   "Statistics_reporting_Description": "By sending your statistics, you'll help us identify how many instances of Rocket.Chat are deployed, as well as how good the system is behaving, so we can further improve it. Don't worry, as no user information is sent and all the information we receive is kept confidential.",
   "Stats_Active_Users": "Active Users",
   "Stats_Avg_Channel_Users": "Average Channel Users",
@@ -1807,8 +1807,8 @@
   "To_users": "To Users",
   "Toggle_original_translated": "Toggle original/translated",
   "Topic": "Topic",
-  "Transcript_Enabled": "Ask visitor if they would like a transcript after chat closed",
-  "Transcript_message": "Message to show when asking about transcript",
+  "Transcript_Enabled": "Ask Visitor if They Would Like a Transcript After Chat Closed",
+  "Transcript_message": "Message to Show When Asking About Transcript",
   "Transcript_of_your_livechat_conversation": "Transcript of your livechat conversation.",
   "Translated": "Translated",
   "Translations": "Translations",
@@ -1828,13 +1828,13 @@
   "Type_your_message": "Type your message",
   "Type_your_name": "Type your name",
   "Type_your_new_password": "Type your new password",
-  "UI_Allow_room_names_with_special_chars": "Allow special chars on room names",
+  "UI_Allow_room_names_with_special_chars": "Allow Special Characters in Room Names",
   "UI_Click_Direct_Message": "Click to Create Direct Message",
   "UI_Click_Direct_Message_Description": "Skip opening profile tab, instead go straight to conversation",
   "UI_DisplayRoles": "Display Roles",
-  "UI_Merge_Channels_Groups": "Merge private groups with channels",
-  "UI_Unread_Counter_Style": "Unread counter style",
-  "UI_Use_Name_Avatar": "Use full name initials to generate default avatar",
+  "UI_Merge_Channels_Groups": "Merge Private Groups with Channels",
+  "UI_Unread_Counter_Style": "Unread Counter Style",
+  "UI_Use_Name_Avatar": "Use Full Name Initials to Generate Default Avatar",
   "UI_Use_Real_Name": "Use Real Name",
   "Unarchive": "Unarchive",
   "unarchive-room": "Unarchive Room",
@@ -1858,7 +1858,7 @@
   "Uploading_file": "Uploading file...",
   "Uptime": "Uptime",
   "URL": "URL",
-  "URL_room_prefix": "URL room prefix",
+  "URL_room_prefix": "URL Room Prefix",
   "Use_account_preference": "Use account preference",
   "Use_Emojis": "Use Emojis",
   "Use_Global_Settings": "Use Global Settings",
@@ -1936,7 +1936,7 @@
   "UTF8_Names_Slugify": "UTF8 Names Slugify",
   "UTF8_Names_Validation": "UTF8 Names Validation",
   "UTF8_Names_Validation_Description": "RegExp that will be used to validate usernames and channel names",
-  "Validate_email_address": "Validate email address",
+  "Validate_email_address": "Validate Email Address",
   "Verification": "Verification",
   "Verification_Description": "You may use the following placeholders: <br /><ul><li>[Verification_Url] for the verification URL.</li><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Verification_Email": "Click <a href=\"[Verification_Url]\">here</a> to verify your account.",
@@ -1948,8 +1948,8 @@
   "Video_Chat_Window": "Video Chat",
   "Video_Conference": "Video Conference",
   "Video_message": "Video message",
-  "Videocall_declined": "Videocall declined.",
-  "Videocall_enabled": "Videocall enabled",
+  "Videocall_declined": "Video Call Declined.",
+  "Videocall_enabled": "Video Call Enabled",
   "view-c-room": "View Public Channel",
   "view-c-room_description": "Permission to view public channels",
   "view-d-room": "View Direct Messages",
@@ -1980,12 +1980,12 @@
   "view-room-administration": "View Room Administration",
   "view-room-administration_description": "Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives",
   "view-statistics": "View Statistics",
-  "view-statistics_description": "Permission o view system statistics such as number of users logged in, number of rooms, operating system information",
+  "view-statistics_description": "Permission to view system statistics such as number of users logged in, number of rooms, operating system information",
   "view-user-administration": "View User Administration",
   "view-user-administration_description": "Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission",
-  "View_All": "View All",
+  "View_All": "View All Members",
   "View_Logs": "View Logs",
-  "View_mode": "View mode",
+  "View_mode": "View Mode",
   "View_mode_info": "This changes the amount of space messages take up on screen.",
   "Viewing_room_administration": "Viewing room administration",
   "Visibility": "Visibility",

From 7e71ef7c0e05d8e45c118d00eaff6d8fe592fccf Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 7 Nov 2017 18:14:16 -0200
Subject: [PATCH 234/244] Fix user email settings on DM :rocket:

---
 package-lock.json                             | 224 +++++++++---------
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../server/lib/sendEmailOnMessage.js          |  13 +
 .../rocketchat-livechat/app/package-lock.json |  40 ++--
 4 files changed, 147 insertions(+), 136 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8b68be000f7..71e9c8dc524 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
     "@google-cloud/storage": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.4.0.tgz",
-      "integrity": "sha512-vt1NU7D12OGYPhWfwBD1Q2qFS6Suykorlp3NLaES2W9CW6sEBWLwScxElXt8nPvonYBCFt99jP4g1AqY+0hefw==",
+      "integrity": "sha1-r1vKwqmGmJxG81Kxyhgzvns4Pds=",
       "requires": {
         "@google-cloud/common": "0.13.6",
         "arrify": "1.0.1",
@@ -67,12 +67,12 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
     },
     "acorn": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-      "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
+      "integrity": "sha1-MXrHghgmwixwLWYYmrg1lnXxNdc=",
       "dev": true
     },
     "acorn-jsx": {
@@ -178,7 +178,7 @@
     "anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
       "dev": true,
       "requires": {
         "micromatch": "2.3.11",
@@ -188,7 +188,7 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
     },
     "archiver": {
       "version": "1.3.0",
@@ -259,7 +259,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
       "dev": true
     },
     "array-find-index": {
@@ -1382,7 +1382,7 @@
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=",
       "dev": true
     },
     "backoff": {
@@ -1401,7 +1401,7 @@
     "base64-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
+      "integrity": "sha1-qRlH2h9KUW6jjltOwOw3c2deCIY="
     },
     "base64url": {
       "version": "2.0.0",
@@ -1411,7 +1411,7 @@
     "bcrypt": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
-      "integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
+      "integrity": "sha1-sC3cbAtS6ha40883XVoy54DatUg=",
       "requires": {
         "nan": "2.6.2",
         "node-pre-gyp": "0.6.36"
@@ -1479,7 +1479,7 @@
     "bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=",
       "dev": true
     },
     "boom": {
@@ -1792,7 +1792,7 @@
     "chromedriver": {
       "version": "2.33.2",
       "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.33.2.tgz",
-      "integrity": "sha512-etnQeM8Mqiys50ZB4IiuNqeB1WS2/EKFhVXwkPQ1qjzKMMAJUyrLjaRUcoZoHrbjGscnhBrWkRR+p3zcTGMhDg==",
+      "integrity": "sha1-j8d51UtuRb71XSZKHs7tUkJ6m0k=",
       "dev": true,
       "requires": {
         "del": "3.0.0",
@@ -1805,7 +1805,7 @@
     "circular-json": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
       "dev": true
     },
     "cli-cursor": {
@@ -1884,7 +1884,7 @@
     "codemirror": {
       "version": "5.31.0",
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.31.0.tgz",
-      "integrity": "sha512-LKbMZKoAz7pMmWuSEl253G6yyloSulj1kXfvYv+3n3I8wMiI7QwnCHwKM3Zw5S9ItNV28Layq0/ihQXWmn9T9w=="
+      "integrity": "sha1-7PPQV+t0F0FHBmv8fF83tMTgffI="
     },
     "color-convert": {
       "version": "1.9.0",
@@ -1918,7 +1918,7 @@
     "commander": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=",
       "dev": true
     },
     "compare-func": {
@@ -1978,7 +1978,7 @@
     "configstore": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+      "integrity": "sha1-CU7mYquD+tmRdnjeEU+q6o/NypA=",
       "requires": {
         "dot-prop": "4.2.0",
         "graceful-fs": "4.1.11",
@@ -1996,7 +1996,7 @@
     "conventional-changelog": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
-      "integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
+      "integrity": "sha1-69mxq2N2bHFfkD9lRia2scDad2I=",
       "dev": true,
       "requires": {
         "conventional-changelog-angular": "1.5.1",
@@ -2014,7 +2014,7 @@
     "conventional-changelog-angular": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
-      "integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
+      "integrity": "sha1-l05zqhw5w5LkNk8pUr2aYpBOnqM=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2024,7 +2024,7 @@
     "conventional-changelog-atom": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
-      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
+      "integrity": "sha1-1AqbKXlhtTx0Xl0XGP0aM3n2qS8=",
       "dev": true,
       "requires": {
         "q": "1.5.1"
@@ -2033,7 +2033,7 @@
     "conventional-changelog-cli": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz",
-      "integrity": "sha512-b8B1i01df+Lq5t16L3g8uoEGdzViChIKmIo7TComL4DqqrjrtasRaT+/4OPGcApEgX86JkBqb4KVt85ytQinUw==",
+      "integrity": "sha1-OPf/ese8qS6hEIl+oItHPyBVonw=",
       "dev": true,
       "requires": {
         "add-stream": "1.0.0",
@@ -2046,7 +2046,7 @@
     "conventional-changelog-codemirror": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
-      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
+      "integrity": "sha1-PMkllV87FEAoJ7FRaASYIZctlFk=",
       "dev": true,
       "requires": {
         "q": "1.5.1"
@@ -2055,7 +2055,7 @@
     "conventional-changelog-core": {
       "version": "1.9.2",
       "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
-      "integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
+      "integrity": "sha1-oJtrlZFhZx/0W5PMnvsEROfIRcA=",
       "dev": true,
       "requires": {
         "conventional-changelog-writer": "2.0.1",
@@ -2076,7 +2076,7 @@
     "conventional-changelog-ember": {
       "version": "0.2.8",
       "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
-      "integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
+      "integrity": "sha1-ZeaG2oPSO2cTPR+FOQjIf5SANcA=",
       "dev": true,
       "requires": {
         "q": "1.5.1"
@@ -2085,7 +2085,7 @@
     "conventional-changelog-eslint": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
-      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
+      "integrity": "sha1-tLm13AlBeETYfHvPsWvcxobEscE=",
       "dev": true,
       "requires": {
         "q": "1.5.1"
@@ -2094,7 +2094,7 @@
     "conventional-changelog-express": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
-      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
+      "integrity": "sha1-jWZq1BsQ6/lkpGAgYt3S4A3rUY0=",
       "dev": true,
       "requires": {
         "q": "1.5.1"
@@ -2121,7 +2121,7 @@
     "conventional-changelog-jshint": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
-      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
+      "integrity": "sha1-Y6167GbNGuVZuv6ANIxGV6brGHI=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2131,7 +2131,7 @@
     "conventional-changelog-writer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
-      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
+      "integrity": "sha1-R8END6ulJreNGUOJ0ekx0J7mI3I=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2159,7 +2159,7 @@
     "conventional-commits-parser": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
-      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
+      "integrity": "sha1-cdAZEMsKma6yDBROUPgfTfMXhEc=",
       "dev": true,
       "requires": {
         "JSONStream": "1.3.1",
@@ -2196,7 +2196,7 @@
     "cosmiconfig": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz",
-      "integrity": "sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==",
+      "integrity": "sha1-ZAqUv5hH8yGABAPNJzr2BmXHM5c=",
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
@@ -2262,7 +2262,7 @@
         "boom": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
           "requires": {
             "hoek": "4.2.0"
           }
@@ -2413,7 +2413,7 @@
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
       "requires": {
         "ms": "2.0.0"
       }
@@ -2557,7 +2557,7 @@
     "dot-prop": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
       "requires": {
         "is-obj": "1.0.1"
       }
@@ -2574,7 +2574,7 @@
     "duplexify": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+      "integrity": "sha1-ThUWvmiDi8kKSZlPCzmm5ZYL780=",
       "requires": {
         "end-of-stream": "1.4.0",
         "inherits": "2.0.3",
@@ -2666,7 +2666,7 @@
     "es-abstract": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz",
-      "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
+      "integrity": "sha1-aQgpoHyuNrIi5/2bdcDQVz6yUic=",
       "requires": {
         "es-to-primitive": "1.1.1",
         "function-bind": "1.1.1",
@@ -2752,7 +2752,7 @@
     "eslint": {
       "version": "4.10.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz",
-      "integrity": "sha512-MMVl8P/dYUFZEvolL8PYt7qc5LNdS2lwheq9BYa5Y07FblhcZqFyaUqlS8TW5QITGex21tV4Lk0a3fK8lsJIkA==",
+      "integrity": "sha1-8l0NeVXIGWjCMJqlyaIp4EUXa7c=",
       "dev": true,
       "requires": {
         "ajv": "5.3.0",
@@ -2803,7 +2803,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -2849,7 +2849,7 @@
     "esprima": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
       "dev": true
     },
     "esquery": {
@@ -2929,7 +2929,7 @@
     "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==",
+      "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=",
       "dev": true,
       "requires": {
         "iconv-lite": "0.4.19",
@@ -2940,7 +2940,7 @@
         "iconv-lite": {
           "version": "0.4.19",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+          "integrity": "sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs=",
           "dev": true
         }
       }
@@ -3242,7 +3242,7 @@
     "fsevents": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "integrity": "sha1-MoK3E/s62A7eDp/PRhG1qm/AM/Q=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4162,7 +4162,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -4197,7 +4197,7 @@
     "gcp-metadata": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+      "integrity": "sha1-MTgURW58PQ7rj4sISzNXnohvgpo=",
       "requires": {
         "extend": "3.0.1",
         "retry-request": "3.1.0"
@@ -4206,7 +4206,7 @@
     "gcs-resumable-upload": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+      "integrity": "sha1-N98CRwQwOVp4mmN+csq8gGd66WQ=",
       "requires": {
         "buffer-equal": "1.0.0",
         "configstore": "3.1.1",
@@ -4299,7 +4299,7 @@
     "git-semver-tags": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
-      "integrity": "sha512-fhINopzKBQ8m6YlQt7gPf6T6hFnTF84O7U+8kYJmfjjKk7gbmKGj+BLcKNWi+japPbBwCeXXnfKwThpJpR9ZnQ==",
+      "integrity": "sha1-ohOb4b9uM34SXz64u4/G9dTWRF8=",
       "dev": true,
       "requires": {
         "meow": "3.7.0",
@@ -4318,7 +4318,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "requires": {
         "fs.realpath": "1.0.0",
         "inflight": "1.0.6",
@@ -4350,7 +4350,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
       "dev": true
     },
     "globby": {
@@ -4405,7 +4405,7 @@
     "google-auto-auth": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+      "integrity": "sha1-v5NS1cSgiXvzH9nEkQKLdl++px4=",
       "requires": {
         "async": "2.5.0",
         "gcp-metadata": "0.3.1",
@@ -4441,7 +4441,7 @@
     "gtoken": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz",
-      "integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==",
+      "integrity": "sha1-VQlXG4r9QyLhJM9mz2gRUoTEdtg=",
       "requires": {
         "google-p12-pem": "0.1.2",
         "jws": "3.1.4",
@@ -4900,7 +4900,7 @@
     "hawk": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+      "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
       "requires": {
         "boom": "4.3.1",
         "cryptiles": "3.1.2",
@@ -4921,7 +4921,7 @@
     "hoek": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
+      "integrity": "sha1-ctnQdU9/4lyi0BrY+PmpRJqJUm0="
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -4936,7 +4936,7 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
       "dev": true
     },
     "html-tags": {
@@ -5010,7 +5010,7 @@
     "ignore": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
+      "integrity": "sha1-YSKJv7PCIOGGpYEYYY1b6MG6sCE=",
       "dev": true
     },
     "imap": {
@@ -5156,7 +5156,7 @@
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -5214,7 +5214,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
       "dev": true
     },
     "is-builtin-module": {
@@ -5304,7 +5304,7 @@
     "is-my-json-valid": {
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+      "integrity": "sha1-WoRnd+LCYg0eaRBOXToDsfYIjxE=",
       "dev": true,
       "requires": {
         "generate-function": "2.0.0",
@@ -5507,7 +5507,7 @@
     "js-base64": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
-      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
+      "integrity": "sha1-p5qSNmY3K1gPjif1GEXG9+j7+68=",
       "dev": true
     },
     "js-tokens": {
@@ -5519,7 +5519,7 @@
     "js-yaml": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=",
       "dev": true,
       "requires": {
         "argparse": "1.0.9",
@@ -5535,7 +5535,7 @@
     "jschardet": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz",
-      "integrity": "sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==",
+      "integrity": "sha1-x9GnHtz/KDnbL57DD8XV69PBpng=",
       "dev": true
     },
     "jsesc": {
@@ -5666,7 +5666,7 @@
     "known-css-properties": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.4.1.tgz",
-      "integrity": "sha512-n+ThoCKhyMFKkMfksdLMP5ndp+VzwDRzQdH6JlmZ2GTpUenYB2EeEKjOue2SErAAG/MmBSUISpwvawDhydWQdQ==",
+      "integrity": "sha1-uqr3BOX4pfEODiISEqrj6nOOo3I=",
       "dev": true
     },
     "lazy-cache": {
@@ -5890,7 +5890,7 @@
     "log-symbols": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
-      "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
+      "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=",
       "dev": true,
       "requires": {
         "chalk": "2.3.0"
@@ -5936,7 +5936,7 @@
     "lru-cache": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
       "dev": true,
       "requires": {
         "pseudomap": "1.0.2",
@@ -5973,7 +5973,7 @@
     "make-dir": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
-      "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
+      "integrity": "sha1-GbQ2n+SMEW9Twq+VrRAsDjnoXVE=",
       "requires": {
         "pify": "3.0.0"
       }
@@ -6035,7 +6035,7 @@
     "meteor-promise": {
       "version": "0.8.6",
       "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.6.tgz",
-      "integrity": "sha512-HP6tOr67z/9XU2Dr0F2SSr8WRTuE23AG9Dj578DCJPEYHs67OLKBviU8A8rwvbwMD7Lu2+Of+yAMz2Wd8r4yxg==",
+      "integrity": "sha1-aZehWiIfuFnUcgQ/y9yuAZBr8Z0=",
       "dev": true
     },
     "methmeth": {
@@ -6073,12 +6073,12 @@
     "mime": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+      "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY="
     },
     "mime-db": {
       "version": "1.31.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz",
-      "integrity": "sha512-oB3w9lx50CMd6nfonoV5rBRUbJtjMifUHaFb5MfzjC8ksAIfVjT0BsX46SjjqBz7n9JGTrTX3paIeLSK+rS5fQ=="
+      "integrity": "sha1-pJzY8+vz7RpIK2BWHZEFrUDKdMs="
     },
     "mime-type": {
       "version": "3.0.5",
@@ -6115,7 +6115,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "requires": {
         "brace-expansion": "1.1.8"
       }
@@ -6136,7 +6136,7 @@
     "mocha": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
-      "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
+      "integrity": "sha1-HgSA/jbS2lhY0etqzDhBiybqog0=",
       "dev": true,
       "requires": {
         "browser-stdout": "1.3.0",
@@ -6307,7 +6307,7 @@
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=",
       "dev": true,
       "requires": {
         "lower-case": "1.1.4"
@@ -6346,7 +6346,7 @@
     "normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
       "dev": true,
       "requires": {
         "hosted-git-info": "2.5.0",
@@ -6385,7 +6385,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "requires": {
         "are-we-there-yet": "1.1.4",
         "console-control-strings": "1.1.0",
@@ -6510,7 +6510,7 @@
     "p-map": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=",
       "dev": true
     },
     "parse-github-repo-url": {
@@ -6890,7 +6890,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
       "dev": true
     },
     "poplib": {
@@ -7044,7 +7044,7 @@
     "postcss-reporter": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
-      "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==",
+      "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=",
       "dev": true,
       "requires": {
         "chalk": "2.3.0",
@@ -7109,7 +7109,7 @@
     "postcss-sorting": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-3.1.0.tgz",
-      "integrity": "sha512-YCPTcJwGIInF1LpMD1lIYvMHTGUL4s97o/OraA6eKvoauhhk6vjwOWDDjm6uRKqug/kyDPMKEzmYZ6FtW6RDgw==",
+      "integrity": "sha1-r3yQ7nOtElaaV2ZOrwZzXC4lvsA=",
       "dev": true,
       "requires": {
         "lodash": "4.17.4",
@@ -7142,7 +7142,7 @@
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=",
       "dev": true
     },
     "process-nextick-args": {
@@ -7159,7 +7159,7 @@
     "prom-client": {
       "version": "10.2.2",
       "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-10.2.2.tgz",
-      "integrity": "sha512-d3qCBK41qZx00/WVzWOX4tau9FinCztqaECZiGuMI5vGYD//5VSdKMOZPRQKjVh5RkI4Ex98DI0YPsoFnEo1QQ==",
+      "integrity": "sha1-drOXIHEOwQeW185gE1tdXa+/9hU=",
       "requires": {
         "tdigest": "0.1.1"
       }
@@ -7222,7 +7222,7 @@
     "qs": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+      "integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg="
     },
     "querystring": {
       "version": "0.2.0",
@@ -7232,7 +7232,7 @@
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
       "dev": true,
       "requires": {
         "is-number": "3.0.0",
@@ -7329,7 +7329,7 @@
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -7375,18 +7375,18 @@
     "regenerate": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
+      "integrity": "sha1-DDNtOYBVPXVcObWGrjsgqknIK38=",
       "dev": true
     },
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
     },
     "regenerator-transform": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "integrity": "sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=",
       "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
@@ -7397,7 +7397,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
       "dev": true,
       "requires": {
         "is-equal-shallow": "0.1.3"
@@ -7467,7 +7467,7 @@
     "request": {
       "version": "2.83.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "integrity": "sha1-ygtl2gLtYpNYh4COb1EDgQNOM1Y=",
       "requires": {
         "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
@@ -7531,7 +7531,7 @@
     "resolve": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=",
       "dev": true,
       "requires": {
         "path-parse": "1.0.5"
@@ -7587,7 +7587,7 @@
     "rimraf": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
       "requires": {
         "glob": "7.1.2"
       }
@@ -7610,7 +7610,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
     },
     "safe-json-stringify": {
       "version": "1.0.4",
@@ -7635,7 +7635,7 @@
     "selenium-standalone": {
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.11.0.tgz",
-      "integrity": "sha512-MedSwbiyLkv/nxr7JpI9zFNSAmSDpcz+bCaVSJC1krXYeIzFuj6tKMMss57xwu4VHgfInTy3IIMM2HdjN87xXQ==",
+      "integrity": "sha1-6yH/ZfOy7OdQYbNdT551cqwCgMI=",
       "dev": true,
       "requires": {
         "async": "2.5.0",
@@ -7836,7 +7836,7 @@
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -7887,7 +7887,7 @@
     "slice-ansi": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "2.0.0"
@@ -7909,7 +7909,7 @@
     "sntp": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+      "integrity": "sha1-LGzsFP7cIiJznK+bXD2F0cxaLMg=",
       "requires": {
         "hoek": "4.2.0"
       }
@@ -7935,7 +7935,7 @@
     "source-map-support": {
       "version": "0.4.18",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=",
       "dev": true,
       "requires": {
         "source-map": "0.5.7"
@@ -7979,13 +7979,13 @@
     "specificity": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz",
-      "integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==",
+      "integrity": "sha1-meZRHs7vD42bV5JJN6rCyxPRPEI=",
       "dev": true
     },
     "split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
       "dev": true,
       "requires": {
         "through": "2.3.8"
@@ -8003,7 +8003,7 @@
     "split2": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
       "dev": true,
       "requires": {
         "through2": "2.0.3"
@@ -8047,7 +8047,7 @@
         "stackframe": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-          "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+          "integrity": "sha1-NXskqZL5Qny6a1RdlqFO0svKGHs=",
           "dev": true
         }
       }
@@ -8124,7 +8124,7 @@
     "string_decoder": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -8179,7 +8179,7 @@
     "stylelint": {
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-8.2.0.tgz",
-      "integrity": "sha512-57JWIz/1Uh9ehZMZyAqlFC0EDfQrMXCH8yqt8ZuJQQvV3LBKgAM/JYd+CWi1hC4eJtRODSPbIIBYKdGjkPZdMg==",
+      "integrity": "sha1-ahUERVP7XDFDsW1iATo3AxRJWw0=",
       "dev": true,
       "requires": {
         "autoprefixer": "7.1.6",
@@ -8230,7 +8230,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -8251,13 +8251,13 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
           "dev": true
         },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -8298,7 +8298,7 @@
     "superagent": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.0.tgz",
-      "integrity": "sha512-71XGWgtn70TNwgmgYa69dPOYg55aU9FCahjUNY03rOrKvaTCaU3b9MeZmqonmf9Od96SCxr3vGfEAnhM7dtxCw==",
+      "integrity": "sha1-h+PtU2yIYMCMfH0SJdqagMqwZMY=",
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
@@ -8316,7 +8316,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -8352,7 +8352,7 @@
     "table": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=",
       "dev": true,
       "requires": {
         "ajv": "5.3.0",
@@ -8378,7 +8378,7 @@
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -8409,7 +8409,7 @@
     "tar-pack": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz",
-      "integrity": "sha512-PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg==",
+      "integrity": "sha1-4dvAOpudO6B+iWrQJzF+tnmhCh8=",
       "requires": {
         "debug": "2.6.9",
         "fstream": "1.0.11",
@@ -8462,7 +8462,7 @@
     "text-extensions": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
-      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
+      "integrity": "sha1-+qq6JiXtdG1WiiPk0KrNm/CKizk=",
       "dev": true
     },
     "text-table": {
@@ -8495,7 +8495,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
         "os-tmpdir": "1.0.2"
@@ -8648,7 +8648,7 @@
     "urijs": {
       "version": "1.19.0",
       "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.0.tgz",
-      "integrity": "sha512-Qs2odXn0hST5VSPVjpi73CMqtbAoanahaqWBujGU+IyMrMqpWcIhDewxQRhCkmqYxuyvICDcSuLdv2O7ncWBGw==",
+      "integrity": "sha1-2KooTQ50aXA6aYitBFxMv98IraA=",
       "dev": true
     },
     "urix": {
@@ -8705,7 +8705,7 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ="
     },
     "validate-npm-package-license": {
       "version": "3.0.1",
@@ -9063,7 +9063,7 @@
     "wide-align": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
       "requires": {
         "string-width": "1.0.2"
       }
@@ -9078,7 +9078,7 @@
     "wolfy87-eventemitter": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.3.tgz",
-      "integrity": "sha512-jCUVjlRkpuoU9vQa1cyynPJhvR8ymNLwfvdkGYjIWwR0STLc0LJQG+yFy1JlQ73vjbtlNiC8xNqZQMJDdpYMeA=="
+      "integrity": "sha1-4Jl5tOfY1SVuOiXoEVKboUMRVWg="
     },
     "wordwrap": {
       "version": "0.0.3",
@@ -9102,7 +9102,7 @@
     "write-file-atomic": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+      "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=",
       "requires": {
         "graceful-fs": "4.1.11",
         "imurmurhash": "0.1.4",
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 27b919ce0bb..2b45ef4db29 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -47,9 +47,9 @@
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "async": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw=="
     },
     "asynckit": {
       "version": "0.4.0",
diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
index 3dae5ee20ce..28219a3394c 100644
--- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
@@ -120,6 +120,19 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 					}
 				}
 
+				if (usersToSendEmail[user._id] === 'direct') {
+					const userEmailPreferenceIsDisable = !user.settings || !user.settings.preferences || !user.settings.preferences.emailNotificationMode || user.settings.preferences.emailNotificationMode === 'disabled';
+					const directMessageEmailPreference = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(message.rid, message.rid.replace(message.u._id, '')).emailNotifications;
+
+					if (directMessageEmailPreference === 'nothing') {
+						return;
+					}
+
+					if (directMessageEmailPreference === 'default' && userEmailPreferenceIsDisable) {
+						return;
+					}
+				}
+
 				// Checks if user is in the room he/she is mentioned (unless it's public channel)
 				if (room.t !== 'c' && room.usernames.indexOf(user.username) === -1) {
 					return;
diff --git a/packages/rocketchat-livechat/app/package-lock.json b/packages/rocketchat-livechat/app/package-lock.json
index aeb329e7a28..ca28ccbd474 100644
--- a/packages/rocketchat-livechat/app/package-lock.json
+++ b/packages/rocketchat-livechat/app/package-lock.json
@@ -55,9 +55,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "autolinker": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.4.4.tgz",
-      "integrity": "sha1-hKqqm7B8eU8IVc1wQaMe7G9vqMo="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.6.0.tgz",
+      "integrity": "sha1-utN2t62OQV8i8QL8Dzf2QOZPHL8="
     },
     "aws-sign2": {
       "version": "0.7.0",
@@ -86,7 +86,7 @@
     "bcrypt": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
-      "integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
+      "integrity": "sha1-sC3cbAtS6ha40883XVoy54DatUg=",
       "requires": {
         "nan": "2.6.2",
         "node-pre-gyp": "0.6.36"
@@ -298,7 +298,7 @@
         "has-unicode": "2.0.1",
         "object-assign": "4.1.1",
         "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
+        "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
         "strip-ansi": "3.0.1",
         "wide-align": "1.1.2"
       }
@@ -314,7 +314,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "requires": {
         "fs.realpath": "1.0.0",
         "inflight": "1.0.6",
@@ -469,7 +469,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "requires": {
         "brace-expansion": "1.1.8"
       }
@@ -530,7 +530,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "requires": {
         "are-we-there-yet": "1.1.4",
         "console-control-strings": "1.1.0",
@@ -626,21 +626,21 @@
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
         "isarray": "1.0.0",
         "process-nextick-args": "1.0.7",
         "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
+        "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
         "util-deprecate": "1.0.2"
       }
     },
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
     },
     "request": {
       "version": "2.83.0",
@@ -682,12 +682,12 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
     },
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -728,8 +728,7 @@
       }
     },
     "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "version": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "requires": {
         "code-point-at": "1.1.0",
@@ -738,9 +737,8 @@
       }
     },
     "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -842,7 +840,7 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ="
     },
     "verror": {
       "version": "1.10.0",
@@ -857,9 +855,9 @@
     "wide-align": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
       "requires": {
-        "string-width": "1.0.2"
+        "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
       }
     },
     "wrappy": {

From 32350a25699c30bd864db48afe37f08970637d13 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Wed, 8 Nov 2017 13:13:07 -0600
Subject: [PATCH 235/244] Bump version to 0.60.0-develop

---
 .circleci/setartname.sh                 | 2 +-
 .docker/Dockerfile                      | 2 +-
 .sandstorm/sandstorm-pkgdef.capnp       | 2 +-
 .travis/snap.sh                         | 2 +-
 package-lock.json                       | 2 +-
 package.json                            | 2 +-
 packages/rocketchat-lib/rocketchat.info | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/setartname.sh b/.circleci/setartname.sh
index d1fa44fbab9..a47393bf2ca 100644
--- a/.circleci/setartname.sh
+++ b/.circleci/setartname.sh
@@ -15,7 +15,7 @@ elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 else
   SNAP_CHANNEL=edge
   RC_RELEASE=develop
-  RC_VERSION=0.59.0-develop
+  RC_VERSION=0.60.0-develop
 fi
 
 export SNAP_CHANNEL
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 36b108406c5..bc96ab99078 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.59.0-develop
+ENV RC_VERSION 0.60.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 6fec056fc80..cee5416212d 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.59.0-develop"),
+		appMarketingVersion = (defaultText = "0.60.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 63a27435c18..05e376a3f4a 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.59.0-develop
+    RC_VERSION=0.60.0-develop
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/package-lock.json b/package-lock.json
index 71e9c8dc524..9827c6fdf1d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Rocket.Chat",
-  "version": "0.59.0-develop",
+  "version": "0.60.0-develop",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7be6b5a5dec..06fc561dba3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.59.0-develop",
+	"version": "0.60.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 73c93e95aea..6bf0194dea8 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.59.0-develop"
+	"version": "0.60.0-develop"
 }

From 21690c0dbf1d3f4f4412548d425c96bd3e26b164 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Thu, 9 Nov 2017 04:51:34 -0600
Subject: [PATCH 236/244] Update path for S3 redirect in CircleCI (#8819)

* Update path for s3 redirect

* Add .asc to bump ci

* Add `--force` to npm cache clear.  Required now with new version of npm / node.js
---
 .circleci/update-releases.sh | 10 ++++++++--
 .docker/Dockerfile           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.circleci/update-releases.sh b/.circleci/update-releases.sh
index 57e01ceb357..aa8d98544f5 100644
--- a/.circleci/update-releases.sh
+++ b/.circleci/update-releases.sh
@@ -5,13 +5,19 @@ IFS=$'\n\t'
 if [[ $RC_RELEASE = "develop" ]]; then
     aws s3api put-object \
     --acl public-read \
-    --website-redirect-location "https://download.rocket.chat/build/$ARTIFACT_NAME" \
+    --website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz" \
     --bucket download.rocket.chat \
     --key "build/rocket.chat-$RC_VERSION.tgz"
 fi
 
 aws s3api put-object \
 --acl public-read \
---website-redirect-location "https://download.rocket.chat/build/$ARTIFACT_NAME" \
+--website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz" \
 --bucket download.rocket.chat \
 --key "$RC_RELEASE"
+
+aws s3api put-object \
+--acl public-read \
+--website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz.asc" \
+--bucket download.rocket.chat \
+--key "$RC_RELEASE.asc"
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 36b108406c5..bc07fc654bb 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -13,7 +13,7 @@ RUN set -x \
  && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
- && npm cache clear \
+ && npm cache clear --force \
  && chown -R rocketchat:rocketchat /app
 
 USER rocketchat

From 4ab29d02c40480fbe3f6810dc99a76cf95567410 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 9 Nov 2017 10:34:12 -0200
Subject: [PATCH 237/244] Fix link to .asc file on S3

---
 .circleci/setartname.sh      | 2 +-
 .circleci/update-releases.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.circleci/setartname.sh b/.circleci/setartname.sh
index a47393bf2ca..c0297ca3c73 100644
--- a/.circleci/setartname.sh
+++ b/.circleci/setartname.sh
@@ -1,7 +1,7 @@
 if [[ $CIRCLE_TAG ]]; then
   export ARTIFACT_NAME="$(npm run version --silent)"
 else
-  export ARTIFACT_NAME="$(npm run version --silent).circleci-$CIRCLE_BUILD_NUM"
+  export ARTIFACT_NAME="$(npm run version --silent).$CIRCLE_BUILD_NUM"
 fi
 
 if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+ ]]; then
diff --git a/.circleci/update-releases.sh b/.circleci/update-releases.sh
index aa8d98544f5..0fd9fb43880 100644
--- a/.circleci/update-releases.sh
+++ b/.circleci/update-releases.sh
@@ -8,6 +8,12 @@ if [[ $RC_RELEASE = "develop" ]]; then
     --website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz" \
     --bucket download.rocket.chat \
     --key "build/rocket.chat-$RC_VERSION.tgz"
+
+    aws s3api put-object \
+    --acl public-read \
+    --website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz.asc" \
+    --bucket download.rocket.chat \
+    --key "build/rocket.chat-$RC_VERSION.tgz.asc"
 fi
 
 aws s3api put-object \

From b94e9dccda0e34c71663c2c920df2bb99c98fd40 Mon Sep 17 00:00:00 2001
From: "Jorge Feldmann (Jota)" <eusoujf@hotmail.com>
Date: Thu, 9 Nov 2017 14:25:54 -0200
Subject: [PATCH 238/244] Set correct Twitter link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6db9a75a6f1..7945db0004d 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Join thousands of members world-wide 24 x 7 in our [community server](https://op
 
 [![Rocket.Chat](https://open.rocket.chat/api/v1/shield.svg?type=channel&name=Rocket.Chat&channel=dev)](https://open.rocket.chat/channel/dev) for developers needing help from the community to developing new features
 
-You can also join the conversation at [Twitter](https://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
+You can also join the conversation at [Twitter](https://twitter.com/RocketChat), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
 
 # Desktop Apps
 Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)

From 330d959fbebba556435ef099856b940721c9373c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 14 Nov 2017 14:27:39 -0200
Subject: [PATCH 239/244] code to get the updated messages

---
 .../rocketchat-lib/server/models/Messages.js  | 13 +++++++
 server/publications/messages.js               | 36 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/packages/rocketchat-lib/server/models/Messages.js b/packages/rocketchat-lib/server/models/Messages.js
index db6036bb07d..f93d03ae64e 100644
--- a/packages/rocketchat-lib/server/models/Messages.js
+++ b/packages/rocketchat-lib/server/models/Messages.js
@@ -89,6 +89,19 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 		return this.find(query, options);
 	}
 
+	findForUpdates(roomId, timestamp, options) {
+		const query = {
+			_hidden: {
+				$ne: true
+			},
+			rid: roomId,
+			_updatedAt: {
+				$gt: timestamp
+			}
+		};
+		return this.find(query, options);
+	}
+
 	findVisibleByRoomIdBeforeTimestamp(roomId, timestamp, options) {
 		const query = {
 			_hidden: {
diff --git a/server/publications/messages.js b/server/publications/messages.js
index 66b1029b9f9..af03ce989a8 100644
--- a/server/publications/messages.js
+++ b/server/publications/messages.js
@@ -63,3 +63,39 @@ Meteor.publish('messages', function(rid/*, start*/) {
 		return cursorDeleteHandle.stop();
 	});
 });
+
+Meteor.methods({
+	'messages/get'(rid, {start, latestDate = new Date(), oldestDate, inclusive = false, count = 20, unreads= false}) {
+		check(rid, String);
+
+		const fromId = Meteor.userId();
+
+		if (!fromId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+				method: 'messages/get'
+			});
+		}
+
+		if (!Meteor.call('canAccessRoom', rid, fromId)) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+				method: 'messages/get'
+			});
+		}
+
+		const options = {
+			sort: {
+				ts: -1
+			}
+		};
+
+		if (start instanceof Date) {
+			return {
+				updated: RocketChat.models.Messages.findForUpdates(rid, start, options).fetch(),
+				deleted: RocketChat.models.Messages.trashFindDeletedAfter(start, {rid}, { ...options, fields: { _id: 1, _deletedAt: 1 }}).fetch()
+			};
+		}
+
+		return Meteor.call('getChannelHistory', { rid, latest: latestDate, oldest: oldestDate, inclusive, count, unreads });
+
+	}
+});

From 7ea35d852720223e7d09aeff54c36c3166479a83 Mon Sep 17 00:00:00 2001
From: Bradley Hilton <graywolf336@craftyn.com>
Date: Tue, 14 Nov 2017 13:34:57 -0600
Subject: [PATCH 240/244] Add a rest api endpoint to list, get, and run
 commands (#8531)

---
 packages/rocketchat-api/package.js            |  1 +
 packages/rocketchat-api/server/v1/commands.js | 86 +++++++++++++++++++
 .../client/lib/RestApiClient.js               | 49 +++++++++++
 packages/rocketchat-lib/package.js            |  1 +
 4 files changed, 137 insertions(+)
 create mode 100644 packages/rocketchat-api/server/v1/commands.js
 create mode 100644 packages/rocketchat-lib/client/lib/RestApiClient.js

diff --git a/packages/rocketchat-api/package.js b/packages/rocketchat-api/package.js
index 36a7d787154..422067dd31d 100644
--- a/packages/rocketchat-api/package.js
+++ b/packages/rocketchat-api/package.js
@@ -33,6 +33,7 @@ Package.onUse(function(api) {
 	//Add v1 routes
 	api.addFiles('server/v1/channels.js', 'server');
 	api.addFiles('server/v1/chat.js', 'server');
+	api.addFiles('server/v1/commands.js', 'server');
 	api.addFiles('server/v1/groups.js', 'server');
 	api.addFiles('server/v1/im.js', 'server');
 	api.addFiles('server/v1/integrations.js', 'server');
diff --git a/packages/rocketchat-api/server/v1/commands.js b/packages/rocketchat-api/server/v1/commands.js
new file mode 100644
index 00000000000..0c3e26d8fe4
--- /dev/null
+++ b/packages/rocketchat-api/server/v1/commands.js
@@ -0,0 +1,86 @@
+RocketChat.API.v1.addRoute('commands.get', { authRequired: true }, {
+	get() {
+		const params = this.queryParams;
+
+		if (typeof params.command !== 'string') {
+			return RocketChat.API.v1.failure('The query param "command" must be provided.');
+		}
+
+		const cmd = RocketChat.slashCommands.commands[params.command.toLowerCase()];
+
+		if (!cmd) {
+			return RocketChat.API.v1.failure(`There is no command in the system by the name of: ${ params.command }`);
+		}
+
+		return RocketChat.API.v1.success({ command: cmd });
+	}
+});
+
+RocketChat.API.v1.addRoute('commands.list', { authRequired: true }, {
+	get() {
+		const { offset, count } = this.getPaginationItems();
+		const { sort, fields, query } = this.parseJsonQuery();
+
+		let commands = Object.values(RocketChat.slashCommands.commands);
+
+		if (query && query.command) {
+			commands = commands.filter((command) => command.command === query.command);
+		}
+
+		const totalCount = commands.length;
+		commands = RocketChat.models.Rooms.processQueryOptionsOnResult(commands, {
+			sort: sort ? sort : { name: 1 },
+			skip: offset,
+			limit: count,
+			fields
+		});
+
+		return RocketChat.API.v1.success({
+			commands,
+			offset,
+			count: commands.length,
+			total: totalCount
+		});
+	}
+});
+
+// Expects a body of: { command: 'gimme', params: 'any string value', roomId: 'value' }
+RocketChat.API.v1.addRoute('commands.run', { authRequired: true }, {
+	post() {
+		const body = this.bodyParams;
+		const user = this.getLoggedInUser();
+
+		if (typeof body.command !== 'string') {
+			return RocketChat.API.v1.failure('You must provide a command to run.');
+		}
+
+		if (body.params && typeof body.params !== 'string') {
+			return RocketChat.API.v1.failure('The parameters for the command must be a single string.');
+		}
+
+		if (typeof body.roomId !== 'string') {
+			return RocketChat.API.v1.failure('The room\'s id where to execute this command must provided and be a string.');
+		}
+
+		const cmd = body.command.toLowerCase();
+		if (!RocketChat.slashCommands.commands[body.command.toLowerCase()]) {
+			return RocketChat.API.v1.failure('The command provided does not exist (or is disabled).');
+		}
+
+		// This will throw an error if they can't or the room is invalid
+		Meteor.call('canAccessRoom', body.roomId, user._id);
+
+		const params = body.params ? body.params : '';
+
+		let result;
+		Meteor.runAsUser(user._id, () => {
+			result = RocketChat.slashCommands.run(cmd, params, {
+				_id: Random.id(),
+				rid: body.roomId,
+				msg: `/${ cmd } ${ params }`
+			});
+		});
+
+		return RocketChat.API.v1.success({ result });
+	}
+});
diff --git a/packages/rocketchat-lib/client/lib/RestApiClient.js b/packages/rocketchat-lib/client/lib/RestApiClient.js
new file mode 100644
index 00000000000..1f1b2492cf4
--- /dev/null
+++ b/packages/rocketchat-lib/client/lib/RestApiClient.js
@@ -0,0 +1,49 @@
+RocketChat.API = {
+	get(endpoint, params) {
+		return RocketChat.API._jqueryCall('GET', endpoint, params);
+	},
+
+	post(endpoint, params, body) {
+		return RocketChat.API._jqueryCall('POST', endpoint, params, body);
+	},
+
+	_jqueryCall(method, endpoint, params, body) {
+		let query = '';
+		if (params) {
+			Object.keys(params).forEach((key) => {
+				query += query === '' ? '?' : '&';
+
+				query += `${ key }=${ params[key] }`;
+			});
+		}
+
+		return new Promise(function _rlRestApiGet(resolve, reject) {
+			jQuery.ajax({
+				method,
+				url: `${ Meteor.absoluteUrl() }api/${ endpoint }${ query }`,
+				headers: {
+					'Content-Type': 'application/json',
+					'X-User-Id': localStorage['Meteor.userId'],
+					'X-Auth-Token': localStorage['Meteor.loginToken']
+				},
+				data: JSON.stringify(body),
+				success: function _rlGetSuccess(result) {
+					resolve(result);
+				},
+				error: function _rlGetFailure(xhr, status, errorThrown) {
+					reject(new Error(errorThrown));
+				}
+			});
+		});
+	},
+
+	v1: {
+		get(endpoint, params) {
+			return RocketChat.API.get(`v1/${ endpoint }`, params);
+		},
+
+		post(endpoint, params, body) {
+			return RocketChat.API.post(`v1/${ endpoint }`, params, body);
+		}
+	}
+};
diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index 15ada28e8ea..442f7231ced 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -189,6 +189,7 @@ Package.onUse(function(api) {
 	api.addFiles('client/OAuthProxy.js', 'client');
 	api.addFiles('client/lib/TabBar.js', 'client');
 	api.addFiles('client/lib/RocketChatTabBar.js', 'client');
+	api.addFiles('client/lib/RestApiClient.js', 'client');
 	api.addFiles('client/lib/cachedCollection.js', 'client');
 	api.addFiles('client/lib/openRoom.js', 'client');
 	api.addFiles('client/lib/roomExit.js', 'client');

From 80bdacfd016028682fcad2afbe264ef253a8e08e Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 14 Nov 2017 17:46:57 -0200
Subject: [PATCH 241/244] Fix Docker image build

---
 .circleci/config.yml         |  1 -
 .circleci/update-releases.sh | 28 +++-------------------------
 .docker/Dockerfile           |  4 ++--
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92207f0277a..00228de78fd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -273,7 +273,6 @@ workflows:
             branches:
               only:
                 - develop
-                - circle-ci
             tags:
               only:
                 - "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/"
diff --git a/.circleci/update-releases.sh b/.circleci/update-releases.sh
index 0fd9fb43880..4e133c304fe 100644
--- a/.circleci/update-releases.sh
+++ b/.circleci/update-releases.sh
@@ -2,28 +2,6 @@
 set -euvo pipefail
 IFS=$'\n\t'
 
-if [[ $RC_RELEASE = "develop" ]]; then
-    aws s3api put-object \
-    --acl public-read \
-    --website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz" \
-    --bucket download.rocket.chat \
-    --key "build/rocket.chat-$RC_VERSION.tgz"
-
-    aws s3api put-object \
-    --acl public-read \
-    --website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz.asc" \
-    --bucket download.rocket.chat \
-    --key "build/rocket.chat-$RC_VERSION.tgz.asc"
-fi
-
-aws s3api put-object \
---acl public-read \
---website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz" \
---bucket download.rocket.chat \
---key "$RC_RELEASE"
-
-aws s3api put-object \
---acl public-read \
---website-redirect-location "https://download.rocket.chat/build/rocket.chat-$ARTIFACT_NAME.tgz.asc" \
---bucket download.rocket.chat \
---key "$RC_RELEASE.asc"
+curl -X POST \
+-H "X-Update-Token: ${UPDATE_TOKEN}" \
+https://releases.rocket.chat/update
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index a4f93216433..091c369ba43 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,8 +5,8 @@ ENV RC_VERSION 0.60.0-develop
 MAINTAINER buildmaster@rocket.chat
 
 RUN set -x \
- && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz" -o rocket.chat.tgz \
- && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download/" -o rocket.chat.tgz \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
  && gpg --verify rocket.chat.tgz.asc \
  && mkdir -p /app \
  && tar -zxf rocket.chat.tgz -C /app \

From afae7f299d22c5d3df430fe71e273fe0c01a995d Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 14 Nov 2017 18:21:51 -0200
Subject: [PATCH 242/244] added rest method

---
 packages/rocketchat-api/server/v1/chat.js | 25 +++++++++++++++++++++++
 server/publications/messages.js           |  8 ++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
index e0546487722..5bf1bf08453 100644
--- a/packages/rocketchat-api/server/v1/chat.js
+++ b/packages/rocketchat-api/server/v1/chat.js
@@ -28,6 +28,31 @@ RocketChat.API.v1.addRoute('chat.delete', { authRequired: true }, {
 	}
 });
 
+RocketChat.API.v1.addRoute('chat.syncMessages', { authRequired: true }, {
+	get() {
+		const { rid } = this.queryParams;
+		let lastUpdate = this.queryParams;
+		lastUpdate = lastUpdate ? new Date(lastUpdate) : lastUpdate;
+		if (!rid) {
+			return RocketChat.API.v1.failure('The "rid" query parameter must be provided.');
+		}
+		if (!lastUpdate) {
+			return RocketChat.API.v1.failure('The "lastUpdate" query parameter must be provided.');
+		}
+
+		let result;
+		Meteor.runAsUser(this.userId, () => {
+			result = Meteor.call('messages/get', rid, { lastUpdate });
+		});
+
+		if (!result) {
+			return RocketChat.API.v1.failure();
+		}
+
+		return RocketChat.API.v1.success({result});
+	}
+});
+
 RocketChat.API.v1.addRoute('chat.getMessage', { authRequired: true }, {
 	get() {
 		if (!this.queryParams.msgId) {
diff --git a/server/publications/messages.js b/server/publications/messages.js
index af03ce989a8..d2f830987b2 100644
--- a/server/publications/messages.js
+++ b/server/publications/messages.js
@@ -65,7 +65,7 @@ Meteor.publish('messages', function(rid/*, start*/) {
 });
 
 Meteor.methods({
-	'messages/get'(rid, {start, latestDate = new Date(), oldestDate, inclusive = false, count = 20, unreads= false}) {
+	'messages/get'(rid, {lastUpdate, latestDate = new Date(), oldestDate, inclusive = false, count = 20, unreads= false}) {
 		check(rid, String);
 
 		const fromId = Meteor.userId();
@@ -88,10 +88,10 @@ Meteor.methods({
 			}
 		};
 
-		if (start instanceof Date) {
+		if (lastUpdate instanceof Date) {
 			return {
-				updated: RocketChat.models.Messages.findForUpdates(rid, start, options).fetch(),
-				deleted: RocketChat.models.Messages.trashFindDeletedAfter(start, {rid}, { ...options, fields: { _id: 1, _deletedAt: 1 }}).fetch()
+				updated: RocketChat.models.Messages.findForUpdates(rid, lastUpdate, options).fetch(),
+				deleted: RocketChat.models.Messages.trashFindDeletedAfter(lastUpdate, {rid}, { ...options, fields: { _id: 1, _deletedAt: 1 }}).fetch()
 			};
 		}
 

From 3462a18a30c9375320ec1ad6b6a89926af115ca6 Mon Sep 17 00:00:00 2001
From: Hammy Havoc <hammy@splitanatom.com>
Date: Wed, 15 Nov 2017 15:46:24 +0000
Subject: [PATCH 243/244] Changed wording for "Maximum Allowed Message Size"

Previously this wasn't too clear that it was for characters rather than the size for if you wanted to upload a larger file. Changed this to be more obvious by mentioning 'characters'. User-friendliness. :- )
---
 packages/rocketchat-i18n/i18n/en.i18n.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 823a77f35cc..9613ce95afc 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1194,7 +1194,7 @@
   "Message_HideType_ul": "Hide \"User Leave\" messages",
   "Message_KeepHistory": "Keep Per Message Editing History",
   "Message_MaxAll": "Maximum Channel Size for ALL Message",
-  "Message_MaxAllowedSize": "Maximum Allowed Message Size",
+  "Message_MaxAllowedSize": "Maximum Allowed Characters Per Message",
   "Message_pinning": "Message pinning",
   "Message_QuoteChainLimit": "Maximum Number of Chained Quotes",
   "Message_removed": "Message removed",

From 9e522e38f4d37e6eac0a20317825bd8a539d3967 Mon Sep 17 00:00:00 2001
From: ryo <ryo.shimizu@gmail.com>
Date: Fri, 17 Nov 2017 05:45:57 +0900
Subject: [PATCH 244/244] Fix emoji (#8822)

---
 packages/rocketchat-emoji-emojione/client/sprites.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-emoji-emojione/client/sprites.css b/packages/rocketchat-emoji-emojione/client/sprites.css
index 53cab7d46c6..e3c89a0eb17 100644
--- a/packages/rocketchat-emoji-emojione/client/sprites.css
+++ b/packages/rocketchat-emoji-emojione/client/sprites.css
@@ -12,7 +12,7 @@
 	white-space: nowrap;
 	text-indent: 100%;
 
-	background-image: url("../../packages/emojione_emojione/assets/sprites/emojione.sprites.png");
+	background-image: url("/packages/emojione_emojione/assets/sprites/emojione.sprites.png");
 	background-repeat: no-repeat;
 	background-size: 4365.625% 4365.625%;