Merge remote-tracking branch 'origin/develop' into dbkr/fix_slash_join

src/Invite.js

@@ -127,7 +127,7 @@ function _onRoomInviteFinished(roomId, shouldInvite, addrs) {
 }
 
 function _isDmChat(addrTexts) {
-    if (addrTexts.length === 1 && getAddressType(addrTexts[0])) {
+    if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx') {
         return true;
     } else {
         return false;

src/components/views/rooms/RoomHeader.js

@@ -56,7 +56,7 @@ module.exports = React.createClass({
             editing: false,
             inRoom: false,
             onSaveClick: function() {},
-            onCancelClick: function() {},
+            onCancelClick: null,
         };
     },
 

src/stores/RoomViewStore.js

@@ -158,6 +158,7 @@ class RoomViewStore extends Store {
                     highlighted: payload.highlighted,
                     room_alias: payload.room_alias,
                     auto_join: payload.auto_join,
+                    oob_data: payload.oob_data,
                 });
             }, (err) => {
                 dis.dispatch({