merge in develop, fixing conflicts

src/GuestAccess.js

src/MatrixClientPeg.js

src/PasswordReset.js

src/Presence.js

src/Signup.js

src/UserActivity.js

src/UserSettingsStore.js

src/Velociraptor.js

src/component-index.js

src/components/structures/MatrixChat.js

src/components/structures/RoomView.js

src/components/structures/ScrollPanel.js

src/components/structures/UserSettings.js

src/components/structures/login/ForgotPassword.js

src/components/structures/login/Login.js

src/components/structures/login/Registration.js

src/components/views/login/PasswordLogin.js

src/components/views/login/RegistrationForm.js

src/components/views/rooms/MessageComposer.js

src/components/views/rooms/RoomSettings.js