Merge branch 'develop' of https://github.com/meetfranz/franz into develop

author: Stefan <stefan@adlk.io> 2019-06-04 14:26:56 +0200
committer: Stefan <stefan@adlk.io> 2019-06-04 14:26:56 +0200
commit: fd6a1e9ba24c7947af08a30829c860cad4726f67 (patch)
tree: 0b6276700ced8d13eaf0a1e3b706a69a5a47b1da
parent: fix(Windows): Replace tray icon with high-res version (diff)
parent: Merge pull request #1443 from meetfranz/feature/multilingual-announcements (diff)
download: ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.gz
ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.zst
ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.zip
91 files changed, 5138 insertions, 880 deletions
diff --git a/.eslintrc b/.eslintrc
index e61d99c20..c85bee1fa 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,7 @@
 {
  "parser": "babel-eslint",
  "extends": "eslint-config-airbnb",
+  "plugins": ["jest"],
  "rules": {
    "consistent-return": 0,
    "no-param-reassign": 0,
@@ -55,5 +56,8 @@
    "btoa": true,
    "ga": true,
    "mocha": true
+  },
+  "env": {
+    "jest/globals": true
  }
 }
diff --git a/.travis.yml b/.travis.yml
index ba827374f..c7e2c714c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
 language: node_js
-install: 
+install:
 - echo do nothing
 before_script:
@@ -22,7 +22,7 @@ before_script:
 - npm install node-sass -g
 script:
-# - npm run lint
+- npm run test
 - travis_wait 30 npm run build
 cache: npm
@@ -30,7 +30,7 @@ cache: npm
 notifications:
  email: false
  slack:
-    secure: NjEDG+6YvJvFNwRT8t8XyVR145m+Pb1pmYgdBeuhqtJbMAr0IOb0lLLW9ixKEsL1NU+0R58QGiG9qqY+lLnMNpDYjzluFo0gQtl2NJrULT4xUFDSu65XTwoutKyvj+hoCsHiwrSrO2dHTx3ZK2vsSueg+8jM/xss7dTLA6BcTYl14wTOU37PqFQZk9JYR+Dfq1Jjhy/mq4BiAsb/1clNIulkjmRjSm6R0XT4ZsZZfj0ifXhL4cLGsUv2n+iePiX6bLwZPFjXV1COYTBafbCu17gw3nRMdNMMTDLbwrXXdJZFS/EjFOPgOhwF7CkZ3kSpB2ZIcAJxG7iAUl5j+jHBXc5dafRbjzE4oYve1vPexLoV3NjV76uANUFkcli6eHYD0uJoUJGBRbRGWp+8Bbw9EcBsn4s3vbf5XqHX3S46zvGgqX+LyhyMJQtEG/iv+9XOsOql18ryyejij0z1K7DxpI0gLV1ATZCphY1Fyz1yZDGlYN4ej/Rl2P1Q3yXilweJRF7Ts04w4U9iuP1u598/w++CKSu4q4EeEuqT/hIeFQUKUkwCEsO4xa39vhLPaxKrG9UEUH8OXN+NPZyTAK/LKuIX7C56O1kwvWNMWlPmTcvsq2RghvNTwgSGUIO0EKZKrQYAEG3Y/veSt5CgZoNzLgc/6Xj+g7daxUo9heLy26A=
+    secure: GMiD9uhGUNkJbasOMvfUmQx/SKG8wd/MC4IPtiZZnlLkiN6eJQnV3p9OeMaiSCcq19gQ65z898h55PXwFX5pFqmGMQF0zdA3VXlVh7wrUU/Z8cYxCBaZTIOgNwtrteT9V9easV/5BuUGLHVgAFYEhS5tJDu2GU4UKdm6mko4YyxKHdsCsvkRpv+zpFF1a+G2ZUwWHDhTZsBJbx7SW7xzPKYI+vq+bNnbyC6p0kpeTehf29A8CoIgQlDctzk4aOHkj35WHIiKS5yzr/nb8oY/B6vCdfFHCrCkZxQrxPEagyYTfEusWwQRJ4rvwt8dgBO1A3ckO+AC1MEAYRYHgQMI5K86tcQ7/su5iOhu9NDbZ/BfriaTDlrurKMWPhZ/RVnFUT4tn7XVVcMxz6/FYFDYIDSHEn5E20a7qV1ixF7XKoJU6eOfo3qZ7euxiZIbDbHBH+Y2ZmzUGfrQ7DFlefMEM/6Laa0jNGOSvfc6mvk1x63bVTT5KfYEX4ztXnBY77haG4/h5bIHyNDzLsZ5vxXbvmHZb6ToMVn9UT6HS0sZQ/B4bghJbdZuOrPFlz8UNRpwoBS4HpLUndhYCo0ppxd3yCd5gqEhIJzEiJNoMq+LA9/iheLbWlJVdjP2WRQ2/m9VCSxnivTdNhnp6lSATiXAgq2WN2LGhTSGtXgqtcYGXhk=
 deploy:
  provider: s3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 175ce06d7..c7a93f2b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,28 @@
-# [5.0.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1) (2019-03-25)
+# [5.1.0](https://github.com/meetfranz/franz/compare/v5.1.0...v5.1.0-beta.1) (2019-04-16)
+### Features
+* **App:** Added Workspaces for all your daily routines 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99))
+* **App:** Added [Team Management](https://meetfranz.com/user/team) 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99))
+* **App:** Added Kerberos Support via Command Line Switches ([#1331](https://github.com/meetfranz/franz/issues/1331)) ([@frumania](https://github.com/frumania)) ([a1950d7](https://github.com/meetfranz/franz/commit/a1950d7))
+* **App:** Open changelog in app
+* **App:** Various small fixes and improvements 
 ### General
 * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+* **App:** Update electron to 4.1.4 ([2604914](https://github.com/meetfranz/franz/commit/2604914))
+# [5.1.0-beta.1](https://github.com/meetfranz/franz/compare/v5.0.1-beta.1...v5.1.0-beta.1) (2019-04-16)
+[See 5.1.0 changelog.](#5-1-0--2019-04-16-)
+# [5.0.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1) (2019-03-25)
 ### Features
 * **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a))
-* **App:** Update electron to 4.0.8 ([8336d17](https://github.com/meetfranz/franz/commit/8336d17))
 * **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e))
 * **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325))
 * **Windows:** Add option to quit Franz from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b))
@@ -22,6 +36,11 @@
 * **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316)
 * **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722))
+### General
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+* **App:** Update electron to 4.0.8 ([8336d17](https://github.com/meetfranz/franz/commit/8336d17))
 # [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18)
@@ -29,10 +48,6 @@
 # [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15)
-### General
-* **App:** Updated electron to 4.0.4
 ### Features
 * **Spellchecker:** Add automatic spellcheck language detection ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
@@ -42,6 +57,10 @@
 * **App:** Various bugfixes and improvements
+### General
+* **App:** Updated electron to 4.0.4
 # [5.0.0-beta.24](https://github.com/meetfranz/franz/compare/v5.0.0-beta.23...v5.0.0-beta.24) (2019-02-03)
diff --git a/appveyor.yml b/appveyor.yml
index 0ed8866a3..abcf81d00 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,6 +17,7 @@ cache:
 before_build:
  - npm run lint
+  - npm run test
 build_script:
  - npm run build
@@ -24,7 +25,7 @@ build_script:
 notifications:
  - provider: Slack
    incoming_webhook:
-      secure: 2NnhP/L7Jk9PDE0JvdNnYVBnmDHFRWHmTQBQ1492ZQ5O0Ok/97FAbk/FbGZVEalli8xcaPkVu3jiOD7IPVvHLKUrmyvficRgmL+qf4lhD1s=
+      secure: 2NnhP/L7Jk9PDE0JvdNnYVBnmDHFRWHmTQBQ1492ZQ7TpD2xQ/cXi3+G1Spr8zN5O8H+MQi4oMn3Ih2w0e8ZkHgQw138jvK/OfZO+FlF/mI=
 artifacts:
  - path: out\*.exe
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 000000000..8c9b59cf5
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  roots: ['src'],
+};
diff --git a/package-lock.json b/package-lock.json
index 57650aac0..fc328c4b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1083,6 +1083,16 @@
        "to-fast-properties": "^2.0.0"
      }
    },
+    "@cnakazawa/watch": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
+      "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
+      "dev": true,
+      "requires": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      }
+    },
    "@fimbul/bifrost": {
      "version": "0.17.0",
      "resolved": "https://registry.npmjs.org/@fimbul/bifrost/-/bifrost-0.17.0.tgz",
@@ -1123,6 +1133,217 @@
        "tslib": "^1.8.1"
      }
    },
+    "@jest/console": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
+      "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==",
+      "dev": true,
+      "requires": {
+        "@jest/source-map": "^24.3.0",
+        "chalk": "^2.0.1",
+        "slash": "^2.0.0"
+      }
+    },
+    "@jest/core": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.7.1.tgz",
+      "integrity": "sha512-ivlZ8HX/FOASfHcb5DJpSPFps8ydfUYzLZfgFFqjkLijYysnIEOieg72YRhO4ZUB32xu40hsSMmaw+IGYeKONA==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/reporters": "^24.7.1",
+        "@jest/test-result": "^24.7.1",
+        "@jest/transform": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.1.15",
+        "jest-changed-files": "^24.7.0",
+        "jest-config": "^24.7.1",
+        "jest-haste-map": "^24.7.1",
+        "jest-message-util": "^24.7.1",
+        "jest-regex-util": "^24.3.0",
+        "jest-resolve-dependencies": "^24.7.1",
+        "jest-runner": "^24.7.1",
+        "jest-runtime": "^24.7.1",
+        "jest-snapshot": "^24.7.1",
+        "jest-util": "^24.7.1",
+        "jest-validate": "^24.7.0",
+        "jest-watcher": "^24.7.1",
+        "micromatch": "^3.1.10",
+        "p-each-series": "^1.0.0",
+        "pirates": "^4.0.1",
+        "realpath-native": "^1.1.0",
+        "rimraf": "^2.5.4",
+        "strip-ansi": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "pirates": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+          "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+          "dev": true,
+          "requires": {
+            "node-modules-regexp": "^1.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "@jest/environment": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.7.1.tgz",
+      "integrity": "sha512-wmcTTYc4/KqA+U5h1zQd5FXXynfa7VGP2NfF+c6QeGJ7c+2nStgh65RQWNX62SC716dTtqheTRrZl0j+54oGHw==",
+      "dev": true,
+      "requires": {
+        "@jest/fake-timers": "^24.7.1",
+        "@jest/transform": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "jest-mock": "^24.7.0"
+      }
+    },
+    "@jest/fake-timers": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.7.1.tgz",
+      "integrity": "sha512-4vSQJDKfR2jScOe12L9282uiwuwQv9Lk7mgrCSZHA9evB9efB/qx8i0KJxsAKtp8fgJYBJdYY7ZU6u3F4/pyjA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "jest-message-util": "^24.7.1",
+        "jest-mock": "^24.7.0"
+      }
+    },
+    "@jest/reporters": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.7.1.tgz",
+      "integrity": "sha512-bO+WYNwHLNhrjB9EbPL4kX/mCCG4ZhhfWmO3m4FSpbgr7N83MFejayz30kKjgqr7smLyeaRFCBQMbXpUgnhAJw==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^24.7.1",
+        "@jest/test-result": "^24.7.1",
+        "@jest/transform": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "chalk": "^2.0.1",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "istanbul-api": "^2.1.1",
+        "istanbul-lib-coverage": "^2.0.2",
+        "istanbul-lib-instrument": "^3.0.1",
+        "istanbul-lib-source-maps": "^3.0.1",
+        "jest-haste-map": "^24.7.1",
+        "jest-resolve": "^24.7.1",
+        "jest-runtime": "^24.7.1",
+        "jest-util": "^24.7.1",
+        "jest-worker": "^24.6.0",
+        "node-notifier": "^5.2.1",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^2.0.0"
+      }
+    },
+    "@jest/source-map": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz",
+      "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.1.15",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "dev": true
+        }
+      }
+    },
+    "@jest/test-result": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.7.1.tgz",
+      "integrity": "sha512-3U7wITxstdEc2HMfBX7Yx3JZgiNBubwDqQMh+BXmZXHa3G13YWF3p6cK+5g0hGkN3iufg/vGPl3hLxQXD74Npg==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "@types/istanbul-lib-coverage": "^2.0.0"
+      }
+    },
+    "@jest/test-sequencer": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.7.1.tgz",
+      "integrity": "sha512-84HQkCpVZI/G1zq53gHJvSmhUer4aMYp9tTaffW28Ih5OxfCg8hGr3nTSbL1OhVDRrFZwvF+/R9gY6JRkDUpUA==",
+      "dev": true,
+      "requires": {
+        "@jest/test-result": "^24.7.1",
+        "jest-haste-map": "^24.7.1",
+        "jest-runner": "^24.7.1",
+        "jest-runtime": "^24.7.1"
+      }
+    },
+    "@jest/transform": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.7.1.tgz",
+      "integrity": "sha512-EsOUqP9ULuJ66IkZQhI5LufCHlTbi7hrcllRMUEV/tOgqBVQi93+9qEvkX0n8mYpVXQ8VjwmICeRgg58mrtIEw==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^24.7.0",
+        "babel-plugin-istanbul": "^5.1.0",
+        "chalk": "^2.0.1",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.1.15",
+        "jest-haste-map": "^24.7.1",
+        "jest-regex-util": "^24.3.0",
+        "jest-util": "^24.7.1",
+        "micromatch": "^3.1.10",
+        "realpath-native": "^1.1.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "2.4.1"
+      },
+      "dependencies": {
+        "write-file-atomic": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
+          "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.2"
+          }
+        }
+      }
+    },
+    "@jest/types": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.7.0.tgz",
+      "integrity": "sha512-ipJUa2rFWiKoBqMKP63Myb6h9+iT3FHRTF2M8OR6irxWzItisa8i4dcSg14IbvmXUnBlHBlUQPYUHWyX3UPpYA==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/yargs": "^12.0.9"
+      }
+    },
    "@lerna/add": {
      "version": "3.11.0",
      "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.11.0.tgz",
@@ -2054,6 +2275,47 @@
        "url-template": "^2.0.8"
      }
    },
+    "@types/babel__core": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.1.tgz",
+      "integrity": "sha512-+hjBtgcFPYyCTo0A15+nxrCVJL7aC6Acg87TXd5OW3QhHswdrOLoles+ldL2Uk8q++7yIfl4tURtztccdeeyOw==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "@types/babel__generator": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.0.2.tgz",
+      "integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__template": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
+      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__traverse": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.6.tgz",
+      "integrity": "sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.3.0"
+      }
+    },
    "@types/classnames": {
      "version": "2.2.7",
      "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.7.tgz",
@@ -2084,6 +2346,12 @@
      "integrity": "sha512-gZ/Rb+MFXF0pXSEQxdRoPMm5jeO3TycjOdvbpbcpHX/B+n9AqaHFe5q6Ga9CsZ7ir/UgIWPfrBzUzn3F19VH/w==",
      "dev": true
    },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz",
+      "integrity": "sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==",
+      "dev": true
+    },
    "@types/jss": {
      "version": "9.5.7",
      "resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.7.tgz",
@@ -2143,6 +2411,12 @@
        "csstype": "^2.0.0"
      }
    },
+    "@types/stack-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+      "dev": true
+    },
    "@types/theming": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/@types/theming/-/theming-1.3.2.tgz",
@@ -2161,6 +2435,12 @@
        "@types/node": "*"
      }
    },
+    "@types/yargs": {
+      "version": "12.0.12",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",
+      "integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==",
+      "dev": true
+    },
    "@webassemblyjs/ast": {
      "version": "1.7.11",
      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
@@ -2355,6 +2635,12 @@
        "through": ">=2.2.7 <3"
      }
    },
+    "abab": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
+      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
+      "dev": true
+    },
    "abbrev": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -2402,12 +2688,28 @@
        }
      }
    },
+    "acorn-globals": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.1.tgz",
+      "integrity": "sha512-gJSiKY8dBIjV/0jagZIFBdVMtfQyA5QHCvAT48H2q8REQoW8Fs5AOjqBql1LgSXgrMWdevcE+8cdZ33NtVbIBA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.1",
+        "acorn-walk": "^6.0.1"
+      }
+    },
    "acorn-jsx": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
      "dev": true
    },
+    "acorn-walk": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+      "dev": true
+    },
    "add-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
@@ -2621,6 +2923,15 @@
        "buffer-equal": "^1.0.0"
      }
    },
+    "append-transform": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
+      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "^2.0.0"
+      }
+    },
    "applescript": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/applescript/-/applescript-1.0.0.tgz",
@@ -2755,6 +3066,12 @@
      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
      "dev": true
    },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
+      "dev": true
+    },
    "array-find-index": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -2994,6 +3311,11 @@
      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
      "dev": true
    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
    "async-settle": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
@@ -3128,6 +3450,21 @@
        "eslint-visitor-keys": "^1.0.0"
      }
    },
+    "babel-jest": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.7.1.tgz",
+      "integrity": "sha512-GPnLqfk8Mtt0i4OemjWkChi73A3ALs4w2/QbG64uAj8b5mmwzxc7jbJVRZt8NJkxi6FopVHog9S3xX6UJKb2qg==",
+      "dev": true,
+      "requires": {
+        "@jest/transform": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "@types/babel__core": "^7.1.0",
+        "babel-plugin-istanbul": "^5.1.0",
+        "babel-preset-jest": "^24.6.0",
+        "chalk": "^2.4.2",
+        "slash": "^2.0.0"
+      }
+    },
    "babel-loader": {
      "version": "8.0.5",
      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz",
@@ -3162,6 +3499,26 @@
        }
      }
    },
+    "babel-plugin-istanbul": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.2.tgz",
+      "integrity": "sha512-U3ZVajC+Z69Gim7ZzmD4Wcsq76i/1hqDamBfowc1tWzWjybRy70iWfngP2ME+1CrgcgZ/+muIbPY/Yi0dxdIkQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0",
+        "istanbul-lib-instrument": "^3.2.0",
+        "test-exclude": "^5.2.2"
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz",
+      "integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==",
+      "dev": true,
+      "requires": {
+        "@types/babel__traverse": "^7.0.6"
+      }
+    },
    "babel-plugin-react-intl": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-3.0.1.tgz",
@@ -3173,6 +3530,16 @@
        "mkdirp": "^0.5.1"
      }
    },
+    "babel-preset-jest": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz",
+      "integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
+        "babel-plugin-jest-hoist": "^24.6.0"
+      }
+    },
    "babel-runtime": {
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -3531,6 +3898,29 @@
      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
      "dev": true
    },
+    "browser-process-hrtime": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
+      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
+      "dev": true
+    },
+    "browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+      "dev": true,
+      "requires": {
+        "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
+        }
+      }
+    },
    "browser-stdout": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -3619,6 +4009,15 @@
        "node-releases": "^1.1.3"
      }
    },
+    "bser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
+      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+      "dev": true,
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
    "btoa-lite": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz",
@@ -3925,6 +4324,15 @@
      "integrity": "sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==",
      "dev": true
    },
+    "capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "requires": {
+        "rsvp": "^4.8.4"
+      }
+    },
    "capture-stack-trace": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
@@ -4211,6 +4619,12 @@
        "mkdirp": "~0.5.0"
      }
    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
    "code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -4345,6 +4759,12 @@
      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
      "dev": true
    },
+    "compare-versions": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
+      "integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
+      "dev": true
+    },
    "component-bind": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
@@ -5105,6 +5525,21 @@
      "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
      "dev": true
    },
+    "cssom": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz",
+      "integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==",
+      "dev": true
+    },
+    "cssstyle": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz",
+      "integrity": "sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==",
+      "dev": true,
+      "requires": {
+        "cssom": "0.3.x"
+      }
+    },
    "csstype": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.2.tgz",
@@ -5172,6 +5607,17 @@
        "assert-plus": "^1.0.0"
      }
    },
+    "data-urls": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.0",
+        "whatwg-mimetype": "^2.2.0",
+        "whatwg-url": "^7.0.0"
+      }
+    },
    "date-fns": {
      "version": "1.30.1",
      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
@@ -5322,6 +5768,15 @@
        }
      }
    },
+    "default-require-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
+      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
+      "dev": true,
+      "requires": {
+        "strip-bom": "^3.0.0"
+      }
+    },
    "default-resolution": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
@@ -5476,6 +5931,12 @@
      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
      "dev": true
    },
+    "detect-newline": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+      "dev": true
+    },
    "detect-node": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
@@ -5498,6 +5959,12 @@
      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
      "dev": true
    },
+    "diff-sequences": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.3.0.tgz",
+      "integrity": "sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==",
+      "dev": true
+    },
    "diffie-hellman": {
      "version": "5.0.3",
      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -5613,6 +6080,15 @@
      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
    },
+    "domexception": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "dev": true,
+      "requires": {
+        "webidl-conversions": "^4.0.2"
+      }
+    },
    "domhandler": {
      "version": "2.4.2",
      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
@@ -6191,9 +6667,9 @@
      "dev": true
    },
    "electron": {
-      "version": "4.0.8",
+      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-4.1.4.tgz",
-      "integrity": "sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw==",
+      "integrity": "sha512-MelOjntJvd33izEjR6H4N/Uii7y535z/b2BuYXJGLNSHL6o1IlyhUQmfiT87kWABayERgeuYERgvsyf956OOFw==",
      "dev": true,
      "requires": {
        "@types/node": "^10.12.18",
@@ -6202,9 +6678,9 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "10.12.30",
+          "version": "10.14.4",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz",
-          "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==",
+          "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==",
          "dev": true
        }
      }
@@ -6543,6 +7019,16 @@
          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
          "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
          "dev": true
+        },
+        "ws": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
+          "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
+          "dev": true,
+          "requires": {
+            "options": ">=0.0.5",
+            "ultron": "1.0.x"
+          }
        }
      }
    },
@@ -6580,6 +7066,16 @@
          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
          "dev": true
+        },
+        "ws": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
+          "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
+          "dev": true,
+          "requires": {
+            "options": ">=0.0.5",
+            "ultron": "1.0.x"
+          }
        }
      }
    },
@@ -6747,6 +7243,27 @@
      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
      "dev": true
    },
+    "escodegen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
+      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+      "dev": true,
+      "requires": {
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
+        }
+      }
+    },
    "eslint": {
      "version": "5.10.0",
      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.10.0.tgz",
@@ -7013,6 +7530,12 @@
        }
      }
    },
+    "eslint-plugin-jest": {
+      "version": "22.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.4.1.tgz",
+      "integrity": "sha512-gcLfn6P2PrFAVx3AobaOzlIEevpAEf9chTpFZz7bYfc7pz8XRv7vuKTIE4hxPKZSha6XWKKplDQ0x9Pq8xX2mg==",
+      "dev": true
+    },
    "eslint-plugin-jsx-a11y": {
      "version": "6.1.2",
      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz",
@@ -7160,6 +7683,12 @@
        "safe-buffer": "^5.1.1"
      }
    },
+    "exec-sh": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
+      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==",
+      "dev": true
+    },
    "execa": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -7180,6 +7709,12 @@
      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
    },
+    "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": "2.1.4",
      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -7310,6 +7845,20 @@
        "homedir-polyfill": "^1.0.1"
      }
    },
+    "expect": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-24.7.1.tgz",
+      "integrity": "sha512-mGfvMTPduksV3xoI0xur56pQsg2vJjNf5+a+bXOjqCkiCBbmCayrBbHS/75y9K430cfqyocPr2ZjiNiRx4SRKw==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "ansi-styles": "^3.2.0",
+        "jest-get-type": "^24.3.0",
+        "jest-matcher-utils": "^24.7.0",
+        "jest-message-util": "^24.7.1",
+        "jest-regex-util": "^24.3.0"
+      }
+    },
    "expect.js": {
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz",
@@ -7691,6 +8240,15 @@
        "websocket-driver": ">=0.5.1"
      }
    },
+    "fb-watchman": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
+      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+      "dev": true,
+      "requires": {
+        "bser": "^2.0.0"
+      }
+    },
    "fbjs": {
      "version": "0.8.17",
      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
@@ -7757,6 +8315,16 @@
      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
      "dev": true
    },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.3",
+        "minimatch": "^3.0.3"
+      }
+    },
    "fill-range": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -8979,6 +9547,12 @@
      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
      "dev": true
    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true
+    },
    "gulp": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz",
@@ -10283,6 +10857,15 @@
      "resolved": "https://registry.npmjs.org/html-element-attributes/-/html-element-attributes-1.3.1.tgz",
      "integrity": "sha512-UrRKgp5sQmRnDy4TEwAUsu14XBUlzKB8U3hjIYDjcZ3Hbp86Jtftzxfgrv6E/ii/h78tsaZwAnAE8HwnHr0dPA=="
    },
+    "html-encoding-sniffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "dev": true,
+      "requires": {
+        "whatwg-encoding": "^1.0.1"
+      }
+    },
    "html-entities": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
@@ -10967,6 +11550,12 @@
      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz",
      "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU="
    },
+    "is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true
+    },
    "is-glob": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
@@ -11231,6 +11820,665 @@
      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
      "dev": true
    },
+    "istanbul-api": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.4.tgz",
+      "integrity": "sha512-aAFQL0HA2BLUl18XmTQ7H7CGKI58DtZFvvfmg6e+rA3iNFergvpi16czLV4CpI7HOImMeZ5mqI62dvSNVtUQVA==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.1",
+        "compare-versions": "^3.2.1",
+        "fileset": "^2.0.3",
+        "istanbul-lib-coverage": "^2.0.4",
+        "istanbul-lib-hook": "^2.0.6",
+        "istanbul-lib-instrument": "^3.2.0",
+        "istanbul-lib-report": "^2.0.7",
+        "istanbul-lib-source-maps": "^3.0.5",
+        "istanbul-reports": "^2.2.2",
+        "js-yaml": "^3.13.0",
+        "make-dir": "^2.1.0",
+        "minimatch": "^3.0.4",
+        "once": "^1.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.11"
+          }
+        },
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-LXTBICkMARVgo579kWDm8SqfB6nvSDKNqIOBEjmJRnL04JvoMHCYGWaMddQnseJYtkEuEvO/sIcOxPLk9gERug==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.6.tgz",
+      "integrity": "sha512-829DKONApZ7UCiPXcOYWSgkFXa4+vNYoNOt3F+4uDJLKL1OotAoVwvThoEj1i8jmOj7odbYcR3rnaHu+QroaXg==",
+      "dev": true,
+      "requires": {
+        "append-transform": "^1.0.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.2.0.tgz",
+      "integrity": "sha512-06IM3xShbNW4NgZv5AP4QH0oHqf1/ivFo8eFys0ZjPXHGldHJQWb3riYOKXqmOqfxXBfxu4B+g/iuhOPZH0RJg==",
+      "dev": true,
+      "requires": {
+        "@babel/generator": "^7.0.0",
+        "@babel/parser": "^7.0.0",
+        "@babel/template": "^7.0.0",
+        "@babel/traverse": "^7.0.0",
+        "@babel/types": "^7.0.0",
+        "istanbul-lib-coverage": "^2.0.4",
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.7.tgz",
+      "integrity": "sha512-wLH6beJBFbRBLiTlMOBxmb85cnVM1Vyl36N48e4e/aTKSM3WbOx7zbVIH1SQ537fhhsPbX0/C5JB4qsmyRXXyA==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^2.0.4",
+        "make-dir": "^2.1.0",
+        "supports-color": "^6.0.0"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.5.tgz",
+      "integrity": "sha512-eDhZ7r6r1d1zQPVZehLc3D0K14vRba/eBYkz3rw16DLOrrTzve9RmnkcwrrkWVgO1FL3EK5knujVe5S8QHE9xw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^2.0.4",
+        "make-dir": "^2.1.0",
+        "rimraf": "^2.6.2",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.2.tgz",
+      "integrity": "sha512-ZFuTdBQ3PSaPnm02aEA4R6mzQ2AF9w03CYiXADzWbbE48v/EFOWF4MaX4FT0NRdqIk48I7o0RPi+S8TMswaCbQ==",
+      "dev": true,
+      "requires": {
+        "handlebars": "^4.1.0"
+      }
+    },
+    "jest": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-24.7.1.tgz",
+      "integrity": "sha512-AbvRar5r++izmqo5gdbAjTeA6uNRGoNRuj5vHB0OnDXo2DXWZJVuaObiGgtlvhKb+cWy2oYbQSfxv7Q7GjnAtA==",
+      "dev": true,
+      "requires": {
+        "import-local": "^2.0.0",
+        "jest-cli": "^24.7.1"
+      },
+      "dependencies": {
+        "import-local": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+          "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+          "dev": true,
+          "requires": {
+            "pkg-dir": "^3.0.0",
+            "resolve-cwd": "^2.0.0"
+          }
+        },
+        "jest-cli": {
+          "version": "24.7.1",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.7.1.tgz",
+          "integrity": "sha512-32OBoSCVPzcTslGFl6yVCMzB2SqX3IrWwZCY5mZYkb0D2WsogmU3eV2o8z7+gRQa4o4sZPX/k7GU+II7CxM6WQ==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^24.7.1",
+            "@jest/test-result": "^24.7.1",
+            "@jest/types": "^24.7.0",
+            "chalk": "^2.0.1",
+            "exit": "^0.1.2",
+            "import-local": "^2.0.0",
+            "is-ci": "^2.0.0",
+            "jest-config": "^24.7.1",
+            "jest-util": "^24.7.1",
+            "jest-validate": "^24.7.0",
+            "prompts": "^2.0.1",
+            "realpath-native": "^1.1.0",
+            "yargs": "^12.0.2"
+          }
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
+    },
+    "jest-changed-files": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.7.0.tgz",
+      "integrity": "sha512-33BgewurnwSfJrW7T5/ZAXGE44o7swLslwh8aUckzq2e17/2Os1V0QU506ZNik3hjs8MgnEMKNkcud442NCDTw==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "execa": "^1.0.0",
+        "throat": "^4.0.0"
+      }
+    },
+    "jest-config": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.7.1.tgz",
+      "integrity": "sha512-8FlJNLI+X+MU37j7j8RE4DnJkvAghXmBWdArVzypW6WxfGuxiL/CCkzBg0gHtXhD2rxla3IMOSUAHylSKYJ83g==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "babel-jest": "^24.7.1",
+        "chalk": "^2.0.1",
+        "glob": "^7.1.1",
+        "jest-environment-jsdom": "^24.7.1",
+        "jest-environment-node": "^24.7.1",
+        "jest-get-type": "^24.3.0",
+        "jest-jasmine2": "^24.7.1",
+        "jest-regex-util": "^24.3.0",
+        "jest-resolve": "^24.7.1",
+        "jest-util": "^24.7.1",
+        "jest-validate": "^24.7.0",
+        "micromatch": "^3.1.10",
+        "pretty-format": "^24.7.0",
+        "realpath-native": "^1.1.0"
+      }
+    },
+    "jest-diff": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.7.0.tgz",
+      "integrity": "sha512-ULQZ5B1lWpH70O4xsANC4tf4Ko6RrpwhE3PtG6ERjMg1TiYTC2Wp4IntJVGro6a8HG9luYHhhmF4grF0Pltckg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1",
+        "diff-sequences": "^24.3.0",
+        "jest-get-type": "^24.3.0",
+        "pretty-format": "^24.7.0"
+      }
+    },
+    "jest-docblock": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.3.0.tgz",
+      "integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==",
+      "dev": true,
+      "requires": {
+        "detect-newline": "^2.1.0"
+      }
+    },
+    "jest-each": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.7.1.tgz",
+      "integrity": "sha512-4fsS8fEfLa3lfnI1Jw6NxjhyRTgfpuOVTeUZZFyVYqeTa4hPhr2YkToUhouuLTrL2eMGOfpbdMyRx0GQ/VooKA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "chalk": "^2.0.1",
+        "jest-get-type": "^24.3.0",
+        "jest-util": "^24.7.1",
+        "pretty-format": "^24.7.0"
+      }
+    },
+    "jest-environment-jsdom": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.7.1.tgz",
+      "integrity": "sha512-Gnhb+RqE2JuQGb3kJsLF8vfqjt3PHKSstq4Xc8ic+ax7QKo4Z0RWGucU3YV+DwKR3T9SYc+3YCUQEJs8r7+Jxg==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^24.7.1",
+        "@jest/fake-timers": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "jest-mock": "^24.7.0",
+        "jest-util": "^24.7.1",
+        "jsdom": "^11.5.1"
+      }
+    },
+    "jest-environment-node": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.7.1.tgz",
+      "integrity": "sha512-GJJQt1p9/C6aj6yNZMvovZuxTUd+BEJprETdvTKSb4kHcw4mFj8777USQV0FJoJ4V3djpOwA5eWyPwfq//PFBA==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^24.7.1",
+        "@jest/fake-timers": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "jest-mock": "^24.7.0",
+        "jest-util": "^24.7.1"
+      }
+    },
+    "jest-get-type": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.3.0.tgz",
+      "integrity": "sha512-HYF6pry72YUlVcvUx3sEpMRwXEWGEPlJ0bSPVnB3b3n++j4phUEoSPcS6GC0pPJ9rpyPSe4cb5muFo6D39cXow==",
+      "dev": true
+    },
+    "jest-haste-map": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.7.1.tgz",
+      "integrity": "sha512-g0tWkzjpHD2qa03mTKhlydbmmYiA2KdcJe762SbfFo/7NIMgBWAA0XqQlApPwkWOF7Cxoi/gUqL0i6DIoLpMBw==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "anymatch": "^2.0.0",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^1.2.7",
+        "graceful-fs": "^4.1.15",
+        "invariant": "^2.2.4",
+        "jest-serializer": "^24.4.0",
+        "jest-util": "^24.7.1",
+        "jest-worker": "^24.6.0",
+        "micromatch": "^3.1.10",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      }
+    },
+    "jest-jasmine2": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.7.1.tgz",
+      "integrity": "sha512-Y/9AOJDV1XS44wNwCaThq4Pw3gBPiOv/s6NcbOAkVRRUEPu+36L2xoPsqQXsDrxoBerqeyslpn2TpCI8Zr6J2w==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^24.7.1",
+        "@jest/test-result": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "chalk": "^2.0.1",
+        "co": "^4.6.0",
+        "expect": "^24.7.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^24.7.1",
+        "jest-matcher-utils": "^24.7.0",
+        "jest-message-util": "^24.7.1",
+        "jest-runtime": "^24.7.1",
+        "jest-snapshot": "^24.7.1",
+        "jest-util": "^24.7.1",
+        "pretty-format": "^24.7.0",
+        "throat": "^4.0.0"
+      }
+    },
+    "jest-leak-detector": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.7.0.tgz",
+      "integrity": "sha512-zV0qHKZGXtmPVVzT99CVEcHE9XDf+8LwiE0Ob7jjezERiGVljmqKFWpV2IkG+rkFIEUHFEkMiICu7wnoPM/RoQ==",
+      "dev": true,
+      "requires": {
+        "pretty-format": "^24.7.0"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.7.0.tgz",
+      "integrity": "sha512-158ieSgk3LNXeUhbVJYRXyTPSCqNgVXOp/GT7O94mYd3pk/8+odKTyR1JLtNOQSPzNi8NFYVONtvSWA/e1RDXg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1",
+        "jest-diff": "^24.7.0",
+        "jest-get-type": "^24.3.0",
+        "pretty-format": "^24.7.0"
+      }
+    },
+    "jest-message-util": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.7.1.tgz",
+      "integrity": "sha512-dk0gqVtyqezCHbcbk60CdIf+8UHgD+lmRHifeH3JRcnAqh4nEyPytSc9/L1+cQyxC+ceaeP696N4ATe7L+omcg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/test-result": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "@types/stack-utils": "^1.0.1",
+        "chalk": "^2.0.1",
+        "micromatch": "^3.1.10",
+        "slash": "^2.0.0",
+        "stack-utils": "^1.0.1"
+      }
+    },
+    "jest-mock": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.7.0.tgz",
+      "integrity": "sha512-6taW4B4WUcEiT2V9BbOmwyGuwuAFT2G8yghF7nyNW1/2gq5+6aTqSPcS9lS6ArvEkX55vbPAS/Jarx5LSm4Fng==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0"
+      }
+    },
+    "jest-pnp-resolver": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
+      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
+      "dev": true
+    },
+    "jest-regex-util": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz",
+      "integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==",
+      "dev": true
+    },
+    "jest-resolve": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.7.1.tgz",
+      "integrity": "sha512-Bgrc+/UUZpGJ4323sQyj85hV9d+ANyPNu6XfRDUcyFNX1QrZpSoM0kE4Mb2vZMAYTJZsBFzYe8X1UaOkOELSbw==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "browser-resolve": "^1.11.3",
+        "chalk": "^2.0.1",
+        "jest-pnp-resolver": "^1.2.1",
+        "realpath-native": "^1.1.0"
+      }
+    },
+    "jest-resolve-dependencies": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.7.1.tgz",
+      "integrity": "sha512-2Eyh5LJB2liNzfk4eo7bD1ZyBbqEJIyyrFtZG555cSWW9xVHxII2NuOkSl1yUYTAYCAmM2f2aIT5A7HzNmubyg==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-snapshot": "^24.7.1"
+      }
+    },
+    "jest-runner": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.7.1.tgz",
+      "integrity": "sha512-aNFc9liWU/xt+G9pobdKZ4qTeG/wnJrJna3VqunziDNsWT3EBpmxXZRBMKCsNMyfy+A/XHiV+tsMLufdsNdgCw==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/environment": "^24.7.1",
+        "@jest/test-result": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "chalk": "^2.4.2",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.1.15",
+        "jest-config": "^24.7.1",
+        "jest-docblock": "^24.3.0",
+        "jest-haste-map": "^24.7.1",
+        "jest-jasmine2": "^24.7.1",
+        "jest-leak-detector": "^24.7.0",
+        "jest-message-util": "^24.7.1",
+        "jest-resolve": "^24.7.1",
+        "jest-runtime": "^24.7.1",
+        "jest-util": "^24.7.1",
+        "jest-worker": "^24.6.0",
+        "source-map-support": "^0.5.6",
+        "throat": "^4.0.0"
+      }
+    },
+    "jest-runtime": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.7.1.tgz",
+      "integrity": "sha512-0VAbyBy7tll3R+82IPJpf6QZkokzXPIS71aDeqh+WzPRXRCNz6StQ45otFariPdJ4FmXpDiArdhZrzNAC3sj6A==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/environment": "^24.7.1",
+        "@jest/source-map": "^24.3.0",
+        "@jest/transform": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "@types/yargs": "^12.0.2",
+        "chalk": "^2.0.1",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "jest-config": "^24.7.1",
+        "jest-haste-map": "^24.7.1",
+        "jest-message-util": "^24.7.1",
+        "jest-mock": "^24.7.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-resolve": "^24.7.1",
+        "jest-snapshot": "^24.7.1",
+        "jest-util": "^24.7.1",
+        "jest-validate": "^24.7.0",
+        "realpath-native": "^1.1.0",
+        "slash": "^2.0.0",
+        "strip-bom": "^3.0.0",
+        "yargs": "^12.0.2"
+      }
+    },
+    "jest-serializer": {
+      "version": "24.4.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.4.0.tgz",
+      "integrity": "sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==",
+      "dev": true
+    },
+    "jest-snapshot": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.7.1.tgz",
+      "integrity": "sha512-8Xk5O4p+JsZZn4RCNUS3pxA+ORKpEKepE+a5ejIKrId9CwrVN0NY+vkqEkXqlstA5NMBkNahXkR/4qEBy0t5yA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^24.7.0",
+        "chalk": "^2.0.1",
+        "expect": "^24.7.1",
+        "jest-diff": "^24.7.0",
+        "jest-matcher-utils": "^24.7.0",
+        "jest-message-util": "^24.7.1",
+        "jest-resolve": "^24.7.1",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^24.7.0",
+        "semver": "^5.5.0"
+      }
+    },
+    "jest-util": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.7.1.tgz",
+      "integrity": "sha512-/KilOue2n2rZ5AnEBYoxOXkeTu6vi7cjgQ8MXEkih0oeAXT6JkS3fr7/j8+engCjciOU1Nq5loMSKe0A1oeX0A==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/fake-timers": "^24.7.1",
+        "@jest/source-map": "^24.3.0",
+        "@jest/test-result": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "callsites": "^3.0.0",
+        "chalk": "^2.0.1",
+        "graceful-fs": "^4.1.15",
+        "is-ci": "^2.0.0",
+        "mkdirp": "^0.5.1",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "dev": true
+        }
+      }
+    },
+    "jest-validate": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.7.0.tgz",
+      "integrity": "sha512-cgai/gts9B2chz1rqVdmLhzYxQbgQurh1PEQSvSgPZ8KGa1AqXsqC45W5wKEwzxKrWqypuQrQxnF4+G9VejJJA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "camelcase": "^5.0.0",
+        "chalk": "^2.0.1",
+        "jest-get-type": "^24.3.0",
+        "leven": "^2.1.0",
+        "pretty-format": "^24.7.0"
+      }
+    },
+    "jest-watcher": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.7.1.tgz",
+      "integrity": "sha512-Wd6TepHLRHVKLNPacEsBwlp9raeBIO+01xrN24Dek4ggTS8HHnOzYSFnvp+6MtkkJ3KfMzy220KTi95e2rRkrw==",
+      "dev": true,
+      "requires": {
+        "@jest/test-result": "^24.7.1",
+        "@jest/types": "^24.7.0",
+        "@types/yargs": "^12.0.9",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.1",
+        "jest-util": "^24.7.1",
+        "string-length": "^2.0.0"
+      }
+    },
+    "jest-worker": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
+      "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
+      "dev": true,
+      "requires": {
+        "merge-stream": "^1.0.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "merge-stream": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+          "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.0.1"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
    "js-base64": {
      "version": "2.5.1",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -11263,6 +12511,68 @@
      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
      "dev": true
    },
+    "jsdom": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.0",
+        "acorn": "^5.5.3",
+        "acorn-globals": "^4.1.0",
+        "array-equal": "^1.0.0",
+        "cssom": ">= 0.3.2 < 0.4.0",
+        "cssstyle": "^1.0.0",
+        "data-urls": "^1.0.0",
+        "domexception": "^1.0.1",
+        "escodegen": "^1.9.1",
+        "html-encoding-sniffer": "^1.0.2",
+        "left-pad": "^1.3.0",
+        "nwsapi": "^2.0.7",
+        "parse5": "4.0.0",
+        "pn": "^1.1.0",
+        "request": "^2.87.0",
+        "request-promise-native": "^1.0.5",
+        "sax": "^1.2.4",
+        "symbol-tree": "^3.2.2",
+        "tough-cookie": "^2.3.4",
+        "w3c-hr-time": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "whatwg-encoding": "^1.0.3",
+        "whatwg-mimetype": "^2.1.0",
+        "whatwg-url": "^6.4.1",
+        "ws": "^5.2.0",
+        "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+          "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+          "dev": true,
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        },
+        "ws": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
+      }
+    },
    "jsesc": {
      "version": "2.5.2",
      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -11519,6 +12829,12 @@
      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
      "dev": true
    },
