Merge branch 'develop' into kegan/guest-peek-then-join

src/PasswordReset.js

src/SlashCommands.js

src/Tinter.js

src/UserActivity.js

src/component-index.js

src/components/structures/MatrixChat.js

src/components/structures/RoomView.js

src/components/structures/login/ForgotPassword.js

src/components/structures/login/Login.js

src/components/views/login/PasswordLogin.js

src/components/views/rooms/RoomHeader.js

src/components/views/rooms/RoomSettings.js

src/components/views/settings/ChangeAvatar.js