Merge branch 'develop' into kegan/archived-rooms

src/components/views/rooms/EventTile.js

@@ -44,6 +44,7 @@ var eventTileTypes = {
     'm.call.hangup' : 'messages.TextualEvent',
     'm.room.name'   : 'messages.TextualEvent',
     'm.room.topic'  : 'messages.TextualEvent',
+    'm.room.third_party_invite': 'messages.TextualEvent'
 };
 
 var MAX_READ_AVATARS = 5;

src/components/views/rooms/RoomList.js

@@ -265,7 +265,7 @@ module.exports = React.createClass({
                              collapsed={ self.props.collapsed } />
 
                 <RoomSubList list={ self.state.lists['im.vector.fake.recent'] }
-                             label="Conversations"
+                             label="Rooms"
                              editable={ true }
                              verb="restore"
                              order="recent"