+    "kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true
+    },
    "last-run": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -11596,6 +12912,12 @@
        "flush-write-stream": "^1.0.2"
      }
    },
+    "left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+      "dev": true
+    },
    "lerna": {
      "version": "3.11.1",
      "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.11.1.tgz",
@@ -11621,6 +12943,12 @@
        "npmlog": "^4.1.2"
      }
    },
+    "leven": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
+      "dev": true
+    },
    "levn": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -12135,6 +13463,15 @@
        "kind-of": "^6.0.2"
      }
    },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "requires": {
+        "tmpl": "1.0.x"
+      }
+    },
    "map-age-cleaner": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -12165,6 +13502,11 @@
        "object-visit": "^1.0.0"
      }
    },
+    "marked": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+      "integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="
+    },
    "matchdep": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
@@ -12860,6 +14202,12 @@
        }
      }
    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
    "node-libs-browser": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
@@ -12931,6 +14279,19 @@
      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
      "dev": true
    },
+    "node-notifier": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz",
+      "integrity": "sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==",
+      "dev": true,
+      "requires": {
+        "growly": "^1.3.0",
+        "is-wsl": "^1.1.0",
+        "semver": "^5.5.0",
+        "shellwords": "^0.1.1",
+        "which": "^1.3.0"
+      }
+    },
    "node-pre-gyp": {
      "version": "0.10.3",
      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
@@ -13577,6 +14938,12 @@
      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
    },
+    "nwsapi": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.3.tgz",
+      "integrity": "sha512-RowAaJGEgYXEZfQ7tvvdtAQUKPyTR6T6wNu0fwlNsGQYr/h3yQc6oI8WnVZh3Y/Sylwc+dtAlvPqfFZjhTyk3A==",
+      "dev": true
+    },
    "oauth-sign": {
      "version": "0.9.0",
      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@@ -13988,6 +15355,15 @@
      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
      "dev": true
    },
+    "p-each-series": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
+      "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
+      "dev": true,
+      "requires": {
+        "p-reduce": "^1.0.0"
+      }
+    },
    "p-finally": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -14298,6 +15674,12 @@
        }
      }
    },
+    "parse5": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "dev": true
+    },
    "parsejson": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
@@ -14553,6 +15935,12 @@
      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
      "dev": true
    },
+    "pn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
+      "dev": true
+    },
    "portfinder": {
      "version": "1.0.20",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
@@ -14616,6 +16004,32 @@
        "utila": "~0.4"
      }
    },
+    "pretty-format": {
+      "version": "24.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.7.0.tgz",
+      "integrity": "sha512-apen5cjf/U4dj7tHetpC7UEFCvtAgnNZnBDkfPv3fokzIqyOJckAG9OlAPC1BlFALnqT/lGB2tl9EJjlK6eCsA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "ansi-regex": "^4.0.0",
+        "ansi-styles": "^3.2.0",
+        "react-is": "^16.8.4"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "react-is": {
+          "version": "16.8.6",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+          "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==",
+          "dev": true
+        }
+      }
+    },
    "pretty-hrtime": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -14731,6 +16145,16 @@
        "retry": "^0.10.0"
      }
    },
+    "prompts": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.0.4.tgz",
+      "integrity": "sha512-HTzM3UWp/99A0gk51gAegwo1QRYA7xjcZufMNe33rCclFszUYAuHe1fIN/3ZmiHeGPkUsNaRyQm1hHOfM0PKxA==",
+      "dev": true,
+      "requires": {
+        "kleur": "^3.0.2",
+        "sisteransi": "^1.0.0"
+      }
+    },
    "promzard": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
@@ -15406,6 +16830,15 @@
        }
      }
    },
+    "realpath-native": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
+      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
+      "dev": true,
+      "requires": {
+        "util.promisify": "^1.0.0"
+      }
+    },
    "rechoir": {
      "version": "0.6.2",
      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -15739,6 +17172,26 @@
        "uuid": "^3.3.2"
      }
    },
+    "request-promise-core": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
+      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.11"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
+      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.2",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
    "require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -15875,6 +17328,12 @@
      "resolved": "https://registry.npmjs.org/route-parser/-/route-parser-0.0.5.tgz",
      "integrity": "sha1-fR0J0zXkkJQDHqFpkaSnmwG74fQ="
    },
+    "rsvp": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.4.tgz",
+      "integrity": "sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA==",
+      "dev": true
+    },
    "run-async": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -15933,6 +17392,23 @@
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
+    "sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "dev": true,
+      "requires": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      }
+    },
    "sanitize-filename": {
      "version": "1.6.1",
      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
@@ -16396,6 +17872,12 @@
      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
      "dev": true
    },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true
+    },
    "sigmund": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
@@ -16460,6 +17942,12 @@
        }
      }
    },
+    "sisteransi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.0.tgz",
+      "integrity": "sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ==",
+      "dev": true
+    },
    "slash": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -17068,6 +18556,12 @@
      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
      "dev": true
    },
+    "stack-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
+      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
+      "dev": true
+    },
    "stat-mode": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
@@ -17136,6 +18630,12 @@
        }
      }
    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
    "stream-browserify": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -17238,6 +18738,16 @@
      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
    },
+    "string-length": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
+      "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
+      "dev": true,
+      "requires": {
+        "astral-regex": "^1.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
    "string-width": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -17331,6 +18841,12 @@
      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
    },
+    "symbol-tree": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
+      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
+      "dev": true
+    },
    "table": {
      "version": "5.2.3",
      "resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz",
@@ -17540,6 +19056,47 @@
        }
      }
    },
+    "test-exclude": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.2.tgz",
+      "integrity": "sha512-N2pvaLpT8guUpb5Fe1GJlmvmzH3x+DAKmmyEQmFP792QcLYoGE1syxztSvPD1V8yPe6VrcCt6YGQVjSRjCASsA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "read-pkg-up": "^4.0.0",
+        "require-main-filename": "^2.0.0"
+      },
+      "dependencies": {
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+          "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        }
+      }
+    },
    "text-extensions": {
      "version": "1.9.0",
      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
@@ -17563,6 +19120,12 @@
        "prop-types": "^15.5.8"
      }
    },
+    "throat": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
+      "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
+      "dev": true
+    },
    "throttleit": {
      "version": "0.0.2",
      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
@@ -17666,6 +19229,12 @@
        "os-tmpdir": "~1.0.2"
      }
    },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "dev": true
+    },
    "to-absolute-glob": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -18602,6 +20171,15 @@
        "indexof": "0.0.1"
      }
    },
+    "w3c-hr-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
+      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
+      "dev": true,
+      "requires": {
+        "browser-process-hrtime": "^0.1.2"
+      }
+    },
    "wait-on": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.2.0.tgz",
@@ -18660,6 +20238,15 @@
        }
      }
    },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "requires": {
+        "makeerror": "1.0.x"
+      }
+    },
    "warning": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
@@ -19060,11 +20647,26 @@
      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
      "dev": true
    },
+    "whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.24"
+      }
+    },
    "whatwg-fetch": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
    },
+    "whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
    "whatwg-url": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
@@ -19318,13 +20920,11 @@
      }
    },
    "ws": {
-      "version": "1.1.5",
+      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "dev": true,
      "requires": {
-        "options": ">=0.0.5",
+        "async-limiter": "~1.0.0"
-        "ultron": "1.0.x"
      }
    },
    "wtf-8": {
@@ -19339,6 +20939,12 @@
      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
      "dev": true
    },
+    "xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
    "xmlbuilder": {
      "version": "9.0.7",
      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
diff --git a/package.json b/package.json
index 361491acd..c1a8c310f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "franz",
  "productName": "Franz",
  "appId": "com.meetfranz.franz",
-  "version": "5.0.1",
+  "version": "5.1.0",
  "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
  "copyright": "adlk x franz - Stefan Malzner",
  "main": "index.js",
@@ -15,6 +15,8 @@
    "start:local": "cross-env LOCAL_API=1 npm start",
    "start:live": "cross-env LIVE_API=1 npm start",
    "dev": "cross-env NODE_ENV=development gulp dev",
+    "test": "jest",
+    "test:watch": "jest --watch",
    "lint": "eslint src",
    "manage-translations": "node ./src/i18n/manage-translations.js",
    "sign": "gulp sign",
@@ -54,6 +56,7 @@
    "hex-to-rgba": "1.0.2",
    "jsonwebtoken": "8.5.1",
    "lodash": "^4.17.4",
+    "marked": "0.6.1",
    "mdi": "^1.9.33",
    "mime-types": "2.1.21",
    "mobx": "5.7.0",
@@ -82,7 +85,8 @@
    "semver": "^5.4.1",
    "smoothscroll-polyfill": "^0.3.4",
    "tar": "^4.0.2",
-    "uuid": "^3.0.1"
+    "uuid": "^3.0.1",
+    "ws": "6.2.1"
  },
  "devDependencies": {
    "@adlk/misty": "^0.1.1",
@@ -113,13 +117,14 @@
    "cross-env": "^5.0.5",
    "cz-conventional-changelog": "2.1.0",
    "dotenv": "^4.0.0",
-    "electron": "4.0.8",
+    "electron": "4.1.4",
    "electron-builder": "20.38.4",
    "electron-rebuild": "1.8.4",
    "eslint": "5.10.0",
    "eslint-config-airbnb": "17.1.0",
    "eslint-loader": "^1.9.0",
    "eslint-plugin-import": "2.14.0",
+    "eslint-plugin-jest": "22.4.1",
    "eslint-plugin-jsx-a11y": "6.1.2",
    "eslint-plugin-react": "7.11.1",
    "expect.js": "0.3.1",
@@ -132,6 +137,7 @@
    "hex-rgb": "3.0.0",
    "html-webpack-plugin": "4.0.0-beta.5",
    "husky": "^1.1.4",
+    "jest": "24.7.1",
    "kebab-case": "1.0.0",
    "lerna": "^3.8.0",
    "mobx-react-devtools": "6.0.3",
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index fd04b106c..bd9f001e8 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -1,5 +1,5 @@
 import color from 'color';
-import { merge, cloneDeep } from 'lodash';
+import { cloneDeep, merge } from 'lodash';
 import * as defaultStyles from '../default';
 import * as legacyStyles from '../legacy';
@@ -112,21 +112,9 @@ export const workspaces = merge({}, defaultStyles.workspaces, {
  },
 });
-// // Workspace settings
+// Announcements
-// export const workspaceSettings = merge({}, defaultStyles.workspaceSettings, {
+export const announcements = merge({}, defaultStyles.announcements, {
-//   listItemBorderColor: legacyStyles.darkThemeGrayDarker,
+  spotlight: {
-//   listItemHoverBgColor: legacyStyles.darkThemeGrayDarker,
+    background: legacyStyles.darkThemeGrayDark,
-// });
+  },
-//
+});
-// // Workspace Drawer
-// export const workspaceDrawerBackground = color(colorBackground).lighten(0.3).hex();
-// export const workspaceDrawerAddButtonColor = legacyStyles.darkThemeGrayLighter;
-// export const workspaceDrawerAddButtonHoverColor = legacyStyles.darkThemeGraySmoke;
-// export const workspaceDrawerItemBorder = color(workspaceDrawerBackground).lighten(0.2).hex();
-// export const workspaceDrawerItemHoverBackground = color(workspaceDrawerBackground).lighten(0.2).hex();
-// export const workspaceDrawerItemActiveBackground = defaultStyles.brandPrimary;
-// export const workspaceDrawerItemNameColor = colorText;
-// export const workspaceDrawerItemNameActiveColor = 'white';
-// export const workspaceDrawerServicesColor = color(colorText).darken(0.5).hex();
-// export const workspaceDrawerServicesActiveColor = color(defaultStyles.brandPrimary).lighten(0.5).hex();
-//
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index d0493b82f..0f02fa3c8 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -201,22 +201,9 @@ export const workspaces = {
  },
 };
-// export const workspaceSettings = {
+// Announcements
-//   listItemHeight: 57,
+export const announcements = {
-//   listItemBorderColor: legacyStyles.themeGrayLightest,
+  spotlight: {
-//   listItemHoverBgColor: legacyStyles.themeGrayLightest,
+    background: legacyStyles.themeGrayLightest,
-// };
+  },
-//
+};
-// // Workspace Drawer
-// export const workspaceDrawerWidth = 300;
-// export const workspaceDrawerPadding = 20;
-// export const workspaceDrawerBackground = color(colorBackground).lighten(0.1).hex();
-// export const workspaceDrawerAddButtonColor = legacyStyles.themeGrayLight;
-// export const workspaceDrawerAddButtonHoverColor = color(legacyStyles.themeGrayLight).lighten(0.1).hex();
-// export const workspaceDrawerItemHoverBackground = color(workspaceDrawerBackground).darken(0.01).hex();
-// export const workspaceDrawerItemActiveBackground = legacyStyles.themeGrayLightest;
-// export const workspaceDrawerItemBorder = color(workspaceDrawerBackground).darken(0.05).hex();
-// export const workspaceDrawerItemNameColor = colorText;
-// export const workspaceDrawerItemNameActiveColor = colorText;
-// export const workspaceDrawerServicesColor = color(colorText).lighten(1.5).hex();
-// export const workspaceDrawerServicesActiveColor = workspaceDrawerServicesColor;
diff --git a/src/actions/index.js b/src/actions/index.js
index 00f843cd6..fc525afeb 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -11,6 +11,7 @@ import payment from './payment';
 import news from './news';
 import settings from './settings';
 import requests from './requests';
