Merge branch 'master' into beta

# Conflicts:
#	.circleci/config.yml
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	android/app/src/debug/AndroidManifest.xml
#	android/app/src/debug/java/chat/rocket/reactnative/ReactNativeFlipper.java
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/assets/fonts/custom.ttf
#	android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
#	android/app/src/main/res/values-night/colors.xml
#	android/app/src/main/res/values/colors.xml
#	android/app/src/main/res/values/strings.xml
#	android/app/src/main/res/values/styles.xml
#	android/app/src/play/AndroidManifest.xml
#	android/app/src/play/java/chat/rocket/reactnative/Encryption.java
#	android/build.gradle
#	android/fastlane/Fastfile
#	android/gradle.properties
#	android/settings.gradle
#	app/actions/server.js
#	app/constants/colors.js
#	app/constants/environment.js
#	app/containers/ActionSheet/styles.js
#	app/containers/Button/index.js
#	app/containers/EmojiPicker/styles.js
#	app/containers/List/ListIcon.js
#	app/containers/List/ListItem.js
#	app/containers/MessageActions/Header.js
#	app/containers/MessageBox/EmojiKeyboard.js
#	app/containers/MessageBox/index.js
#	app/containers/MessageBox/styles.js
#	app/containers/ReactionsModal.js
#	app/containers/TextInput.js
#	app/containers/Toast.js
#	app/containers/markdown/index.js
#	app/containers/message/Content.js
#	app/containers/message/Message.js
#	app/containers/message/RepliedThread.js
#	app/containers/message/User.js
#	app/containers/message/index.js
#	app/containers/message/styles.js
#	app/i18n/index.js
#	app/i18n/locales/de.js
#	app/i18n/locales/en.js
#	app/i18n/locales/es-ES.js
#	app/i18n/locales/fr.js
#	app/i18n/locales/it.js
#	app/i18n/locales/ja.js
#	app/i18n/locales/nl.js
#	app/i18n/locales/pt-BR.js
#	app/i18n/locales/ru.js
#	app/i18n/locales/zh-CN.js
#	app/i18n/locales/zh-TW.js
#	app/lib/database/index.js
#	app/lib/database/model/Subscription.js
#	app/lib/database/model/migrations.js
#	app/lib/database/schema/app.js
#	app/lib/methods/helpers/mergeSubscriptionsRooms.js
#	app/lib/methods/sendFileMessage.js
#	app/lib/methods/subscriptions/rooms.js
#	app/lib/rocketchat.js
#	app/lib/selection.json
#	app/presentation/RoomItem/Actions.js
#	app/presentation/RoomItem/RoomItem.js
#	app/presentation/RoomItem/Touchable.js
#	app/presentation/RoomItem/UpdatedAt.js
#	app/presentation/RoomItem/index.js
#	app/presentation/RoomItem/styles.js
#	app/presentation/TextInput.js
#	app/presentation/UnreadBadge/getUnreadStyle.js
#	app/presentation/UnreadBadge/getUnreadStyle.test.js
#	app/sagas/login.js
#	app/sagas/selectServer.js
#	app/stacks/InsideStack.js
#	app/utils/navigation/animations.js
#	app/utils/room.js
#	app/views/AttachmentView.js
#	app/views/DirectoryView/index.js
#	app/views/LanguageView/index.js
#	app/views/NewServerView/index.js
#	app/views/OnboardingView/styles.js
#	app/views/PickerView.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomActionsView/styles.js
#	app/views/RoomInfoEditView/styles.js
#	app/views/RoomMembersView/index.js
#	app/views/RoomView/List.js
#	app/views/RoomView/index.js
#	app/views/ShareListView/index.js
#	app/views/ShareListView/styles.js
#	app/views/ShareView/Preview.js
#	app/views/ThreadMessagesView/Item.stories.js
#	app/views/ThreadMessagesView/NoDataFound.js
#	app/views/VisitorNavigationView.js
#	app/views/WithoutServersView.js
#	app/views/WorkspaceView/styles.js
#	e2e/data.js
#	e2e/data/data.cloud.js
#	e2e/data/data.docker.js
#	e2e/helpers/data_setup.js
#	e2e/tests/init.js
#	e2e/tests/room/02-room.spec.js
#	e2e/tests/room/03-roomactions.spec.js
#	ios/LaunchScreen.storyboard
#	ios/NotificationService/Info.plist
#	ios/Podfile.lock
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Headers/JitsiMeet-Swift.h
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Info.plist
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/JitsiMeet
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/Project/x86_64.swiftsourceinfo
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64-apple-ios.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64-apple-ios.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64-apple-ios.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64-apple-ios-simulator.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64-apple-ios-simulator.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/main.jsbundle
#	ios/Pods/Local Podspecs/FBLazyVector.podspec.json
#	ios/Pods/Local Podspecs/FBReactNativeSpec.podspec.json
#	ios/Pods/Local Podspecs/RCTRequired.podspec.json
#	ios/Pods/Local Podspecs/RCTTypeSafety.podspec.json
#	ios/Pods/Local Podspecs/RNFastImage.podspec.json
#	ios/Pods/Local Podspecs/React-Core.podspec.json
#	ios/Pods/Local Podspecs/React-CoreModules.podspec.json
#	ios/Pods/Local Podspecs/React-RCTActionSheet.podspec.json
#	ios/Pods/Local Podspecs/React-RCTAnimation.podspec.json
#	ios/Pods/Local Podspecs/React-RCTBlob.podspec.json
#	ios/Pods/Local Podspecs/React-RCTImage.podspec.json
#	ios/Pods/Local Podspecs/React-RCTLinking.podspec.json
#	ios/Pods/Local Podspecs/React-RCTNetwork.podspec.json
#	ios/Pods/Local Podspecs/React-RCTSettings.podspec.json
#	ios/Pods/Local Podspecs/React-RCTText.podspec.json
#	ios/Pods/Local Podspecs/React-RCTVibration.podspec.json
#	ios/Pods/Local Podspecs/React-callinvoker.podspec.json
#	ios/Pods/Local Podspecs/React-cxxreact.podspec.json
#	ios/Pods/Local Podspecs/React-jsi.podspec.json
#	ios/Pods/Local Podspecs/React-jsiexecutor.podspec.json
#	ios/Pods/Local Podspecs/React-jsinspector.podspec.json
#	ios/Pods/Local Podspecs/React.podspec.json
#	ios/Pods/Local Podspecs/ReactCommon.podspec.json
#	ios/Pods/Local Podspecs/Yoga.podspec.json
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService.release.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/React-Core/ResourceBundle-AccessibilityResources-React-Core-Info.plist
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/NotificationService.xcscheme
#	ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme
#	ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/ShareRocketChatRN.xcscheme
#	ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/Contents.json
#	ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/Contents.json
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	ios/Shared/RocketChat/Database.swift
#	ios/custom.ttf
#	ios/fastlane/Fastfile
#	package.json
#	patches/react-native-webview+10.3.2.patch
#	patches/rn-fetch-blob+0.12.0.patch
#	react-native.config.js
#	storybook/stories/Markdown.js
#	storybook/stories/Message.js
#	storybook/stories/RoomItem.js
#	storybook/stories/index.js
#	yarn.lock