Merge remote-tracking branch 'upstream/develop' into develop

client/package.json

@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/Algoteers/MasterApp#readme",
   "devDependencies": {
-    "@advancedalgos/events-client": "^0.0.4",
-    "@advancedalgos/key-vault-client": "^0.0.21",
-    "@advancedalgos/teams-client": "^0.0.27",
-    "@advancedalgos/users-client": "^0.0.24",
+    "@advancedalgos/events-client": "0.0.4",
+    "@advancedalgos/key-vault-client": "0.0.23",
+    "@advancedalgos/teams-client": "0.0.27",
+    "@advancedalgos/users-client": "0.0.24",
     "@advancedalgos/web-components": "0.0.13",
     "@babel/core": "^7.1.2",
     "@babel/plugin-proposal-class-properties": "^7.1.0",

client/src/styles/styles.scss

@@ -44,7 +44,8 @@ $advanced-algos-red: rgb(245,88,88);
 }
 
 body{
-  overflow-y:scroll;
+  padding-right: 0 !important;
+  overflow-y: scroll;
 
   &::-webkit-scrollbar-track {
     border: 1px solid #000;

client/src/views/layout/header/imports.js

@@ -57,7 +57,7 @@ const keyvaultMenus = {
   icon: Home,
   authenticated: true,
   submenus: [
-    { title: 'Manage keys', to: '/key-vault/browse', icon: VpnKey },
+    { title: 'Your keys', to: '/key-vault/browse', icon: VpnKey },
     { title: 'Add key', to: '/key-vault/addKey', icon: AddCircleOutline },
     { title: 'Report', to: 'https://github.com/AdvancedAlgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true }
   ]