+import announcements from '../features/announcements/actions';
 import workspaces from '../features/workspaces/actions';
 const actions = Object.assign({}, {
@@ -28,5 +29,6 @@ const actions = Object.assign({}, {
 export default Object.assign(
  defineActions(actions, PropTypes.checkPropTypes),
+  { announcements },
  { workspaces },
 );
diff --git a/src/actions/lib/actions.js b/src/actions/lib/actions.js
index 2bc7d2711..b38db9946 100644
--- a/src/actions/lib/actions.js
+++ b/src/actions/lib/actions.js
@@ -1,7 +1,7 @@
 export const createActionsFromDefinitions = (actionDefinitions, validate) => {
  const actions = {};
  Object.keys(actionDefinitions).forEach((actionName) => {
-    const action = (params) => {
+    const action = (params = {}) => {
      const schema = actionDefinitions[actionName];
      validate(schema, params, actionName);
      action.notify(params);
diff --git a/src/actions/service.js b/src/actions/service.js
index ceaabc31e..68c62d594 100644
--- a/src/actions/service.js
+++ b/src/actions/service.js
@@ -4,7 +4,9 @@ import ServiceModel from '../models/Service';
 export default {
  setActive: {
    serviceId: PropTypes.string.isRequired,
+    keepActiveRoute: PropTypes.bool,
  },
+  blurActive: {},
  setActiveNext: {},
  setActivePrev: {},
  showAddServiceInterface: {
diff --git a/src/api/PaymentApi.js b/src/api/PaymentApi.js
index 3f6bb442e..7325151e9 100644
--- a/src/api/PaymentApi.js
+++ b/src/api/PaymentApi.js
@@ -11,12 +11,4 @@ export default class PaymentApi {
  getHostedPage(planId) {
    return this.server.getHostedPage(planId);
  }
-  getDashboardUrl() {
-    return this.server.getPaymentDashboardUrl();
-  }
-  getOrders() {
-    return this.server.getSubscriptionOrders();
-  }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index bafeef005..a9ce202ff 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -268,7 +268,7 @@ export default class ServerApi {
    const data = await request.json();
    const features = data;
-    console.debug('ServerApi::getDefaultFeatures resolves', features);
+    debug('ServerApi::getDefaultFeatures resolves', features);
    return features;
  }
@@ -280,7 +280,7 @@ export default class ServerApi {
    const data = await request.json();
    const features = data;
-    console.debug('ServerApi::getFeatures resolves', features);
+    debug('ServerApi::getFeatures resolves', features);
    return features;
  }
@@ -418,23 +418,6 @@ export default class ServerApi {
    return data;
  }
-  async getPaymentDashboardUrl() {
-    const request = await sendAuthRequest(`${API_URL}/me/billing`);
-    if (!request.ok) throw request;
-    const data = await request.json();
-    debug('ServerApi::getPaymentDashboardUrl resolves', data);
-    return data;
-  }
-  async getSubscriptionOrders() {
-    const request = await sendAuthRequest(`${API_URL}/me/subscription`);
-    if (!request.ok) throw request;
-    const data = await request.json();
-    const orders = this._mapOrderModels(data);
-    debug('ServerApi::getSubscriptionOrders resolves', orders);
-    return orders;
-  }
  // News
  async getLatestNews() {
    const url = `${API_URL}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
diff --git a/src/app.js b/src/app.js
index fb9f1c6ab..cb3e37c64 100644
--- a/src/app.js
+++ b/src/app.js
@@ -27,6 +27,7 @@ import RecipesScreen from './containers/settings/RecipesScreen';
 import ServicesScreen from './containers/settings/ServicesScreen';
 import EditServiceScreen from './containers/settings/EditServiceScreen';
 import AccountScreen from './containers/settings/AccountScreen';
+import TeamScreen from './containers/settings/TeamScreen';
 import EditUserScreen from './containers/settings/EditUserScreen';
 import EditSettingsScreen from './containers/settings/EditSettingsScreen';
 import InviteSettingsScreen from './containers/settings/InviteScreen';
@@ -42,6 +43,8 @@ import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopup
 import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
 import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
 import { WORKSPACES_ROUTES } from './features/workspaces';
+import AnnouncementScreen from './features/announcements/components/AnnouncementScreen';
+import { ANNOUNCEMENTS_ROUTES } from './features/announcements';
 // Add Polyfills
 smoothScroll.polyfill();
@@ -72,6 +75,7 @@ window.addEventListener('load', () => {
          <I18N>
            <Router history={history}>
              <Route path="/" component={AppLayoutContainer}>
+                <Route path={ANNOUNCEMENTS_ROUTES.TARGET} component={AnnouncementScreen} />
                <Route path="/settings" component={SettingsWindow}>
                  <IndexRedirect to="/settings/recipes" />
                  <Route path="/settings/recipes" component={RecipesScreen} />
@@ -82,6 +86,7 @@ window.addEventListener('load', () => {
                  <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} />
                  <Route path="/settings/user" component={AccountScreen} />
                  <Route path="/settings/user/edit" component={EditUserScreen} />
+                  <Route path="/settings/team" component={TeamScreen} />
                  <Route path="/settings/app" component={EditSettingsScreen} />
                  <Route path="/settings/invite" component={InviteSettingsScreen} />
                </Route>
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index b7f7722dd..b31c00f54 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -16,6 +16,7 @@ import ErrorBoundary from '../util/ErrorBoundary';
 import { isWindows } from '../../environment';
 import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
 import { workspaceStore } from '../../features/workspaces';
+import { announcementActions } from '../../features/announcements/actions';
 function createMarkup(HTMLString) {
  return { __html: HTMLString };
@@ -71,6 +72,7 @@ class AppLayout extends Component {
    // isOnline: PropTypes.bool.isRequired,
    showServicesUpdatedInfoBar: PropTypes.bool.isRequired,
    appUpdateIsDownloaded: PropTypes.bool.isRequired,
+    nextAppReleaseVersion: PropTypes.string,
    removeNewsItem: PropTypes.func.isRequired,
    reloadServicesAfterUpdate: PropTypes.func.isRequired,
    installAppUpdate: PropTypes.func.isRequired,
@@ -84,6 +86,7 @@ class AppLayout extends Component {
  static defaultProps = {
    children: [],
+    nextAppReleaseVersion: null,
  };
  static contextTypes = {
@@ -102,6 +105,7 @@ class AppLayout extends Component {
      news,
      showServicesUpdatedInfoBar,
      appUpdateIsDownloaded,
+      nextAppReleaseVersion,
      removeNewsItem,
      reloadServicesAfterUpdate,
      installAppUpdate,
@@ -178,19 +182,23 @@ class AppLayout extends Component {
                    <span className="mdi mdi-information" />
                    {intl.formatMessage(messages.updateAvailable)}
                    {' '}
-                    <a href="https://meetfranz.com/changelog" target="_blank">
+                    <button
+                      className="info-bar__inline-button"
+                      type="button"
+                      onClick={() => announcementActions.show({ targetVersion: nextAppReleaseVersion })}
+                    >
                      <u>{intl.formatMessage(messages.changelog)}</u>
-                    </a>
+                    </button>
                  </InfoBar>
                )}
                {isDelayAppScreenVisible && (<DelayApp />)}
                <BasicAuth />
                <ShareFranz />
                {services}
+                {children}
              </div>
            </div>
          </div>
-          {children}
        </div>
      </ErrorBoundary>
    );
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 181b95c8c..3f6964b6b 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -3,12 +3,11 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
-import moment from 'moment';
+import { ProBadge } from '@meetfranz/ui';
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import Link from '../../ui/Link';
 import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 const messages = defineMessages({
@@ -24,10 +23,6 @@ const messages = defineMessages({
    id: 'settings.account.headlineUpgrade',
    defaultMessage: '!!!Upgrade your Account',
  },
-  headlineInvoices: {
-    id: 'settings.account.headlineInvoices',
-    defaultMessage: '!!Invoices',
-  },
  headlineDangerZone: {
    id: 'settings.account.headlineDangerZone',
    defaultMessage: '!!Danger Zone',
@@ -48,6 +43,10 @@ const messages = defineMessages({
    id: 'settings.account.account.editButton',
    defaultMessage: '!!!Edit Account',
  },
+  invoicesButton: {
+    id: 'settings.account.headlineInvoices',
+    defaultMessage: '!!Invoices',
+  },
  invoiceDownload: {
    id: 'settings.account.invoiceDownload',
    defaultMessage: '!!!Download',
@@ -77,19 +76,17 @@ const messages = defineMessages({
 export default @observer class AccountDashboard extends Component {
  static propTypes = {
    user: MobxPropTypes.observableObject.isRequired,
-    orders: MobxPropTypes.arrayOrObservableArray.isRequired,
    isLoading: PropTypes.bool.isRequired,
-    isLoadingOrdersInfo: PropTypes.bool.isRequired,
    isLoadingPlans: PropTypes.bool.isRequired,
-    isCreatingPaymentDashboardUrl: PropTypes.bool.isRequired,
    userInfoRequestFailed: PropTypes.bool.isRequired,
    retryUserInfoRequest: PropTypes.func.isRequired,
-    openDashboard: PropTypes.func.isRequired,
-    openExternalUrl: PropTypes.func.isRequired,
    onCloseSubscriptionWindow: PropTypes.func.isRequired,
    deleteAccount: PropTypes.func.isRequired,
    isLoadingDeleteAccount: PropTypes.bool.isRequired,
    isDeleteAccountSuccessful: PropTypes.bool.isRequired,
+    openEditAccount: PropTypes.func.isRequired,
+    openBilling: PropTypes.func.isRequired,
+    openInvoices: PropTypes.func.isRequired,
  };
  static contextTypes = {
@@ -99,12 +96,7 @@ export default @observer class AccountDashboard extends Component {
  render() {
    const {
      user,
-      orders,
      isLoading,
-      isCreatingPaymentDashboardUrl,
-      openDashboard,
-      openExternalUrl,
-      isLoadingOrdersInfo,
      isLoadingPlans,
      userInfoRequestFailed,
      retryUserInfoRequest,
@@ -112,6 +104,9 @@ export default @observer class AccountDashboard extends Component {
      deleteAccount,
      isLoadingDeleteAccount,
      isDeleteAccountSuccessful,
+      openEditAccount,
+      openBilling,
+      openInvoices,
    } = this.props;
    const { intl } = this.context;
@@ -149,80 +144,53 @@ export default @observer class AccountDashboard extends Component {
                        src="./assets/images/logo.svg"
                        alt=""
                      />
-                      {user.isPremium && (
-                        <span
-                          className="account__avatar-premium emoji"
-                          data-tip="Premium Supporter Account"
-                        >
-                          <img src="./assets/images/emoji/star.png" alt="" />
-                        </span>
-                      )}
                    </div>
                    <div className="account__info">
                      <h2>
-                        {`${user.firstname} ${user.lastname}`}
+                        <span className="username">{`${user.firstname} ${user.lastname}`}</span>
+                        {user.isPremium && (
+                          <>
+                            {' '}
+                            <ProBadge />
+                            <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
+                          </>
+                        )}
                      </h2>
                      {user.organization && `${user.organization}, `}
                      {user.email}
-                      <br />
                      {user.isPremium && (
-                        <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
+                        <div className="manage-user-links">
+                          <Button
+                            label={intl.formatMessage(messages.accountEditButton)}
+                            className="franz-form__button--inverted"
+                            onClick={openEditAccount}
+                          />
+                          {user.isSubscriptionOwner && (
+                            <>
+                              <Button
+                                label={intl.formatMessage(messages.manageSubscriptionButtonLabel)}
+                                className="franz-form__button--inverted"
+                                onClick={openBilling}
+                              />
+                              <Button
+                                label={intl.formatMessage(messages.invoicesButton)}
+                                className="franz-form__button--inverted"
+                                onClick={openInvoices}
+                              />
+                            </>
+                          )}
+                        </div>
                      )}
                    </div>
-                    <Link to="/settings/user/edit" className="button">
+                    {!user.isPremium && (
-                      {intl.formatMessage(messages.accountEditButton)}
+                      <Button
-                    </Link>
+                        label={intl.formatMessage(messages.accountEditButton)}
-                    {user.emailValidated}
+                        className="franz-form__button--inverted"
-                  </div>
+                        onClick={openEditAccount}
-                </div>
+                      />
-              )}
-              {user.isSubscriptionOwner && (
-                isLoadingOrdersInfo ? (
-                  <Loader />
-                ) : (
-                  <div className="account franz-form">
-                    {orders.length > 0 && (
-                      <Fragment>
-                        <div className="account__box">
-                          <h2>{intl.formatMessage(messages.headlineSubscription)}</h2>
-                          <div className="account__subscription">
-                            {orders[0].name}
-                            <span className="badge">{orders[0].price}</span>
-                            <Button
-                              label={intl.formatMessage(messages.manageSubscriptionButtonLabel)}
-                              className="account__subscription-button franz-form__button--inverted"
-                              loaded={!isCreatingPaymentDashboardUrl}
-                              onClick={() => openDashboard()}
-                            />
-                          </div>
-                        </div>
-                        <div className="account__box">
-                          <h2>{intl.formatMessage(messages.headlineInvoices)}</h2>
-                          <table className="invoices">
-                            <tbody>
-                              {orders.map(order => (
-                                <tr key={order.id}>
-                                  <td className="invoices__date">
-                                    {moment(order.date).format('DD.MM.YYYY')}
-                                  </td>
-                                  <td className="invoices__action">
-                                    <button
-                                      type="button"
-                                      onClick={() => openExternalUrl(order.invoiceUrl)}
-                                    >
-                                      {intl.formatMessage(messages.invoiceDownload)}
-                                    </button>
-                                  </td>
-                                </tr>
-                              ))}
-                            </tbody>
-                          </table>
-                        </div>
-                      </Fragment>
                    )}
                  </div>
-                )
+                </div>
              )}
              {!user.isPremium && (
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 993b0a44a..df4b3b3b2 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -7,6 +7,7 @@ import { ProBadge } from '@meetfranz/ui';
 import Link from '../../ui/Link';
 import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
+import UserStore from '../../../stores/UserStore';
 const messages = defineMessages({
  availableServices: {
@@ -25,6 +26,10 @@ const messages = defineMessages({
    id: 'settings.navigation.account',
    defaultMessage: '!!!Account',
  },
+  team: {
+    id: 'settings.navigation.team',
+    defaultMessage: '!!!Manage Team',
+  },
  settings: {
    id: 'settings.navigation.settings',
    defaultMessage: '!!!Settings',
@@ -43,6 +48,7 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
  static propTypes = {
    stores: PropTypes.shape({
      ui: PropTypes.instanceOf(UIStore).isRequired,
+      user: PropTypes.instanceOf(UserStore).isRequired,
    }).isRequired,
    serviceCount: PropTypes.number.isRequired,
    workspaceCount: PropTypes.number.isRequired,
@@ -55,6 +61,7 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
  render() {
    const { serviceCount, workspaceCount, stores } = this.props;
    const { isDarkThemeActive } = stores.ui;
+    const { router, user } = stores;
    const { intl } = this.context;
    return (
@@ -98,6 +105,16 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
          {intl.formatMessage(messages.account)}
        </Link>
        <Link
+          to="/settings/team"
+          className="settings-navigation__link"
+          activeClassName="is-active"
+        >
+          {intl.formatMessage(messages.team)}
+          {!user.data.isPremium && (
+            <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} />
+          )}
+        </Link>
+        <Link
          to="/settings/app"
          className="settings-navigation__link"
          activeClassName="is-active"
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 8429d0ecb..efd453356 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -81,6 +81,10 @@ const messages = defineMessages({
    id: 'settings.app.restartRequired',
    defaultMessage: '!!!Changes require restart',
  },
+  languageDisclaimer: {
+    id: 'settings.app.languageDisclaimer',
+    defaultMessage: '!!!Official translations are English & German. All other languages are community based translations.',
+  },
 });
 export default @observer class EditSettingsForm extends Component {
@@ -239,6 +243,10 @@ export default @observer class EditSettingsForm extends Component {
            {intl.formatMessage(messages.currentVersion)}
            {' '}
            {remote.app.getVersion()}
+            <p className="settings__message">
+              <span className="mdi mdi-information" />
+              {intl.formatMessage(messages.languageDisclaimer)}
+            </p>
          </form>
        </div>
      </div>
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
new file mode 100644
index 000000000..82c517fcb
--- /dev/null
+++ b/src/components/settings/team/TeamDashboard.js
@@ -0,0 +1,152 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import ReactTooltip from 'react-tooltip';
+import injectSheet from 'react-jss';
+import Loader from '../../ui/Loader';
+import Button from '../../ui/Button';
+import Infobox from '../../ui/Infobox';
+import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
+const messages = defineMessages({
+  headline: {
+    id: 'settings.team.headline',
+    defaultMessage: '!!!Team',
+  },
+  contentHeadline: {
+    id: 'settings.team.contentHeadline',
+    defaultMessage: '!!!Franz for Teams',
+  },
+  intro: {
+    id: 'settings.team.intro',
+    defaultMessage: '!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.',
+  },
+  copy: {
+    id: 'settings.team.copy',
+    defaultMessage: '!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!',
+  },
+  manageButton: {
+    id: 'settings.team.manageAction',
+    defaultMessage: '!!!Manage your Team on meetfranz.com',
+  },
+  upgradeButton: {
+    id: 'settings.team.upgradeAction',
+    defaultMessage: '!!!Upgrade your Account',
+  },
+});
+const styles = {
+  cta: {
+    margin: [40, 'auto'],
+  },
+  container: {
+    display: 'flex',
+    flexDirection: 'column',
+    height: 'auto',
+    '@media(min-width: 800px)': {
+      flexDirection: 'row',
+    },
+  },
+  content: {
+    height: 'auto',
+    order: 1,
+    '@media(min-width: 800px)': {
+      order: 0,
+    },
+  },
+  image: {
+    display: 'block',
+    height: 150,
+    order: 0,
+    margin: [0, 'auto', 40, 'auto'],
+    '@media(min-width: 800px)': {
+      marginLeft: 40,
+      order: 1,
+    },
+  },
+};
+export default @injectSheet(styles) @observer class TeamDashboard extends Component {
+  static propTypes = {
+    isLoading: PropTypes.bool.isRequired,
+    userInfoRequestFailed: PropTypes.bool.isRequired,
+    retryUserInfoRequest: PropTypes.func.isRequired,
+    openTeamManagement: PropTypes.func.isRequired,
+    classes: PropTypes.object.isRequired,
+  };
+  static contextTypes = {
+    intl: intlShape,
+  };
+  render() {
+    const {
+      isLoading,
+      userInfoRequestFailed,
+      retryUserInfoRequest,
+      openTeamManagement,
+      classes,
+    } = this.props;
+    const { intl } = this.context;
+    return (
+      <div className="settings__main">
+        <div className="settings__header">
+          <span className="settings__header-item">
+            {intl.formatMessage(messages.headline)}
+          </span>
+        </div>
+        <div className="settings__body">
+          {isLoading && (
+            <Loader />
+          )}
+          {!isLoading && userInfoRequestFailed && (
+            <Infobox
+              icon="alert"
+              type="danger"
+              ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)}
+              ctaLoading={isLoading}
+              ctaOnClick={retryUserInfoRequest}
+            >
+              {intl.formatMessage(messages.userInfoRequestFailed)}
+            </Infobox>
+          )}
+          {!userInfoRequestFailed && (
+            <>
+              {!isLoading && (
+                <>
+                  <PremiumFeatureContainer>
+                    <>
+                      <h1>{intl.formatMessage(messages.contentHeadline)}</h1>
+                      <div className={classes.container}>
+                        <div className={classes.content}>
+                          <p>{intl.formatMessage(messages.intro)}</p>
+                          <p>{intl.formatMessage(messages.copy)}</p>
+                        </div>
+                        <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Franz for Teams" />
+                      </div>
+                      <Button
+                        label={intl.formatMessage(messages.manageButton)}
+                        onClick={openTeamManagement}
+                        className={classes.cta}
+                      />
+                    </>
+                  </PremiumFeatureContainer>
+                </>
+              )}
+            </>
+          )}
+        </div>
+        <ReactTooltip place="right" type="dark" effect="solid" />
+      </div>
+    );
+  }
+}
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 7a818d100..50f1e0522 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -51,6 +51,10 @@ const messages = defineMessages({
    id: 'subscription.features.spellchecker',
    defaultMessage: '!!!Support for Spellchecker',
  },
+  workspaces: {
+    id: 'subscription.features.workspaces',
+    defaultMessage: '!!!Organize your services in workspaces',
+  },
  ads: {
    id: 'subscription.features.ads',
    defaultMessage: '!!!No ads, ever!',
@@ -171,6 +175,9 @@ export default @observer class SubscriptionForm extends Component {
                  {intl.formatMessage(messages.proxy)}
                </li>
                <li>
+                  {intl.formatMessage(messages.workspaces)}
+                </li>
+                <li>
                  {intl.formatMessage(messages.ads)}
                </li>
              </ul>
diff --git a/src/config.js b/src/config.js
index 242675762..5bc318545 100644
--- a/src/config.js
+++ b/src/config.js
@@ -9,9 +9,21 @@ const app = process.type === 'renderer' ? electron.remote.app : electron.app;
 const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences;
 export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
 export const LOCAL_API = 'http://localhost:3000';
 export const DEV_API = 'https://dev.franzinfra.com';
 export const LIVE_API = 'https://api.franzinfra.com';
+export const LOCAL_WS_API = 'ws://localhost:3000';
+export const DEV_WS_API = 'wss://dev.franzinfra.com';
+export const LIVE_WS_API = 'wss://api.franzinfra.com';
+export const LOCAL_API_WEBSITE = 'http://localhost:3333';
+export const DEV_API_WEBSITE = 'https://meetfranz.com';
+export const LIVE_API_WEBSITE = 'https://meetfranz.com';
+export const STATS_API = 'https://stats.franzinfra.com';
 export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12';
 export const DEFAULT_APP_SETTINGS = {
@@ -41,6 +53,7 @@ export const DEFAULT_FEATURES_CONFIG = {
  },
  isServiceProxyEnabled: false,
  isServiceProxyPremiumFeature: true,
+  isAnnouncementsEnabled: true,
  isWorkspacePremiumFeature: true,
  isWorkspaceEnabled: false,
 };
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 2d855c78f..d290a6094 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -135,6 +135,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
          isOnline={app.isOnline}
          showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
          appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
+          nextAppReleaseVersion={app.nextAppReleaseVersion}
          sidebar={sidebar}
          workspacesDrawer={workspacesDrawer}
          services={servicesContainer}
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index ce1b9c333..b3f967353 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -1,4 +1,3 @@
-import { remote } from 'electron';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
@@ -9,84 +8,52 @@ import AppStore from '../../stores/AppStore';
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { WEBSITE } from '../../environment';
-const { BrowserWindow } = remote;
 export default @inject('stores', 'actions') @observer class AccountScreen extends Component {
-  componentWillMount() {
-    const {
-      user,
-    } = this.props.stores;
-    user.getUserInfoRequest.invalidate({ immediately: true });
-  }
  onCloseWindow() {
-    const { user, payment } = this.props.stores;
+    const { user } = this.props.stores;
    user.getUserInfoRequest.invalidate({ immediately: true });
-    payment.ordersDataRequest.invalidate({ immediately: true });
  }
  reloadData() {
    const { user, payment } = this.props.stores;
    user.getUserInfoRequest.reload();
-    payment.ordersDataRequest.reload();
    payment.plansRequest.reload();
  }
-  async handlePaymentDashboard() {
+  handleWebsiteLink(route) {
    const { actions, stores } = this.props;
-    actions.payment.createDashboardUrl();
+    const url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`;
+    console.log(url);
-    const dashboard = await stores.payment.createDashboardUrlRequest;
-    if (dashboard.url) {
-      const paymentWindow = new BrowserWindow({
-        title: '🔒 Franz Subscription Dashboard',
-        parent: remote.getCurrentWindow(),
-        modal: false,
-        width: 900,
-        minWidth: 600,
-        webPreferences: {
-          nodeIntegration: false,
-        },
-      });
-      paymentWindow.loadURL(dashboard.url);
-      paymentWindow.on('closed', () => {
+    actions.app.openExternalUrl({ url });
-        this.onCloseWindow();
-      });
-    }
  }
  render() {
    const { user, payment } = this.props.stores;
-    const { openExternalUrl } = this.props.actions.app;
    const { user: userActions } = this.props.actions;
    const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
-    const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting;
    const isLoadingPlans = payment.plansRequest.isExecuting;
    return (
      <ErrorBoundary>
        <AccountDashboard
          user={user.data}
-          orders={payment.orders}
          isLoading={isLoadingUserInfo}
-          isLoadingOrdersInfo={isLoadingOrdersInfo}
          isLoadingPlans={isLoadingPlans}
          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
          retryUserInfoRequest={() => this.reloadData()}
-          isCreatingPaymentDashboardUrl={payment.createDashboardUrlRequest.isExecuting}
-          openDashboard={price => this.handlePaymentDashboard(price)}
-          openExternalUrl={url => openExternalUrl({ url })}
          onCloseSubscriptionWindow={() => this.onCloseWindow()}
          deleteAccount={userActions.delete}
          isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
          isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
+          openEditAccount={() => this.handleWebsiteLink('/user/profile')}
+          openBilling={() => this.handleWebsiteLink('/user/billing')}
+          openInvoices={() => this.handleWebsiteLink('/user/invoices')}
        />
      </ErrorBoundary>
    );
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
new file mode 100644
index 000000000..c69d5ad08
--- /dev/null
+++ b/src/containers/settings/TeamScreen.js
@@ -0,0 +1,57 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+import UserStore from '../../stores/UserStore';
+import AppStore from '../../stores/AppStore';
+import TeamDashboard from '../../components/settings/team/TeamDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { WEBSITE } from '../../environment';
+export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
+  handleWebsiteLink(route) {
+    const { actions, stores } = this.props;
+    const url = `${WEBSITE}${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`;
+    console.log(url);
+    actions.app.openExternalUrl({ url });
+  }
+  render() {
+    const { user } = this.props.stores;
+    const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
+    return (
+      <ErrorBoundary>
+        <TeamDashboard
+          isLoading={isLoadingUserInfo}
+          userInfoRequestFailed={user.getUserInfoRequest.wasExecuted && user.getUserInfoRequest.isError}
+          retryUserInfoRequest={() => this.reloadData()}
+          openTeamManagement={() => this.handleWebsiteLink('/user/team')}
+        />
+      </ErrorBoundary>
+    );
+  }
+}
+TeamScreen.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+  }).isRequired,
+  actions: PropTypes.shape({
+    payment: PropTypes.shape({
+      createDashboardUrl: PropTypes.func.isRequired,
+    }).isRequired,
+    app: PropTypes.shape({
+      openExternalUrl: PropTypes.func.isRequired,
+    }).isRequired,
+    user: PropTypes.shape({
+      update: PropTypes.func.isRequired,
+      delete: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 74b718734..9a04c1958 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -30,9 +30,12 @@ export default (params) => {
      params.mainWindow.webContents.send('autoUpdate', { available: false });
    });
-    autoUpdater.on('update-available', () => {
+    autoUpdater.on('update-available', (event) => {
      debug('update-available');
-      params.mainWindow.webContents.send('autoUpdate', { available: true });
+      params.mainWindow.webContents.send('autoUpdate', {
+        version: event.version,
+        available: true,
+      });
    });
    autoUpdater.on('download-progress', (progressObj) => {
diff --git a/src/environment.js b/src/environment.js
index d67fd6adb..ae7a67e4d 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,6 +1,16 @@
 import isDev from 'electron-is-dev';
-import { LIVE_API, DEV_API, LOCAL_API } from './config';
+import {
+  LIVE_API,
+  DEV_API,
+  LOCAL_API,
+  LOCAL_API_WEBSITE,
+  DEV_API_WEBSITE,
+  LIVE_API_WEBSITE,
+  LIVE_WS_API,
+  LOCAL_WS_API,
+  DEV_WS_API,
+} from './config';
 export const isDevMode = isDev;
 export const useLiveAPI = process.env.LIVE_API;
@@ -19,13 +29,23 @@ export const ctrlKey = isMac ? '⌘' : 'Ctrl';
 export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 let api;
+let wsApi;
+let web;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
  api = LIVE_API;
+  wsApi = LIVE_WS_API;
+  web = LIVE_API_WEBSITE;
 } else if (isDevMode && useLocalAPI) {
  api = LOCAL_API;
+  wsApi = LOCAL_WS_API;
+  web = LOCAL_API_WEBSITE;
 } else {
  api = DEV_API;
+  wsApi = DEV_WS_API;
+  web = DEV_API_WEBSITE;
 }
 export const API = api;
 export const API_VERSION = 'v1';
+export const WS_API = wsApi;
+export const WEBSITE = web;
diff --git a/src/features/announcements/actions.js b/src/features/announcements/actions.js
new file mode 100644
index 000000000..bab496314
--- /dev/null
+++ b/src/features/announcements/actions.js
@@ -0,0 +1,10 @@
+import PropTypes from 'prop-types';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+export const announcementActions = createActionsFromDefinitions({
+  show: {
+    targetVersion: PropTypes.string,
+  },
+}, PropTypes.checkPropTypes);
+export default announcementActions;
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
new file mode 100644
index 000000000..a581bd8de
--- /dev/null
+++ b/src/features/announcements/api.js
@@ -0,0 +1,33 @@
+import { remote } from 'electron';
+import Request from '../../stores/lib/Request';
+import { API, API_VERSION } from '../../environment';
+const debug = require('debug')('Franz:feature:announcements:api');
+export const announcementsApi = {
+  async getCurrentVersion() {
+    debug('getting current version of electron app');
+    return Promise.resolve(remote.app.getVersion());
+  },
+  async getChangelog(version) {
+    debug('fetching release changelog from Github');
+    const url = `https://api.github.com/repos/meetfranz/franz/releases/tags/v${version}`;
+    const request = await window.fetch(url, { method: 'GET' });
+    if (!request.ok) return null;
+    const data = await request.json();
+    return data.body;
+  },
+  async getAnnouncement(version) {
+    debug('fetching release announcement from api');
+    const url = `${API}/${API_VERSION}/announcements/${version}`;
+    const response = await window.fetch(url, { method: 'GET' });
+    if (!response.ok) return null;
+    return response.json();
+  },
+};
+export const getCurrentVersionRequest = new Request(announcementsApi, 'getCurrentVersion');
+export const getChangelogRequest = new Request(announcementsApi, 'getChangelog');
+export const getAnnouncementRequest = new Request(announcementsApi, 'getAnnouncement');
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
new file mode 100644
index 000000000..e7c5fe395
--- /dev/null
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -0,0 +1,286 @@
+import React, { Component } from 'react';
+import marked from 'marked';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+import { Button } from '@meetfranz/forms';
+import { announcementsStore } from '../index';
+import UIStore from '../../../stores/UIStore';
+import { gaEvent } from '../../../lib/analytics';
+const renderer = new marked.Renderer();
+renderer.link = (href, title, text) => `<a target="_blank" href="${href}" title="${title}">${text}</a>`;
+const markedOptions = { sanitize: true, renderer };
+const messages = defineMessages({
+  headline: {
+    id: 'feature.announcements.changelog.headline',
+    defaultMessage: '!!!Changes in Franz {version}',
+  },
+});
+const smallScreen = '1000px';
+const styles = theme => ({
+  container: {
+    background: theme.colorBackground,
+    position: 'absolute',
+    top: 0,
+    zIndex: 140,
+    width: '100%',
+    height: '100%',
+    overflowY: 'auto',
+  },
+  headline: {
+    color: theme.colorHeadline,
+    margin: [25, 0, 40],
+    // 'max-width': 500,
+    'text-align': 'center',
+    'line-height': '1.3em',
+  },
+  announcement: {
+    height: 'auto',
+    [`@media(min-width: ${smallScreen})`]: {
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'center',
+      height: '100vh',
+    },
+  },
+  main: {
+    display: 'flex',
+    flexDirection: 'column',
+    flexGrow: 1,
+    justifyContent: 'center',
+    '& h1': {
+      margin: [40, 0, 15],
+      fontSize: 70,
+      color: theme.styleTypes.primary.accent,
+      textAlign: 'center',
+      [`@media(min-width: ${smallScreen})`]: {
+        marginTop: 0,
+      },
+    },
+    '& h2': {
+      fontSize: 30,
+      fontWeight: 300,
+      color: theme.colorText,
+      textAlign: 'center',
+      marginBottom: 60,
+    },
+  },
+  mainBody: {
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    width: 'calc(100% - 80px)',
+    height: 'auto',
+    margin: '0 auto',
+    [`@media(min-width: ${smallScreen})`]: {
+      flexDirection: 'row',
+      justifyContent: 'center',
+    },
+  },
+  mainImage: {
+    minWidth: 250,
+    maxWidth: 400,
+    margin: '0 auto',
+    marginBottom: 40,
+    '& img': {
+      width: '100%',
+    },
+    [`@media(min-width: ${smallScreen})`]: {
+      margin: 0,
+    },
+  },
+  mainText: {
+    height: 'auto',
+    maxWidth: 600,
+    textAlign: 'center',
+    '& p': {
+      lineHeight: '1.5em',
+    },
+    [`@media(min-width: ${smallScreen})`]: {
+      textAlign: 'left',
+    },
+  },
+  mainCtaButton: {
+    textAlign: 'center',
+    marginTop: 40,
+    [`@media(min-width: ${smallScreen})`]: {
+      textAlign: 'left',
+    },
+  },
+  spotlight: {
+    height: 'auto',
+    background: theme.announcements.spotlight.background,
+    padding: [40, 0],
+    marginTop: 80,
+    [`@media(min-width: ${smallScreen})`]: {
+      marginTop: 0,
+      justifyContent: 'center',
+      alignItems: 'flex-start',
+      display: 'flex',
+      flexDirection: 'row',
+    },
+  },
+  spotlightTopicContainer: {
+    textAlign: 'center',
+    marginBottom: 20,
+    [`@media(min-width: ${smallScreen})`]: {
+      marginBottom: 0,
+      minWidth: 250,
+      maxWidth: 330,
+      width: '100%',
+      textAlign: 'right',
+      marginRight: 60,
+    },
+  },
+  spotlightContentContainer: {
+    textAlign: 'center',
+    [`@media(min-width: ${smallScreen})`]: {
+      height: 'auto',
+      maxWidth: 600,
+      paddingRight: 40,
+      textAlign: 'left',
+    },
+    '& p': {
+      lineHeight: '1.5em',
+    },
+  },
+  spotlightTopic: {
+    fontSize: 20,
+    marginBottom: 5,
+    letterSpacing: 0,
+    fontWeight: 100,
+  },
+  spotlightSubject: {
+    fontSize: 20,
+  },
+  changelog: {
+    padding: [0, 60],
+    maxWidth: 700,
+    margin: [100, 'auto'],
+    height: 'auto',
+    '& h3': {
+      fontSize: '24px',
+      margin: '1.5em 0 1em 0',
+    },
+    '& li': {
+      marginBottom: '1em',
+      lineHeight: '1.4em',
+    },
+    '& div': {
+      height: 'auto',
+    },
+  },
+});
+@inject('stores', 'actions') @injectSheet(styles) @observer
+class AnnouncementScreen extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    stores: PropTypes.shape({
+      ui: PropTypes.instanceOf(UIStore).isRequired,
+    }).isRequired,
+  };
+  static contextTypes = {
+    intl: intlShape,
+  };
+  render() {
+    const { classes, stores } = this.props;
+    const { intl } = this.context;
+    const { changelog, announcement } = announcementsStore;
+    const themeImage = stores.ui.isDarkThemeActive ? 'dark' : 'light';
+    return (
+      <div className={classes.container}>
+        {announcement && (
+          <div className={classes.announcement}>
+            <div className={classes.main}>
+              <h1>{announcement.main.headline}</h1>
+              <h2>{announcement.main.subHeadline}</h2>
+              <div className={classes.mainBody}>
+                <div className={classes.mainImage}>
+                  <img
+                    src={announcement.main.image[themeImage]}
+                    alt=""
+                  />
+                </div>
+                <div className={classes.mainText}>
+                  <div
+                    dangerouslySetInnerHTML={{
+                      __html: marked(announcement.main.text, markedOptions),
+                    }}
+                  />
+                  <div className={classes.mainCtaButton}>
+                    <Button
+                      label={announcement.main.cta.label}
+                      onClick={() => {
+                        const { analytics } = announcement.main.cta;
+                        window.location.href = `#${announcement.main.cta.href}`;
+                        gaEvent(analytics.category, analytics.action, announcement.main.cta.label);
+                      }}
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+            {announcement.spotlight && (
+              <div className={classes.spotlight}>
+                <div className={classes.spotlightTopicContainer}>
+                  <h2 className={classes.spotlightTopic}>{announcement.spotlight.title}</h2>
+                  <h3 className={classes.spotlightSubject}>{announcement.spotlight.subject}</h3>
+                </div>
+                <div className={classes.spotlightContentContainer}>
+                  <div
+                    dangerouslySetInnerHTML={{
+                      __html: marked(announcement.spotlight.text, markedOptions),
+                    }}
+                  />
+                  <div className={classes.mainCtaButton}>
+                    <Button
+                      label={announcement.spotlight.cta.label}
+                      onClick={() => {
+                        const { analytics } = announcement.spotlight.cta;
+                        window.location.href = `#${announcement.spotlight.cta.href}`;
+                        gaEvent(analytics.category, analytics.action, announcement.spotlight.cta.label);
+                      }}
+                    />
+                  </div>
+                </div>
+              </div>
+            )}
+          </div>
+        )}
+        {changelog && (
+          <div className={classes.changelog}>
+            <h1 className={classes.headline}>
+              {intl.formatMessage(messages.headline, {
+                version: announcementsStore.targetVersion,
+              })}
+            </h1>
+            <div
+              dangerouslySetInnerHTML={{
+                __html: marked(changelog, markedOptions),
+              }}
+            />
+          </div>
+        )}
+      </div>
+    );
+  }
+}
+export default AnnouncementScreen;
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
new file mode 100644
index 000000000..f14e7c9a5
--- /dev/null
+++ b/src/features/announcements/index.js
@@ -0,0 +1,36 @@
+import { reaction } from 'mobx';
+import { AnnouncementsStore } from './store';
+const debug = require('debug')('Franz:feature:announcements');
+export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
+export const announcementsStore = new AnnouncementsStore();
+export const ANNOUNCEMENTS_ROUTES = {
+  TARGET: '/announcements/:id',
+};
+export default function initAnnouncements(stores, actions) {
+  // const { features } = stores;
+  // Toggle workspace feature
+  reaction(
+    () => (
+      true
+      // features.features.isAnnouncementsEnabled
+    ),
+    (isEnabled) => {
+      if (isEnabled) {
+        debug('Initializing `announcements` feature');
+        announcementsStore.start(stores, actions);
+      } else if (announcementsStore.isFeatureActive) {
+        debug('Disabling `announcements` feature');
+        announcementsStore.stop();
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
new file mode 100644
index 000000000..ad78a0979
--- /dev/null
+++ b/src/features/announcements/store.js
@@ -0,0 +1,144 @@
+import {
+  action,
+  computed,
+  observable,
+} from 'mobx';
+import semver from 'semver';
+import localStorage from 'mobx-localstorage';
+import { FeatureStore } from '../utils/FeatureStore';
+import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
+import { announcementActions } from './actions';
+import { createActionBindings } from '../utils/ActionBinding';
+import { createReactions } from '../../stores/lib/Reaction';
+import { gaEvent } from '../../lib/analytics';
+import { matchRoute } from '../../helpers/routing-helpers';
+const LOCAL_STORAGE_KEY = 'announcements';
+const debug = require('debug')('Franz:feature:announcements:store');
+export class AnnouncementsStore extends FeatureStore {
+  @observable targetVersion = null;
+  @observable isFeatureActive = false;
+  @computed get changelog() {
+    return getChangelogRequest.result;
+  }
+  @computed get announcement() {
+    if (!this.stores || !getAnnouncementRequest.result) return null;
+    const { locale, defaultLocale } = this.stores.app;
+    const announcement = getAnnouncementRequest.result;
+    // User locale
+    if (announcement[locale]) return announcement[locale];
+    // Default locale
+    if (announcement[defaultLocale]) return announcement[defaultLocale];
+    // No locales specified
+    return announcement;
+  }
+  @computed get areNewsAvailable() {
+    const isChangelogAvailable = getChangelogRequest.wasExecuted && !!this.changelog;
+    const isAnnouncementAvailable = getAnnouncementRequest.wasExecuted && !!this.announcement;
+    return isChangelogAvailable || isAnnouncementAvailable;
+  }
+  @computed get settings() {
+    return localStorage.getItem(LOCAL_STORAGE_KEY) || {};
+  }
+  @computed get lastSeenAnnouncementVersion() {
+    return this.settings.lastSeenAnnouncementVersion || null;
+  }
+  @computed get currentVersion() {
+    return getCurrentVersionRequest.result;
+  }
+  @computed get isNewUser() {
+    return this.stores.settings.stats.appStarts <= 1;
+  }
+  async start(stores, actions) {
+    debug('AnnouncementsStore::start');
+    this.stores = stores;
+    this.actions = actions;
+    getCurrentVersionRequest.execute();
+    this._registerActions(createActionBindings([
+      [announcementActions.show, this._showAnnouncement],
+    ]));
+    this._reactions = createReactions([
+      this._showAnnouncementOnRouteMatch,
+      this._showAnnouncementToUsersWhoUpdatedApp,
+      this._fetchAnnouncements,
+    ]);
+    this._registerReactions(this._reactions);
+    this.isFeatureActive = true;
+  }
+  stop() {
+    super.stop();
+    debug('AnnouncementsStore::stop');
+    this.isFeatureActive = false;
+  }
+  // ======= HELPERS ======= //
+  _updateSettings = (changes) => {
+    localStorage.setItem(LOCAL_STORAGE_KEY, {
+      ...this.settings,
+      ...changes,
+    });
+  };
+  // ======= ACTIONS ======= //
+  @action _showAnnouncement = ({ targetVersion } = {}) => {
+    const { router } = this.stores;
+    this.targetVersion = targetVersion || this.currentVersion;
+    this._updateSettings({
+      lastSeenAnnouncementVersion: this.currentVersion,
+    });
+    const targetRoute = `/announcements/${this.targetVersion}`;
+    if (router.location.pathname !== targetRoute) {
+      this.stores.router.push(targetRoute);
+    }
+    gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
+  };
+  // ======= REACTIONS ========
+  _showAnnouncementToUsersWhoUpdatedApp = () => {
+    const { announcement, isNewUser } = this;
+    // Check if there is an announcement and don't show announcements to new users
+    if (!announcement || isNewUser) return;
+    // Check if the user has already used current version (= has seen the announcement)
+    const { currentVersion, lastSeenAnnouncementVersion } = this;
+    if (semver.gt(currentVersion, lastSeenAnnouncementVersion || '0.0.0')) {
+      debug(`${currentVersion} > ${lastSeenAnnouncementVersion}: announcement is shown`);
+      this._showAnnouncement();
+    }
+  };
+  _fetchAnnouncements = () => {
+    const targetVersion = this.targetVersion || this.currentVersion;
+    if (!targetVersion) return;
+    getChangelogRequest.reset().execute(targetVersion);
+    getAnnouncementRequest.reset().execute(targetVersion);
+  };
+  _showAnnouncementOnRouteMatch = () => {
+    const { router } = this.stores;
+    const match = matchRoute(ANNOUNCEMENTS_ROUTES.TARGET, router.location.pathname);
+    if (match) {
+      const targetVersion = match.id;
+      this._showAnnouncement({ targetVersion });
+    }
+  }
+}
diff --git a/src/features/settingsWS/actions.js b/src/features/settingsWS/actions.js
new file mode 100755
index 000000000..631670c8a
--- /dev/null
+++ b/src/features/settingsWS/actions.js
@@ -0,0 +1,10 @@
+import PropTypes from 'prop-types';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+export const settingsWSActions = createActionsFromDefinitions({
+  greet: {
+    name: PropTypes.string.isRequired,
+  },
+}, PropTypes.checkPropTypes);
+export default settingsWSActions;
diff --git a/src/features/settingsWS/index.js b/src/features/settingsWS/index.js
new file mode 100755
index 000000000..2064d2973
--- /dev/null
+++ b/src/features/settingsWS/index.js
@@ -0,0 +1,29 @@
+import { reaction } from 'mobx';
+import { SettingsWSStore } from './store';
+const debug = require('debug')('Franz:feature:settingsWS');
+export const settingsStore = new SettingsWSStore();
+export default function initSettingsWebSocket(stores, actions) {
+  const { features } = stores;
+  // Toggle SettingsWebSocket feature
+  reaction(
+    () => (
+      features.features.isSettingsWSEnabled
+    ),
+    (isEnabled) => {
+      if (isEnabled) {
+        debug('Initializing `settingsWS` feature');
+        settingsStore.start(stores, actions);
+      } else if (settingsStore) {
+        debug('Disabling `settingsWS` feature');
+        settingsStore.stop();
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/settingsWS/state.js b/src/features/settingsWS/state.js
new file mode 100755
index 000000000..7b16b2b6e
--- /dev/null
+++ b/src/features/settingsWS/state.js
@@ -0,0 +1,13 @@
+import { observable } from 'mobx';
+const defaultState = {
+  isFeatureActive: false,
+};
+export const settingsWSState = observable(defaultState);
+export function resetState() {
+  Object.assign(settingsWSState, defaultState);
+}
+export default settingsWSState;
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
new file mode 100755
index 000000000..167a70d10
--- /dev/null
+++ b/src/features/settingsWS/store.js
@@ -0,0 +1,130 @@
+import { observable } from 'mobx';
+import WebSocket from 'ws';
+import ms from 'ms';
+import { FeatureStore } from '../utils/FeatureStore';
+import { createReactions } from '../../stores/lib/Reaction';
+import { WS_API } from '../../environment';
+const debug = require('debug')('Franz:feature:settingsWS:store');
+export class SettingsWSStore extends FeatureStore {
+  stores = null;
+  actions = null;
+  ws = null;
+  pingTimeout = null;
+  reconnectTimeout = null;
+  @observable connected = false;
+  start(stores, actions) {
+    this.stores = stores;
+    this.actions = actions;
+    this._registerReactions(createReactions([
+      this._initialize.bind(this),
+      this._reconnect.bind(this),
+      this._close.bind(this),
+    ]));
+  }
+  connect() {
+    try {
+      const wsURL = `${WS_API}/ws/${this.stores.user.data.id}`;
+      debug('Setting up WebSocket to', wsURL);
+      this.ws = new WebSocket(wsURL);
+      this.ws.on('open', () => {
+        debug('Opened WebSocket');
+        this.send({
+          action: 'authorize',
+          token: this.stores.user.authToken,
+        });
+        this.connected = true;
+        this.heartbeat();
+      });
+      this.ws.on('message', (data) => {
+        const resp = JSON.parse(data);
+        debug('Received message', resp);
+        if (resp.id) {
+          this.stores.user.getUserInfoRequest.patch((result) => {
+            if (!result) return;
+            debug('Patching user object with new values');
+            Object.assign(result, resp);
+          });
+        }
+      });
+      this.ws.on('ping', this.heartbeat.bind(this));
+    } catch (err) {
+      console.err(err);
+    }
+  }
+  heartbeat() {
+    debug('Heartbeat');
+    clearTimeout(this.pingTimeout);
+    this.pingTimeout = setTimeout(() => {
+      debug('Terminating connection, reconnecting in 35');
+      this.ws.terminate();
+      this.connected = false;
+    }, ms('35s'));
+  }
+  send(data) {
+    if (this.ws && this.ws.readyState === 1) {
+      this.ws.send(JSON.stringify(data));
+      debug('Sending data', data);
+    } else {
+      debug('WebSocket is not initialized');
+    }
+  }
+  // Reactions
+  _initialize() {
+    if (this.stores.user.data.id && !this.ws) {
+      this.connect();
+    }
+  }
+  _reconnect() {
+    if (!this.connected) {
+      debug('Trying to reconnect in 30s');
+      this.reconnectTimeout = setInterval(() => {
+        debug('Trying to reconnect');
+        this.connect();
+      }, ms('30s'));
+    } else {
+      debug('Clearing reconnect interval');
+      clearInterval(this.reconnectTimeout);
+    }
+  }
+  _close() {
+    if (!this.stores.user.isLoggedIn) {
+      debug('Stopping reactions');
+      this._stopReactions();
+      if (this.ws) {
+        debug('Terminating connection');
+        this.ws.terminate();
+        this.ws = null;
+      }
+    }
+  }
+}
+export default SettingsWSStore;
diff --git a/src/features/shareFranz/index.js b/src/features/shareFranz/index.js
index 3a8ec95d3..87deacef4 100644
--- a/src/features/shareFranz/index.js
+++ b/src/features/shareFranz/index.js
@@ -35,7 +35,7 @@ export default function initialize(stores) {
    () => stores.user.isLoggedIn,
    () => {
      setTimeout(() => {
-        if (stores.settings.stats.appStarts % 30 === 0) {
+        if (stores.settings.stats.appStarts % 50 === 0) {
          if (delayAppState.isDelayAppScreenVisible) {
            debug('Delaying share modal by 5 minutes');
            setTimeout(() => showModal(), ms('5m'));
diff --git a/src/features/utils/ActionBinding.js b/src/features/utils/ActionBinding.js
new file mode 100644
index 000000000..497aa071b
--- /dev/null
+++ b/src/features/utils/ActionBinding.js
@@ -0,0 +1,29 @@
+export default class ActionBinding {
+  action;
+  isActive = false;
+  constructor(action) {
+    this.action = action;
+  }
+  start() {
+    if (!this.isActive) {
+      const { action } = this;
+      action[0].listen(action[1]);
+      this.isActive = true;
+    }
+  }
+  stop() {
+    if (this.isActive) {
+      const { action } = this;
+      action[0].off(action[1]);
+      this.isActive = false;
+    }
+  }
+}
+export const createActionBindings = actions => (
+  actions.map(a => new ActionBinding(a))
+);
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
index 66b66a104..0bc10e176 100644
--- a/src/features/utils/FeatureStore.js
+++ b/src/features/utils/FeatureStore.js
@@ -1,21 +1,40 @@
-import Reaction from '../../stores/lib/Reaction';
 export class FeatureStore {
-  _actions = null;
+  _actions = [];
+  _reactions = [];
+  stop() {
+    this._stopActions();
+    this._stopReactions();
+  }
+  // ACTIONS
+  _registerActions(actions) {
+    this._actions = actions;
+    this._startActions();
+  }
-  _reactions = null;
+  _startActions(actions = this._actions) {
+    actions.forEach(a => a.start());
+  }
+  _stopActions(actions = this._actions) {
+    actions.forEach(a => a.stop());
+  }
+  // REACTIONS
+  _registerReactions(reactions) {
+    this._reactions = reactions;
+    this._startReactions();
+  }
-  _listenToActions(actions) {
+  _startReactions(reactions = this._reactions) {
-    if (this._actions) this._actions.forEach(a => a[0].off(a[1]));
+    reactions.forEach(r => r.start());
-    this._actions = [];
-    actions.forEach(a => this._actions.push(a));
-    this._actions.forEach(a => a[0].listen(a[1]));
  }
-  _startReactions(reactions) {
+  _stopReactions(reactions = this._reactions) {
-    if (this._reactions) this._reactions.forEach(r => r.stop());
+    reactions.forEach(r => r.stop());
-    this._reactions = [];
-    reactions.forEach(r => this._reactions.push(new Reaction(r)));
-    this._reactions.forEach(r => r.start());
  }
 }
diff --git a/src/features/utils/FeatureStore.test.js b/src/features/utils/FeatureStore.test.js
new file mode 100644
index 000000000..92308bf52
--- /dev/null
+++ b/src/features/utils/FeatureStore.test.js
@@ -0,0 +1,92 @@
+import PropTypes from 'prop-types';
+import { observable } from 'mobx';
+import { FeatureStore } from './FeatureStore';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
+import { createActionBindings } from './ActionBinding';
+import { createReactions } from '../../stores/lib/Reaction';
+const actions = createActionsFromDefinitions({
+  countUp: {},
+}, PropTypes.checkPropTypes);
+class TestFeatureStore extends FeatureStore {
+  @observable count = 0;
+  reactionInvokedCount = 0;
+  start() {
+    this._registerActions(createActionBindings([
+      [actions.countUp, this._countUp],
+    ]));
+    this._registerReactions(createReactions([
+      this._countReaction,
+    ]));
+  }
+  _countUp = () => {
+    this.count += 1;
+  };
+  _countReaction = () => {
+    this.reactionInvokedCount += 1;
+  }
+}
+describe('FeatureStore', () => {
+  let store = null;
+  beforeEach(() => {
+    store = new TestFeatureStore();
+  });
+  describe('registering actions', () => {
+    it('starts the actions', () => {
+      store.start();
+      actions.countUp();
+      expect(store.count).toBe(1);
+    });
+    it('starts the reactions', () => {
+      store.start();
+      actions.countUp();
+      expect(store.reactionInvokedCount).toBe(1);
+    });
+  });
+  describe('stopping the store', () => {
+    it('stops the actions', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      actions.countUp();
+      expect(store.count).toBe(1);
+    });
+    it('stops the reactions', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      store.count += 1;
+      expect(store.reactionInvokedCount).toBe(1);
+    });
+  });
+  describe('toggling the store', () => {
+    it('restarts the actions correctly', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      actions.countUp();
+      store.start();
+      actions.countUp();
+      expect(store.count).toBe(2);
+    });
+    it('restarts the reactions correctly', () => {
+      store.start();
+      actions.countUp();
+      store.stop();
+      actions.countUp();
+      store.start();
+      actions.countUp();
+      expect(store.count).toBe(2);
+    });
+  });
+});
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index 2c00ea63c..cddbb2b04 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -7,7 +7,7 @@ import injectSheet from 'react-jss';
 import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
 import { gaEvent } from '../../../lib/analytics';
-import { GA_CATEGORY_WORKSPACES } from '../index';
+import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
 const messages = defineMessages({
  submitButton: {
@@ -82,7 +82,7 @@ class CreateWorkspaceForm extends Component {
          {...form.$('name').bind()}
          showLabel={false}
          onEnterKey={this.submitForm.bind(this, form)}
-          focus
+          focus={workspaceStore.isUserAllowedToUseFeature}
        />
        <Button
          className={classes.submitButton}
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index bba4485ff..e602ebd5a 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
@@ -36,6 +36,14 @@ const messages = defineMessages({
    id: 'settings.workspace.form.servicesInWorkspaceHeadline',
    defaultMessage: '!!!Services in this Workspace',
  },
+  noServicesAdded: {
+    id: 'settings.services.noServicesAdded',
+    defaultMessage: '!!!You haven\'t added any services yet.',
+  },
+  discoverServices: {
+    id: 'settings.services.discoverServices',
+    defaultMessage: '!!!Discover services',
+  },
 });
 const styles = () => ({
@@ -150,14 +158,29 @@ class EditWorkspaceForm extends Component {
          </div>
          <h2>{intl.formatMessage(messages.servicesInWorkspaceHeadline)}</h2>
          <div className={classes.serviceList}>
-            {services.map(s => (
+            {services.length === 0 ? (
-              <WorkspaceServiceListItem
+              <div className="align-middle settings__empty-state">
-                key={s.id}
+                {/* ===== Empty state ===== */}
-                service={s}
+                <p className="settings__empty-text">
-                isInWorkspace={workspaceServices.includes(s.id)}
+                  <span className="emoji">
-                onToggle={() => this.toggleService(s)}
+                    <img src="./assets/images/emoji/sad.png" alt="" />
-              />
+                  </span>
-            ))}
+                  {intl.formatMessage(messages.noServicesAdded)}
+                </p>
+                <Link to="/settings/recipes" className="button">{intl.formatMessage(messages.discoverServices)}</Link>
+              </div>
+            ) : (
+              <Fragment>
+                {services.map(s => (
+                  <WorkspaceServiceListItem
+                    key={s.id}
+                    service={s}
+                    isInWorkspace={workspaceServices.includes(s.id)}
+                    onToggle={() => this.toggleService(s)}
+                  />
+                ))}
+              </Fragment>
+            )}
          </div>
        </div>
        <div className="settings__controls">
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index dd4381a15..09c98ab8c 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -170,18 +170,32 @@ class WorkspacesDashboard extends Component {
                    {intl.formatMessage(messages.workspacesRequestFailed)}
                  </Infobox>
                ) : (
-                  <table className={classes.table}>
+                  <Fragment>
-                    {/* ===== Workspaces list ===== */}
+                    {workspaces.length === 0 ? (
-                    <tbody>
+                      <div className="align-middle settings__empty-state">
-                      {workspaces.map(workspace => (
+                        {/* ===== Workspaces empty state ===== */}
-                        <WorkspaceItem
+                        <p className="settings__empty-text">
-                          key={workspace.id}
+                          <span className="emoji">
-                          workspace={workspace}
+                            <img src="./assets/images/emoji/sad.png" alt="" />
-                          onItemClick={w => onWorkspaceClick(w)}
+                          </span>
-                        />
+                          {intl.formatMessage(messages.noServicesAdded)}
-                      ))}
+                        </p>
-                    </tbody>
+                      </div>
-                  </table>
+                    ) : (
+                      <table className={classes.table}>
+                        {/* ===== Workspaces list ===== */}
+                        <tbody>
+                          {workspaces.map(workspace => (
+                            <WorkspaceItem
+                              key={workspace.id}
+                              workspace={workspace}
+                              onItemClick={w => onWorkspaceClick(w)}
+                            />
+                          ))}
+                        </tbody>
+                      </table>
+                    )}
+                  </Fragment>
                )}
              </Fragment>
            )}
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index ea601700e..51a7f3651 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -14,6 +14,8 @@ import {
  updateWorkspaceRequest,
 } from './api';
 import { WORKSPACES_ROUTES } from './index';
+import { createReactions } from '../../stores/lib/Reaction';
+import { createActionBindings } from '../utils/ActionBinding';
 const debug = require('debug')('Franz:feature:workspaces:store');
@@ -51,37 +53,78 @@ export default class WorkspacesStore extends FeatureStore {
    return getUserWorkspacesRequest.wasExecuted && this.workspaces.length > 0;
  }
+  @computed get isUserAllowedToUseFeature() {
+    return !this.isPremiumUpgradeRequired;
+  }
+  @computed get isAnyWorkspaceActive() {
+    return !!this.activeWorkspace;
+  }
+  // ========== PRIVATE PROPERTIES ========= //
+  _wasDrawerOpenBeforeSettingsRoute = null;
+  _freeUserActions = [];
+  _premiumUserActions = [];
+  _allActions = [];
+  _freeUserReactions = [];
+  _premiumUserReactions = [];
+  _allReactions = [];
+  // ========== PUBLIC API ========= //
  start(stores, actions) {
    debug('WorkspacesStore::start');
    this.stores = stores;
    this.actions = actions;
-    this._listenToActions([
+    // ACTIONS
+    this._freeUserActions = createActionBindings([
+      [workspaceActions.toggleWorkspaceDrawer, this._toggleWorkspaceDrawer],
+      [workspaceActions.openWorkspaceSettings, this._openWorkspaceSettings],
+    ]);
+    this._premiumUserActions = createActionBindings([
      [workspaceActions.edit, this._edit],
      [workspaceActions.create, this._create],
      [workspaceActions.delete, this._delete],
      [workspaceActions.update, this._update],
      [workspaceActions.activate, this._setActiveWorkspace],
      [workspaceActions.deactivate, this._deactivateActiveWorkspace],
-      [workspaceActions.toggleWorkspaceDrawer, this._toggleWorkspaceDrawer],
-      [workspaceActions.openWorkspaceSettings, this._openWorkspaceSettings],
    ]);
+    this._allActions = this._freeUserActions.concat(this._premiumUserActions);
+    this._registerActions(this._allActions);
-    this._startReactions([
+    // REACTIONS
-      this._setWorkspaceBeingEditedReaction,
-      this._setActiveServiceOnWorkspaceSwitchReaction,
+    this._freeUserReactions = createReactions([
+      this._stopPremiumActionsAndReactions,
+      this._openDrawerWithSettingsReaction,
      this._setFeatureEnabledReaction,
      this._setIsPremiumFeatureReaction,
-      this._activateLastUsedWorkspaceReaction,
-      this._openDrawerWithSettingsReaction,
      this._cleanupInvalidServiceReferences,
    ]);
+    this._premiumUserReactions = createReactions([
+      this._setActiveServiceOnWorkspaceSwitchReaction,
+      this._activateLastUsedWorkspaceReaction,
+      this._setWorkspaceBeingEditedReaction,
+    ]);
+    this._allReactions = this._freeUserReactions.concat(this._premiumUserReactions);
+    this._registerReactions(this._allReactions);
    getUserWorkspacesRequest.execute();
    this.isFeatureActive = true;
  }
  stop() {
+    super.stop();
    debug('WorkspacesStore::stop');
    this.isFeatureActive = false;
    this.activeWorkspace = null;
@@ -104,9 +147,7 @@ export default class WorkspacesStore extends FeatureStore {
    return workspace.services.map(id => services.one(id)).filter(s => !!s);
  }
-  // ========== PRIVATE ========= //
+  // ========== PRIVATE METHODS ========= //
-  _wasDrawerOpenBeforeSettingsRoute = null;
  _getWorkspaceById = id => this.workspaces.find(w => w.id === id);
@@ -192,6 +233,14 @@ export default class WorkspacesStore extends FeatureStore {
    this.actions.ui.openSettings({ path: 'workspaces' });
  };
+  @action reorderServicesOfActiveWorkspace = async ({ oldIndex, newIndex }) => {
+    const { activeWorkspace } = this;
+    const { services } = activeWorkspace;
+    // Move services from the old to the new position
+    services.splice(newIndex, 0, services.splice(oldIndex, 1)[0]);
+    await updateWorkspaceRequest.execute(activeWorkspace);
+  };
  // Reactions
  _setFeatureEnabledReaction = () => {
@@ -218,13 +267,15 @@ export default class WorkspacesStore extends FeatureStore {
  _setActiveServiceOnWorkspaceSwitchReaction = () => {
    if (!this.isFeatureActive) return;
    if (this.activeWorkspace) {
-      const services = this.stores.services.allDisplayed;
+      const activeService = this.stores.services.active;
-      const activeService = services.find(s => s.isActive);
      const workspaceServices = this.getWorkspaceServices(this.activeWorkspace);
      if (workspaceServices.length <= 0) return;
      const isActiveServiceInWorkspace = workspaceServices.includes(activeService);
      if (!isActiveServiceInWorkspace) {
-        this.actions.service.setActive({ serviceId: workspaceServices[0].id });
+        this.actions.service.setActive({
+          serviceId: workspaceServices[0].id,
+          keepActiveRoute: true,
+        });
      }
    }
  };
@@ -273,4 +324,14 @@ export default class WorkspacesStore extends FeatureStore {
      getUserWorkspacesRequest.execute();
    }
  };
+  _stopPremiumActionsAndReactions = () => {
+    if (!this.isUserAllowedToUseFeature) {
+      this._stopActions(this._premiumUserActions);
+      this._stopReactions(this._premiumUserReactions);
+    } else {
+      this._startActions(this._premiumUserActions);
+      this._startReactions(this._premiumUserReactions);
+    }
+  }
 }
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index dabe4ba16..b2aaaa070 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,15 +1,16 @@
 {
   "app.errorHandler.action" : "Recarrega",
   "app.errorHandler.headline" : "Quelcom ha anat malament",
+   "feature.announcements.changelog.headline" : "Canvis en Franz {version}",
   "feature.delayApp.action" : "Aconsegueix una llicència de suport per a Franz",
   "feature.delayApp.headline" : "Si us plau, compra una llicència de suport per a Franz per saltar l'espera",
   "feature.delayApp.text" : "Franz continuarà en {seconds} segons",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Envia com a correu",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "No es pot connectar amb els serveis en línia de Franz",
   "global.notConnectedToTheInternet" : "No esteu connectat a Internet.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Accedir",
   "login.tokenExpired" : "La teva sessió ha caducat, torna a iniciar la sessió.",
   "menu.app.about" : "Sobre Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Amaga",
   "menu.app.hideOthers" : "Amaga altres",
   "menu.app.quit" : "Surt",
@@ -87,6 +89,11 @@
   "menu.window" : "Finestra",
   "menu.window.close" : "Tanca",
   "menu.window.minimize" : "Minimitza",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Tots els serveis",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Correu electrònic",
   "password.headline" : "Restablir contrasenya",
   "password.link.login" : "Inicia la sessió al teu compte",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oh no!",
   "service.errorHandler.message" : "Error",
   "service.errorHandler.text" : "{name} ha fallat al carregar",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Introducció",
   "services.welcome" : "Benvingut a Franz",
   "settings.account.account.editButton" : "Editar Compte",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "General",
   "settings.app.headlineLanguage" : "Idioma",
   "settings.app.headlineUpdates" : "Actualitzacions",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Els canvis requereixen reiniciar",
   "settings.app.subheadlineCache" : "Memòria cau",
   "settings.app.translationHelp" : "Ajuda'ns a traduir Franz en la teva llengua.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Convidar amics",
   "settings.navigation.logout" : "Sortir",
   "settings.navigation.settings" : "Configuració",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Els vostres serveis",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Tots els serveis",
   "settings.recipes.dev" : "Desenvolupament",
   "settings.recipes.headline" : "Serveis disponibles",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Tots els sons estan desactivats",
   "settings.services.tooltip.notificationsDisabled" : "Les notificacions estan desactivades",
   "settings.services.updatedInfo" : "S'han desat els canvis",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equip",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Empresa",
   "settings.user.form.accountType.individual" : "Individual",
   "settings.user.form.accountType.label" : "Tipus de compte",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Nom",
   "settings.user.form.lastname" : "Cognoms",
   "settings.user.form.newPassword" : "Nova contrasenya",
+   "settings.workspace.add.form.name" : "Nom",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nom",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Torna a provar-ho",
+   "settings.workspaces.updatedInfo" : "S'han desat els canvis",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Afegeix nou servei",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Desactivar notificacions i àudio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Configuració",
   "sidebar.unmuteApp" : "Activar notificacions i àudio",
   "signup.company.label" : "Empresa",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Afegir serveis allotjats com Mattermost",
   "subscription.features.proxy" : "Suport de Proxy per a serveis",
   "subscription.features.spellchecker" : "Suport per corrector ortogràfic",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
   "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
   "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} es requerit",
   "validation.url" : "{field} es una URL no vàlida",
   "welcome.loginButton" : "Inicia sessió al teu compte",
-   "welcome.signupButton" : "Crea un compte gratuït"
+   "welcome.signupButton" : "Crea un compte gratuït",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tots els serveis",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index f0b0b7c81..aadfeffbc 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,15 +1,16 @@
 {
   "app.errorHandler.action" : "Obnovit",
   "app.errorHandler.headline" : "Něco se pokazilo",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Podpoř Franz a získej Supporter licenci",
   "feature.delayApp.headline" : "Kup si Franz Supporter licenci a nebudeš už muset čekat",
   "feature.delayApp.text" : "Franz bude pokračovat v {seconds} sekundách.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Poslat jako e-mail",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Sdílet na Facebooku",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Sdílet na Twitteru",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Nemůžeme připojit Franz k online službám",
   "global.notConnectedToTheInternet" : "Připojení k internetu není k dispozici.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Přihlásit se",
   "login.tokenExpired" : "Sezení vypršelo, prosím přihlaste se znovu",
   "menu.app.about" : "O aplikaci",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Skrýt",
   "menu.app.hideOthers" : "Skryt ostatní",
   "menu.app.quit" : "Ukončit",
@@ -87,6 +89,11 @@
   "menu.window" : "Okno",
   "menu.window.close" : "Zavřít",
   "menu.window.minimize" : "Minimalizovat",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Všechny služby",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "E-mailová adresa",
   "password.headline" : "Obnovit heslo",
   "password.link.login" : "Přihlásit se k účtu",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Ale ne!",
   "service.errorHandler.message" : "Chyba",
   "service.errorHandler.text" : "{name} se nepodařilo načíst.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Začněme",
   "services.welcome" : "Vítejte v programu Franz",
   "settings.account.account.editButton" : "Upravit účet",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Obecné",
   "settings.app.headlineLanguage" : "Jazyk",
   "settings.app.headlineUpdates" : "Aktualizace",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Změny vyžadují restart",
   "settings.app.subheadlineCache" : "Mezipaměť",
   "settings.app.translationHelp" : "Pomozte nám přeložit Franz do svého jazyka.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Pozvi přátele",
   "settings.navigation.logout" : "Odhlásit",
   "settings.navigation.settings" : "Nastavení",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Vaše služby",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Všechny služby",
   "settings.recipes.dev" : "Vývoj",
   "settings.recipes.headline" : "Dostupné služby",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Všechny zvuky jsou ztišeny",
   "settings.services.tooltip.notificationsDisabled" : "Oznámení jsou zakázána",
   "settings.services.updatedInfo" : "Vaše změny byly uloženy",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tým",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Společnost",
   "settings.user.form.accountType.individual" : "Jednotlivec",
   "settings.user.form.accountType.label" : "Druh účtu",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Jméno",
   "settings.user.form.lastname" : "Příjmení",
   "settings.user.form.newPassword" : "Nové heslo",
+   "settings.workspace.add.form.name" : "Jméno",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Jméno",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Zkusit opět",
+   "settings.workspaces.updatedInfo" : "Vaše změny byly uloženy",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Přidat novou službu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Vypnout upozornění a zvuky",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Nastavení",
   "sidebar.unmuteApp" : "Zapnout upozornění a zvuky",
   "signup.company.label" : "Společnost",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Placený účet Premium Supporter Franz zahrnuje",
   "subscription.paymentSessionError" : "Nebylo možné inicializovat platbu od",
   "subscription.submit.label" : "Chci podpořit vývoj aplikace Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} je povinné",
   "validation.url" : "{field} není validní URL",
   "welcome.loginButton" : "Přihlášení do vašeho účtu",
-   "welcome.signupButton" : "Vytvořit účet zdarma"
+   "welcome.signupButton" : "Vytvořit účet zdarma",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Všechny služby",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 06a03db65..bd5193177 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,41 +1,42 @@
 {
   "app.errorHandler.action" : "Neu laden",
-   "app.errorHandler.headline" : "Es trat ein Fehler auf",
+   "app.errorHandler.headline" : "Es ist ein Fehler aufgetreten",
-   "feature.delayApp.action" : "Upgrade deinen Account",
+   "feature.announcements.changelog.headline" : "Was ist neu in Franz {version}",
-   "feature.delayApp.headline" : "Erspare dir das Warten mit einer Franz Supporter Lizenz",
+   "feature.delayApp.action" : "Hol dir Franz Premium!",
-   "feature.delayApp.text" : "Es geht in {seconds} Sekunden weiter.",
+   "feature.delayApp.headline" : "Erspare dir das Warten mit Franz Premium!",
+   "feature.delayApp.text" : "In {seconds} Sekunden geht's weiter!",
   "feature.shareFranz.action.email" : "Als E-Mail senden",
   "feature.shareFranz.action.facebook" : "Auf Facebook teilen",
   "feature.shareFranz.action.twitter" : "Auf Twitter teilen",
   "feature.shareFranz.headline" : "Gemeinsam ist Franz noch besser!",
   "feature.shareFranz.shareText.email" : "Ich verwende Franz! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "Ich verwende Franz mit {count} Diensten! Hol dir jetzt die kostenlose App für WhatsApp, Messenger, Slack, Skype und mehr auf www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "Ich habe {count} Services zu Franz hinzugefügt! Hol dir die kostenlose App für WhatsApp, Messenger, Slack, Skype und viele mehr auf www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Bitte erzähle deinen Freunden und Kollegen wie toll du Franz findest.",
+   "feature.shareFranz.text" : "Bitte erzähle deinen Freunden und Kolleginnen, warum du Franz toll findest.",
-   "global.api.unhealthy" : "Verbindung mit dem Franz Online Service fehlgeschlagen",
+   "global.api.unhealthy" : "Verbindung zum Franz Online Service fehlgeschlagen",
   "global.notConnectedToTheInternet" : "Du bist nicht mit dem Internet verbunden.",
   "global.spellchecker.useDefault" : "Standard benutzen ({default})",
   "global.spellchecking.autodetect" : "Sprache automatisch erkennen",
   "global.spellchecking.autodetect.short" : "Automatisch",
   "global.spellchecking.language" : "Sprache für Rechtschreibprüfung",
-   "import.headline" : "Deine Franz 4 Dienste importieren",
+   "import.headline" : "Deine Franz-4-Dienste importieren",
   "import.notSupportedHeadline" : "Dienste, die noch nicht von Franz 5 unterstützt werden",
   "import.skip.label" : "Ich möchte Dienste selbst hinzufügen",
   "import.submit.label" : "Dienste importieren",
-   "infobar.buttonChangelog" : "Was ist neu?",
+   "infobar.buttonChangelog" : "Was gibt es Neues?",
   "infobar.buttonInstallUpdate" : "Neu starten & Update installieren",
-   "infobar.buttonReloadServices" : "Dienste neuladen",
+   "infobar.buttonReloadServices" : "Dienste neu laden",
   "infobar.requiredRequestsFailed" : "Dienste und Benutzerinformationen konnten nicht geladen werden",
   "infobar.servicesUpdated" : "Deine Dienste wurden aktualisiert.",
-   "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar.",
+   "infobar.updateAvailable" : "Eine neue Version von Franz ist verfügbar!",
   "invite.email.label" : "E-Mail-Adresse",
-   "invite.headline.friends" : "Lade 3 Freunde oder Kollegen ein",
+   "invite.headline.friends" : "Lade drei Freunde oder Kolleginnen ein!",
   "invite.name.label" : "Name",
-   "invite.skip.label" : "Ich möchte das später tun",
+   "invite.skip.label" : "Jetzt nicht! Ich möchte das später tun.",
   "invite.submit.label" : "Einladungen schicken",
-   "invite.successInfo" : "Die Einladungen wurden erfolgreich gesendet.",
+   "invite.successInfo" : "Die Einladungen wurden erfolgreich versendet.",
   "login.email.label" : "E-Mail-Adresse",
   "login.headline" : "Anmelden",
-   "login.invalidCredentials" : "E-Mail Adresse oder Passwort ungültig",
+   "login.invalidCredentials" : "E-Mail-Adresse oder Passwort ungültig",
   "login.link.password" : "Passwort zurücksetzen",
   "login.link.signup" : "Kostenloses Konto erstellen",
   "login.password.label" : "Passwort",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Anmelden",
   "login.tokenExpired" : "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
   "menu.app.about" : "Über Franz",
+   "menu.app.announcement" : "Was ist neu?",
   "menu.app.hide" : "Ausblenden",
   "menu.app.hideOthers" : "Andere ausblenden",
   "menu.app.quit" : "Beenden",
@@ -87,12 +89,14 @@
   "menu.window" : "Fenster",
   "menu.window.close" : "Schließen",
   "menu.window.minimize" : "Minimieren",
-   "menu.workspaces": "Workspaces",
+   "menu.workspaces" : "Workspaces",
-   "menu.workspaces.defaultWorkspace": "All services",
+   "menu.workspaces.addNewWorkspace" : "Neuen Workspace hinzufügen",
-   "menu.workspaces.addNewWorkspace": "Add New Workspace",
+   "menu.workspaces.closeWorkspaceDrawer" : "Workspaces öffnen",
-   "password.email.label" : "E-Mail Adresse",
+   "menu.workspaces.defaultWorkspace" : "Alle Dienste",
+   "menu.workspaces.openWorkspaceDrawer" : "Workspaces schließen",
+   "password.email.label" : "E-Mail-Adresse",
   "password.headline" : "Passwort zurücksetzen",
-   "password.link.login" : "An Deinem Konto anmelden",
+   "password.link.login" : "Mit deinem Konto anmelden",
   "password.link.signup" : "Kostenloses Konto erstellen",
   "password.noUser" : "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
   "password.submit.label" : "Absenden",
@@ -102,28 +106,29 @@
   "pricing.link.skipPayment" : "Ich möchte die Entwicklung von Franz nicht unterstützen.",
   "pricing.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen.",
   "pricing.support.label" : "Wie möchtest Du Franz unterstützen?",
-   "service.crashHandler.action" : "{name} neuladen",
+   "service.crashHandler.action" : "{name} neu laden",
   "service.crashHandler.autoReload" : "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
   "service.crashHandler.headline" : "Oh nein!",
   "service.crashHandler.text" : "{name} hat einen Fehler verursacht.",
   "service.disabledHandler.action" : "{name} aktivieren",
   "service.disabledHandler.headline" : "{name} ist deaktiviert",
-   "service.errorHandler.action" : "{name} neuladen",
+   "service.errorHandler.action" : "{name} neu laden",
   "service.errorHandler.editAction" : "{name} bearbeiten",
   "service.errorHandler.headline" : "Oh nein!",
   "service.errorHandler.message" : "Fehler",
   "service.errorHandler.text" : "{name} konnte nicht geladen werden.",
-   "services.getStarted" : "Loslegen",
+   "service.webviewLoader.loading" : "Lade",
-   "services.welcome" : "Willkommen bei Franz.",
+   "services.getStarted" : "Los geht's!",
+   "services.welcome" : "Willkommen bei Franz!",
   "settings.account.account.editButton" : "Konto bearbeiten",
-   "settings.account.accountType.basic" : "Basis Konto",
+   "settings.account.accountType.basic" : "Basis-Konto",
-   "settings.account.accountType.premium" : "Premium-Supporter Konto",
+   "settings.account.accountType.premium" : "Premium Lizenz",
   "settings.account.buttonSave" : "Profil aktualisieren",
   "settings.account.deleteAccount" : "Benutzerkonto löschen",
-   "settings.account.deleteEmailSent" : "Du hast eine Email zur Bestätigung der Löschung Deines Benutzerkontos erhalten. Dein Benutzerkonto und Deine Daten können nach der Löschung nicht wiederhergestellt werden!",
+   "settings.account.deleteEmailSent" : "Du hast eine E-Mail zur Bestätigung der Löschung Deines Benutzerkontos erhalten. Dein Benutzerkonto und Deine Daten können nach der Löschung nicht wiederhergestellt werden!",
-   "settings.account.deleteInfo" : "Wenn du dein Franz Benutzerkonto nicht mehr länger benötigst, kannst du hier deinen Account und alle dazugehörigen Daten löschen.",
+   "settings.account.deleteInfo" : "Wenn du dein Franz-Benutzerkonto nicht mehr länger benötigst, kannst du es hier mit allen dazugehörigen Daten löschen.",
   "settings.account.headline" : "Konto",
-   "settings.account.headlineAccount" : "Konto Informationen",
+   "settings.account.headlineAccount" : "Konto-Informationen",
   "settings.account.headlineDangerZone" : "Benutzerkonto löschen",
   "settings.account.headlineInvoices" : "Rechnungen",
   "settings.account.headlinePassword" : "Passwort ändern",
@@ -144,7 +149,7 @@
   "settings.app.form.autoLaunchInBackground" : "Im Hintergrund öffnen",
   "settings.app.form.autoLaunchOnStart" : "Franz beim Systemstart ausführen",
   "settings.app.form.beta" : "Beta-Versionen einbeziehen",
-   "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich (Dark Mode)",
+   "settings.app.form.darkMode" : "Die dunkle Seite erwartet dich! (Dark Mode)",
   "settings.app.form.enableGPUAcceleration" : "Hardwarebeschleunigung aktivieren",
   "settings.app.form.enableSpellchecking" : "Rechtschreibprüfung aktivieren",
   "settings.app.form.enableSystemTray" : "Franz im Infobereich anzeigen",
@@ -159,26 +164,28 @@
   "settings.app.headlineGeneral" : "Allgemeines",
   "settings.app.headlineLanguage" : "Sprache",
   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.languageDisclaimer" : "Offizielle Übersetzungen: Englisch & Deutsch. Alle anderen Sprachen sind Übersetzungen der Franz Community.",
   "settings.app.restartRequired" : "Änderungen werden erst nach einem Neustart wirksam.",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Hilf uns, Franz in Deine Sprache zu übersetzen.",
-   "settings.app.updateStatusAvailable" : "Update verfügbar, lädt herunter...",
+   "settings.app.updateStatusAvailable" : "Update verfügbar, lädt herunter ...",
   "settings.app.updateStatusSearching" : "Suche nach Updates",
   "settings.app.updateStatusUpToDate" : "Du nutzt die aktuellste Version von Franz",
-   "settings.invite.headline" : "Lade 3 Deiner Freunde ein",
+   "settings.invite.headline" : "Lade drei Deiner Freunde ein",
   "settings.navigation.account" : "Konto",
   "settings.navigation.availableServices" : "Verfügbare Dienste",
   "settings.navigation.inviteFriends" : "Freunde einladen",
   "settings.navigation.logout" : "Abmelden",
   "settings.navigation.settings" : "Einstellungen",
+   "settings.navigation.team" : "Team verwalten",
   "settings.navigation.yourServices" : "Deine Dienste",
-   "settings.navigation.yourWorkspaces": "Deine Workspaces",
+   "settings.navigation.yourWorkspaces" : "Deine Workspaces",
   "settings.recipes.all" : "Alle Dienste",
   "settings.recipes.dev" : "Entwicklung",
   "settings.recipes.headline" : "Verfügbare Dienste",
   "settings.recipes.missingService" : "Fehlt ein Dienst?",
   "settings.recipes.mostPopular" : "Am beliebtesten",
-   "settings.recipes.nothingFound" : "Entschuldigung, aber der von Dir gesuchte Dienst konnte nicht gefunden werden.",
+   "settings.recipes.nothingFound" : "Entschuldigung, der gesuchte Dienst konnte nicht gefunden werden.",
   "settings.recipes.servicesSuccessfulAddedInfo" : "Dienst erfolgreich hinzugefügt",
   "settings.searchService" : "Dienst suchen",
   "settings.service.error.goBack" : "Zurück zu den Diensten",
@@ -187,7 +194,7 @@
   "settings.service.form.addServiceHeadline" : "{name} hinzufügen",
   "settings.service.form.availableServices" : "Verfügbare Dienste",
   "settings.service.form.customUrl" : "Eigener Server",
-   "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Franz Premium-Supporter Konto.",
+   "settings.service.form.customUrlPremiumInfo" : "Um einen selbst gehosteten Dienst hinzuzufügen, brauchst Du ein Franz Premium Konto.",
   "settings.service.form.customUrlUpgradeAccount" : "Dein Konto upgraden",
   "settings.service.form.customUrlValidationError" : "Dein {name}-Server konnte nicht verifiziert werden.",
   "settings.service.form.deleteButton" : "Dienst löschen",
@@ -207,13 +214,13 @@
   "settings.service.form.indirectMessages" : "Nachrichten-Badge für alle neuen Nachrichten anzeigen",
   "settings.service.form.isMutedInfo" : "Sämtliche Wiedergabe von Tönen wird deaktiviert",
   "settings.service.form.name" : "Name",
-   "settings.service.form.proxy.headline" : "HTTP\/HTTPS Proxy Einstellungen",
+   "settings.service.form.proxy.headline" : "HTTP-\/HTTPS-Proxy-Einstellungen",
   "settings.service.form.proxy.host" : "Proxy Host\/IP",
-   "settings.service.form.proxy.info" : "Proxy Einstellungen werden nicht mit den Franz Servern synchronisiert.",
+   "settings.service.form.proxy.info" : "Proxy-Einstellungen werden nicht mit den Franz Servern synchronisiert.",
-   "settings.service.form.proxy.isEnabled" : "Proxy Server verwenden",
+   "settings.service.form.proxy.isEnabled" : "Proxy-Server verwenden",
   "settings.service.form.proxy.password" : "Passwort (optional)",
   "settings.service.form.proxy.port" : "Port",
-   "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy Einstellungen neu.",
+   "settings.service.form.proxy.restartInfo" : "Bitte starte Franz nach dem Ändern der Proxy-Einstellungen neu.",
   "settings.service.form.proxy.user" : "Benutzer (optional)",
   "settings.service.form.saveButton" : "Dienst speichern",
   "settings.service.form.tabHosted" : "Gehostet",
@@ -230,14 +237,12 @@
   "settings.services.tooltip.isMuted" : "Alle Töne sind deaktiviert",
   "settings.services.tooltip.notificationsDisabled" : "Benachrichtigungen deaktiviert",
   "settings.services.updatedInfo" : "Deine Änderungen wurden gespeichert",
-   "settings.workspaces.headline": "Deine Workspaces",
+   "settings.team.contentHeadline" : "Franz für Teams",
-   "settings.workspace.add.form.submitButton": "Workspace erstellen",
+   "settings.team.copy" : "Mit Franz für Teams kannst du Kolleginnen und Kollegen per Email-Invite in dein Team einladen und ihre Abonnments in den Einstellungen deines Accounts verwalten. Verschwende keine Zeit mehr damit, Lizenzen für jedes Teammitglied einzeln einzurichten, vergiss mehrfache Rechnungen und unterschiedliche Abrechnungszeiträume - alles unter einem Dach.",
-   "settings.workspace.add.form.name": "Name",
+   "settings.team.headline" : "Team",
-   "settings.workspace.form.yourWorkspaces": "Deine Workspaces",
+   "settings.team.intro" : "Mit Franz für Teams kannst du Premium Lizenzen für Kolleginnen und Kollegen oder Freunde und Familienmitglieder kaufen und verwalten - so viele du willst.",
-   "settings.workspace.form.name": "Name",
+   "settings.team.manageAction" : "Verwalte dein Team auf meetfranz.com",
-   "settings.workspace.form.buttonDelete": "Workspace löschen",
+   "settings.team.upgradeAction" : "Account Upgrade durchführen",
-   "settings.workspace.form.buttonSave": "Workspace speichern",
-   "settings.workspace.form.servicesInWorkspaceHeadline": "Services in diesem Workspace",
   "settings.user.form.accountType.company" : "Firma",
   "settings.user.form.accountType.individual" : "Einzelperson",
   "settings.user.form.accountType.label" : "Konto-Typ",
@@ -247,30 +252,48 @@
   "settings.user.form.firstname" : "Vorname",
   "settings.user.form.lastname" : "Nachname",
   "settings.user.form.newPassword" : "Neues Passwort",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Workspace erstellen",
+   "settings.workspace.form.buttonDelete" : "Workspace löschen",
+   "settings.workspace.form.buttonSave" : "Workspace speichern",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in diesem Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Deine Workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace wurde gelöscht",
+   "settings.workspaces.headline" : "Deine Workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "Du hast noch keine Workspaces hinzugefügt",
+   "settings.workspaces.tryReloadWorkspaces" : "Erneut versuchen",
+   "settings.workspaces.updatedInfo" : "Deine Änderungen wurden gespeichert",
+   "settings.workspaces.workspaceFeatureHeadline" : "Weniger ist mehr: Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Mit Franz Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
+   "settings.workspaces.workspacesRequestFailed" : "Workspaces konnte nicht geladen werden",
   "sidebar.addNewService" : "Neuen Dienst hinzufügen",
+   "sidebar.closeWorkspaceDrawer" : "Workspaces schließen",
   "sidebar.muteApp" : "Benachrichtigungen & Audio deaktivieren",
+   "sidebar.openWorkspaceDrawer" : "Workspaces öffnen",
   "sidebar.settings" : "Einstellungen",
   "sidebar.unmuteApp" : "Benachrichtigungen & Audio aktivieren",
   "signup.company.label" : "Firma",
-   "signup.email.label" : "E-Mail Adresse",
+   "signup.email.label" : "E-Mail-Adresse",
   "signup.emailDuplicate" : "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
   "signup.firstname.label" : "Vorname",
   "signup.headline" : "Anmelden",
   "signup.lastname.label" : "Nachname",
-   "signup.legal.info" : "Mit der Erstellung eines Franz Kontos akzeptierst Du die",
+   "signup.legal.info" : "Mit der Erstellung eines Franz-Kontos akzeptierst Du die",
   "signup.legal.privacy" : "Datenschutzerklärung",
   "signup.legal.terms" : "Nutzungsbedingungen",
   "signup.link.login" : "Du hast bereits ein Konto? Melde Dich an.",
   "signup.password.label" : "Passwort",
   "signup.submit.label" : "Konto erstellen",
-   "subscription.euTaxInfo" : "Preise sind exklusive Steuern.",
+   "subscription.euTaxInfo" : "Preise zuzüglich allfälliger Steuern",
   "subscription.features.ads" : "Werbefrei auf Lebenszeit!",
   "subscription.features.comingSoon" : "folgt bald",
-   "subscription.features.noInterruptions" : "Keine Wartezeiten um Franz zu verwenden",
+   "subscription.features.noInterruptions" : "Verwende Franz ohne Wartezeiten",
-   "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
+   "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten wie Mattermost",
   "subscription.features.proxy" : "Proxy Support für Dienste",
   "subscription.features.spellchecker" : "Unterstützung für Rechtschreibprüfung",
-   "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
+   "subscription.features.workspaces" : "Organisiere deine Services in Workspaces",
+   "subscription.includedFeatures" : "Bezahlte Franz Premium Lizenzen beinhalten",
   "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
   "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
   "subscription.type.free" : "kostenlos",
@@ -286,12 +309,23 @@
   "tabs.item.enableAudio" : "Audio aktivieren",
   "tabs.item.enableNotification" : "Benachrichtigungen aktivieren",
   "tabs.item.enableService" : "Dienst aktivieren",
-   "tabs.item.reload" : "Neuladen",
+   "tabs.item.reload" : "Neu laden",
   "validation.email" : "{field} ist ungültig",
   "validation.minLength" : "{field} muss mindestens {length} Zeichen enthalten",
   "validation.oneRequired" : "Mindestens ein Wert wird benötigt",
   "validation.required" : "{field} wird benötigt",
   "validation.url" : "{field} ist keine gültige URL",
   "welcome.loginButton" : "Bei Franz einloggen",
-   "welcome.signupButton" : "Kostenloses Konto erstellen"
+   "welcome.signupButton" : "Kostenloses Konto erstellen",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Neuen Workspace hinzufügen",
+   "workspaceDrawer.allServices" : "Alle Dienste",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "Bearbeiten",
+   "workspaceDrawer.item.noServicesAddedYet" : "Noch keine Services hinzugefügt",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Erstelle deinen ersten Workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium Feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Premium Account aktivieren",
+   "workspaceDrawer.workspaceFeatureInfo" : "Mit Franz Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Workspaces bearbeiten",
+   "workspaces.switchingIndicator.switchingTo" : "Wechsle zu"
 }
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 65799b614..9524238f0 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -625,78 +625,78 @@
        "defaultMessage": "!!!Your services have been updated.",
        "end": {
          "column": 3,
-          "line": 28
+          "line": 29
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.servicesUpdated",
        "start": {
          "column": 19,
-          "line": 25
+          "line": 26
        }
      },
      {
        "defaultMessage": "!!!A new update for Franz is available.",
        "end": {
          "column": 3,
-          "line": 32
+          "line": 33
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.updateAvailable",
        "start": {
          "column": 19,
-          "line": 29
+          "line": 30
        }
      },
      {
        "defaultMessage": "!!!Reload services",
        "end": {
          "column": 3,
-          "line": 36
+          "line": 37
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.buttonReloadServices",
        "start": {
          "column": 24,
-          "line": 33
+          "line": 34
        }
      },
      {
        "defaultMessage": "!!!Changelog",
        "end": {
          "column": 3,
-          "line": 40
+          "line": 41
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.buttonChangelog",
        "start": {
          "column": 13,
-          "line": 37
+          "line": 38
        }
      },
      {
        "defaultMessage": "!!!Restart & install update",
        "end": {
          "column": 3,
-          "line": 44
+          "line": 45
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.buttonInstallUpdate",
        "start": {
          "column": 23,
-          "line": 41
+          "line": 42
        }
      },
      {
        "defaultMessage": "!!!Could not load services and user information",
        "end": {
          "column": 3,
-          "line": 48
+          "line": 49
        },
        "file": "src/components/layout/AppLayout.js",
        "id": "infobar.requiredRequestsFailed",
        "start": {
          "column": 26,
-          "line": 45
+          "line": 46
        }
      }
    ],
@@ -1102,195 +1102,195 @@
        "defaultMessage": "!!!Account",
        "end": {
          "column": 3,
-          "line": 18
+          "line": 17
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headline",
        "start": {
          "column": 12,
-          "line": 15
+          "line": 14
        }
      },
      {
        "defaultMessage": "!!!Your Subscription",
        "end": {
          "column": 3,
-          "line": 22
+          "line": 21
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headlineSubscription",
        "start": {
          "column": 24,
-          "line": 19
+          "line": 18
        }
      },
      {
        "defaultMessage": "!!!Upgrade your Account",
        "end": {
          "column": 3,
-          "line": 26
+          "line": 25
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headlineUpgrade",
        "start": {
          "column": 19,
-          "line": 23
+          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!Invoices",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineInvoices",
-        "start": {
-          "column": 20,
-          "line": 27
        }
      },
      {
        "defaultMessage": "!!Danger Zone",
        "end": {
          "column": 3,
-          "line": 34
+          "line": 29
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.headlineDangerZone",
        "start": {
          "column": 22,
-          "line": 31
+          "line": 26
        }
      },
      {
        "defaultMessage": "!!!Manage your subscription",
        "end": {
          "column": 3,
-          "line": 38
+          "line": 33
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.manageSubscription.label",
        "start": {
          "column": 33,
-          "line": 35
+          "line": 30
        }
      },
      {
        "defaultMessage": "!!!Basic Account",
        "end": {
          "column": 3,
-          "line": 42
+          "line": 37
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.accountType.basic",
        "start": {
          "column": 20,
-          "line": 39
+          "line": 34
        }
      },
      {
        "defaultMessage": "!!!Premium Supporter Account",
        "end": {
          "column": 3,
-          "line": 46
+          "line": 41
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.accountType.premium",
        "start": {
          "column": 22,
-          "line": 43
+          "line": 38
        }
      },
      {
        "defaultMessage": "!!!Edit Account",
        "end": {
          "column": 3,
-          "line": 50
+          "line": 45
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.account.editButton",
        "start": {
          "column": 21,
-          "line": 47
+          "line": 42
+        }
+      },
+      {
+        "defaultMessage": "!!Invoices",
+        "end": {
+          "column": 3,
+          "line": 49
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.headlineInvoices",
+        "start": {
+          "column": 18,
+          "line": 46
        }
      },
      {
        "defaultMessage": "!!!Download",
        "end": {
          "column": 3,
-          "line": 54
+          "line": 53
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.invoiceDownload",
        "start": {
          "column": 19,
-          "line": 51
+          "line": 50
        }
      },
      {
        "defaultMessage": "!!!Could not load user information",
        "end": {
          "column": 3,
-          "line": 58
+          "line": 57
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.userInfoRequestFailed",
        "start": {
          "column": 25,
-          "line": 55
+          "line": 54
        }
      },
      {
        "defaultMessage": "!!!Try again",
        "end": {
          "column": 3,
-          "line": 62
+          "line": 61
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.tryReloadUserInfoRequest",
        "start": {
          "column": 28,
-          "line": 59
+          "line": 58
        }
      },
      {
        "defaultMessage": "!!!Delete account",
        "end": {
          "column": 3,
-          "line": 66
+          "line": 65
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.deleteAccount",
        "start": {
          "column": 17,
-          "line": 63
+          "line": 62
        }
      },
      {
        "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
        "end": {
          "column": 3,
-          "line": 70
+          "line": 69
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.deleteInfo",
        "start": {
          "column": 14,
-          "line": 67
+          "line": 66
        }
      },
      {
        "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
        "end": {
          "column": 3,
-          "line": 74
+          "line": 73
        },
        "file": "src/components/settings/account/AccountDashboard.js",
        "id": "settings.account.deleteEmailSent",
        "start": {
          "column": 19,
-          "line": 71
+          "line": 70
        }
      }
    ],
@@ -1302,91 +1302,104 @@
        "defaultMessage": "!!!Available services",
        "end": {
          "column": 3,
-          "line": 15
+          "line": 16
        },
        "file": "src/components/settings/navigation/SettingsNavigation.js",
        "id": "settings.navigation.availableServices",
        "start": {
          "column": 21,
-          "line": 12
+          "line": 13
        }
      },
      {
        "defaultMessage": "!!!Your services",
        "end": {
          "column": 3,
-          "line": 19
+          "line": 20
        },
        "file": "src/components/settings/navigation/SettingsNavigation.js",
        "id": "settings.navigation.yourServices",
        "start": {
          "column": 16,
-          "line": 16
+          "line": 17
        }
      },
      {
        "defaultMessage": "!!!Your workspaces",
        "end": {
          "column": 3,
-          "line": 23
+          "line": 24
        },
        "file": "src/components/settings/navigation/SettingsNavigation.js",
        "id": "settings.navigation.yourWorkspaces",
        "start": {
          "column": 18,
-          "line": 20
+          "line": 21
        }
      },
      {
        "defaultMessage": "!!!Account",
        "end": {
          "column": 3,
-          "line": 27
+          "line": 28
        },
        "file": "src/components/settings/navigation/SettingsNavigation.js",
        "id": "settings.navigation.account",
        "start": {
          "column": 11,
-          "line": 24
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Manage Team",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/settings/navigation/SettingsNavigation.js",
+        "id": "settings.navigation.team",
+        "start": {
+          "column": 8,
+          "line": 29
        }
      },
      {
        "defaultMessage": "!!!Settings",
        "end": {
          "column": 3,
-          "line": 31
+          "line": 36
        },
        "file": "src/components/settings/navigation/SettingsNavigation.js",
        "id": "settings.navigation.settings",
        "start": {
          "column": 12,
-          "line": 28
+          "line": 33
        }
      },
      {
        "defaultMessage": "!!!Invite Friends",
        "end": {
          "column": 3,
-          "line": 35
+          "line": 40
        },
        "file": "src/components/settings/navigation/SettingsNavigation.js",
        "id": "settings.navigation.inviteFriends",
        "start": {
          "column": 17,
-          "line": 32
+          "line": 37
        }
      },
      {
        "defaultMessage": "!!!Logout",
        "end": {
          "column": 3,
-          "line": 39
+          "line": 44
        },
        "file": "src/components/settings/navigation/SettingsNavigation.js",
        "id": "settings.navigation.logout",
        "start": {
          "column": 10,
-          "line": 36
+          "line": 41
        }
      }
    ],
@@ -2237,6 +2250,19 @@
          "column": 29,
          "line": 80
        }
+      },
+      {
+        "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
+        "end": {
+          "column": 3,
+          "line": 87
+        },
+        "file": "src/components/settings/settings/EditSettingsForm.js",
+        "id": "settings.app.languageDisclaimer",
+        "start": {
+          "column": 22,
+          "line": 84
+        }
      }
    ],
    "path": "src/components/settings/settings/EditSettingsForm.json"
@@ -2244,6 +2270,89 @@
  {
    "descriptors": [
      {
+        "defaultMessage": "!!!Team",
+        "end": {
+          "column": 3,
+          "line": 17
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.headline",
+        "start": {
+          "column": 12,
+          "line": 14
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz for Teams",
+        "end": {
+          "column": 3,
+          "line": 21
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.contentHeadline",
+        "start": {
+          "column": 19,
+          "line": 18
+        }
+      },
+      {
+        "defaultMessage": "!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+        "end": {
+          "column": 3,
+          "line": 25
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.intro",
+        "start": {
+          "column": 9,
+          "line": 22
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+        "end": {
+          "column": 3,
+          "line": 29
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.copy",
+        "start": {
+          "column": 8,
+          "line": 26
+        }
+      },
+      {
+        "defaultMessage": "!!!Manage your Team on meetfranz.com",
+        "end": {
+          "column": 3,
+          "line": 33
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.manageAction",
+        "start": {
+          "column": 16,
+          "line": 30
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade your Account",
+        "end": {
+          "column": 3,
+          "line": 37
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.upgradeAction",
+        "start": {
+          "column": 17,
+          "line": 34
+        }
+      }
+    ],
+    "path": "src/components/settings/team/TeamDashboard.json"
+  },
+  {
+    "descriptors": [
+      {
        "defaultMessage": "!!!Account",
        "end": {
          "column": 3,
@@ -2457,42 +2566,55 @@
        }
      },
      {
-        "defaultMessage": "!!!No ads, ever!",
+        "defaultMessage": "!!!Organize your services in workspaces",
        "end": {
          "column": 3,
          "line": 57
        },
        "file": "src/components/subscription/SubscriptionForm.js",
+        "id": "subscription.features.workspaces",
+        "start": {
+          "column": 14,
+          "line": 54
+        }
+      },
+      {
+        "defaultMessage": "!!!No ads, ever!",
+        "end": {
+          "column": 3,
+          "line": 61
+        },
+        "file": "src/components/subscription/SubscriptionForm.js",
        "id": "subscription.features.ads",
        "start": {
          "column": 7,
-          "line": 54
+          "line": 58
        }
      },
      {
        "defaultMessage": "!!!coming soon",
        "end": {
          "column": 3,
-          "line": 61
+          "line": 65
        },
        "file": "src/components/subscription/SubscriptionForm.js",
        "id": "subscription.features.comingSoon",
        "start": {
          "column": 14,
-          "line": 58
+          "line": 62
        }
      },
      {
        "defaultMessage": "!!!EU residents: local sales tax may apply",
        "end": {
          "column": 3,
-          "line": 65
+          "line": 69
        },
        "file": "src/components/subscription/SubscriptionForm.js",
        "id": "subscription.euTaxInfo",
        "start": {
          "column": 13,
-          "line": 62
+          "line": 66
        }
      }
    ],
@@ -3082,6 +3204,24 @@
  {
    "descriptors": [
      {
+        "defaultMessage": "!!!Changes in Franz {version}",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/announcements/components/AnnouncementScreen.js",
+        "id": "feature.announcements.changelog.headline",
+        "start": {
+          "column": 12,
+          "line": 20
+        }
+      }
+    ],
+    "path": "src/features/announcements/components/AnnouncementScreen.json"
+  },
+  {
+    "descriptors": [
+      {
        "defaultMessage": "!!!Please purchase license to skip waiting",
        "end": {
          "column": 3,
@@ -3316,6 +3456,32 @@
          "column": 31,
          "line": 35
        }
+      },
+      {
+        "defaultMessage": "!!!You haven't added any services yet.",
+        "end": {
+          "column": 3,
+          "line": 42
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.services.noServicesAdded",
+        "start": {
+          "column": 19,
+          "line": 39
+        }
+      },
+      {
+        "defaultMessage": "!!!Discover services",
+        "end": {
+          "column": 3,
+          "line": 46
+        },
+        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+        "id": "settings.services.discoverServices",
+        "start": {
+          "column": 20,
+          "line": 43
+        }
      }
    ],
    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
@@ -3746,676 +3912,689 @@
        "defaultMessage": "!!!Edit",
        "end": {
          "column": 3,
-          "line": 16
+          "line": 18
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit",
        "start": {
          "column": 8,
-          "line": 13
+          "line": 15
        }
      },
      {
        "defaultMessage": "!!!Undo",
        "end": {
          "column": 3,
-          "line": 20
+          "line": 22
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.undo",
        "start": {
          "column": 8,
-          "line": 17
+          "line": 19
        }
      },
      {
        "defaultMessage": "!!!Redo",
        "end": {
          "column": 3,
-          "line": 24
+          "line": 26
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.redo",
        "start": {
          "column": 8,
-          "line": 21
+          "line": 23
        }
      },
      {
        "defaultMessage": "!!!Cut",
        "end": {
          "column": 3,
-          "line": 28
+          "line": 30
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.cut",
        "start": {
          "column": 7,
-          "line": 25
+          "line": 27
        }
      },
      {
        "defaultMessage": "!!!Copy",
        "end": {
          "column": 3,
-          "line": 32
+          "line": 34
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.copy",
        "start": {
          "column": 8,
-          "line": 29
+          "line": 31
        }
      },
      {
        "defaultMessage": "!!!Paste",
        "end": {
          "column": 3,
-          "line": 36
+          "line": 38
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.paste",
        "start": {
          "column": 9,
-          "line": 33
+          "line": 35
        }
      },
      {
        "defaultMessage": "!!!Paste And Match Style",
        "end": {
          "column": 3,
-          "line": 40
+          "line": 42
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.pasteAndMatchStyle",
        "start": {
          "column": 22,
-          "line": 37
+          "line": 39
        }
      },
      {
        "defaultMessage": "!!!Delete",
        "end": {
          "column": 3,
-          "line": 44
+          "line": 46
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.delete",
        "start": {
          "column": 10,
-          "line": 41
+          "line": 43
        }
      },
      {
        "defaultMessage": "!!!Select All",
        "end": {
          "column": 3,
-          "line": 48
+          "line": 50
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.selectAll",
        "start": {
          "column": 13,
-          "line": 45
+          "line": 47
        }
      },
      {
        "defaultMessage": "!!!Speech",
        "end": {
          "column": 3,
-          "line": 52
+          "line": 54
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.speech",
        "start": {
          "column": 10,
-          "line": 49
+          "line": 51
        }
      },
      {
        "defaultMessage": "!!!Start Speaking",
        "end": {
          "column": 3,
-          "line": 56
+          "line": 58
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.startSpeaking",
        "start": {
          "column": 17,
-          "line": 53
+          "line": 55
        }
      },
      {
        "defaultMessage": "!!!Stop Speaking",
        "end": {
          "column": 3,
-          "line": 60
+          "line": 62
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.stopSpeaking",
        "start": {
          "column": 16,
-          "line": 57
+          "line": 59
        }
      },
      {
        "defaultMessage": "!!!Start Dictation",
        "end": {
          "column": 3,
-          "line": 64
+          "line": 66
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.startDictation",
        "start": {
          "column": 18,
-          "line": 61
+          "line": 63
        }
      },
      {
        "defaultMessage": "!!!Emoji & Symbols",
        "end": {
          "column": 3,
-          "line": 68
+          "line": 70
        },
        "file": "src/lib/Menu.js",
        "id": "menu.edit.emojiSymbols",
        "start": {
          "column": 16,
-          "line": 65
+          "line": 67
        }
      },
      {
        "defaultMessage": "!!!Actual Size",
        "end": {
          "column": 3,
-          "line": 72
+          "line": 74
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.resetZoom",
        "start": {
          "column": 13,
-          "line": 69
+          "line": 71
        }
      },
      {
        "defaultMessage": "!!!Zoom In",
        "end": {
          "column": 3,
-          "line": 76
+          "line": 78
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.zoomIn",
        "start": {
          "column": 10,
-          "line": 73
+          "line": 75
        }
      },
      {
        "defaultMessage": "!!!Zoom Out",
        "end": {
          "column": 3,
-          "line": 80
+          "line": 82
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.zoomOut",
        "start": {
          "column": 11,
-          "line": 77
+          "line": 79
        }
      },
      {
        "defaultMessage": "!!!Enter Full Screen",
        "end": {
          "column": 3,
-          "line": 84
+          "line": 86
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.enterFullScreen",
        "start": {
          "column": 19,
-          "line": 81
+          "line": 83
        }
      },
      {
        "defaultMessage": "!!!Exit Full Screen",
        "end": {
          "column": 3,
-          "line": 88
+          "line": 90
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.exitFullScreen",
        "start": {
          "column": 18,
-          "line": 85
+          "line": 87
        }
      },
      {
        "defaultMessage": "!!!Toggle Full Screen",
        "end": {
          "column": 3,
-          "line": 92
+          "line": 94
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.toggleFullScreen",
        "start": {
          "column": 20,
-          "line": 89
+          "line": 91
        }
      },
      {
        "defaultMessage": "!!!Toggle Developer Tools",
        "end": {
          "column": 3,
-          "line": 96
+          "line": 98
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.toggleDevTools",
        "start": {
          "column": 18,
-          "line": 93
+          "line": 95
        }
      },
      {
        "defaultMessage": "!!!Toggle Service Developer Tools",
        "end": {
          "column": 3,
-          "line": 100
+          "line": 102
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.toggleServiceDevTools",
        "start": {
          "column": 25,
-          "line": 97
+          "line": 99
        }
      },
      {
        "defaultMessage": "!!!Reload Service",
        "end": {
          "column": 3,
-          "line": 104
+          "line": 106
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.reloadService",
        "start": {
          "column": 17,
-          "line": 101
+          "line": 103
        }
      },
      {
        "defaultMessage": "!!!Reload Franz",
        "end": {
          "column": 3,
-          "line": 108
+          "line": 110
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view.reloadFranz",
        "start": {
          "column": 15,
-          "line": 105
+          "line": 107
        }
      },
      {
        "defaultMessage": "!!!Minimize",
        "end": {
          "column": 3,
-          "line": 112
+          "line": 114
        },
        "file": "src/lib/Menu.js",
        "id": "menu.window.minimize",
        "start": {
          "column": 12,
-          "line": 109
+          "line": 111
        }
      },
      {
        "defaultMessage": "!!!Close",
        "end": {
          "column": 3,
-          "line": 116
+          "line": 118
        },
        "file": "src/lib/Menu.js",
        "id": "menu.window.close",
        "start": {
          "column": 9,
-          "line": 113
+          "line": 115
        }
      },
      {
        "defaultMessage": "!!!Learn More",
        "end": {
          "column": 3,
-          "line": 120
+          "line": 122
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.learnMore",
        "start": {
          "column": 13,
-          "line": 117
+          "line": 119
        }
      },
      {
        "defaultMessage": "!!!Changelog",
        "end": {
          "column": 3,
-          "line": 124
+          "line": 126
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.changelog",
        "start": {
          "column": 13,
-          "line": 121
+          "line": 123
        }
      },
      {
        "defaultMessage": "!!!Support",
        "end": {
          "column": 3,
-          "line": 128
+          "line": 130
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.support",
        "start": {
          "column": 11,
-          "line": 125
+          "line": 127
        }
      },
      {
        "defaultMessage": "!!!Terms of Service",
        "end": {
          "column": 3,
-          "line": 132
+          "line": 134
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.tos",
        "start": {
          "column": 7,
-          "line": 129
+          "line": 131
        }
      },
      {
        "defaultMessage": "!!!Privacy Statement",
        "end": {
          "column": 3,
-          "line": 136
+          "line": 138
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help.privacy",
        "start": {
          "column": 11,
-          "line": 133
+          "line": 135
        }
      },
      {
        "defaultMessage": "!!!File",
        "end": {
          "column": 3,
-          "line": 140
+          "line": 142
        },
        "file": "src/lib/Menu.js",
        "id": "menu.file",
        "start": {
          "column": 8,
-          "line": 137
+          "line": 139
        }
      },
      {
        "defaultMessage": "!!!View",
        "end": {
          "column": 3,
-          "line": 144
+          "line": 146
        },
        "file": "src/lib/Menu.js",
        "id": "menu.view",
        "start": {
          "column": 8,
-          "line": 141
+          "line": 143
        }
      },
      {
        "defaultMessage": "!!!Services",
        "end": {
          "column": 3,
-          "line": 148
+          "line": 150
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services",
        "start": {
          "column": 12,
-          "line": 145
+          "line": 147
        }
      },
      {
        "defaultMessage": "!!!Window",
        "end": {
          "column": 3,
-          "line": 152
+          "line": 154
        },
        "file": "src/lib/Menu.js",
        "id": "menu.window",
        "start": {
          "column": 10,
-          "line": 149
+          "line": 151
        }
      },
      {
        "defaultMessage": "!!!Help",
        "end": {
          "column": 3,
-          "line": 156
+          "line": 158
        },
        "file": "src/lib/Menu.js",
        "id": "menu.help",
        "start": {
          "column": 8,
-          "line": 153
+          "line": 155
        }
      },
      {
        "defaultMessage": "!!!About Franz",
        "end": {
          "column": 3,
-          "line": 160
+          "line": 162
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.about",
        "start": {
          "column": 9,
-          "line": 157
+          "line": 159
+        }
+      },
+      {
+        "defaultMessage": "!!!What's new?",
+        "end": {
+          "column": 3,
+          "line": 166
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.app.announcement",
+        "start": {
+          "column": 16,
+          "line": 163
        }
      },
      {
        "defaultMessage": "!!!Settings",
        "end": {
          "column": 3,
-          "line": 164
+          "line": 170
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.settings",
        "start": {
          "column": 12,
-          "line": 161
+          "line": 167
        }
      },
      {
        "defaultMessage": "!!!Hide",
        "end": {
          "column": 3,
-          "line": 168
+          "line": 174
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.hide",
        "start": {
          "column": 8,
-          "line": 165
+          "line": 171
        }
      },
      {
        "defaultMessage": "!!!Hide Others",
        "end": {
          "column": 3,
-          "line": 172
+          "line": 178
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.hideOthers",
        "start": {
          "column": 14,
-          "line": 169
+          "line": 175
        }
      },
      {
        "defaultMessage": "!!!Unhide",
        "end": {
          "column": 3,
-          "line": 176
+          "line": 182
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.unhide",
        "start": {
          "column": 10,
-          "line": 173
+          "line": 179
        }
      },
      {
        "defaultMessage": "!!!Quit",
        "end": {
          "column": 3,
-          "line": 180
+          "line": 186
        },
        "file": "src/lib/Menu.js",
        "id": "menu.app.quit",
        "start": {
          "column": 8,
-          "line": 177
+          "line": 183
        }
      },
      {
        "defaultMessage": "!!!Add New Service...",
        "end": {
          "column": 3,
-          "line": 184
+          "line": 190
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services.addNewService",
        "start": {
          "column": 17,
-          "line": 181
+          "line": 187
        }
      },
      {
        "defaultMessage": "!!!Add New Workspace...",
        "end": {
          "column": 3,
-          "line": 188
+          "line": 194
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.addNewWorkspace",
        "start": {
          "column": 19,
-          "line": 185
+          "line": 191
        }
      },
      {
        "defaultMessage": "!!!Open workspace drawer",
        "end": {
          "column": 3,
-          "line": 192
+          "line": 198
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.openWorkspaceDrawer",
        "start": {
          "column": 23,
-          "line": 189
+          "line": 195
        }
      },
      {
        "defaultMessage": "!!!Close workspace drawer",
        "end": {
          "column": 3,
-          "line": 196
+          "line": 202
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.closeWorkspaceDrawer",
        "start": {
          "column": 24,
-          "line": 193
+          "line": 199
        }
      },
      {
        "defaultMessage": "!!!Activate next service...",
        "end": {
          "column": 3,
-          "line": 200
+          "line": 206
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services.setNextServiceActive",
        "start": {
          "column": 23,
-          "line": 197
+          "line": 203
        }
      },
      {
        "defaultMessage": "!!!Activate previous service...",
        "end": {
          "column": 3,
-          "line": 204
+          "line": 210
        },
        "file": "src/lib/Menu.js",
        "id": "menu.services.activatePreviousService",
        "start": {
          "column": 27,
-          "line": 201
+          "line": 207
        }
      },
      {
        "defaultMessage": "!!!Disable notifications & audio",
        "end": {
          "column": 3,
-          "line": 208
+          "line": 214
        },
        "file": "src/lib/Menu.js",
        "id": "sidebar.muteApp",
        "start": {
          "column": 11,
-          "line": 205
+          "line": 211
        }
      },
      {
        "defaultMessage": "!!!Enable notifications & audio",
        "end": {
          "column": 3,
-          "line": 212
+          "line": 218
        },
        "file": "src/lib/Menu.js",
        "id": "sidebar.unmuteApp",
        "start": {
          "column": 13,
-          "line": 209
+          "line": 215
        }
      },
      {
        "defaultMessage": "!!!Workspaces",
        "end": {
          "column": 3,
-          "line": 216
+          "line": 222
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces",
        "start": {
          "column": 14,
-          "line": 213
+          "line": 219
        }
      },
      {
        "defaultMessage": "!!!Default",
        "end": {
          "column": 3,
-          "line": 220
+          "line": 226
        },
        "file": "src/lib/Menu.js",
        "id": "menu.workspaces.defaultWorkspace",
        "start": {
          "column": 20,
-          "line": 217
+          "line": 223
        }
      }
    ],
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 626abfddd..0ff4b5abb 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Επαναφόρτωση",
   "app.errorHandler.headline" : "Κάτι δεν λειτουργεί",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz θα συνεχίσει σε {seconds} δευτερόλεπτα.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Franz",
   "global.notConnectedToTheInternet" : "Έχετε αποσυνδεθεί από το Διαδίκτυο",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Σύνδεση",
   "login.tokenExpired" : "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
   "menu.app.about" : "Σχετικά με το Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Απόκρυψη",
   "menu.app.hideOthers" : "Απόκρυψη των άλλων",
   "menu.app.quit" : "Έξοδος",
@@ -87,6 +89,11 @@
   "menu.window" : "Παράθυρο",
   "menu.window.close" : "Κλείσιμο",
   "menu.window.minimize" : "Ελαχιστοποίηση",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Όλες οι υπηρεσίες",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
   "password.headline" : "Επαναφορά κωδικού πρόσβασης",
   "password.link.login" : "Σύνδεση στο λογαριασμό σας",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Ω, όχι!",
   "service.errorHandler.message" : "Σφάλμα",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Ξεκινήστε",
   "services.welcome" : "Καλώς ορίσατε στον Franz",
   "settings.account.account.editButton" : "Επεξεργασία λογαριασμού",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Γενικά",
   "settings.app.headlineLanguage" : "Γλώσσα",
   "settings.app.headlineUpdates" : "Ενημερώσεις",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Οι αλλαγές απαιτούν επανεκκίνηση",
   "settings.app.subheadlineCache" : "Λανθάνουσα μνήμη",
   "settings.app.translationHelp" : "Βοηθήστε μας να μεταφράσουμε το Franz στη δική σας γλώσσα.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Πρασκαλέστε Φίλους",
   "settings.navigation.logout" : "Αποσύνδεση",
   "settings.navigation.settings" : "Ρυθμίσεις",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Οι υπηρεσίες σας",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Όλες οι υπηρεσίες",
   "settings.recipes.dev" : "Ανάπτυξη",
   "settings.recipes.headline" : "Διαθέσιμες υπηρεσίες",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Όλοι οι ήχοι είναι απενεργοποιημένοι",
   "settings.services.tooltip.notificationsDisabled" : "Οι ειδοποιήσεις είναι απενεργοποιημένες",
   "settings.services.updatedInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Ομάδα",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Εταιρεία",
   "settings.user.form.accountType.individual" : "Ατομικός",
   "settings.user.form.accountType.label" : "Τύπος λογαριασμού",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Όνομα",
   "settings.user.form.lastname" : "Επίθετο",
   "settings.user.form.newPassword" : "Νέος κωδικός πρόσβασης",
+   "settings.workspace.add.form.name" : "Όνομα",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Όνομα",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Δοκιμάστε ξανά",
+   "settings.workspaces.updatedInfo" : "Οι αλλαγές σας έχουν αποθηκευτεί",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Προσθήκη νέας υπηρεσίας",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Απενεργοποίηση ειδοποιήσεων & ήχου",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ρυθμίσεις",
   "sidebar.unmuteApp" : "Ενεργοποίηση ειδοποιήσεων & ήχου",
   "signup.company.label" : "Εταιρεία",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Ο Premium λογαριασμός υποστήριξης Franz περιλαμβάνει",
   "subscription.paymentSessionError" : "Δεν ήταν δυνατή η προετοιμασία της φόρμας πληρωμής",
   "subscription.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} είναι υποχρεωτικό",
   "validation.url" : "{field} δεν είναι έγκυρος σύνδεσμος URL",
   "welcome.loginButton" : "Σύνδεση στο λογαριασμό σας",
-   "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού"
+   "welcome.signupButton" : "Δημιουργία δωρεάν λογαριασμού",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Όλες οι υπηρεσίες",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 84a71117a..6c2759dcc 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,6 +1,7 @@
 {
  "app.errorHandler.action": "Reload",
  "app.errorHandler.headline": "Something went wrong",
+  "feature.announcements.changelog.headline": "Changes in Franz {version}",
  "feature.delayApp.action": "Get a Franz Supporter License",
  "feature.delayApp.headline": "Please purchase a Franz Supporter License to skip waiting",
  "feature.delayApp.text": "Franz will continue in {seconds} seconds.",
@@ -43,6 +44,7 @@
  "login.submit.label": "Sign in",
  "login.tokenExpired": "Your session expired, please login again.",
  "menu.app.about": "About Franz",
+  "menu.app.announcement": "What's new?",
  "menu.app.hide": "Hide",
  "menu.app.hideOthers": "Hide Others",
  "menu.app.quit": "Quit",
@@ -162,6 +164,7 @@
  "settings.app.headlineGeneral": "General",
  "settings.app.headlineLanguage": "Language",
  "settings.app.headlineUpdates": "Updates",
+  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
  "settings.app.restartRequired": "Changes require restart",
  "settings.app.subheadlineCache": "Cache",
  "settings.app.translationHelp": "Help us to translate Franz into your language.",
@@ -174,6 +177,7 @@
  "settings.navigation.inviteFriends": "Invite Friends",
  "settings.navigation.logout": "Logout",
  "settings.navigation.settings": "Settings",
+  "settings.navigation.team": "Manage Team",
  "settings.navigation.yourServices": "Your services",
  "settings.navigation.yourWorkspaces": "Your workspaces",
  "settings.recipes.all": "All services",
@@ -233,6 +237,12 @@
  "settings.services.tooltip.isMuted": "All sounds are muted",
  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
  "settings.services.updatedInfo": "Your changes have been saved",
+  "settings.team.contentHeadline": "Franz for Teams",
+  "settings.team.copy": "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+  "settings.team.headline": "Team",
+  "settings.team.intro": "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+  "settings.team.manageAction": "Manage your Team on meetfranz.com",
+  "settings.team.upgradeAction": "Upgrade your Account",
  "settings.user.form.accountType.company": "Company",
  "settings.user.form.accountType.individual": "Individual",
  "settings.user.form.accountType.label": "Account type",
@@ -282,6 +292,7 @@
  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
  "subscription.features.proxy": "Proxy support for services",
  "subscription.features.spellchecker": "Support for spellchecker",
+  "subscription.features.workspaces": "Organize your services in workspaces",
  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
  "subscription.paymentSessionError": "Could not initialize payment form",
  "subscription.submit.label": "I want to support the development of Franz",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 5c26b456c..4167a5c7d 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,21 +1,22 @@
 {
   "app.errorHandler.action" : "Recargar",
   "app.errorHandler.headline" : "Ha surgido un error",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Consigue una Licencia de Soporte de Franz",
   "feature.delayApp.headline" : "Por favor, compra una Licencia de Soporte de Franz para saltar la espera",
   "feature.delayApp.text" : "Franz continuará en {seconds} segundos.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Envía como correo",
   "feature.shareFranz.action.facebook" : "Compartir en Facebook",
   "feature.shareFranz.action.twitter" : "Compartir en Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "¡Juntos mejoramos Franz!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "¡He añadido {count} servicios a Franz! Obtén la aplicación gratuita para WhatsApp, Messenger, Slack, Skype en www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "Dile a tus amigos y colegas lo asombroso que es Franz y ayúdanos a correr la voz.",
   "global.api.unhealthy" : "No es posible conectarse a los servicios en línea de Franz.",
   "global.notConnectedToTheInternet" : "No estás conectado a Internet",
   "global.spellchecker.useDefault" : "Utilizar estándar del sistema ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Detectar el idioma automáticamente",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "Automático",
   "global.spellchecking.language" : "Corrector de ortografía",
   "import.headline" : "Importa tus servicios de Franz 4",
   "import.notSupportedHeadline" : "Servicios no admitidos aún en Franz 5",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Iniciar sesión",
   "login.tokenExpired" : "Tu sesión ha expirado, por favor inicia sesión de nuevo.",
   "menu.app.about" : "Sobre Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Ocultar",
   "menu.app.hideOthers" : "Ocultar otros",
   "menu.app.quit" : "Salir",
@@ -70,9 +72,9 @@
   "menu.help.support" : "Ayuda técnica",
   "menu.help.tos" : "Términos del Servicio",
   "menu.services" : "Servicios",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Activa el servicio previo",
   "menu.services.addNewService" : "Añadir Nuevo Servicio...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Activa el siguiente servicio",
   "menu.view" : "Mostrar",
   "menu.view.enterFullScreen" : "Pasar a pantalla completa",
   "menu.view.exitFullScreen" : "Salir de Pantalla Completa",
@@ -87,6 +89,11 @@
   "menu.window" : "Ventana",
   "menu.window.close" : "Cerrar",
   "menu.window.minimize" : "Minimizar",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Todos los servicios",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Dirección de correo electrónico",
   "password.headline" : "Restablecer contraseña",
   "password.link.login" : "Inicia sesión en tu cuenta",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "¡Oh, no!",
   "service.errorHandler.message" : "Error",
   "service.errorHandler.text" : "{name} ha fallado la carga",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Primeros pasos",
   "services.welcome" : "Bienvenido a Franz",
   "settings.account.account.editButton" : "Editar cuenta",
@@ -131,7 +139,7 @@
   "settings.account.manageSubscription.label" : "Administra tu suscripción",
   "settings.account.successInfo" : "Tus cambios han sido guardados",
   "settings.account.tryReloadServices" : "Intentar de nuevo",
-   "settings.account.tryReloadUserInfoRequest" : "Intentar de nuevo",
+   "settings.account.tryReloadUserInfoRequest" : "Intenta de nuevo",
   "settings.account.userInfoRequestFailed" : "No se pudo cargar la información de usuario",
   "settings.app.buttonClearAllCache" : "Limpiar caché",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar actualizaciones",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "General",
   "settings.app.headlineLanguage" : "Idioma",
   "settings.app.headlineUpdates" : "Actualizaciones",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Los cambios requieren reiniciar",
   "settings.app.subheadlineCache" : "Caché",
   "settings.app.translationHelp" : "Ayúdanos a traducir Franz a tu idioma.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Invita a tus amigos",
   "settings.navigation.logout" : "Cerrar sesión",
   "settings.navigation.settings" : "Configuración",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Tus servicios",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Todos los servicios",
   "settings.recipes.dev" : "Desarrollo",
   "settings.recipes.headline" : "Servicios disponibles",
@@ -221,11 +232,17 @@
   "settings.services.discoverServices" : "Descubrir servicios",
   "settings.services.headline" : "Tus servicios",
   "settings.services.noServicesAdded" : "No has añadido ningún servicio aún.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "No pudo cargar tus servicios",
   "settings.services.tooltip.isDisabled" : "El servicio está desactivado",
   "settings.services.tooltip.isMuted" : "Todos los sonidos están silenciados",
   "settings.services.tooltip.notificationsDisabled" : "Las notificaciones están desactivadas",
   "settings.services.updatedInfo" : "Tus cambios han sido guardados",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equipo",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Empresa",
   "settings.user.form.accountType.individual" : "Individual",
   "settings.user.form.accountType.label" : "Tipo de cuenta",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Nombre",
   "settings.user.form.lastname" : "Apellido",
   "settings.user.form.newPassword" : "Nueva contraseña",
+   "settings.workspace.add.form.name" : "Nombre",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nombre",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspaces.updatedInfo" : "Tus cambios han sido guardados",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Añadir nuevo servicio",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Desactivar notificaciones y sonido",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Configuración",
   "sidebar.unmuteApp" : "Activar notificaciones y sonido",
   "signup.company.label" : "Compañía",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Agregar servicios de almacenamiento como Mattermost",
   "subscription.features.proxy" : "Soporte Proxy para servicios",
   "subscription.features.spellchecker" : "Soporte para corrector de ortografía",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Franz incluye",
   "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
   "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
@@ -277,9 +312,20 @@
   "tabs.item.reload" : "Recargar",
   "validation.email" : "{field} no es válido",
   "validation.minLength" : "{field} debería tener al menos {length} caracteres",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Al menos uno es requerido",
   "validation.required" : "{field} es obligatorio",
   "validation.url" : "{field} no es una URL válida",
   "welcome.loginButton" : "Accede a tu cuenta",
-   "welcome.signupButton" : "Crear una cuenta gratuita"
+   "welcome.signupButton" : "Crear una cuenta gratuita",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Todos los servicios",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 6f9d81713..2bd5326c0 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Recharger",
   "app.errorHandler.headline" : "Une erreur s'est produite",
+   "feature.announcements.changelog.headline" : "Changements dans Franz {version}",
   "feature.delayApp.action" : "Obtenez une licence de Supporter Franz",
   "feature.delayApp.headline" : "Veuillez acheter une licence de Supporter Franz pour sauter le temps d'attente",
   "feature.delayApp.text" : "Franz reprendra dans {seconds} secondes.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Partager sur Twitter",
   "feature.shareFranz.headline" : "Franz est meilleur quand on est tous ensemble !",
   "feature.shareFranz.shareText.email" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz ! Télécharger l'appli gratuite pour WhatsApp, Messenger, Skype et cie sur www.meetfranz.com \/cc @NeetFranz",
+   "feature.shareFranz.shareText.twitter" : "J'ai ajouté {count} services à Franz! Télécharge l'application gratuite pour WhatsApp, Messenger, Slack, Skype et compagnie sur www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Dites à vos amis et collègues combien Franz est super et aidez nous à faire passer le mot.",
   "global.api.unhealthy" : "Impossible de se connecter aux services en ligne de Franz",
   "global.notConnectedToTheInternet" : "Vous n'êtes pas connecté à Internet.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Se connecter",
   "login.tokenExpired" : "Votre session a expiré, veuillez vous reconnecter.",
   "menu.app.about" : "À propos de Franz",
+   "menu.app.announcement" : "Quoi de neuf? ",
   "menu.app.hide" : "Masquer",
   "menu.app.hideOthers" : "Masquer les autres",
   "menu.app.quit" : "Quitter",
@@ -70,9 +72,9 @@
   "menu.help.support" : "Support",
   "menu.help.tos" : "Conditions d'utilisation",
   "menu.services" : "Services",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Activer le service précédent",
   "menu.services.addNewService" : "Ajouter un nouveau service...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Activer le service suivant",
   "menu.view" : "Aperçu",
   "menu.view.enterFullScreen" : "Entrer en mode plein écran",
   "menu.view.exitFullScreen" : "Sortir du mode plein écran",
@@ -87,13 +89,18 @@
   "menu.window" : "Fenêtre",
   "menu.window.close" : "Fermer",
   "menu.window.minimize" : "Réduire",
-   "password.email.label" : "Adresse e-mail",
+   "menu.workspaces" : "Espace de travail",
+   "menu.workspaces.addNewWorkspace" : "Ajouter un nouvel espace de travail",
+   "menu.workspaces.closeWorkspaceDrawer" : "Ouvrir l'espace de travail",
+   "menu.workspaces.defaultWorkspace" : "Tous les services",
+   "menu.workspaces.openWorkspaceDrawer" : "Fermer l'espace de travail",
+   "password.email.label" : "Adresse email",
   "password.headline" : "Réinitialiser le mot de passe",
   "password.link.login" : "Connectez-vous à votre compte",
   "password.link.signup" : "Créer un compte gratuit.",
-   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse e-mail",
+   "password.noUser" : "Aucun utilisateur n'a été trouvé avec cette adresse email",
   "password.submit.label" : "Soumettre",
-   "password.successInfo" : "Merci de consulter vos e-mails",
+   "password.successInfo" : "Merci de consulter vos emails",
   "premiumFeature.button.upgradeAccount" : "Mettre à niveau mon compte",
   "pricing.headline" : "Soutenez Franz",
   "pricing.link.skipPayment" : "Je ne veux pas soutenir le développement de Franz.",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oh non !",
   "service.errorHandler.message" : "Erreur",
   "service.errorHandler.text" : "Le chargement de {name} a échoué.",
+   "service.webviewLoader.loading" : "Chargement (c'est l'heure du café...)",
   "services.getStarted" : "Commencer",
   "services.welcome" : "Bienvenue dans Franz",
   "settings.account.account.editButton" : "Modifier le compte",
@@ -121,7 +129,7 @@
   "settings.account.deleteInfo" : "Si vous n'avez plus besoin de votre compte Franz, vous pouvez le supprimer avec toutes ses données associées.",
   "settings.account.headline" : "Compte",
   "settings.account.headlineAccount" : "Informations sur le compte",
-   "settings.account.headlineDangerZone" : "Zone Dangereuse !",
+   "settings.account.headlineDangerZone" : "Zone dangereuse !",
   "settings.account.headlineInvoices" : "Factures",
   "settings.account.headlinePassword" : "Changer le mot de passe",
   "settings.account.headlineProfile" : "Mettre à jour le profil",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Général",
   "settings.app.headlineLanguage" : "Langue",
   "settings.app.headlineUpdates" : "Mises à jour",
+   "settings.app.languageDisclaimer" : "Les traductions officielles sont l'anglais et l'allemand. Toutes les autres langues sont des traductions faites par la communauté.",
   "settings.app.restartRequired" : "Les modifications nécessitent un redémarrage",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Aidez-nous à traduire Franz dans votre langue.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Inviter des amis",
   "settings.navigation.logout" : "Se déconnecter",
   "settings.navigation.settings" : "Paramètres",
+   "settings.navigation.team" : "Gérer l'équipe",
   "settings.navigation.yourServices" : "Vos services",
+   "settings.navigation.yourWorkspaces" : "Tes espaces de travail",
   "settings.recipes.all" : "Tous les services",
   "settings.recipes.dev" : "Développement",
   "settings.recipes.headline" : "Services disponibles",
@@ -203,7 +214,7 @@
   "settings.service.form.indirectMessages" : "Afficher le badge des messages pour tous les nouveaux messages",
   "settings.service.form.isMutedInfo" : "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
   "settings.service.form.name" : "Nom",
-   "settings.service.form.proxy.headline" : "Paramètres Proxy HTTP\/HTTPS",
+   "settings.service.form.proxy.headline" : "Paramètres proxy HTTP\/HTTPS",
   "settings.service.form.proxy.host" : "Hôte\/IP du proxy",
   "settings.service.form.proxy.info" : "Les paramètres de proxy ne seront pas synchronisés avec les serveurs de Franz.",
   "settings.service.form.proxy.isEnabled" : "Utiliser un proxy",
@@ -213,7 +224,7 @@
   "settings.service.form.proxy.user" : "Utilisateur (facultatif)",
   "settings.service.form.saveButton" : "Enregistrer le service",
   "settings.service.form.tabHosted" : "Hébergé",
-   "settings.service.form.tabOnPremise" : "Auto-hébergé ⭐️",
+   "settings.service.form.tabOnPremise" : "hébergé par soi-même ⭐️",
   "settings.service.form.team" : "Équipe",
   "settings.service.form.useHostedService" : "Utilisez le service hébergé {name}.",
   "settings.service.form.yourServices" : "Vos services",
@@ -221,27 +232,50 @@
   "settings.services.discoverServices" : "Découvrir les services",
   "settings.services.headline" : "Vos services",
   "settings.services.noServicesAdded" : "Vous n'avez pas encore ajouté de services.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Impossible de charger vos services",
   "settings.services.tooltip.isDisabled" : "Ce service est désactivé",
   "settings.services.tooltip.isMuted" : "Tous les sons sont coupés",
   "settings.services.tooltip.notificationsDisabled" : "Notifications désactivées.",
   "settings.services.updatedInfo" : "Vos modifications ont été enregistrées",
+   "settings.team.contentHeadline" : "Franz pour les équipes",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Équipe de travail",
+   "settings.team.intro" : "Tu peux désormais gérer les abonnements Premium pour autant de collègues, amis ou membres de famille que tu souhaites, à partir d'un seul et même compte.",
+   "settings.team.manageAction" : "Gère ton équipe sur meetfranz.com",
+   "settings.team.upgradeAction" : "Mise à niveau du compte",
   "settings.user.form.accountType.company" : "Entreprise",
   "settings.user.form.accountType.individual" : "Individuel",
   "settings.user.form.accountType.label" : "Type de compte",
   "settings.user.form.accountType.non-profit" : "Non-lucratif",
   "settings.user.form.currentPassword" : "Mot de passe actuel",
-   "settings.user.form.email" : "E-mail",
+   "settings.user.form.email" : "Email",
   "settings.user.form.firstname" : "Prénom",
   "settings.user.form.lastname" : "Nom",
   "settings.user.form.newPassword" : "Nouveau mot de passe",
+   "settings.workspace.add.form.name" : "Nom",
+   "settings.workspace.add.form.submitButton" : "Créer un espace de travail",
+   "settings.workspace.form.buttonDelete" : "Effacer l'espace de travail",
+   "settings.workspace.form.buttonSave" : "Sauvegarder l'espace de travail",
+   "settings.workspace.form.name" : "Nom",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Tes espaces de travail",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Vos espaces de travails",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Réessayer",
+   "settings.workspaces.updatedInfo" : "Vos modifications ont été enregistrées",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Ajouter un nouveau service",
+   "sidebar.closeWorkspaceDrawer" : "Ouvrir l'espace de travail",
   "sidebar.muteApp" : "Désactiver les notifications et les sons",
+   "sidebar.openWorkspaceDrawer" : "Fermer l'espace de travail",
   "sidebar.settings" : "Paramètres",
   "sidebar.unmuteApp" : "Activer les notifications et les sons",
   "signup.company.label" : "Entreprise",
-   "signup.email.label" : "Adresse e-mail",
+   "signup.email.label" : "Adresse email",
-   "signup.emailDuplicate" : "Cette adresse e-mail est déjà utilisée",
+   "signup.emailDuplicate" : "Cette adresse email est déjà utilisée",
   "signup.firstname.label" : "Prénom",
   "signup.headline" : "S'inscrire",
   "signup.lastname.label" : "Nom",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Ajouter des services auto-hébergés comme Mattermost",
   "subscription.features.proxy" : "Support proxy pour les services",
   "subscription.features.spellchecker" : "Prise en charge du correcteur orthographique",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
   "subscription.paymentSessionError" : "Initialisation du paiement impossible",
   "subscription.submit.label" : "Je souhaite aider au développement de Franz",
@@ -277,9 +312,20 @@
   "tabs.item.reload" : "Recharger",
   "validation.email" : "{field} n'est pas valide",
   "validation.minLength" : "{field} doit contenir au moins {length} caractère(s)",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Au moins un de ces champs est requis",
   "validation.required" : "{field} est requis",
   "validation.url" : "{field} n'est pas une URL valide",
   "welcome.loginButton" : "Se connecter sur son compte",
-   "welcome.signupButton" : "Créer un compte gratuit"
+   "welcome.signupButton" : "Créer un compte gratuit",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tous les services",
+   "workspaceDrawer.headline" : "Espace de travail",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index eb7c04491..3f1e827fb 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Athlódáil",
   "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Ní féidir nascadh le seirbhísí Franz ar líne",
   "global.notConnectedToTheInternet" : "Níl tú nasctha leis an Idirlíon.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Logáil isteach",
   "login.tokenExpired" : "D'éag do sheisiún, logáil isteach arís le do thoil.",
   "menu.app.about" : "Faoi Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Cuir Franz i bhfolach",
   "menu.app.hideOthers" : "Folaigh feidhmchláir eile",
   "menu.app.quit" : "Scoir",
@@ -87,6 +89,11 @@
   "menu.window" : "Fuinneog",
   "menu.window.close" : "Dún",
   "menu.window.minimize" : "Íoslaghdaigh",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Gach seirbhís",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Seoladh ríomhphoist",
   "password.headline" : "Athshocraigh pasfhocal",
   "password.link.login" : "Logáil isteach i do chuntas",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oró, ní hea!",
   "service.errorHandler.message" : "Earráid",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Cuir tús",
   "services.welcome" : "Fáilte go Franz",
   "settings.account.account.editButton" : "Cuir cuntas in eagar",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Ginearálta",
   "settings.app.headlineLanguage" : "Teanga",
   "settings.app.headlineUpdates" : "Nuashonruithe",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Ní gá atosú chun athruithe a chur i bhfeidhm.",
   "settings.app.subheadlineCache" : "Taisce",
   "settings.app.translationHelp" : "Cabhraigh linn Franz a aistriú i do theanga.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Tabhair cuireadh do chairde",
   "settings.navigation.logout" : "Logáil amach",
   "settings.navigation.settings" : "Socruithe",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Do sheirbhísí",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Gach seirbhís",
   "settings.recipes.dev" : "Forbairt",
   "settings.recipes.headline" : "Seirbhísí le fáil",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Tachtar gach fuaim",
   "settings.services.tooltip.notificationsDisabled" : "Fógraí dhíchumasaithe",
   "settings.services.updatedInfo" : "Sábháiltear do chuid athruithe",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Foireann",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Comhlacht",
   "settings.user.form.accountType.individual" : "Ar leith",
   "settings.user.form.accountType.label" : "Cineál chuntais",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Céadainm",
   "settings.user.form.lastname" : "Sloinne",
   "settings.user.form.newPassword" : "Pasfhocal nua",
+   "settings.workspace.add.form.name" : "Ainm",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ainm",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Atriail",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Cuir seirbhís nua leis",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Díchumasaigh fógraí ⁊ fuaim",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Socruithe",
   "sidebar.unmuteApp" : "Cumasaigh fógraí ⁊ fuaim",
   "signup.company.label" : "Comhlacht",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhthacadóra Franz san áireamh",
   "subscription.paymentSessionError" : "Ní féidir an bhfoirm íocaíochta a lódáil",
   "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "Tá {field} de dhíth",
   "validation.url" : "Ní AAA bhailí é {field}",
   "welcome.loginButton" : "Logáil isteach i do chuntas",
-   "welcome.signupButton" : "Cruthaigh cuntas nua"
+   "welcome.signupButton" : "Cruthaigh cuntas nua",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Gach seirbhís",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 95920c4ce..468238166 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Ponovno učitavanje",
   "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Nije se moguće povezati na Francove on-line servise. ",
   "global.notConnectedToTheInternet" : "Sada ste povezani s internetom. ",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Prijavite se",
   "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
   "menu.app.about" : "O aplikaciji",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Hide",
   "menu.app.hideOthers" : "Hide Others",
   "menu.app.quit" : "Quit",
@@ -87,6 +89,11 @@
   "menu.window" : "Window",
   "menu.window.close" : "Close",
   "menu.window.minimize" : "Minimize",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Sve usluge",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Vaša e-adresa",
   "password.headline" : "Stvorite novu zaporku",
   "password.link.login" : "Prijavite se na Vaš račun",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "O, ne! ",
   "service.errorHandler.message" : "Greška",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Započnimo!",
   "services.welcome" : "Dobrodošli u Franz",
   "settings.account.account.editButton" : "Uredi račun",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Općenito",
   "settings.app.headlineLanguage" : "Jezik",
   "settings.app.headlineUpdates" : "Nadogradnje",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni zagon",
   "settings.app.subheadlineCache" : "Predmemorija",
   "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Pozovi prijatelje",
   "settings.navigation.logout" : "Odjava",
   "settings.navigation.settings" : "Postavke",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Vaše usluge",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Sve usluge",
   "settings.recipes.dev" : "Razvoj",
   "settings.recipes.headline" : "Dostupne usluge",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni. ",
   "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
   "settings.services.updatedInfo" : "Vaše promjene su pohranjene. ",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tim",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Tvrtka",
   "settings.user.form.accountType.individual" : "Pojedinac",
   "settings.user.form.accountType.label" : "Tip računa",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Ime",
   "settings.user.form.lastname" : "Prezime",
   "settings.user.form.newPassword" : "Nova lozinka",
+   "settings.workspace.add.form.name" : "Ime",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ime",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Pokušajte ponovno",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Ugasi obavijesti i zvuk",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Postavke",
   "sidebar.unmuteApp" : "Omogući obavijesti i zvuk",
   "signup.company.label" : "Tvrtka",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Plaćeni\/Premium račun uključuje sljedeće: ",
   "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
   "subscription.submit.label" : "Želim da podržim razvoj Franca. ",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} is required",
   "validation.url" : "{field} is not a valid URL",
   "welcome.loginButton" : "Prijavite se na račun",
-   "welcome.signupButton" : "Stvorite novi korisnički račun"
+   "welcome.signupButton" : "Stvorite novi korisnički račun",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Sve usluge",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index bce9a368e..b28dcb17a 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Újratöltés",
   "app.errorHandler.headline" : "Valami nem jött össze",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Szerezz egy Franz Támogatói Liszencet",
   "feature.delayApp.headline" : "Kérjük vásárolj egy Franc Támogatói Liszencet a várakozás átugrásához",
   "feature.delayApp.text" : "A Franz továbblép {seconds} másodperc múlva.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Nem lehet csatlakozni a Franz online szolgáltatáshoz",
   "global.notConnectedToTheInternet" : "Nincs hálózati kapcsolat.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Bejelentkezés",
   "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.",
   "menu.app.about" : "Névjegy",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Elrejt",
   "menu.app.hideOthers" : "Többi elrejtése",
   "menu.app.quit" : "Kilépés",
@@ -87,6 +89,11 @@
   "menu.window" : "Ablak",
   "menu.window.close" : "Bezárás",
   "menu.window.minimize" : "Tálcára",
+   "menu.workspaces" : "Munkaterületek",
+   "menu.workspaces.addNewWorkspace" : "Új munkaterület...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Munkaterület panel bezárása",
+   "menu.workspaces.defaultWorkspace" : "Összes szolgáltatás",
+   "menu.workspaces.openWorkspaceDrawer" : "Munkaterület panel kinyitása",
   "password.email.label" : "Email cím",
   "password.headline" : "Jelszó visszaállítása",
   "password.link.login" : "Jelentkezz be a fiókodba",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Jajj ne!",
   "service.errorHandler.message" : "Hiba",
   "service.errorHandler.text" : "{name} nem tudott betöltődni.",
+   "service.webviewLoader.loading" : "Betöltés",
   "services.getStarted" : "Kezdj hozzá",
   "services.welcome" : "Üdvözöl a Franz",
   "settings.account.account.editButton" : "Fiók szerkesztése",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Általános",
   "settings.app.headlineLanguage" : "Nyelv",
   "settings.app.headlineUpdates" : "Frissítések",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Újraindítást igénylő módosítás",
   "settings.app.subheadlineCache" : "Gyorsítótár",
   "settings.app.translationHelp" : "Segíts nekünk a Franz-ot lefordítani a nyelvedre.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Barát meghívása",
   "settings.navigation.logout" : "Kijelentkezés",
   "settings.navigation.settings" : "Beállítások",
+   "settings.navigation.team" : "Csapat kezelése",
   "settings.navigation.yourServices" : "Szolgáltatásaid",
+   "settings.navigation.yourWorkspaces" : "Munkaterületeid",
   "settings.recipes.all" : "Összes szolgáltatás",
   "settings.recipes.dev" : "Fejlesztés",
   "settings.recipes.headline" : "Elérhető szolgáltatások",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Minden hang lenémítva",
   "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva",
   "settings.services.updatedInfo" : "A módosításokat elmentettük",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Csapat",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Cég",
   "settings.user.form.accountType.individual" : "Egyén",
   "settings.user.form.accountType.label" : "Fiók típusa",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Keresztnév",
   "settings.user.form.lastname" : "Vezetéknév",
   "settings.user.form.newPassword" : "Új jelszó",
+   "settings.workspace.add.form.name" : "Név",
+   "settings.workspace.add.form.submitButton" : "Új munkaterület",
+   "settings.workspace.form.buttonDelete" : "Munkaterület törlése",
+   "settings.workspace.form.buttonSave" : "Munkaterület mentése",
+   "settings.workspace.form.name" : "Név",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Szolgáltatások ezen a Munkaterületen",
+   "settings.workspace.form.yourWorkspaces" : "Munkaterületeid",
+   "settings.workspaces.deletedInfo" : "Munkaterület törölve",
+   "settings.workspaces.headline" : "Munkaterületeid",
+   "settings.workspaces.noWorkspacesAdded" : "Még nem hoztál létre munkaterületeket.",
+   "settings.workspaces.tryReloadWorkspaces" : "Próbáld újra",
+   "settings.workspaces.updatedInfo" : "A módosításokat elmentettük",
+   "settings.workspaces.workspaceFeatureHeadline" : "A kevesebb több: Bemutatjuk a Franz Munkaterületeket",
+   "settings.workspaces.workspaceFeatureInfo" : "A Franz Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor. Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.",
+   "settings.workspaces.workspacesRequestFailed" : "Nem sikerült betölteni a munkaterületeket",
   "sidebar.addNewService" : "Szolgáltatás hozzáadása",
+   "sidebar.closeWorkspaceDrawer" : "Munkaterület panel bezárása",
   "sidebar.muteApp" : "Értesítések és hangok letiltása",
+   "sidebar.openWorkspaceDrawer" : "Munkaterület panel megnyitása",
   "sidebar.settings" : "Beállítások",
   "sidebar.unmuteApp" : "Értesítések és hangok engedélyezése",
   "signup.company.label" : "Cég",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost",
   "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz",
   "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
   "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
   "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} kitöltése kötelező",
   "validation.url" : "{field} nem érvényes URL",
   "welcome.loginButton" : "Jelentkezz be a fiókodba",
-   "welcome.signupButton" : "Új fiók létrehozása"
+   "welcome.signupButton" : "Új fiók létrehozása",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Összes szolgáltatás",
+   "workspaceDrawer.headline" : "Munkaterületek",
+   "workspaceDrawer.item.contextMenuEdit" : "szerkeszt",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Készítsd el az első munkaterületedet",
+   "workspaceDrawer.proFeatureBadge" : "Prémium funkció",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Prémium fiók reaktiválása",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Munkaterület beállítások szerkesztése",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 73271dceb..e7a46e5e9 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,27 +1,28 @@
 {
   "app.errorHandler.action" : "Muat Ulang",
   "app.errorHandler.headline" : "Terjadi kesalahan",
-   "feature.delayApp.action" : "Dapatkan Franz Supporter License",
+   "feature.announcements.changelog.headline" : "Perubahan dalam Franz {version}",
-   "feature.delayApp.headline" : "Beli Franz Supporter License agar tidak perlu menunggu",
+   "feature.delayApp.action" : "Dapatkan Lisensi Pendukung Franz",
+   "feature.delayApp.headline" : "Beli Lisensi Pendukung Franz agar tidak perlu menunggu",
   "feature.delayApp.text" : "Franz akan melanjutkan dalam {seconds} detik.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Kirim sebagai email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Bagikan di Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Bagikan di Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "Franz lebih baik bersama!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Saya telah menambahkan layanan {count} ke Franz! Dapatkan aplikasi gratis untuk WhatsApp, Messenger, Slack, Skype dan co di www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "Beri tahu teman dan kolega Anda betapa hebatnya Franz dan bantu kami menyebarkan berita.",
   "global.api.unhealthy" : "Tidak dapat tersambung ke layanan Franz",
   "global.notConnectedToTheInternet" : "Anda tidak tersambung ke internet.",
   "global.spellchecker.useDefault" : "Gunakan Bawaan Sistem ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Deteksi bahasa secara otomatis",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "Otomatis",
   "global.spellchecking.language" : "Periksa ejaan",
   "import.headline" : "Impor layanan Franz 4 Anda",
   "import.notSupportedHeadline" : "Layanan belum didukung di Franz 5",
   "import.skip.label" : "Saya ingin menambahkan layanan secara manual",
   "import.submit.label" : "Impor layanan",
-   "infobar.buttonChangelog" : "Apa yang baru?",
+   "infobar.buttonChangelog" : "Yang baru",
   "infobar.buttonInstallUpdate" : "Mulai ulang & instal pembaruan",
   "infobar.buttonReloadServices" : "Muat ulang layanan",
   "infobar.requiredRequestsFailed" : "Gagal memuat layanan dan informasi pengguna",
@@ -30,12 +31,12 @@
   "invite.email.label" : "Alamat email",
   "invite.headline.friends" : "Undang 3 teman atau kolega Anda",
   "invite.name.label" : "Nama",
-   "invite.skip.label" : "Nanti saja",
+   "invite.skip.label" : "Saya ingin melakukan ini nanti",
   "invite.submit.label" : "Kirim undangan",
   "invite.successInfo" : "Undangan berhasil dikirim",
   "login.email.label" : "Alamat email",
   "login.headline" : "Masuk",
-   "login.invalidCredentials" : "Email atau sandi salah",
+   "login.invalidCredentials" : "Email atau kata sandi tidak valid",
   "login.link.password" : "Setel ulang sandi",
   "login.link.signup" : "Buat akun gratis",
   "login.password.label" : "Sandi",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Masuk",
   "login.tokenExpired" : "Sesi Anda telah kedaluwarsa, silakan masuk kembali.",
   "menu.app.about" : "Tentang Franz",
+   "menu.app.announcement" : "Yang baru",
   "menu.app.hide" : "Sembunyikan",
   "menu.app.hideOthers" : "Sembunyikan Lainnya",
   "menu.app.quit" : "Keluar",
@@ -70,9 +72,9 @@
   "menu.help.support" : "Dukungan",
   "menu.help.tos" : "Ketentuan Layanan",
   "menu.services" : "Layanan",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Aktifkan layanan sebelumnya",
   "menu.services.addNewService" : "Tambahkan Layanan Baru...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Aktifkan layanan berikutnya",
   "menu.view" : "Tampilan",
   "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh",
   "menu.view.exitFullScreen" : "Keluar dari Layar Penuh",
@@ -87,6 +89,11 @@
   "menu.window" : "Jendela",
   "menu.window.close" : "Tutup",
   "menu.window.minimize" : "Minimalkan",
+   "menu.workspaces" : "Ruang kerja",
+   "menu.workspaces.addNewWorkspace" : "Tambah Ruang Kerja Baru...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Tutup laci ruang kerja",
+   "menu.workspaces.defaultWorkspace" : "Semua layanan",
+   "menu.workspaces.openWorkspaceDrawer" : "Buka laci ruang kerja",
   "password.email.label" : "Alamat email",
   "password.headline" : "Setel ulang sandi",
   "password.link.login" : "Masuk ke akun Anda",
@@ -110,14 +117,15 @@
   "service.errorHandler.headline" : "Oh tidak!",
   "service.errorHandler.message" : "Kesalahan",
   "service.errorHandler.text" : "{name} gagal dimuat",
-   "services.getStarted" : "Ayo mulai!",
+   "service.webviewLoader.loading" : "Memuat",
+   "services.getStarted" : "Memulai",
   "services.welcome" : "Selamat datang di Franz",
   "settings.account.account.editButton" : "Edit akun",
   "settings.account.accountType.basic" : "Akun Dasar",
   "settings.account.accountType.premium" : "Akun Pendukung Premium",
   "settings.account.buttonSave" : "Perbarui profil",
   "settings.account.deleteAccount" : "Hapus akun",
-   "settings.account.deleteEmailSent" : "Anda akan menerima email yang berisi tautan untuk melakukan konfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
+   "settings.account.deleteEmailSent" : "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
   "settings.account.deleteInfo" : "Jika Anda tidak membutuhkan akun Franz lagi, Anda bisa menghapus akun dan semua data terkait di sini.",
   "settings.account.headline" : "Akun",
   "settings.account.headlineAccount" : "Informasi akun",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Umum",
   "settings.app.headlineLanguage" : "Bahasa",
   "settings.app.headlineUpdates" : "Versi Baru",
+   "settings.app.languageDisclaimer" : "Penerjemahan resmi dilakukan untuk Bahasa Inggris dan Jerman. Bahasa lainnya merupakan penerjemahan oleh komunitas.",
   "settings.app.restartRequired" : "Perubahan membutuhkan mulai ulang",
   "settings.app.subheadlineCache" : "Singgahan",
   "settings.app.translationHelp" : "Bantu kami menerjemahkan Franz ke bahasa Anda.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Undang Teman",
   "settings.navigation.logout" : "Keluar",
   "settings.navigation.settings" : "Pengaturan",
+   "settings.navigation.team" : "Kelola Tim",
   "settings.navigation.yourServices" : "Layanan Anda",
+   "settings.navigation.yourWorkspaces" : "Ruang kerja Anda",
   "settings.recipes.all" : "Semua layanan",
   "settings.recipes.dev" : "Pengembangan",
   "settings.recipes.headline" : "Layanan tersedia",
@@ -221,11 +232,17 @@
   "settings.services.discoverServices" : "Temukan layanan",
   "settings.services.headline" : "Layanan Anda",
   "settings.services.noServicesAdded" : "Anda belum menambahkan layanan apa pun.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Tidak dapat memuat layanan Anda",
   "settings.services.tooltip.isDisabled" : "Layanan dinonaktifkan",
   "settings.services.tooltip.isMuted" : "Semua suara dibisukan",
   "settings.services.tooltip.notificationsDisabled" : "Pemberitahuan dinonaktifkan",
   "settings.services.updatedInfo" : "Perubahan telah disimpan",
+   "settings.team.contentHeadline" : "Franz untuk Tim",
+   "settings.team.copy" : "Franz untuk Tim menyediakan opsi untuk mengundang rekan kerja ke tim Anda dengan mengirimkan undangan email dan mengelola langganan mereka pada preferensi akun Anda. Jangan habiskan waktu Anda menyiapkan langganan bagi masing-masing anggota tim, lupakan berbagai faktur dan periode penagihan - satu tim untuk semua!",
+   "settings.team.headline" : "Tim",
+   "settings.team.intro" : "Anda dan tim Anda menggunakan Franz? Kini Anda bisa mengelola langganan Premium untuk semua rekan kerja, teman, atau anggota keluar sebanyak yang Anda inginkan, semuanya cukup dari satu akun.",
+   "settings.team.manageAction" : "Kelola Tim Anda di meetfranz.com",
+   "settings.team.upgradeAction" : "Tingkatkan Akun Anda",
   "settings.user.form.accountType.company" : "Perusahaan",
   "settings.user.form.accountType.individual" : "Pribadi",
   "settings.user.form.accountType.label" : "Jenis akun",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Nama Depan",
   "settings.user.form.lastname" : "Nama Belakang",
   "settings.user.form.newPassword" : "Sandi baru",
+   "settings.workspace.add.form.name" : "Nama",
+   "settings.workspace.add.form.submitButton" : "Buat ruang kerja",
+   "settings.workspace.form.buttonDelete" : "Hapus ruang kerja",
+   "settings.workspace.form.buttonSave" : "Simpan ruang kerja",
+   "settings.workspace.form.name" : "Nama",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Layanan dalam Ruang Kerja ini",
+   "settings.workspace.form.yourWorkspaces" : "Ruang kerja Anda",
+   "settings.workspaces.deletedInfo" : "Ruang kerja telah dihapus",
+   "settings.workspaces.headline" : "Ruang kerja Anda",
+   "settings.workspaces.noWorkspacesAdded" : "Anda belum menambahkan ruang kerja.",
+   "settings.workspaces.tryReloadWorkspaces" : "Coba lagi",
+   "settings.workspaces.updatedInfo" : "Perubahan Anda telah disimpan",
+   "settings.workspaces.workspaceFeatureHeadline" : "Sedikit Namun Banyak: Memperkenalkan Ruang Kerja Franz",
+   "settings.workspaces.workspaceFeatureInfo" : "Ruang Kerja Franz dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain. Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.",
+   "settings.workspaces.workspacesRequestFailed" : "Tidak dapat memuat ruang kerja Anda",
   "sidebar.addNewService" : "Tambahkan layanan baru",
+   "sidebar.closeWorkspaceDrawer" : "Tutup laci ruang kerja",
   "sidebar.muteApp" : "Nonaktifkan pemberitahuan & audio",
+   "sidebar.openWorkspaceDrawer" : "Buka laci ruang kerja",
   "sidebar.settings" : "Pengaturan",
   "sidebar.unmuteApp" : "Aktifkan pemberitahuan",
   "signup.company.label" : "Perusahaan",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost",
   "subscription.features.proxy" : "Dukungan proksi untuk layanan",
   "subscription.features.spellchecker" : "Dukungan pengecek ejaan",
+   "subscription.features.workspaces" : "Kelola layanan Anda dalam ruang kerja",
   "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
   "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
   "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
@@ -277,9 +312,20 @@
   "tabs.item.reload" : "Muat Ulang",
   "validation.email" : "{field} tidak benar",
   "validation.minLength" : "{field} setidaknya harus {length} karakter",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Setidaknya diperlukan satu",
   "validation.required" : "{field} wajib diisi",
   "validation.url" : "{field} bukan URL yang benar",
   "welcome.loginButton" : "Masuk ke akun Anda",
-   "welcome.signupButton" : "Buat akun gratis"
+   "welcome.signupButton" : "Buat akun gratis",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Tambah ruang kerja baru",
+   "workspaceDrawer.allServices" : "Semua layanan",
+   "workspaceDrawer.headline" : "Ruang kerja",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "Belum ada layanan yang ditambahkan",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Buat ruang kerja pertama Anda",
+   "workspaceDrawer.proFeatureBadge" : "Fitur premium",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Aktifkan ulang akun premium",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Ruang Kerja Franz dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain.<\/p><p>Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit setelan ruang kerja",
+   "workspaces.switchingIndicator.switchingTo" : "Beralih ke"
 }
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 71150483c..c12641e36 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,21 +1,22 @@
 {
   "app.errorHandler.action" : "Ricarica",
   "app.errorHandler.headline" : "Qualcosa è andato storto",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Ricevi una Licenza Supporter di Franz",
   "feature.delayApp.headline" : "Per favore, compra una Licenza Supporter di Franz per saltare l'attesa",
   "feature.delayApp.text" : "Franz continuerà a funzionare tra {seconds} secondi.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Manda come email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Condividi su Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Condividi su Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "Franze è migliore insieme!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Ho aggiunto {count} nuovi servizi a Franz! Scarica ora l'app gratuita per WhatsApp, Messenger, Slack, Skype e altri all'indirizzo www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "Condividi con i tuoi amici e colleghi quanto Franz è fantastico e aiutaci a diffondere la parola.",
   "global.api.unhealthy" : "Impossibile connettersi ai servizi online di Franz",
   "global.notConnectedToTheInternet" : "Non sei connesso a Internet.",
   "global.spellchecker.useDefault" : "Usa le impostazioni predefinite di sistema ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Rileva automaticamente la lingua",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "Automatico",
   "global.spellchecking.language" : "Lingua per controllo ortografico",
   "import.headline" : "Importa i servizi di Franz 4",
   "import.notSupportedHeadline" : "Servizi non ancora supportati in Franz 5",
@@ -43,8 +44,9 @@
   "login.submit.label" : "Accedi",
   "login.tokenExpired" : "La tua sessione è scaduta, per favore accedi di nuovo.",
   "menu.app.about" : "Info su Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Nascondi",
-   "menu.app.hideOthers" : "Nascondi Altri",
+   "menu.app.hideOthers" : "Nascondi altri",
   "menu.app.quit" : "Esci",
   "menu.app.settings" : "Settings",
   "menu.app.unhide" : "Mostra",
@@ -52,7 +54,7 @@
   "menu.edit.copy" : "Copia",
   "menu.edit.cut" : "Taglia",
   "menu.edit.delete" : "Elimina",
-   "menu.edit.emojiSymbols" : "Emoji e Simboli",
+   "menu.edit.emojiSymbols" : "Emoji e simboli",
   "menu.edit.paste" : "Incolla",
   "menu.edit.pasteAndMatchStyle" : "Incolla e Mantieni Stile",
   "menu.edit.redo" : "Ripeti",
@@ -70,9 +72,9 @@
   "menu.help.support" : "Supporto",
   "menu.help.tos" : "Termini di Servizio",
   "menu.services" : "Servizi",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Attiva servizio precedente",
   "menu.services.addNewService" : "Aggiungi Nuovo Servizio...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Attiva servizio seguente",
   "menu.view" : "Visualizza",
   "menu.view.enterFullScreen" : "Visualizza a Schermo Intero",
   "menu.view.exitFullScreen" : "Esci da Schermo Intero",
@@ -87,6 +89,11 @@
   "menu.window" : "Finestra",
   "menu.window.close" : "Chiudi",
   "menu.window.minimize" : "Minimizza",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Tutti i servizi",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Indirizzo email",
   "password.headline" : "Reimposta password",
   "password.link.login" : "Accedi al tuo account",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oh no!",
   "service.errorHandler.message" : "Errore",
   "service.errorHandler.text" : "{name} non si è caricato correttamente.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Iniziamo",
   "services.welcome" : "Benvenuto su Franz",
   "settings.account.account.editButton" : "Modifica account",
@@ -131,7 +139,7 @@
   "settings.account.manageSubscription.label" : "Gestisci il tuo abbonamento",
   "settings.account.successInfo" : "Le tue modifiche sono state salvate",
   "settings.account.tryReloadServices" : "Prova di nuovo",
-   "settings.account.tryReloadUserInfoRequest" : "Prova di nuovo",
+   "settings.account.tryReloadUserInfoRequest" : "Riprova",
   "settings.account.userInfoRequestFailed" : "Impossibile caricare le informazioni dell'utente.",
   "settings.app.buttonClearAllCache" : "Svuota la cache",
   "settings.app.buttonInstallUpdate" : "Riavvia e installa l'aggiornamento",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Generale",
   "settings.app.headlineLanguage" : "Lingua",
   "settings.app.headlineUpdates" : "Aggiornamenti",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Le modifiche richiedono un riavvio",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Aiutaci a tradurre Franz nella tua lingua.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Invita Amici",
   "settings.navigation.logout" : "Esci",
   "settings.navigation.settings" : "Impostazioni",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "I tuoi servizi",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Tutti i servizi",
   "settings.recipes.dev" : "Sviluppo",
   "settings.recipes.headline" : "Servizi disponibili",
@@ -221,11 +232,17 @@
   "settings.services.discoverServices" : "Scopri servizi",
   "settings.services.headline" : "I tuoi servizi",
   "settings.services.noServicesAdded" : "Non hai aggiunto ancora nessun servizio.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Impossibile caricare il servizio",
   "settings.services.tooltip.isDisabled" : "Il servizio è disattivato",
   "settings.services.tooltip.isMuted" : "Tutti i suoni sono disattivati",
   "settings.services.tooltip.notificationsDisabled" : "Le notifiche sono disattivate",
   "settings.services.updatedInfo" : "Le tue modifiche sono state salvate",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Gruppo",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Società",
   "settings.user.form.accountType.individual" : "Individuale",
   "settings.user.form.accountType.label" : "Tipo di account",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Nome",
   "settings.user.form.lastname" : "Cognome",
   "settings.user.form.newPassword" : "Nuova password",
+   "settings.workspace.add.form.name" : "Nome",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nome",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspaces.updatedInfo" : "Le tue modifiche sono state salvate",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Aggiungi un nuovo servizio",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Disattiva notifiche e audio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Impostazioni",
   "sidebar.unmuteApp" : "Attiva notifiche e audio",
   "signup.company.label" : "Società",
@@ -245,7 +279,7 @@
   "signup.firstname.label" : "Nome",
   "signup.headline" : "Iscriviti",
   "signup.lastname.label" : "Cognome",
-   "signup.legal.info" : "Creando un account di Franz accetti l' ",
+   "signup.legal.info" : "Creando un account di Franz stai accettando il ",
   "signup.legal.privacy" : "Informativa sulla Privacy",
   "signup.legal.terms" : "Termini di Servizio",
   "signup.link.login" : "Hai già un account, vuoi accedere?",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Aggiungi servizi on-premise\/hosted come \"Mattermost\"",
   "subscription.features.proxy" : "Supporto proxy per i servizi",
   "subscription.features.spellchecker" : "Supporto per il correttore ortografico",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
   "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
   "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
@@ -277,9 +312,20 @@
   "tabs.item.reload" : "Ricarica",
   "validation.email" : "{field} non valido",
   "validation.minLength" : "{field} dovrebbe contenere almeno {length} caratteri",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Almeno un campo è richiesto",
   "validation.required" : "{field} è necessario",
   "validation.url" : "{field} non è un URL valido",
   "welcome.loginButton" : "Accedi al tuo account",
-   "welcome.signupButton" : "Crea un account gratuito"
+   "welcome.signupButton" : "Crea un account gratuito",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tutti i servizi",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index bd1024a34..cf7e9ab78 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,21 +1,22 @@
 {
   "app.errorHandler.action" : "再読み込み",
   "app.errorHandler.headline" : "間違えている部分があります",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Franzサポーターライセンスを購入する",
   "feature.delayApp.headline" : "Franzをすぐに起動するには、Franz サポーターライセンスを購入してください。",
   "feature.delayApp.text" : "Franzはあと{seconds}秒後に起動します。",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "メールで送信",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Facebookでシェア",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Twitterでシェア",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "Franzはあなたとともに",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Franzで{count}個のサービスを使っています！あなたもGmail, Messenger, Slack, SkypeなどのサービスをFranzで一元管理しましょう！ www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "あなたのお友達にFranzを教えてあげましょう。",
   "global.api.unhealthy" : "Franzのオンラインサービスに接続できません。",
   "global.notConnectedToTheInternet" : "インターネットに接続されていません。",
   "global.spellchecker.useDefault" : " {default}を初期設定で使用してください",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "言語を自動的に検出する",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "自動",
   "global.spellchecking.language" : "スペルチェックする言語",
   "import.headline" : "Franz 4のサービスをインポートして下さい",
   "import.notSupportedHeadline" : "Franz 5ではこのサービスにまだ対応していません",
@@ -43,6 +44,7 @@
   "login.submit.label" : "サインイン",
   "login.tokenExpired" : "セッションの期限が切れました。ログインし直して下さい。",
   "menu.app.about" : "バージョン情報",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "隠す",
   "menu.app.hideOthers" : "他を隠す",
   "menu.app.quit" : "終了",
@@ -70,9 +72,9 @@
   "menu.help.support" : "サポート",
   "menu.help.tos" : "サービス利用規約",
   "menu.services" : "サービス",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "前のサービスを有効にする",
   "menu.services.addNewService" : "サービスを追加",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "次のサービスを有効にする",
   "menu.view" : "表示",
   "menu.view.enterFullScreen" : "全画面表示",
   "menu.view.exitFullScreen" : "全画面表示を終了する",
@@ -87,6 +89,11 @@
   "menu.window" : "ウィンドウ",
   "menu.window.close" : "閉じる",
   "menu.window.minimize" : "最小化",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "すべてのサービス",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "メールアドレス",
   "password.headline" : "パスワードのリセット",
   "password.link.login" : "サインイン",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "しまった！",
   "service.errorHandler.message" : "エラー",
   "service.errorHandler.text" : "{name} はロードに失敗しました",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "はじめる",
   "services.welcome" : "Franzにようこそ",
   "settings.account.account.editButton" : "アカウントの編集",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "一般",
   "settings.app.headlineLanguage" : "言語",
   "settings.app.headlineUpdates" : "更新",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "変更には再起動が必要です",
   "settings.app.subheadlineCache" : "キャッシュ",
   "settings.app.translationHelp" : "Franzの翻訳作業にご協力をお願いします。",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "知り合いを招待する",
   "settings.navigation.logout" : "ログアウト",
   "settings.navigation.settings" : "設定",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "利用中のサービス",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "すべてのサービス",
   "settings.recipes.dev" : "開発版",
   "settings.recipes.headline" : "利用可能なサービス",
@@ -221,11 +232,17 @@
   "settings.services.discoverServices" : "サービスを探す",
   "settings.services.headline" : "利用中のサービス",
   "settings.services.noServicesAdded" : "まだ、どのサービスも追加されていません。",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "サービスを読み込むことができませんでした",
   "settings.services.tooltip.isDisabled" : "サービスが無効です",
   "settings.services.tooltip.isMuted" : "無音となっています",
   "settings.services.tooltip.notificationsDisabled" : "通知は無効です",
   "settings.services.updatedInfo" : "変更内容が保存されました",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "チーム",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "法人",
   "settings.user.form.accountType.individual" : "個人",
   "settings.user.form.accountType.label" : "アカウントの種類",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "名",
   "settings.user.form.lastname" : "姓",
   "settings.user.form.newPassword" : "新しいパスワード",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "もう一度試す",
+   "settings.workspaces.updatedInfo" : "変更内容が保存されました",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "サービスを追加",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "通知とオーディオを無効化",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "設定",
   "sidebar.unmuteApp" : "通知とオーディオを有効化",
   "signup.company.label" : "法人",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Mattermost のようなオンプレミス（自社運用）型のサービスを追加できるようになります",
   "subscription.features.proxy" : "プロキシ設定が利用可能",
   "subscription.features.spellchecker" : "スペルチェック機能をお使いいただけます",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Franz Premium Supporter有料アカウントには以下が含まれます",
   "subscription.paymentSessionError" : "支払いフォームを初期化出来ません",
   "subscription.submit.label" : "Franzの開発を支援したい",
@@ -277,9 +312,20 @@
   "tabs.item.reload" : "再読み込み",
   "validation.email" : "{field}は正しくありません",
   "validation.minLength" : "{field}は少なくとも{length}文字以上でなければなりません",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "少なくとも1つは必要です",
   "validation.required" : "{field}は必須です",
   "validation.url" : "{field}は正しいURLではありません",
   "welcome.loginButton" : "アカウントにログイン",
-   "welcome.signupButton" : "無料アカウントを作成"
+   "welcome.signupButton" : "無料アカウントを作成",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "すべてのサービス",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 4796cbe9f..af224c115 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "ჩატვირთვა",
   "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Franz-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
   "global.notConnectedToTheInternet" : "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "შესვლა",
   "login.tokenExpired" : "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
   "menu.app.about" : "Franz-ის შესახებ",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Hide",
   "menu.app.hideOthers" : "სხვების დამალვა",
   "menu.app.quit" : "გამოსვლა",
@@ -87,6 +89,11 @@
   "menu.window" : "Window",
   "menu.window.close" : "Close",
   "menu.window.minimize" : "Minimize",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "ყველა სერვისი",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "მეილი",
   "password.headline" : "პაროლის აღდგენა",
   "password.link.login" : "შედით თქვენს ანგარიშში",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oh no!",
   "service.errorHandler.message" : "შეცდომა",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "დაწყება",
   "services.welcome" : "მოგესალმებით Franz-ზე",
   "settings.account.account.editButton" : "ანგარიშის მართვა",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "მთავარი",
   "settings.app.headlineLanguage" : "ენა",
   "settings.app.headlineUpdates" : "განახლებები",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Changes require restart",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Help us to translate Franz into your language.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Invite Friends",
   "settings.navigation.logout" : "გასვლა",
   "settings.navigation.settings" : "პარამეტრები",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "თქვენი სერვისები",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "ყველა სერვისი",
   "settings.recipes.dev" : "განვითარება",
   "settings.recipes.headline" : "ხელმისაწვდომი სერვისები",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "All sounds are muted",
   "settings.services.tooltip.notificationsDisabled" : "შეტყობინებები გათიშულია",
   "settings.services.updatedInfo" : "ცვლილებები შენახულია",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "გუნდი",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "კომპანია",
   "settings.user.form.accountType.individual" : "ინდივიდუალური",
   "settings.user.form.accountType.label" : "ანგარიშის ტიპი",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "First Name",
   "settings.user.form.lastname" : "Last Name",
   "settings.user.form.newPassword" : "ახალი პაროლი",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "სცადეთ ხელახლა",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Add new service",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Disable notifications & audio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "პარამეტრები",
   "sidebar.unmuteApp" : "Enable notifications & audio",
   "signup.company.label" : "კომპანია",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "ფასიანი Franz-ის პრემიუმ მხარმდამჭერი ანგარიში",
   "subscription.paymentSessionError" : "გადახდის ფორმატის ინიციალიზაცია ვერ მოხერხდა",
   "subscription.submit.label" : "მინდა ხელი შევუწყო Franz-ის განვითარებას",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} is required",
   "validation.url" : "{field} is not a valid URL",
   "welcome.loginButton" : "შედით თქვენს ანგარიშში",
-   "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა"
+   "welcome.signupButton" : "შექმენი ანგარიში, ეს უფასოა",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "ყველა სერვისი",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 00d7ddd06..2854fcb09 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Herladen",
   "app.errorHandler.headline" : "Er ging iets mis",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Neem een Franz Supporter Licentie ",
   "feature.delayApp.headline" : "Neem een Franz Supporter Licentie om niet meer te hoeven wachten",
   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz services",
   "global.notConnectedToTheInternet" : "Je hebt geen internet verbinding.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Inloggen",
   "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
   "menu.app.about" : "Over Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Verbergen",
   "menu.app.hideOthers" : "Andere Verbergen",
   "menu.app.quit" : "Afsluiten",
@@ -87,6 +89,11 @@
   "menu.window" : "Venster",
   "menu.window.close" : "Sluiten",
   "menu.window.minimize" : "Minimaliseren",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Alle services",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "E-mailadres",
   "password.headline" : "Wachtwoord resetten",
   "password.link.login" : "Log in op je account",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oh nee!",
   "service.errorHandler.message" : "Fout",
   "service.errorHandler.text" : "{name} kon niet geladen worden.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Beginnen",
   "services.welcome" : "Welkom bij Franz",
   "settings.account.account.editButton" : "Account bewerken",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Algemeen",
   "settings.app.headlineLanguage" : "Taal",
   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Nodig vrienden uit",
   "settings.navigation.logout" : "Uitloggen",
   "settings.navigation.settings" : "Instellingen",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Jouw services",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Alle services",
   "settings.recipes.dev" : "Ontwikkeling",
   "settings.recipes.headline" : "Beschikbare services",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
   "settings.services.tooltip.notificationsDisabled" : "Notificaties staan uit",
   "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Team",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Bedrijf",
   "settings.user.form.accountType.individual" : "Particulier",
   "settings.user.form.accountType.label" : "Account type",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Voornaam",
   "settings.user.form.lastname" : "Achternaam",
   "settings.user.form.newPassword" : "Nieuw wachtwoord",
+   "settings.workspace.add.form.name" : "Naam",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Naam",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
+   "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Nieuw service toevoegen",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Berichten & geluid uitschakelen",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
   "signup.company.label" : "Bedrijf",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
   "subscription.features.proxy" : "Proxy ondersteuning voor services",
   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
   "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} is vereist",
   "validation.url" : "{field} is niet een geldige URL",
   "welcome.loginButton" : "Inloggen op je account",
-   "welcome.signupButton" : "Maak een gratis account aan"
+   "welcome.signupButton" : "Maak een gratis account aan",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Alle services",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 782c29a6c..03d4474c1 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Herladen",
   "app.errorHandler.headline" : "Er ging iets mis",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Sponsor Franz",
   "feature.delayApp.headline" : "Sponsor Franz om wachten over te slaan",
   "feature.delayApp.text" : "Franz gaat over {seconds} seconden verder.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Kan geen verbinding maken met de Franz-services",
   "global.notConnectedToTheInternet" : "U bent niet verbonden met het internet.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Inloggen",
   "login.tokenExpired" : "De sessie is verlopen, log opnieuw in alsjeblieft.",
   "menu.app.about" : "Over Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Verbergen",
   "menu.app.hideOthers" : "Andere verbergen",
   "menu.app.quit" : "Afsluiten",
@@ -87,6 +89,11 @@
   "menu.window" : "Venster",
   "menu.window.close" : "Sluiten",
   "menu.window.minimize" : "Minimaliseren",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Alle services",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "E-mailadres",
   "password.headline" : "Wachtwoord vergeten",
   "password.link.login" : "Log in op je account",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oh nee!",
   "service.errorHandler.message" : "Fout",
   "service.errorHandler.text" : "{name} kon niet geladen worden.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Begin",
   "services.welcome" : "Welkom bij Franz",
   "settings.account.account.editButton" : "Bewerk account",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Algemeen",
   "settings.app.headlineLanguage" : "Taal",
   "settings.app.headlineUpdates" : "Updates",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Nodig vrienden uit",
   "settings.navigation.logout" : "Uitloggen",
   "settings.navigation.settings" : "Instellingen",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Jouw services",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Alle services",
   "settings.recipes.dev" : "Ontwikkeling",
   "settings.recipes.headline" : "Beschikbare services",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld",
   "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld",
   "settings.services.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Team",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Bedrijf",
   "settings.user.form.accountType.individual" : "Individueel",
   "settings.user.form.accountType.label" : "Accounttype",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Voornaam",
   "settings.user.form.lastname" : "Achternaam",
   "settings.user.form.newPassword" : "Nieuw wachtwoord",
+   "settings.workspace.add.form.name" : "Naam",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Naam",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw",
+   "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Voeg service toe",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Schakel berichten & geluid uit",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Instellingen",
   "sidebar.unmuteApp" : "Berichten & geluid inschakelen",
   "signup.company.label" : "Bedrijf",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe",
   "subscription.features.proxy" : "Proxy understeuning voor diensten",
   "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
   "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
   "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} is vereist",
   "validation.url" : "{field} is niet een geldige URL",
   "welcome.loginButton" : "Log in op je account",
-   "welcome.signupButton" : "Maak een gratis account"
+   "welcome.signupButton" : "Maak een gratis account",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Alle services",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index dd70f25f7..591b13145 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,21 +1,22 @@
 {
   "app.errorHandler.action" : "Przeładuj",
   "app.errorHandler.headline" : "Coś poszło nie tak",
+   "feature.announcements.changelog.headline" : "Zmiany we Franzie {version}",
   "feature.delayApp.action" : "Uzyskaj licencję Franz Supporter",
   "feature.delayApp.headline" : "Aby nie czekać kup licencję Franz Supporter",
   "feature.delayApp.text" : "Franz będzie kontynuował za {seconds} sekund.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Wyślij nam maila",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Udostępnij na Facebooku",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Udostępnij na Twitterze",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "Franz jest lepszy, gdy tworzymy go razem!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikacją WhatsApp, Messenger, Slack, Skype i inne na www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "Dodałem {count} serwisów do Franza! Pobierz darmową aplikacją WhatsApp, Messenger, Slack, Skype i inne na www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "Powiedz znajomym i kolegom o tym, jak odlotowy jest Franz i pomóż nam go spopularyzować.",
   "global.api.unhealthy" : "Nie można połączyć się z usługami Franz online",
   "global.notConnectedToTheInternet" : "Nie masz połączenia z Internetem.",
   "global.spellchecker.useDefault" : "Użyj domyślnego dla systemu ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Automatycznie wykryj język",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "Automatycznie",
   "global.spellchecking.language" : "Język słownika",
   "import.headline" : "Importuj usługi Franz 4",
   "import.notSupportedHeadline" : "Usługi, które nie są jeszcze obsługiwane w Franz 5",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Zaloguj się",
   "login.tokenExpired" : "Twoja sesja wygasła, zaloguj się ponownie.",
   "menu.app.about" : "O Franz",
+   "menu.app.announcement" : "Co słychać?",
   "menu.app.hide" : "Ukryj",
   "menu.app.hideOthers" : "Ukryj pozostałe",
   "menu.app.quit" : "Zakończ",
@@ -70,9 +72,9 @@
   "menu.help.support" : "Wsparcie",
   "menu.help.tos" : "Warunki świadczenia usług",
   "menu.services" : "Usługi",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Włącz poprzedni serwis",
   "menu.services.addNewService" : "Dodaj nową usługę...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Włącz kolejny serwis",
   "menu.view" : "Widok",
   "menu.view.enterFullScreen" : "Włącz tryb pełnoekranowy",
   "menu.view.exitFullScreen" : "Zakończ tryb pełnoekranowy",
@@ -87,6 +89,11 @@
   "menu.window" : "Okno",
   "menu.window.close" : "Zamknij",
   "menu.window.minimize" : "Zminimalizuj",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Wszystkie usługi",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Adres email",
   "password.headline" : "Przypomnij hasło",
   "password.link.login" : "Zaloguj się na swoje konto",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "O nie!",
   "service.errorHandler.message" : "Błąd",
   "service.errorHandler.text" : "Nie udało się załadować {name}.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Zacznij",
   "services.welcome" : "Witaj w programie Franz",
   "settings.account.account.editButton" : "Modyfikuj konta",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Ogólne",
   "settings.app.headlineLanguage" : "Język",
   "settings.app.headlineUpdates" : "Aktualizacje",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Zmiany. wymagają ponownego uruchomienia",
   "settings.app.subheadlineCache" : "Pamięć podręczna",
   "settings.app.translationHelp" : "Pomóż nam tłumaczyć Franz na Twój język.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Zaproś znajomych",
   "settings.navigation.logout" : "Wyloguj",
   "settings.navigation.settings" : "Ustawienia",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Twoje usługi",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Wszystkie usługi",
   "settings.recipes.dev" : "Rozwojowe",
   "settings.recipes.headline" : "Dostępne usługi",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Wszystkie dźwięki są wyciszone",
   "settings.services.tooltip.notificationsDisabled" : "Powiadomienia są nieaktywne",
   "settings.services.updatedInfo" : "Zmiany zostały zapisane",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Zespół",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Firma",
   "settings.user.form.accountType.individual" : "Prywatne",
   "settings.user.form.accountType.label" : "Typ konta",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Imię",
   "settings.user.form.lastname" : "Nazwisko",
   "settings.user.form.newPassword" : "Nowe hasło",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Spróbuj ponownie",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Dodaj kolejną usługę",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Wyłącz powiadomienia i dźwięki",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ustawienia",
   "sidebar.unmuteApp" : "Włącz powiadomienia i dźwięki",
   "signup.company.label" : "Firma",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Dodaj prywatnie hostowane usługi takie jak Mattermost",
   "subscription.features.proxy" : "Obsługa proxy dla usług",
   "subscription.features.spellchecker" : "Wsparcie dla sprawdzania pisowni",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
   "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
   "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "Pole {field} jest wymagane",
   "validation.url" : "Pole {field} nie jest poprawnym ciągiem URL.",
   "welcome.loginButton" : "Zaloguj się na swoje konto",
-   "welcome.signupButton" : "Stwórz darmowe konto"
+   "welcome.signupButton" : "Stwórz darmowe konto",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Wszystkie usługi",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 490771c39..4ad2fac08 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Recarregar",
   "app.errorHandler.headline" : "Alguma coisa deu errado",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Adquira uma licença Franz Supporter",
   "feature.delayApp.headline" : "Por favor, adquira uma licença Franz Supporter para pular o tempo de espera",
   "feature.delayApp.text" : "Franz continuará em {seconds} segundos.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
   "feature.shareFranz.headline" : "Franz é melhor em grupo!",
   "feature.shareFranz.shareText.email" : "Eu adicionei {count} serviços ao Franz! Adquira o aplicativo gratuito para WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "Adicionei o serviço de {count} ao Franz! Adquira o app grátis para usar WhatsApp, Messenger, Slack, Skype e mais em www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Conte aos seus amigos e colegas o quão incrível Franz é e nos ajude a espalhar a mensagem.  ",
   "global.api.unhealthy" : "Não foi possível conectar-se aos serviços on-line do Franz.",
   "global.notConnectedToTheInternet" : "Você não está conectado à internet",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Entrar",
   "login.tokenExpired" : "Sua sessão expirou, faça o login novamente.",
   "menu.app.about" : "Sobre Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Ocultar",
   "menu.app.hideOthers" : "Ocultar Outros",
   "menu.app.quit" : "Sair",
@@ -70,9 +72,9 @@
   "menu.help.support" : "Suporte",
   "menu.help.tos" : "Termos de Serviço",
   "menu.services" : "Serviços",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Pular para serviço anterior",
   "menu.services.addNewService" : "Adicionar Novo Serviço",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Pular para próximo serviço",
   "menu.view" : "Visualizar ",
   "menu.view.enterFullScreen" : "Modo Tela Cheia",
   "menu.view.exitFullScreen" : "Sair da Tela Cheia",
@@ -87,6 +89,11 @@
   "menu.window" : "Modo Janela",
   "menu.window.close" : "Fechar",
   "menu.window.minimize" : "Minimizar",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Todos os serviços",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "E-mail",
   "password.headline" : "Trocar senha",
   "password.link.login" : "Fazer login na sua conta",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Ah, não!",
   "service.errorHandler.message" : "Erro",
   "service.errorHandler.text" : "{name} não pôde ser carregado.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Iniciar",
   "services.welcome" : "Bem-vindo ao Franz!",
   "settings.account.account.editButton" : "Editar conta",
@@ -131,7 +139,7 @@
   "settings.account.manageSubscription.label" : "Gerencie a sua assinatura",
   "settings.account.successInfo" : "Suas alterações foram gravadas",
   "settings.account.tryReloadServices" : "Tente novamente",
-   "settings.account.tryReloadUserInfoRequest" : "Tente novamente",
+   "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
   "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário",
   "settings.app.buttonClearAllCache" : "Limpar cache",
   "settings.app.buttonInstallUpdate" : "Reiniciar e instalar atualização",
@@ -156,8 +164,9 @@
   "settings.app.headlineGeneral" : "Geral",
   "settings.app.headlineLanguage" : "Idioma",
   "settings.app.headlineUpdates" : "Atualizações",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "As atualizações exigem reiniciar o sistema",
-   "settings.app.subheadlineCache" : "Cachê",
+   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Ajude-nos a traduzir o Franz para seu idioma.",
   "settings.app.updateStatusAvailable" : "Atualização disponível, baixando...",
   "settings.app.updateStatusSearching" : "Buscando atualizações",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Convidar Amigos",
   "settings.navigation.logout" : "Sair",
   "settings.navigation.settings" : "Ajustes",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Seus serviços",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Todos os serviços",
   "settings.recipes.dev" : "Desenvolvimento",
   "settings.recipes.headline" : "Serviços disponíveis",
@@ -221,11 +232,17 @@
   "settings.services.discoverServices" : "Descobrir serviços",
   "settings.services.headline" : "Seus serviços",
   "settings.services.noServicesAdded" : "Você ainda não adicionou nenhum serviço.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Não foi possível carregar os seus serviços",
   "settings.services.tooltip.isDisabled" : "O serviço está desativado",
   "settings.services.tooltip.isMuted" : "Sem som",
   "settings.services.tooltip.notificationsDisabled" : "Notificações desativadas",
   "settings.services.updatedInfo" : "Suas mudanças foram gravadas",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equipe",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Empresa",
   "settings.user.form.accountType.individual" : "Pessoal",
   "settings.user.form.accountType.label" : "Tipo de conta",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Nome",
   "settings.user.form.lastname" : "Sobrenome",
   "settings.user.form.newPassword" : "Nova senha",
+   "settings.workspace.add.form.name" : "Nome",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nome",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Try again",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Adicionar novo serviço",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Desativar notificações e áudio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ajustes",
   "sidebar.unmuteApp" : "Ativar notificações e áudio",
   "signup.company.label" : "Empresa",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Adicionar serviços locais\/hospedados como o Mattermost",
   "subscription.features.proxy" : "Suporte de proxy para serviços",
   "subscription.features.spellchecker" : "Suporte para corretor ortográfico",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
   "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
   "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
@@ -277,9 +312,20 @@
   "tabs.item.reload" : "Recarregar",
   "validation.email" : "inválido",
   "validation.minLength" : "{campo} deve ter pelo menos {comprimento} mais caracteres ",
-   "validation.oneRequired" : "At least one is required",
+   "validation.oneRequired" : "Necessário pelo menos um",
   "validation.required" : "{campo} obrigatório",
   "validation.url" : "{campo} essa URL não é válida",
   "welcome.loginButton" : "Entrar na sua conta",
-   "welcome.signupButton" : "Criar uma conta grátis"
+   "welcome.signupButton" : "Criar uma conta grátis",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Todos os serviços",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 7e23aa0ba..302284ab8 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,15 +1,16 @@
 {
   "app.errorHandler.action" : "Recarregar",
   "app.errorHandler.headline" : "Alguma coisa correu mal",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Faz parte do grupo de apoio do Franz",
   "feature.delayApp.headline" : "Por favor compre uma licença Franz Supporter para saltar a fila de espera",
   "feature.delayApp.text" : "Franz irá continuar em {seconds} segundos.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Enviar por e-mail",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Compartilahr no Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Não foi possível estabelecer ligação aos serviços do Franz",
   "global.notConnectedToTheInternet" : "Não estás ligado à Internet",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Iniciar sessão",
   "login.tokenExpired" : "A sua sessão expirou, inicie sessão novamente.",
   "menu.app.about" : "Sobre o Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Ocultar",
   "menu.app.hideOthers" : "Ocultar Outros",
   "menu.app.quit" : "Sair",
@@ -87,6 +89,11 @@
   "menu.window" : "Janela",
   "menu.window.close" : "Fechar",
   "menu.window.minimize" : "Minimizar",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Todos os serviços",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Endereço de e-mail",
   "password.headline" : "Repor a minha palavra-passe",
   "password.link.login" : "Iniciar sessão",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Oh não!",
   "service.errorHandler.message" : "Erro",
   "service.errorHandler.text" : "{name} falhou o carregamento",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Vamos começar",
   "services.welcome" : "Bem-vindo ao Franz",
   "settings.account.account.editButton" : "Editar conta",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Geral",
   "settings.app.headlineLanguage" : "Idioma",
   "settings.app.headlineUpdates" : "Atualizações",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Alterações requerem reinício",
   "settings.app.subheadlineCache" : "Cache",
   "settings.app.translationHelp" : "Ajude-nos a traduzir a Franz para a sua língua.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Convide Amigos",
   "settings.navigation.logout" : "Terminar sessão",
   "settings.navigation.settings" : "Definições",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Os seus serviços",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Todos os serviços",
   "settings.recipes.dev" : "Desenvolvimento",
   "settings.recipes.headline" : "Serviços disponíveis",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Todos os sons estão silenciados",
   "settings.services.tooltip.notificationsDisabled" : "As notificações estão desativadas",
   "settings.services.updatedInfo" : "As alterações foram guardadas",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Equipa",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Empresa",
   "settings.user.form.accountType.individual" : "Indivíduo",
   "settings.user.form.accountType.label" : "Tipo de conta",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Primeiro Nome",
   "settings.user.form.lastname" : "Último Nome",
   "settings.user.form.newPassword" : "Nova palavra-passe",
+   "settings.workspace.add.form.name" : "Nome",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Nome",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Tentar novamente",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Adicionar um novo serviço",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Desativar notificações e áudio",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Definições",
   "sidebar.unmuteApp" : "Ativar notificações e áudio",
   "signup.company.label" : "Empresa",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Adicione serviços como Mattermost no local ou online",
   "subscription.features.proxy" : "Suporte Proxy para os serviços",
   "subscription.features.spellchecker" : "Suporte para correção ortográfica",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
   "subscription.paymentSessionError" : "Erro no serviço de pagamento",
   "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} é obrigatório",
   "validation.url" : "{field} não é uma hiperligação válida",
   "welcome.loginButton" : "Iniciar sessão",
-   "welcome.signupButton" : "Criar uma conta gratuita"
+   "welcome.signupButton" : "Criar uma conta gratuita",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Todos os serviços",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index d8e02b7f3..97ad98361 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,21 +1,22 @@
 {
   "app.errorHandler.action" : "Перезагрузить",
   "app.errorHandler.headline" : "Что-то пошло не так",
+   "feature.announcements.changelog.headline" : "Изменения в версии Franz {version}",
   "feature.delayApp.action" : "Получите лицензию Franz Supporter",
-   "feature.delayApp.headline" : "Пожалуйста приобретите лицензию Franz Supporter чтобы отменить ожидание",
+   "feature.delayApp.headline" : "Пожалуйста приобретите лицензию Franz Supporter чтобы убрать ожидание",
   "feature.delayApp.text" : "Franz продолжит работу через {seconds} секунд.",
-   "feature.shareFranz.action.email" : "Send as email",
+   "feature.shareFranz.action.email" : "Отправить email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.facebook" : "Поделиться на Facebook",
-   "feature.shareFranz.action.twitter" : "Share on Twitter",
+   "feature.shareFranz.action.twitter" : "Поделиться в Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "Сделаем Franz лучше вместе!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
+   "feature.shareFranz.shareText.email" : "Я добавил {count} сервисов во Franz! Теперь доступны такие мессенджеры как WhatsApp, Messenger, Slack, Skype и другие. Полый список вы найдете на www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "Я добавил {count} сервис(ов) в Franz! Скачай бесплатную аппку для WhatsApp, Messenger, Slack, Skype и иже на www.meetfranz.com \/cc @FranzMessenger",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.text" : "Расскажи своим друзьям и коллегам насколько прелестен Franz и помоги нам развиться",
   "global.api.unhealthy" : "Невозможно подключиться к онлайн-сервисам Franz",
   "global.notConnectedToTheInternet" : "Вы не подключены к сети Интернет",
   "global.spellchecker.useDefault" : "Использовать системные параметры по умолчанию ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Найти язык автоматически",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "Авто",
   "global.spellchecking.language" : "Проверка правописания",
   "import.headline" : "Импортировать ваши сервисы из Franz 4",
   "import.notSupportedHeadline" : "Сервисы пока ещё не поддерживаются в Franz 5",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Вход",
   "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
   "menu.app.about" : "О Franz",
+   "menu.app.announcement" : "Что нового?",
   "menu.app.hide" : "Скрыть",
   "menu.app.hideOthers" : "Скрыть остальные",
   "menu.app.quit" : "Выйти",
@@ -70,9 +72,9 @@
   "menu.help.support" : "Поддержка",
   "menu.help.tos" : "Условия использования",
   "menu.services" : "Сервис",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Активировать предыдущий сервич",
   "menu.services.addNewService" : "Добавить новый сервис...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Активировать следующий сервис",
   "menu.view" : "Вид",
   "menu.view.enterFullScreen" : "На весь экран",
   "menu.view.exitFullScreen" : "В окне",
@@ -87,6 +89,11 @@
   "menu.window" : "Окно",
   "menu.window.close" : "Закрыть",
   "menu.window.minimize" : "Свернуть",
+   "menu.workspaces" : "Окружение",
+   "menu.workspaces.addNewWorkspace" : "Добавить Новое Окружение...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Закрыть меню окружений",
+   "menu.workspaces.defaultWorkspace" : "Все сервисы",
+   "menu.workspaces.openWorkspaceDrawer" : "Открыть меню окружений",
   "password.email.label" : "Адрес электронной почты",
   "password.headline" : "Сбросить пароль",
   "password.link.login" : "Вход",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "О, нет!",
   "service.errorHandler.message" : "Ошибка",
   "service.errorHandler.text" : "{name} не смог загрузиться.",
+   "service.webviewLoader.loading" : "Загрузка",
   "services.getStarted" : "Начать работу",
   "services.welcome" : "Добро пожаловать во Franz",
   "settings.account.account.editButton" : "Редактировать аккаунт",
@@ -121,7 +129,7 @@
   "settings.account.deleteInfo" : "Если вам больше не нужна ваша учетная запись в Franz, вы можете удалить аккаунт и всю связанную с ней информацию.",
   "settings.account.headline" : "Аккаунт",
   "settings.account.headlineAccount" : "Информация аккаунта",
-   "settings.account.headlineDangerZone" : "��п����ная Зона",
+   "settings.account.headlineDangerZone" : "������р����ная Зона",
   "settings.account.headlineInvoices" : "Счета",
   "settings.account.headlinePassword" : "Сменить пароль",
   "settings.account.headlineProfile" : "Обновить профиль",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Общие",
   "settings.app.headlineLanguage" : "Язык",
   "settings.app.headlineUpdates" : "Обновления",
+   "settings.app.languageDisclaimer" : "Официальная поддержка только для английского и немецкого языков. Остальные языки переведены сообществом.",
   "settings.app.restartRequired" : "Изменения требуют перезагрузки приложения",
   "settings.app.subheadlineCache" : "Кэш",
   "settings.app.translationHelp" : "Помогите нам перевести Franz на ваш язык.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Пригласить друзей",
   "settings.navigation.logout" : "Выход",
   "settings.navigation.settings" : "Настройки",
+   "settings.navigation.team" : "Управление Командой",
   "settings.navigation.yourServices" : "Ваши сервисы",
+   "settings.navigation.yourWorkspaces" : "Ваши окружения",
   "settings.recipes.all" : "Все сервисы",
   "settings.recipes.dev" : "Разработка",
   "settings.recipes.headline" : "Доступные сервисы",
@@ -221,11 +232,17 @@
   "settings.services.discoverServices" : "Найти сервисы",
   "settings.services.headline" : "Ваши сервисы",
   "settings.services.noServicesAdded" : "Вы пока не добавили никаких сервисов.",
-   "settings.services.servicesRequestFailed" : "Could not load your services",
+   "settings.services.servicesRequestFailed" : "Ошибка загрузки сервисов",
   "settings.services.tooltip.isDisabled" : "Сервис отключен",
   "settings.services.tooltip.isMuted" : "Все звуки отключены",
   "settings.services.tooltip.notificationsDisabled" : "Уведомления отключены",
   "settings.services.updatedInfo" : "Изменения сохранены",
+   "settings.team.contentHeadline" : "Franz для Команд",
+   "settings.team.copy" : "Franz для Команд позволяет пригласить коллег в вашу команду, отправив им емайл с приглашением, а также управлять их подписками в настройках вашего аккаунта. Не тратьте время на настройку подписок для каждого члена команды индивидуально, забудьте о многочисленных платежках и разных циклах оплаты - одна команда для управления всеми!",
+   "settings.team.headline" : "Команда",
+   "settings.team.intro" : "Вы и ваша команда испльзуете Franz? Вы теперь можете управлять Премиум подписками любого количества коллег, друзей и членов семьи, из одного и того же аккаунта.",
+   "settings.team.manageAction" : "Управляйте вашей Командой на meetfranz.com",
+   "settings.team.upgradeAction" : "Улучшить ваш аккаунт",
   "settings.user.form.accountType.company" : "Компания",
   "settings.user.form.accountType.individual" : "Индивидуальный",
   "settings.user.form.accountType.label" : "Тип аккаунта",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Имя",
   "settings.user.form.lastname" : "Фамилия",
   "settings.user.form.newPassword" : "Новый пароль",
+   "settings.workspace.add.form.name" : "Имя",
+   "settings.workspace.add.form.submitButton" : "Создать окружение",
+   "settings.workspace.form.buttonDelete" : "Удалить окружение",
+   "settings.workspace.form.buttonSave" : "Сохранить окружение",
+   "settings.workspace.form.name" : "Имя",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Ваши окружения",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Ваши окружения",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Попробовать снова",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Добавить новый сервис",
+   "sidebar.closeWorkspaceDrawer" : "Закрыть меню окружений",
   "sidebar.muteApp" : "Отключить уведомления и звук",
+   "sidebar.openWorkspaceDrawer" : "Открыть меню окружений",
   "sidebar.settings" : "Настройки",
   "sidebar.unmuteApp" : "Включить уведомления и звук",
   "signup.company.label" : "Организация",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Локальные\/размещенные на хостинге сервисы, такие как Mattermost",
   "subscription.features.proxy" : "Подержка прокси для сервисов",
   "subscription.features.spellchecker" : "Поддержка проверки правописания",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Платный премиум аккаунт Franz включает",
   "subscription.paymentSessionError" : "Невозможно загрузить форму оплаты",
   "subscription.submit.label" : "Я хочу поддержать разработку Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} обязательно",
   "validation.url" : "{field} является недействительной ссылкой",
   "welcome.loginButton" : "Вход",
-   "welcome.signupButton" : "Создать бесплатный аккаунт"
+   "welcome.signupButton" : "Создать бесплатный аккаунт",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Все сервисы",
+   "workspaceDrawer.headline" : "Окружение",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Восстановить премиум аккаунт",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 688490b58..7af29ef1c 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Obnoviť",
   "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Nedá sa pripojiť k online službám Franz",
   "global.notConnectedToTheInternet" : "Nie ste pripojení k internetu.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Prihlásiť sa",
   "login.tokenExpired" : "Vaša relácia vypršala, prihláste sa prosím znovu.",
   "menu.app.about" : "O aplikácii",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Skryť",
   "menu.app.hideOthers" : "Skryť ostatné",
   "menu.app.quit" : "Ukončiť",
@@ -87,6 +89,11 @@
   "menu.window" : "Okno",
   "menu.window.close" : "Zatvoriť",
   "menu.window.minimize" : "Minimalizovať",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Všetky služby",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "E-mailová adresa",
   "password.headline" : "Obnoviť heslo",
   "password.link.login" : "Prihlásiť sa do vášho účtu",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Ale nie!",
   "service.errorHandler.message" : "Chyba",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Začíname",
   "services.welcome" : "Vítajte v aplikácii Franz",
   "settings.account.account.editButton" : "Upraviť účet",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Všeobecné",
   "settings.app.headlineLanguage" : "Jazyk",
   "settings.app.headlineUpdates" : "Aktualizácie",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Zmeny vyžadujú reštart",
   "settings.app.subheadlineCache" : "Vyrovnávacia pamäť",
   "settings.app.translationHelp" : "Pomôžte nám preložiť Franz do svojho jazyka.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Pozvať priateľov",
   "settings.navigation.logout" : "Odhlásiť sa",
   "settings.navigation.settings" : "Nastavenia",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Vaše služby",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Všetky služby",
   "settings.recipes.dev" : "Vývoj",
   "settings.recipes.headline" : "Dostupné služby",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Všetky zvuky sú stíšené",
   "settings.services.tooltip.notificationsDisabled" : "Oznámenia sú vypnuté",
   "settings.services.updatedInfo" : "Vaše zmeny boli uložené",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tím",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Spoločnosť",
   "settings.user.form.accountType.individual" : "Osoba",
   "settings.user.form.accountType.label" : "Typ účtu",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Krstné meno",
   "settings.user.form.lastname" : "Priezvisko",
   "settings.user.form.newPassword" : "Nové heslo",
+   "settings.workspace.add.form.name" : "Meno",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Meno",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Skúsiť znova",
+   "settings.workspaces.updatedInfo" : "Vaše zmeny boli uložené",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Pridať novú službu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Vypnúť upozornenia a zvuky",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Nastavenia",
   "sidebar.unmuteApp" : "Povoliť oznámenia a zvuky",
   "signup.company.label" : "Spoločnosť",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Platený účet Premium Supporter Franz zahŕňa",
   "subscription.paymentSessionError" : "Nepodarilo sa inicializovať platbu od",
   "subscription.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} je povinné",
   "validation.url" : "{field} nie je platné URL",
   "welcome.loginButton" : "Prihlásiť sa do vášho účtu",
-   "welcome.signupButton" : "Vytvoriť účet zdarma"
+   "welcome.signupButton" : "Vytvoriť účet zdarma",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Všetky služby",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index a3a80925d..e5962566b 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Ponovno učitavanje",
   "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Get a Franz Supporter License",
   "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
   "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Nije moguće pristupiti Franz-ovim on-line servisima. ",
   "global.notConnectedToTheInternet" : "Niste povezani sa serverom.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Prijavite se",
   "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
   "menu.app.about" : "O Francu",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Sakrij",
   "menu.app.hideOthers" : "Sakrij ostale",
   "menu.app.quit" : "Izađi",
@@ -87,6 +89,11 @@
   "menu.window" : "У прозору",
   "menu.window.close" : "Затвори",
   "menu.window.minimize" : "Умањи",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Sve usluge",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Vaša e-adresa",
   "password.headline" : "Stvorite novu zaporku",
   "password.link.login" : "Prijavite se na Vaš račun",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "O, ne! ",
   "service.errorHandler.message" : "Greška ",
   "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Započnimo! ",
   "services.welcome" : "Dobrodošli u Franz",
   "settings.account.account.editButton" : "Uredi račun",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Općenito",
   "settings.app.headlineLanguage" : "Jezik",
   "settings.app.headlineUpdates" : "Nadogradnje",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni pogon",
   "settings.app.subheadlineCache" : "Кеш",
   "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Позови пријатеље",
   "settings.navigation.logout" : "Odjava",
   "settings.navigation.settings" : "Postavke",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Vaše usluge",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Sve usluge",
   "settings.recipes.dev" : "Razvoj",
   "settings.recipes.headline" : "Dostupne usluge",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni.",
   "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
   "settings.services.updatedInfo" : "Vaše promjene su pohranjene.",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tim",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Tvrtka",
   "settings.user.form.accountType.individual" : "Pojedinac",
   "settings.user.form.accountType.label" : "Tip računa",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Ime",
   "settings.user.form.lastname" : "Prezime",
   "settings.user.form.newPassword" : "Nova lozinka",
+   "settings.workspace.add.form.name" : "Ime",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ime",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Pokušajte ponovno",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Dodajte novu uslugu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Онемогући обавештења и звукове",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Postavke",
   "sidebar.unmuteApp" : "Искључи обавештења и звукове",
   "signup.company.label" : "Tvrtka",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
   "subscription.features.proxy" : "Proxy support for services",
   "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Plaćeni\/Premium račun uključuje sljedeće:",
   "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
   "subscription.submit.label" : "Želim da podržim razvoj Franca.",
@@ -281,5 +316,16 @@
   "validation.required" : "{поље} је неопходно",
   "validation.url" : "{field} није валидан УРЛ",
   "welcome.loginButton" : "Prijavite se na račun",
-   "welcome.signupButton" : "Stvorite novi korisnički račun"
+   "welcome.signupButton" : "Stvorite novi korisnički račun",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Sve usluge",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 9f8313c2e..69c5ede37 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Tekrar Yükle",
   "app.errorHandler.headline" : "Bir terslik çıktı",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Franz Destek Lisansı'nı alın",
   "feature.delayApp.headline" : "Beklememek için Franz Destek Lisansı'nı satın alın",
   "feature.delayApp.text" : "Franz {seconds} saniye sonra devam edecek.",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Twitter'da Paylaş",
   "feature.shareFranz.headline" : "Franz birlikte daha iyi!",
   "feature.shareFranz.shareText.email" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin.",
-   "feature.shareFranz.shareText.twitter" : "Franz'a {count} tane servis ekledim! WhatsApp, Messenger, Slack ve fazlasını içeren ücretsiz uygulamayı www.meetfranz.com adresinden edinin. \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Arkadaşlarına ve meslektaşlarına Franz'ın ne kadar harika olduğunu söyle ve bize bu kelimeyi yaymamızda yardım et.",
   "global.api.unhealthy" : "Franz hizmetlerine şu anda erişilemiyor",
   "global.notConnectedToTheInternet" : "İnternete bağlı değilsiniz.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Oturum Aç",
   "login.tokenExpired" : "Oturum zaman aşımına uğradı, lütfen tekrar giriş yapın.",
   "menu.app.about" : "Franz Hakkında",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Gizle",
   "menu.app.hideOthers" : "Diğerlerini Gizle",
   "menu.app.quit" : "Çıkış",
@@ -87,6 +89,11 @@
   "menu.window" : "Pencere",
   "menu.window.close" : "Kapat",
   "menu.window.minimize" : "Simge Durumuna Küçült",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Tüm servisler",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "E-posta adresi",
   "password.headline" : "Parola sıfırla",
   "password.link.login" : "Hesabına giriş yap",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "Hayııırrr!",
   "service.errorHandler.message" : "Hata",
   "service.errorHandler.text" : "{name} yüklenemedi.",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Haydi başlayalım",
   "services.welcome" : "Franz'a Hoşgeldiniz",
   "settings.account.account.editButton" : "Hesabı düzenle",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Genel",
   "settings.app.headlineLanguage" : "Dil",
   "settings.app.headlineUpdates" : "Güncellemeler",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Değişiklikler yeniden başlatmayı gerektiriyor",
   "settings.app.subheadlineCache" : "Önbellek",
   "settings.app.translationHelp" : "Franz'ı senin diline tercüme etmemiz için yardım et.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Arkadaşlarını Davet Et",
   "settings.navigation.logout" : "Çıkış",
   "settings.navigation.settings" : "Ayarlar",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Servislerin",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Tüm servisler",
   "settings.recipes.dev" : "Geliştirme",
   "settings.recipes.headline" : "Mevcut servisler",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Tüm sesler kapalı",
   "settings.services.tooltip.notificationsDisabled" : "Bildirimler devre dışı",
   "settings.services.updatedInfo" : "Değişikliklerin kaydedildi",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Takım",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Kurum",
   "settings.user.form.accountType.individual" : "Bireysel",
   "settings.user.form.accountType.label" : "Hesap tipi",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Ad",
   "settings.user.form.lastname" : "Soyad",
   "settings.user.form.newPassword" : "Yeni şifre",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Tekrar deneyin",
+   "settings.workspaces.updatedInfo" : "Değişikliklerin kaydedildi",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Yeni servis ekle",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Bildirimleri ve sesli uyarıları kapat",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Ayarlar",
   "sidebar.unmuteApp" : "Bildirimleri ve sesli uyarıları etkinleştir",
   "signup.company.label" : "Kurum",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Mattermost gibi şirket-içi\/barındırılan servisler ekleyin",
   "subscription.features.proxy" : "Servisler için proxy desteği",
   "subscription.features.spellchecker" : "Yazım denetleyicisi desteği",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
   "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
   "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} gereklidir",
   "validation.url" : "{field} geçerli bir URL değil",
   "welcome.loginButton" : "Hesabına giriş yap",
-   "welcome.signupButton" : "Ücretsiz hesap oluştur"
+   "welcome.signupButton" : "Ücretsiz hesap oluştur",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Tüm servisler",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 56dda09d5..113665f5f 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "Перезавантажити",
   "app.errorHandler.headline" : "Щось пішло не так",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "Отримати ліцензію Franz Supporter ",
   "feature.delayApp.headline" : "Будь ласка, придбайте ліцензію Franz Supporter аби пропустити очікування",
   "feature.delayApp.text" : "Franz відновить роботу за {seconds} секунд",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "Не можливо підключитись до онлайн сервісів Franz",
   "global.notConnectedToTheInternet" : "Ви не підключені до Інтернету.",
@@ -43,6 +44,7 @@
   "login.submit.label" : "Увійти",
   "login.tokenExpired" : "Ваша сесія закінчилась, будь ласка, увійдіть знову.",
   "menu.app.about" : "Про Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "Приховати",
   "menu.app.hideOthers" : "Приховати інші",
   "menu.app.quit" : "Вийти",
@@ -87,6 +89,11 @@
   "menu.window" : "Вікно",
   "menu.window.close" : "Закрити",
   "menu.window.minimize" : "Згорнути",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Всі сервіси",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "Email адреса",
   "password.headline" : "Скинути пароль",
   "password.link.login" : "Увійти до вашого акаунту",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "О, ні!",
   "service.errorHandler.message" : "Помилка",
   "service.errorHandler.text" : "{name} не завантажено",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "Почати",
   "services.welcome" : "Ласкаво просимо в Franz",
   "settings.account.account.editButton" : "Редагувати акаунт",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "Загальні",
   "settings.app.headlineLanguage" : "Мова",
   "settings.app.headlineUpdates" : "Оновлення",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "Зміни потребують перезапуску",
   "settings.app.subheadlineCache" : "Кеш",
   "settings.app.translationHelp" : "Допоможіть перекласти Franz на Вашу мову.",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "Запросити друзів",
   "settings.navigation.logout" : "Вийти",
   "settings.navigation.settings" : "Налаштування",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "Ваші сервіси",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "Всі сервіси",
   "settings.recipes.dev" : "Розробка",
   "settings.recipes.headline" : "Доступні сервіси",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "Всі звуки вимкнено",
   "settings.services.tooltip.notificationsDisabled" : "Сповіщення відключені",
   "settings.services.updatedInfo" : "Ваші зміни були збережені",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Команда",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "Компанія",
   "settings.user.form.accountType.individual" : "Індивідуальний",
   "settings.user.form.accountType.label" : "Тип акаунту",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "Ім`я",
   "settings.user.form.lastname" : "Прізвище",
   "settings.user.form.newPassword" : "Новий пароль",
+   "settings.workspace.add.form.name" : "Ім'я",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ім'я",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Спробуйте ще раз",
+   "settings.workspaces.updatedInfo" : "Ваші зміни були збережені",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "Додати новий сервіс",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "Вимкнути сповіщення та звуки",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "Налаштування",
   "sidebar.unmuteApp" : "Увімкнути сповіщення та звуки",
   "signup.company.label" : "Компанія",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "Сервіси, що виконуються локально\/вимагають хостингу, приміром Mattermost",
   "subscription.features.proxy" : "Підтримка проксі ",
   "subscription.features.spellchecker" : "Підтримка перевірки правопису",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Платний Преміальний Акаунт Прихильника Franz включає",
   "subscription.paymentSessionError" : "Не вдалося ініціалізувати форму платежу",
   "subscription.submit.label" : "Я хочу підтримати розробку Franz",
@@ -281,5 +316,16 @@
   "validation.required" : "{field} обов'язвоке",
   "validation.url" : "{field} не валідний URL",
   "welcome.loginButton" : "Увійдіть до свого акаунту",
-   "welcome.signupButton" : "Створити безплатний акаунт"
+   "welcome.signupButton" : "Створити безплатний акаунт",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Всі сервіси",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index 54245ba57..34bd2158c 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -1,6 +1,7 @@
 {
   "app.errorHandler.action" : "重新載入",
   "app.errorHandler.headline" : "有些東西出錯了",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
   "feature.delayApp.action" : "取得 Franz 支援授權",
   "feature.delayApp.headline" : "請購買 Franz 支援授權以跳過等候",
   "feature.delayApp.text" : "Franz 會在 {seconds} 秒後繼續。",
@@ -9,7 +10,7 @@
   "feature.shareFranz.action.twitter" : "Share on Twitter",
   "feature.shareFranz.headline" : "Franz is better together!",
   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
   "global.api.unhealthy" : "無法連線至 Franz 的伺服器",
   "global.notConnectedToTheInternet" : "你沒有連上網路。",
@@ -43,6 +44,7 @@
   "login.submit.label" : "登入",
   "login.tokenExpired" : "您的登入已過期，請重新登入。",
   "menu.app.about" : "關於 Franz",
+   "menu.app.announcement" : "What's new?",
   "menu.app.hide" : "隱藏",
   "menu.app.hideOthers" : "隱藏其他",
   "menu.app.quit" : "結束",
@@ -87,6 +89,11 @@
   "menu.window" : "視窗",
   "menu.window.close" : "關閉",
   "menu.window.minimize" : "最小化",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "所有服務",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
   "password.email.label" : "電子郵件地址",
   "password.headline" : "重設密碼",
   "password.link.login" : "登入您的帳號",
@@ -110,6 +117,7 @@
   "service.errorHandler.headline" : "噢不！",
   "service.errorHandler.message" : "錯誤",
   "service.errorHandler.text" : "{name} 載入失敗。",
+   "service.webviewLoader.loading" : "Loading",
   "services.getStarted" : "開始",
   "services.welcome" : "歡迎使用 Franz",
   "settings.account.account.editButton" : "編輯帳號",
@@ -156,6 +164,7 @@
   "settings.app.headlineGeneral" : "一般",
   "settings.app.headlineLanguage" : "語言",
   "settings.app.headlineUpdates" : "更新",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
   "settings.app.restartRequired" : "需要重啟以更變",
   "settings.app.subheadlineCache" : "快取",
   "settings.app.translationHelp" : "幫助我們將 Franz 翻譯成您的語言。",
@@ -168,7 +177,9 @@
   "settings.navigation.inviteFriends" : "邀請朋友",
   "settings.navigation.logout" : "登出",
   "settings.navigation.settings" : "設定",
+   "settings.navigation.team" : "Manage Team",
   "settings.navigation.yourServices" : "您的服務",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
   "settings.recipes.all" : "所有服務",
   "settings.recipes.dev" : "開發",
   "settings.recipes.headline" : "可使用的服務",
@@ -226,6 +237,12 @@
   "settings.services.tooltip.isMuted" : "所有的聲音都是靜音",
   "settings.services.tooltip.notificationsDisabled" : "通知已停用",
   "settings.services.updatedInfo" : "已儲存你的變更",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "團隊",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
   "settings.user.form.accountType.company" : "公司",
   "settings.user.form.accountType.individual" : "個人",
   "settings.user.form.accountType.label" : "帳戶類型",
@@ -235,8 +252,25 @@
   "settings.user.form.firstname" : "名",
   "settings.user.form.lastname" : "姓",
   "settings.user.form.newPassword" : "新密碼",
+   "settings.workspace.add.form.name" : "名稱",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "名稱",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "再試一次",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
   "sidebar.addNewService" : "新增新的服務",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
   "sidebar.muteApp" : "關閉通知和通知音效",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
   "sidebar.settings" : "設定",
   "sidebar.unmuteApp" : "開啟通知和通知音效",
   "signup.company.label" : "公司",
@@ -258,6 +292,7 @@
   "subscription.features.onpremise.mattermost" : "加入如 Mattermost 等已預定 \/ 託管的服務",
   "subscription.features.proxy" : "服務的代理伺服器支援",
   "subscription.features.spellchecker" : "支援拼字檢查",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
   "subscription.includedFeatures" : "Franz 高級支援帳戶包含",
   "subscription.paymentSessionError" : "無法初始化付款表單",
   "subscription.submit.label" : "我想支持 Franz 開發",
@@ -281,5 +316,16 @@
   "validation.required" : "{field}為必填",
   "validation.url" : "{field}不是個有效的網址",
   "welcome.loginButton" : "登入您的帳戶",
-   "welcome.signupButton" : "建立免費帳號"
+   "welcome.signupButton" : "建立免費帳號",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "所有服務",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index 92593ed5c..4dd354afc 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -4,11 +4,11 @@
    "defaultMessage": "!!!Your services have been updated.",
    "file": "src/components/layout/AppLayout.js",
    "start": {
-      "line": 25,
+      "line": 26,
      "column": 19
    },
    "end": {
-      "line": 28,
+      "line": 29,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!A new update for Franz is available.",
    "file": "src/components/layout/AppLayout.js",
    "start": {
-      "line": 29,
+      "line": 30,
      "column": 19
    },
    "end": {
-      "line": 32,
+      "line": 33,
      "column": 3
    }
  },
@@ -30,11 +30,11 @@
    "defaultMessage": "!!!Reload services",
    "file": "src/components/layout/AppLayout.js",
    "start": {
-      "line": 33,
+      "line": 34,
      "column": 24
    },
    "end": {
-      "line": 36,
+      "line": 37,
      "column": 3
    }
  },
@@ -43,11 +43,11 @@
    "defaultMessage": "!!!Changelog",
    "file": "src/components/layout/AppLayout.js",
    "start": {
-      "line": 37,
+      "line": 38,
      "column": 13
    },
    "end": {
-      "line": 40,
+      "line": 41,
      "column": 3
    }
  },
@@ -56,11 +56,11 @@
    "defaultMessage": "!!!Restart & install update",
    "file": "src/components/layout/AppLayout.js",
    "start": {
-      "line": 41,
+      "line": 42,
      "column": 23
    },
    "end": {
-      "line": 44,
+      "line": 45,
      "column": 3
    }
  },
@@ -69,11 +69,11 @@
    "defaultMessage": "!!!Could not load services and user information",
    "file": "src/components/layout/AppLayout.js",
    "start": {
-      "line": 45,
+      "line": 46,
      "column": 26
    },
    "end": {
-      "line": 48,
+      "line": 49,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index 603950395..4969db910 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -4,11 +4,11 @@
    "defaultMessage": "!!!Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 15,
+      "line": 14,
      "column": 12
    },
    "end": {
-      "line": 18,
+      "line": 17,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!Your Subscription",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 19,
+      "line": 18,
      "column": 24
    },
    "end": {
-      "line": 22,
+      "line": 21,
      "column": 3
    }
  },
@@ -30,24 +30,11 @@
    "defaultMessage": "!!!Upgrade your Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 23,
+      "line": 22,
      "column": 19
    },
    "end": {
-      "line": 26,
+      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineInvoices",
-    "defaultMessage": "!!Invoices",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 20
-    },
-    "end": {
-      "line": 30,
      "column": 3
    }
  },
@@ -56,11 +43,11 @@
    "defaultMessage": "!!Danger Zone",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 31,
+      "line": 26,
      "column": 22
    },
    "end": {
-      "line": 34,
+      "line": 29,
      "column": 3
    }
  },
@@ -69,11 +56,11 @@
    "defaultMessage": "!!!Manage your subscription",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 35,
+      "line": 30,
      "column": 33
    },
    "end": {
-      "line": 38,
+      "line": 33,
      "column": 3
    }
  },
@@ -82,11 +69,11 @@
    "defaultMessage": "!!!Basic Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 39,
+      "line": 34,
      "column": 20
    },
    "end": {
-      "line": 42,
+      "line": 37,
      "column": 3
    }
  },
@@ -95,11 +82,11 @@
    "defaultMessage": "!!!Premium Supporter Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 43,
+      "line": 38,
      "column": 22
    },
    "end": {
-      "line": 46,
+      "line": 41,
      "column": 3
    }
  },
@@ -108,11 +95,24 @@
    "defaultMessage": "!!!Edit Account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 47,
+      "line": 42,
      "column": 21
    },
    "end": {
-      "line": 50,
+      "line": 45,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineInvoices",
+    "defaultMessage": "!!Invoices",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 46,
+      "column": 18
+    },
+    "end": {
+      "line": 49,
      "column": 3
    }
  },
@@ -121,11 +121,11 @@
    "defaultMessage": "!!!Download",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 51,
+      "line": 50,
      "column": 19
    },
    "end": {
-      "line": 54,
+      "line": 53,
      "column": 3
    }
  },
@@ -134,11 +134,11 @@
    "defaultMessage": "!!!Could not load user information",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 55,
+      "line": 54,
      "column": 25
    },
    "end": {
-      "line": 58,
+      "line": 57,
      "column": 3
    }
  },
@@ -147,11 +147,11 @@
    "defaultMessage": "!!!Try again",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 59,
+      "line": 58,
      "column": 28
    },
    "end": {
-      "line": 62,
+      "line": 61,
      "column": 3
    }
  },
@@ -160,11 +160,11 @@
    "defaultMessage": "!!!Delete account",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 63,
+      "line": 62,
      "column": 17
    },
    "end": {
-      "line": 66,
+      "line": 65,
      "column": 3
    }
  },
@@ -173,11 +173,11 @@
    "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 67,
+      "line": 66,
      "column": 14
    },
    "end": {
-      "line": 70,
+      "line": 69,
      "column": 3
    }
  },
@@ -186,11 +186,11 @@
    "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
    "file": "src/components/settings/account/AccountDashboard.js",
    "start": {
-      "line": 71,
+      "line": 70,
      "column": 19
    },
    "end": {
-      "line": 74,
+      "line": 73,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
index 77b0ed8a4..70a989211 100644
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
@@ -4,11 +4,11 @@
    "defaultMessage": "!!!Available services",
    "file": "src/components/settings/navigation/SettingsNavigation.js",
    "start": {
-      "line": 12,
+      "line": 13,
      "column": 21
    },
    "end": {
-      "line": 15,
+      "line": 16,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!Your services",
    "file": "src/components/settings/navigation/SettingsNavigation.js",
    "start": {
-      "line": 16,
+      "line": 17,
      "column": 16
    },
    "end": {
-      "line": 19,
+      "line": 20,
      "column": 3
    }
  },
@@ -30,11 +30,11 @@
    "defaultMessage": "!!!Your workspaces",
    "file": "src/components/settings/navigation/SettingsNavigation.js",
    "start": {
-      "line": 20,
+      "line": 21,
      "column": 18
    },
    "end": {
-      "line": 23,
+      "line": 24,
      "column": 3
    }
  },
@@ -43,11 +43,24 @@
    "defaultMessage": "!!!Account",
    "file": "src/components/settings/navigation/SettingsNavigation.js",
    "start": {
-      "line": 24,
+      "line": 25,
      "column": 11
    },
    "end": {
-      "line": 27,
+      "line": 28,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.navigation.team",
+    "defaultMessage": "!!!Manage Team",
+    "file": "src/components/settings/navigation/SettingsNavigation.js",
+    "start": {
+      "line": 29,
+      "column": 8
+    },
+    "end": {
+      "line": 32,
      "column": 3
    }
  },
@@ -56,11 +69,11 @@
    "defaultMessage": "!!!Settings",
    "file": "src/components/settings/navigation/SettingsNavigation.js",
    "start": {
-      "line": 28,
+      "line": 33,
      "column": 12
    },
    "end": {
-      "line": 31,
+      "line": 36,
      "column": 3
    }
  },
@@ -69,11 +82,11 @@
    "defaultMessage": "!!!Invite Friends",
    "file": "src/components/settings/navigation/SettingsNavigation.js",
    "start": {
-      "line": 32,
+      "line": 37,
      "column": 17
    },
    "end": {
-      "line": 35,
+      "line": 40,
      "column": 3
    }
  },
@@ -82,11 +95,11 @@
    "defaultMessage": "!!!Logout",
    "file": "src/components/settings/navigation/SettingsNavigation.js",
    "start": {
-      "line": 36,
+      "line": 41,
      "column": 10
    },
    "end": {
-      "line": 39,
+      "line": 44,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index c64f477be..fa21db10a 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -219,5 +219,18 @@
      "line": 83,
      "column": 3
    }
+  },
+  {
+    "id": "settings.app.languageDisclaimer",
+    "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 84,
+      "column": 22
+    },
+    "end": {
+      "line": 87,
+      "column": 3
+    }
  }
 ]
 \ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
new file mode 100644
index 000000000..6bccc25ff
--- /dev/null
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "settings.team.headline",
+    "defaultMessage": "!!!Team",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 14,
+      "column": 12
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.contentHeadline",
+    "defaultMessage": "!!!Franz for Teams",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 18,
+      "column": 19
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.intro",
+    "defaultMessage": "!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 22,
+      "column": 9
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.copy",
+    "defaultMessage": "!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 26,
+      "column": 8
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.manageAction",
+    "defaultMessage": "!!!Manage your Team on meetfranz.com",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 30,
+      "column": 16
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.team.upgradeAction",
+    "defaultMessage": "!!!Upgrade your Account",
+    "file": "src/components/settings/team/TeamDashboard.js",
+    "start": {
+      "line": 34,
+      "column": 17
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  }
+]
+\ No newline at end of file
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
index cc7470358..f98eb986f 100644
--- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json
+++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
@@ -130,15 +130,28 @@
    }
  },
  {
+    "id": "subscription.features.workspaces",
+    "defaultMessage": "!!!Organize your services in workspaces",
+    "file": "src/components/subscription/SubscriptionForm.js",
+    "start": {
+      "line": 54,
+      "column": 14
+    },
+    "end": {
+      "line": 57,
+      "column": 3
+    }
+  },
+  {
    "id": "subscription.features.ads",
    "defaultMessage": "!!!No ads, ever!",
    "file": "src/components/subscription/SubscriptionForm.js",
    "start": {
-      "line": 54,
+      "line": 58,
      "column": 7
    },
    "end": {
-      "line": 57,
+      "line": 61,
      "column": 3
    }
  },
@@ -147,11 +160,11 @@
    "defaultMessage": "!!!coming soon",
    "file": "src/components/subscription/SubscriptionForm.js",
    "start": {
-      "line": 58,
+      "line": 62,
      "column": 14
    },
    "end": {
-      "line": 61,
+      "line": 65,
      "column": 3
    }
  },
@@ -160,11 +173,11 @@
    "defaultMessage": "!!!EU residents: local sales tax may apply",
    "file": "src/components/subscription/SubscriptionForm.js",
    "start": {
-      "line": 62,
+      "line": 66,
      "column": 13
    },
    "end": {
-      "line": 65,
+      "line": 69,
      "column": 3
    }
  }
diff --git a/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
new file mode 100644
index 000000000..eb1b66916
--- /dev/null
+++ b/src/i18n/messages/src/features/announcements/components/AnnouncementScreen.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "feature.announcements.changelog.headline",
+    "defaultMessage": "!!!Changes in Franz {version}",
+    "file": "src/features/announcements/components/AnnouncementScreen.js",
+    "start": {
+      "line": 20,
+      "column": 12
+    },
+    "end": {
+      "line": 23,
+      "column": 3
+    }
+  }
+]
+\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
index 7b0c3e1ce..20ed99f8d 100644
--- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
+++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
@@ -63,5 +63,31 @@
      "line": 38,
      "column": 3
    }
+  },
+  {
+    "id": "settings.services.noServicesAdded",
+    "defaultMessage": "!!!You haven't added any services yet.",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 39,
+      "column": 19
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.services.discoverServices",
+    "defaultMessage": "!!!Discover services",
+    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
+    "start": {
+      "line": 43,
+      "column": 20
+    },
+    "end": {
+      "line": 46,
+      "column": 3
+    }
  }
 ]
 \ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 3889d39e0..2adf5b787 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -4,11 +4,11 @@
    "defaultMessage": "!!!Edit",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 13,
+      "line": 15,
      "column": 8
    },
    "end": {
-      "line": 16,
+      "line": 18,
      "column": 3
    }
  },
@@ -17,11 +17,11 @@
    "defaultMessage": "!!!Undo",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 17,
+      "line": 19,
      "column": 8
    },
    "end": {
-      "line": 20,
+      "line": 22,
      "column": 3
    }
  },
@@ -30,11 +30,11 @@
    "defaultMessage": "!!!Redo",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 21,
+      "line": 23,
      "column": 8
    },
    "end": {
-      "line": 24,
+      "line": 26,
      "column": 3
    }
  },
@@ -43,11 +43,11 @@
    "defaultMessage": "!!!Cut",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 25,
+      "line": 27,
      "column": 7
    },
    "end": {
-      "line": 28,
+      "line": 30,
      "column": 3
    }
  },
@@ -56,11 +56,11 @@
    "defaultMessage": "!!!Copy",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 29,
+      "line": 31,
      "column": 8
    },
    "end": {
-      "line": 32,
+      "line": 34,
      "column": 3
    }
  },
@@ -69,11 +69,11 @@
    "defaultMessage": "!!!Paste",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 33,
+      "line": 35,
      "column": 9
    },
    "end": {
-      "line": 36,
+      "line": 38,
      "column": 3
    }
  },
@@ -82,11 +82,11 @@
    "defaultMessage": "!!!Paste And Match Style",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 37,
+      "line": 39,
      "column": 22
    },
    "end": {
-      "line": 40,
+      "line": 42,
      "column": 3
    }
  },
@@ -95,11 +95,11 @@
    "defaultMessage": "!!!Delete",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 41,
+      "line": 43,
      "column": 10
    },
    "end": {
-      "line": 44,
+      "line": 46,
      "column": 3
    }
  },
@@ -108,11 +108,11 @@
    "defaultMessage": "!!!Select All",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 45,
+      "line": 47,
      "column": 13
    },
    "end": {
-      "line": 48,
+      "line": 50,
      "column": 3
    }
  },
@@ -121,11 +121,11 @@
    "defaultMessage": "!!!Speech",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 49,
+      "line": 51,
      "column": 10
    },
    "end": {
-      "line": 52,
+      "line": 54,
      "column": 3
    }
  },
@@ -134,11 +134,11 @@
    "defaultMessage": "!!!Start Speaking",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 53,
+      "line": 55,
      "column": 17
    },
    "end": {
-      "line": 56,
+      "line": 58,
      "column": 3
    }
  },
@@ -147,11 +147,11 @@
    "defaultMessage": "!!!Stop Speaking",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 57,
+      "line": 59,
      "column": 16
    },
    "end": {
-      "line": 60,
+      "line": 62,
      "column": 3
    }
  },
@@ -160,11 +160,11 @@
    "defaultMessage": "!!!Start Dictation",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 61,
+      "line": 63,
      "column": 18
    },
    "end": {
-      "line": 64,
+      "line": 66,
      "column": 3
    }
  },
@@ -173,11 +173,11 @@
    "defaultMessage": "!!!Emoji & Symbols",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 65,
+      "line": 67,
      "column": 16
    },
    "end": {
-      "line": 68,
+      "line": 70,
      "column": 3
    }
  },
@@ -186,11 +186,11 @@
    "defaultMessage": "!!!Actual Size",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 69,
+      "line": 71,
      "column": 13
    },
    "end": {
-      "line": 72,
+      "line": 74,
      "column": 3
    }
  },
@@ -199,11 +199,11 @@
    "defaultMessage": "!!!Zoom In",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 73,
+      "line": 75,
      "column": 10
    },
    "end": {
-      "line": 76,
+      "line": 78,
      "column": 3
    }
  },
@@ -212,11 +212,11 @@
    "defaultMessage": "!!!Zoom Out",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 77,
+      "line": 79,
      "column": 11
    },
    "end": {
-      "line": 80,
+      "line": 82,
      "column": 3
    }
  },
@@ -225,11 +225,11 @@
    "defaultMessage": "!!!Enter Full Screen",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 81,
+      "line": 83,
      "column": 19
    },
    "end": {
-      "line": 84,
+      "line": 86,
      "column": 3
    }
  },
@@ -238,11 +238,11 @@
    "defaultMessage": "!!!Exit Full Screen",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 85,
+      "line": 87,
      "column": 18
    },
    "end": {
-      "line": 88,
+      "line": 90,
      "column": 3
    }
  },
@@ -251,11 +251,11 @@
    "defaultMessage": "!!!Toggle Full Screen",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 89,
+      "line": 91,
      "column": 20
    },
    "end": {
-      "line": 92,
+      "line": 94,
      "column": 3
    }
  },
@@ -264,11 +264,11 @@
    "defaultMessage": "!!!Toggle Developer Tools",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 93,
+      "line": 95,
      "column": 18
    },
    "end": {
-      "line": 96,
+      "line": 98,
      "column": 3
    }
  },
@@ -277,11 +277,11 @@
    "defaultMessage": "!!!Toggle Service Developer Tools",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 97,
+      "line": 99,
      "column": 25
    },
    "end": {
-      "line": 100,
+      "line": 102,
      "column": 3
    }
  },
@@ -290,11 +290,11 @@
    "defaultMessage": "!!!Reload Service",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 101,
+      "line": 103,
      "column": 17
    },
    "end": {
-      "line": 104,
+      "line": 106,
      "column": 3
    }
  },
@@ -303,11 +303,11 @@
    "defaultMessage": "!!!Reload Franz",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 105,
+      "line": 107,
      "column": 15
    },
    "end": {
-      "line": 108,
+      "line": 110,
      "column": 3
    }
  },
@@ -316,11 +316,11 @@
    "defaultMessage": "!!!Minimize",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 109,
+      "line": 111,
      "column": 12
    },
    "end": {
-      "line": 112,
+      "line": 114,
      "column": 3
    }
  },
@@ -329,11 +329,11 @@
    "defaultMessage": "!!!Close",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 113,
+      "line": 115,
      "column": 9
    },
    "end": {
-      "line": 116,
+      "line": 118,
      "column": 3
    }
  },
@@ -342,11 +342,11 @@
    "defaultMessage": "!!!Learn More",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 117,
+      "line": 119,
      "column": 13
    },
    "end": {
-      "line": 120,
+      "line": 122,
      "column": 3
    }
  },
@@ -355,11 +355,11 @@
    "defaultMessage": "!!!Changelog",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 121,
+      "line": 123,
      "column": 13
    },
    "end": {
-      "line": 124,
+      "line": 126,
      "column": 3
    }
  },
@@ -368,11 +368,11 @@
    "defaultMessage": "!!!Support",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 125,
+      "line": 127,
      "column": 11
    },
    "end": {
-      "line": 128,
+      "line": 130,
      "column": 3
    }
  },
@@ -381,11 +381,11 @@
    "defaultMessage": "!!!Terms of Service",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 129,
+      "line": 131,
      "column": 7
    },
    "end": {
-      "line": 132,
+      "line": 134,
      "column": 3
    }
  },
@@ -394,11 +394,11 @@
    "defaultMessage": "!!!Privacy Statement",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 133,
+      "line": 135,
      "column": 11
    },
    "end": {
-      "line": 136,
+      "line": 138,
      "column": 3
    }
  },
@@ -407,11 +407,11 @@
    "defaultMessage": "!!!File",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 137,
+      "line": 139,
      "column": 8
    },
    "end": {
-      "line": 140,
+      "line": 142,
      "column": 3
    }
  },
@@ -420,11 +420,11 @@
    "defaultMessage": "!!!View",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 141,
+      "line": 143,
      "column": 8
    },
    "end": {
-      "line": 144,
+      "line": 146,
      "column": 3
    }
  },
