Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

skins/base/views/organisms/RoomView.js

@@ -166,6 +166,7 @@ module.exports = React.createClass({
                 if (typingString) {
                     statusBar = (
                         <div className="mx_RoomView_typingBar">
+                            <img src="img/typing.png" width="40" height="40" alt=""/>
                             {typingString}
                         </div>
                     );