Merge branch 'develop' into new-guest-access

Conflicts:
	src/components/structures/MatrixChat.js

src/components/structures/RoomView.js

@@ -1760,6 +1760,7 @@ module.exports = React.createClass({
                     oobData={this.props.oobData}
                     editing={this.state.editingRoomSettings}
                     saving={this.state.uploadingRoomSettings}
+                    inRoom={myMember && myMember.membership === 'join'}
                     collapsedRhs={ this.props.collapsedRhs }
                     onSearchClick={this.onSearchClick}
                     onSettingsClick={this.onSettingsClick}