@@ -433,11 +433,11 @@
    "defaultMessage": "!!!Services",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 145,
+      "line": 147,
      "column": 12
    },
    "end": {
-      "line": 148,
+      "line": 150,
      "column": 3
    }
  },
@@ -446,11 +446,11 @@
    "defaultMessage": "!!!Window",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 149,
+      "line": 151,
      "column": 10
    },
    "end": {
-      "line": 152,
+      "line": 154,
      "column": 3
    }
  },
@@ -459,11 +459,11 @@
    "defaultMessage": "!!!Help",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 153,
+      "line": 155,
      "column": 8
    },
    "end": {
-      "line": 156,
+      "line": 158,
      "column": 3
    }
  },
@@ -472,11 +472,24 @@
    "defaultMessage": "!!!About Franz",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 157,
+      "line": 159,
      "column": 9
    },
    "end": {
-      "line": 160,
+      "line": 162,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.app.announcement",
+    "defaultMessage": "!!!What's new?",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 163,
+      "column": 16
+    },
+    "end": {
+      "line": 166,
      "column": 3
    }
  },
@@ -485,11 +498,11 @@
    "defaultMessage": "!!!Settings",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 161,
+      "line": 167,
      "column": 12
    },
    "end": {
-      "line": 164,
+      "line": 170,
      "column": 3
    }
  },
