Merge pull request #392 from matrix-org/dbkr/scalar

Dbkr/scalar

src/components/structures/MatrixChat.js

@@ -19,6 +19,7 @@ var url = require('url');
 var Favico = require('favico.js');
 
 var MatrixClientPeg = require("../../MatrixClientPeg");
+var SdkConfig = require("../../SdkConfig");
 var Notifier = require("../../Notifier");
 var ContextualMenu = require("./ContextualMenu");
 var RoomListSorter = require("../../RoomListSorter");
@@ -140,6 +141,7 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
+        SdkConfig.put(this.props.config);
         this.favicon = new Favico({animation: 'none'});
 
         // Stashed guest credentials if the user logs out

src/components/structures/UserSettings.js

@@ -34,7 +34,11 @@ const LABS_FEATURES = [
     {
         name: 'End-to-End Encryption',
         id: 'e2e_encryption'
-    }
+    },
+    {
+        name: 'Integration Management',
+        id: 'integration_management'
+    },
 ];
 
 // if this looks like a release, use the 'version' from package.json; else use