Merge branch 'develop' into kegan/vector-references

Update having merged skindexing PR

src/components/views/login/VectorCustomServerDialog.js

@@ -18,6 +18,9 @@ var React = require("react");
 
 module.exports = React.createClass({
     displayName: 'VectorCustomServerDialog',
+    statics: {
+        replaces: 'CustomServerDialog',
+    },
 
     render: function() {
         return (

src/components/views/login/VectorLoginFooter.js

@@ -20,6 +20,9 @@ var React = require('react');
 
 module.exports = React.createClass({
     displayName: 'VectorLoginFooter',
+    statics: {
+        replaces: 'LoginFooter',
+    },
 
     render: function() {
         return (

src/components/views/login/VectorLoginHeader.js

@@ -20,6 +20,9 @@ var React = require('react');
 
 module.exports = React.createClass({
     displayName: 'VectorLoginHeader',
+    statics: {
+        replaces: 'LoginHeader',
+    },
 
     render: function() {
         return (

src/components/views/rooms/RoomDNDView.js

@@ -201,4 +201,6 @@ DragSource('RoomTile', roomTileSource, function(connect, monitor) {
         // You can ask the monitor about the current drag state:
         isDragging: monitor.isDragging()
     };
-})(RoomTile));
+})(RoomTile));
+
+module.exports.replaces = 'RoomTile';