@@ -498,11 +511,11 @@
    "defaultMessage": "!!!Hide",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 165,
+      "line": 171,
      "column": 8
    },
    "end": {
-      "line": 168,
+      "line": 174,
      "column": 3
    }
  },
@@ -511,11 +524,11 @@
    "defaultMessage": "!!!Hide Others",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 169,
+      "line": 175,
      "column": 14
    },
    "end": {
-      "line": 172,
+      "line": 178,
      "column": 3
    }
  },
@@ -524,11 +537,11 @@
    "defaultMessage": "!!!Unhide",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 173,
+      "line": 179,
      "column": 10
    },
    "end": {
-      "line": 176,
+      "line": 182,
      "column": 3
    }
  },
@@ -537,11 +550,11 @@
    "defaultMessage": "!!!Quit",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 177,
+      "line": 183,
      "column": 8
    },
    "end": {
-      "line": 180,
+      "line": 186,
      "column": 3
    }
  },
@@ -550,11 +563,11 @@
    "defaultMessage": "!!!Add New Service...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 181,
+      "line": 187,
      "column": 17
    },
    "end": {
-      "line": 184,
+      "line": 190,
      "column": 3
    }
  },
@@ -563,11 +576,11 @@
    "defaultMessage": "!!!Add New Workspace...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 185,
