Merge pull request #813 from t3chguy/RoomSettings_close_focus_composer

On return to RoomView from auxPanel, send focus back to Composer

src/components/structures/RoomView.js

@@ -1181,6 +1181,7 @@ module.exports = React.createClass({
         console.log("updateTint from onCancelClick");
         this.updateTint();
         this.setState({editingRoomSettings: false});
+        dis.dispatch({action: 'focus_composer'});
     },
 
     onLeaveClick: function() {