Merge pull request #38 from matrix-org/kegan/controller-merging2

src/components/views/create_room/CreateRoomButton.js

src/components/views/create_room/Presets.js

src/components/views/create_room/RoomAlias.js

src/components/views/elements/EditableText.js

src/components/views/settings/EnableNotificationsButton.js

src/components/views/voip/CallView.js

src/components/views/voip/IncomingCallBox.js

src/components/views/voip/VideoFeed.js

src/components/views/voip/VideoView.js

src/controllers/atoms/create_room/RoomNameTextbox.js

src/controllers/molecules/MemberInfo.js

src/controllers/molecules/MemberTile.js

src/controllers/organisms/CreateRoom.js