+      "line": 191,
      "column": 19
    },
    "end": {
-      "line": 188,
+      "line": 194,
      "column": 3
    }
  },
@@ -576,11 +589,11 @@
    "defaultMessage": "!!!Open workspace drawer",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 189,
+      "line": 195,
      "column": 23
    },
    "end": {
-      "line": 192,
+      "line": 198,
      "column": 3
    }
  },
@@ -589,11 +602,11 @@
    "defaultMessage": "!!!Close workspace drawer",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 193,
+      "line": 199,
      "column": 24
    },
    "end": {
-      "line": 196,
+      "line": 202,
      "column": 3
    }
  },
@@ -602,11 +615,11 @@
    "defaultMessage": "!!!Activate next service...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 197,
+      "line": 203,
      "column": 23
    },
    "end": {
-      "line": 200,
+      "line": 206,
      "column": 3
    }
  },
@@ -615,11 +628,11 @@
    "defaultMessage": "!!!Activate previous service...",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 201,
+      "line": 207,
      "column": 27
    },
    "end": {
-      "line": 204,
+      "line": 210,
      "column": 3
    }
  },
@@ -628,11 +641,11 @@
    "defaultMessage": "!!!Disable notifications & audio",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 205,
+      "line": 211,
      "column": 11
    },
    "end": {
-      "line": 208,
+      "line": 214,
      "column": 3
    }
  },
