Merge branch 'master' into beta

# Conflicts:
#	.circleci/config.yml
#	README.md
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java
#	android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
#	android/app/src/main/res/values/strings.xml
#	app/actions/actionsTypes.js
#	app/actions/index.js
#	app/actions/room.js
#	app/constants/settings.js
#	app/constants/tablet.js
#	app/containers/Avatar.js
#	app/containers/Button/index.js
#	app/containers/Check.js
#	app/containers/ListItem.js
#	app/containers/MessageActions.js
#	app/containers/MessageBox/LeftButtons.ios.js
#	app/containers/MessageBox/RightButtons.android.js
#	app/containers/MessageBox/UploadModal.js
#	app/containers/MessageBox/buttons/FileButton.js
#	app/containers/MessageBox/index.js
#	app/containers/RoomTypeIcon.js
#	app/containers/Status/Status.js
#	app/containers/Status/index.js
#	app/containers/TextInput.js
#	app/containers/UIKit/MultiSelect/Chips.js
#	app/containers/UIKit/MultiSelect/Input.js
#	app/containers/UIKit/MultiSelect/Items.js
#	app/containers/UIKit/MultiSelect/index.js
#	app/containers/UIKit/MultiSelect/styles.js
#	app/containers/markdown/index.js
#	app/containers/message/User.js
#	app/i18n/locales/de.js
#	app/i18n/locales/en.js
#	app/i18n/locales/es-ES.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/index.js
#	app/lib/database/index.js
#	app/lib/database/model/Subscription.js
#	app/lib/database/model/User.js
#	app/lib/database/model/migrations.js
#	app/lib/database/schema/app.js
#	app/lib/database/schema/servers.js
#	app/lib/methods/canOpenRoom.js
#	app/lib/methods/getSettings.js
#	app/lib/methods/getUsersPresence.js
#	app/lib/methods/helpers/mergeSubscriptionsRooms.js
#	app/lib/methods/loadMessagesForRoom.js
#	app/lib/methods/loadMissedMessages.js
#	app/lib/methods/readMessages.js
#	app/lib/methods/subscriptions/room.js
#	app/lib/methods/subscriptions/rooms.js
#	app/lib/rocketchat.js
#	app/presentation/RoomItem/TypeIcon.js
#	app/presentation/RoomItem/index.js
#	app/presentation/UserItem.js
#	app/reducers/index.js
#	app/reducers/reducers.js
#	app/reducers/room.js
#	app/sagas/createChannel.js
#	app/sagas/deepLinking.js
#	app/sagas/index.js
#	app/sagas/login.js
#	app/sagas/room.js
#	app/sagas/rooms.js
#	app/sagas/selectServer.js
#	app/selectors/login.js
#	app/tablet.js
#	app/utils/fetch.js
#	app/utils/shortnameToUnicode/emojis.js
#	app/views/AuthenticationWebView.js
#	app/views/CreateChannelView.js
#	app/views/DirectoryView/index.js
#	app/views/ForgotPasswordView.js
#	app/views/LoginSignupView.js
#	app/views/LoginView.js
#	app/views/NewMessageView.js
#	app/views/NewServerView.js
#	app/views/NotificationPreferencesView/index.js
#	app/views/NotificationPreferencesView/styles.js
#	app/views/OnboardingView/Button.js
#	app/views/OnboardingView/index.js
#	app/views/OnboardingView/styles.js
#	app/views/ProfileView/index.js
#	app/views/RegisterView.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomView/Header/Header.js
#	app/views/RoomView/Header/Icon.js
#	app/views/RoomView/Header/index.js
#	app/views/RoomView/index.js
#	app/views/RoomView/styles.js
#	app/views/RoomsListView/ServerDropdown.js
#	app/views/RoomsListView/index.js
#	app/views/SelectedUsersView.js
#	app/views/ShareListView/Header/Header.ios.js
#	app/views/ShareListView/index.js
#	app/views/SidebarView/SidebarItem.js
#	app/views/SidebarView/index.js
#	app/views/SidebarView/styles.js
#	app/views/Styles.js
#	app/views/ThreadMessagesView/index.js
#	app/views/WithoutServersView.js
#	ios/Podfile.lock
#	ios/Pods/Local Podspecs/RNBootSplash.podspec.json
#	ios/Pods/Local Podspecs/yoga.podspec.json
#	ios/Pods/Manifest.lock
#	ios/Pods/Target Support Files/yoga/yoga-dummy.m
#	ios/Pods/Target Support Files/yoga/yoga.xcconfig
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/AppDelegate.m
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	storybook/stories/index.js
#	yarn.lock

yarn.lock

@@ -9481,7 +9481,7 @@ pretty-format@^24.7.0, pretty-format@^24.8.0:
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
   integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
   dependencies:
-    "@jest/types" "^24.8.0"
+    "@jest/types" "^24.9.0"
     ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
     react-is "^16.8.4"