Merge branch 'master' into about-us-page

# Conflicts:
#	package.json

Author: Matthias Rütten

package.json

@@ -104,16 +104,16 @@
     "cross-env": "^6.0.0",
     "css-loader": "^3.2.0",
     "electron": "^7.0.0",
-    "electron-builder": "^21.2.0",
+    "electron-builder": "^22.1.0",
     "electron-devtools-installer": "^2.2.4",
     "electron-log": "^3.0.8",
     "electron-notarize": "^0.2.0",
     "electron-unhandled": "^3.0.0",
-    "electron-updater": "^4.1.2",
+    "electron-updater": "^4.2.0",
     "electron-util": "^0.12.2",
     "emotion-theming": "^10.0.18",
     "file-loader": "^4.2.0",
-    "fork-ts-checker-webpack-plugin": "^2.0.0",
+    "fork-ts-checker-webpack-plugin": "^3.0.0",
     "html-webpack-plugin": "^3.2.0",
     "husky": "^3.0.5",
     "image-webpack-loader": "^6.0.0",

yarn.lock

@@ -4932,10 +4932,10 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-2.0.0.tgz#6b77f0ba7edbe03246721a9f0519e32eb5765f41"
-  integrity sha512-9FWDlYAkuJFvWW6/uykliAAbhneLOS1PK3z9DjFAt3BLaUsCcFHFFzICSot998J4VPvT6aA8F+XIlxE0q0G6Tg==
+fork-ts-checker-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.0.0.tgz#9d1eaca50ff4c006dae7f882849481a39e27634c"
+  integrity sha512-WArJLuWoQJz3gli0tc8MjuSl+arIeXPU5cADg0LxnczoNYngXlo26AYpsqgj1X+79q1GS8dNUAHVjtQ+Z+WQZA==
   dependencies:
     babel-code-frame "^6.22.0"
     chalk "^2.4.1"