@@ -641,11 +654,11 @@
    "defaultMessage": "!!!Enable notifications & audio",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 209,
+      "line": 215,
      "column": 13
    },
    "end": {
-      "line": 212,
+      "line": 218,
      "column": 3
    }
  },
@@ -654,11 +667,11 @@
    "defaultMessage": "!!!Workspaces",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 213,
+      "line": 219,
      "column": 14
    },
    "end": {
-      "line": 216,
+      "line": 222,
      "column": 3
    }
  },
@@ -667,11 +680,11 @@
    "defaultMessage": "!!!Default",
    "file": "src/lib/Menu.js",
    "start": {
-      "line": 217,
+      "line": 223,
      "column": 20
    },
    "end": {
-      "line": 220,
+      "line": 226,
      "column": 3
    }
  }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index a4e41c17c..da2540274 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -6,6 +6,8 @@ import { isMac, ctrlKey, cmdKey } from '../environment';
 import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index';
 import { workspaceActions } from '../features/workspaces/actions';
 import { gaEvent } from './analytics';
+import { announcementActions } from '../features/announcements/actions';
+import { announcementsStore } from '../features/announcements';
 const { app, Menu, dialog } = remote;
@@ -158,6 +160,10 @@ const menuItems = defineMessages({
    id: 'menu.app.about',
    defaultMessage: '!!!About Franz',
  },
+  announcement: {
+    id: 'menu.app.announcement',
+    defaultMessage: '!!!What\'s new?',
+  },
  settings: {
    id: 'menu.app.settings',
    defaultMessage: '!!!Settings',
@@ -348,8 +354,11 @@ const _templateFactory = intl => [
        click() { shell.openExternal('https://meetfranz.com'); },
      },
      {
-        label: intl.formatMessage(menuItems.changelog),
+        label: intl.formatMessage(menuItems.announcement),
-        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+        click: () => {
+          announcementActions.show();
+        },
+        visible: window.franz.stores.user.isLoggedIn && announcementsStore.areNewsAvailable,
      },
      {
        type: 'separator',
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index e7daa9d06..c305fdb00 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -1,5 +1,8 @@
 import { remote } from 'electron';
-import { GA_ID } from '../config';
+import querystring from 'querystring';
+import { GA_ID, STATS_API } from '../config';
+import { isDevMode } from '../environment';
 const debug = require('debug')('Franz:Analytics');
@@ -35,3 +38,18 @@ export function gaEvent(category, action, label) {
  ga('send', 'event', category, action, label);
  debug('GA track event', category, action, label);
 }
+export function statsEvent(key, value) {
+  const params = {
+    key,
+    value: value || key,
+    platform: process.platform,
+    version: remote.app.getVersion(),
+  };
+  debug('Send Franz stats event', params);
+  if (!isDevMode) {
+    window.fetch(`${STATS_API}/event/?${querystring.stringify(params)}`);
+  }
+}
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 351ad6422..72c4b4d0b 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -14,7 +14,7 @@ import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac } from '../environment';
 import locales from '../i18n/translations';
-import { gaEvent, gaPage } from '../lib/analytics';
+import { gaEvent, gaPage, statsEvent } from '../lib/analytics';
 import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
@@ -67,6 +67,8 @@ export default class AppStore extends Store {
  @observable isFocused = true;
+  @observable nextAppReleaseVersion = null;
  dictionaries = [];
  constructor(...args) {
@@ -123,7 +125,7 @@ export default class AppStore extends Store {
    ipcRenderer.on('autoUpdate', (event, data) => {
      if (data.available) {
        this.updateStatus = this.updateStatusTypes.AVAILABLE;
+        this.nextAppReleaseVersion = data.version;
        if (isMac) {
          app.dock.bounce();
        }
@@ -172,7 +174,8 @@ export default class AppStore extends Store {
    reaction(() => this.stores.router.location.pathname, (pathname) => {
      gaPage(pathname);
    });
-    console.log('router location', this.stores.router.location);
+    statsEvent('app-start');
  }
  @computed get cacheSize() {
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 8fe576813..e7832088b 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -14,6 +14,8 @@ import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
 import shareFranz from '../features/shareFranz';
+import announcements from '../features/announcements';
+import settingsWS from '../features/settingsWS';
 import { DEFAULT_FEATURES_CONFIG } from '../config';
@@ -71,5 +73,7 @@ export default class FeaturesStore extends Store {
    basicAuth(this.stores, this.actions);
    workspaces(this.stores, this.actions);
    shareFranz(this.stores, this.actions);
+    announcements(this.stores, this.actions);
+    settingsWS(this.stores, this.actions);
  }
 }
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index 4cabee194..d4de476c8 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -10,15 +10,10 @@ export default class PaymentStore extends Store {
  @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage');
-  @observable createDashboardUrlRequest = new Request(this.api.payment, 'getDashboardUrl');
-  @observable ordersDataRequest = new CachedRequest(this.api.payment, 'getOrders');
  constructor(...args) {
    super(...args);
    this.actions.payment.createHostedPage.listen(this._createHostedPage.bind(this));
-    this.actions.payment.createDashboardUrl.listen(this._createDashboardUrl.bind(this));
  }
  @computed get plan() {
@@ -28,10 +23,6 @@ export default class PaymentStore extends Store {
    return this.plansRequest.execute().result || {};
  }
-  @computed get orders() {
-    return this.ordersDataRequest.execute().result || [];
-  }
  @action _createHostedPage({ planId }) {
    const request = this.createHostedPageRequest.execute(planId);
@@ -39,12 +30,4 @@ export default class PaymentStore extends Store {
    return request;
  }
-  @action _createDashboardUrl() {
-    const request = this.createDashboardUrlRequest.execute();
-    gaEvent('Payment', 'createDashboardUrl');
-    return request;
-  }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 0ec6bf550..d63302fce 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -11,7 +11,7 @@ import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
-import { gaEvent } from '../lib/analytics';
+import { gaEvent, statsEvent } from '../lib/analytics';
 import { workspaceStore } from '../features/workspaces';
 const debug = require('debug')('Franz:ServiceStore');
@@ -36,6 +36,7 @@ export default class ServicesStore extends Store {
    // Register action handlers
    this.actions.service.setActive.listen(this._setActive.bind(this));
+    this.actions.service.blurActive.listen(this._blurActive.bind(this));
    this.actions.service.setActiveNext.listen(this._setActiveNext.bind(this));
    this.actions.service.setActivePrev.listen(this._setActivePrev.bind(this));
    this.actions.service.showAddServiceInterface.listen(this._showAddServiceInterface.bind(this));
@@ -290,7 +291,8 @@ export default class ServicesStore extends Store {
    gaEvent('Service', 'clear cache');
  }
-  @action _setActive({ serviceId }) {
+  @action _setActive({ serviceId, keepActiveRoute }) {
+    if (!keepActiveRoute) this.stores.router.push('/');
    const service = this.one(serviceId);
    this.all.forEach((s, index) => {
@@ -298,9 +300,16 @@ export default class ServicesStore extends Store {
    });
    service.isActive = true;
+    statsEvent('activate-service', service.recipe.id);
    this._focusActiveService();
  }
+  @action _blurActive() {
+    if (!this.active) return;
+    this.active.isActive = false;
+  }
  @action _setActiveNext() {
    const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length);
@@ -509,7 +518,16 @@ export default class ServicesStore extends Store {
    this.actions.ui.toggleServiceUpdatedInfoBar({ visible: false });
  }
-  @action _reorder({ oldIndex, newIndex }) {
+  @action _reorder(params) {
+    const { workspaces } = this.stores;
+    if (workspaces.isAnyWorkspaceActive) {
+      workspaces.reorderServicesOfActiveWorkspace(params);
+    } else {
+      this._reorderService(params);
+    }
+  }
+  @action _reorderService({ oldIndex, newIndex }) {
    const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
    const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
    const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 534690fbb..31555dd5c 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -178,6 +178,7 @@ export default class UserStore extends Store {
      password,
      accountType,
      company,
+      locale: this.stores.app.locale,
    });
    this.hasCompletedSignup = false;
diff --git a/src/stores/index.js b/src/stores/index.js
index 96b844c95..1912418a2 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -10,6 +10,8 @@ import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
 import GlobalErrorStore from './GlobalErrorStore';
+import { workspaceStore } from '../features/workspaces';
+import { announcementsStore } from '../features/announcements';
 export default (api, actions, router) => {
  const stores = {};
@@ -27,6 +29,8 @@ export default (api, actions, router) => {
    news: new NewsStore(stores, api, actions),
    requests: new RequestStore(stores, api, actions),
    globalError: new GlobalErrorStore(stores, api, actions),
+    workspaces: workspaceStore,
+    announcements: announcementsStore,
  });
  // Initialize all stores
  Object.keys(stores).forEach((name) => {
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index 46aa4dae6..f2642908f 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -1,24 +1,31 @@
-// @flow
 import { autorun } from 'mobx';
 export default class Reaction {
  reaction;
-  hasBeenStarted;
+  isRunning = false;
  dispose;
  constructor(reaction) {
    this.reaction = reaction;
-    this.hasBeenStarted = false;
  }
  start() {
-    this.dispose = autorun(() => this.reaction());
+    if (!this.isRunning) {
-    this.hasBeenStarted = true;
+      this.dispose = autorun(() => this.reaction());
+      this.isActive = true;
+    }
  }
  stop() {
-    if (this.hasBeenStarted) this.dispose();
+    if (this.isRunning) {
+      this.dispose();
+      this.isActive = false;
+    }
  }
 }
+export const createReactions = reactions => (
+  reactions.map(r => new Reaction(r))
+);
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index f9fac039a..69879de31 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -8,7 +8,7 @@
  &.badge--primary,
  &.badge--premium {
    background: $theme-brand-primary;
-    color: $dark-theme-gray-smoke;
+    color: $dark-theme-gray-lightest;
  }
 }
@@ -19,6 +19,7 @@
  display: inline-block;
  font-size: 14px;
  padding: 5px 10px;
+  letter-spacing: 0;
  &.badge--primary,
  &.badge--premium {
diff --git a/src/styles/info-bar.scss b/src/styles/info-bar.scss
index fb4917358..d3010942f 100644
--- a/src/styles/info-bar.scss
+++ b/src/styles/info-bar.scss
@@ -43,6 +43,10 @@
    }
  }
+  .info-bar__inline-button {
+    color: white;
+  }
  &.info-bar--bottom { order: 10; }
  &.info-bar--primary {
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index dd6f56d2b..1baff8b54 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -61,11 +61,6 @@
    .account {
      .account__box { background: $dark-theme-gray-darker; }
-      .invoices {
-        td { border-bottom: 1px solid $dark-theme-gray-darker; }
-        .invoices__action button { color: $theme-brand-primary; }
-      }
    }
    .premium-info {
@@ -329,15 +324,6 @@
    .account__avatar {
      margin-right: 20px;
      position: relative;
-      .emoji img { width: 30px; }
-    }
-    .account__avatar-premium {
-      font-size: 26px;
-      position: absolute;
-      right: 2px;
-      top: 2px;
    }
    .account__info {
@@ -345,6 +331,7 @@
      h2 { margin-bottom: 5px; }
      .badge { margin-top: 5px; }
+      .username { margin-right: 10 }
    }
    .account__subscription {
@@ -354,6 +341,22 @@
      .badge { margin-left: 10px; }
    }
+    .badge--premium {
+      margin-left: 1px;
+      position: relative;
+      top: -3px;
+      padding-top: 4px;
+      color: #FFF;
+      border-radius: 3px;
+    }
+    .manage-user-links {
+      margin-top: 20px;
+      display: flex;
+      justify-content: space-between;
+    }
    .account__subscription-button { margin-left: auto; }
    .franz-form__button { white-space: nowrap; }
    div { height: auto; }
author	Stefan <stefan@adlk.io>	2019-06-04 14:26:56 +0200
committer	Stefan <stefan@adlk.io>	2019-06-04 14:26:56 +0200
commit	fd6a1e9ba24c7947af08a30829c860cad4726f67 (patch)
tree	0b6276700ced8d13eaf0a1e3b706a69a5a47b1da
parent	fix(Windows): Replace tray icon with high-res version (diff)
parent	Merge pull request #1443 from meetfranz/feature/multilingual-announcements (diff)
download	ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.gz ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.zst ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.zip