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

package.json

src/AddThreepid.js

src/Avatar.js

src/Entities.js

src/GuestAccess.js

src/MatrixClientPeg.js

src/PasswordReset.js

src/Presence.js

src/Signup.js

src/SlashCommands.js

src/TabComplete.js

src/TabCompleteEntries.js

src/TextForEvent.js

src/Tinter.js

src/UserActivity.js

src/UserSettingsStore.js

src/Velociraptor.js

src/component-index.js

src/components/structures/CreateRoom.js

src/components/structures/MatrixChat.js