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

src/components/views/rooms/RoomHeader.js

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