Merge branch 'master' into beta-4.18.0

# Conflicts:
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	app/actions/actionsTypes.js
#	app/actions/login.js
#	app/actions/permissions.js
#	app/actions/room.js
#	app/actions/settings.js
#	app/constants/colors.js
#	app/constants/settings.js
#	app/containers/InAppNotification/NotifierComponent.js
#	app/containers/markdown/Link.js
#	app/i18n/locales/ar.json
#	app/i18n/locales/de.json
#	app/i18n/locales/en.json
#	app/i18n/locales/es-ES.json
#	app/i18n/locales/fr.json
#	app/i18n/locales/it.json
#	app/i18n/locales/ja.json
#	app/i18n/locales/nl.json
#	app/i18n/locales/pt-BR.json
#	app/i18n/locales/pt-PT.json
#	app/i18n/locales/ru.json
#	app/i18n/locales/tr.json
#	app/i18n/locales/zh-CN.json
#	app/i18n/locales/zh-TW.json
#	app/index.js
#	app/lib/database/model/servers/User.js
#	app/lib/database/model/servers/migrations.js
#	app/lib/database/schema/servers.js
#	app/lib/methods/getPermissions.js
#	app/lib/methods/getRoles.js
#	app/lib/methods/getSettings.js
#	app/lib/rocketchat.js
#	app/reducers/index.js
#	app/reducers/permissions.js
#	app/reducers/room.js
#	app/reducers/settings.js
#	app/sagas/createChannel.js
#	app/sagas/deepLinking.js
#	app/sagas/login.js
#	app/sagas/room.js
#	app/sagas/selectServer.js
#	app/share.js
#	app/utils/log/events.js
#	app/utils/openLink.js
#	app/views/DefaultBrowserView.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomMembersView/index.js
#	app/views/RoomView/List/NavBottomFAB.js
#	app/views/RoomView/List/index.js
#	app/views/RoomsListView/index.js
#	app/views/SettingsView/index.js
#	app/views/SidebarView/index.js
#	app/views/ThemeView.js
#	e2e/data.js
#	e2e/data/data.cloud.js
#	e2e/data/data.docker.js
#	e2e/docker/docker-entrypoint-initdb.d/rocketchat_message.js
#	e2e/docker/docker-entrypoint-initdb.d/rocketchat_room.js
#	e2e/docker/docker-entrypoint-initdb.d/rocketchat_settings.js
#	e2e/docker/docker-entrypoint-initdb.d/rocketchat_subscription.js
#	e2e/helpers/app.js
#	e2e/helpers/data_setup.js
#	e2e/tests/assorted/01-e2eencryption.spec.js
#	e2e/tests/assorted/02-broadcast.spec.js
#	e2e/tests/assorted/03-profile.spec.js
#	e2e/tests/assorted/04-setting.spec.js
#	e2e/tests/assorted/05-joinpublicroom.spec.js
#	e2e/tests/assorted/06-status.spec.js
#	e2e/tests/assorted/07-changeserver.spec.js
#	e2e/tests/assorted/08-joinprotectedroom.spec.js
#	e2e/tests/assorted/09-joinfromdirectory.spec.js
#	e2e/tests/assorted/10-deleteserver.spec.js
#	e2e/tests/assorted/11-deeplinking.spec.js
#	e2e/tests/assorted/12-i18n.spec.js
#	e2e/tests/init.js
#	e2e/tests/onboarding/01-onboarding.spec.js
#	e2e/tests/onboarding/02-legal.spec.js
#	e2e/tests/onboarding/03-forgotpassword.spec.js
#	e2e/tests/onboarding/04-createuser.spec.js
#	e2e/tests/onboarding/05-login.spec.js
#	e2e/tests/onboarding/06-roomslist.spec.js
#	e2e/tests/onboarding/07-server-history.spec.js
#	e2e/tests/room/01-createroom.spec.js
#	e2e/tests/room/02-room.spec.js
#	e2e/tests/room/03-roomactions.spec.js
#	e2e/tests/room/04-discussion.spec.js
#	e2e/tests/room/05-threads.spec.js
#	e2e/tests/room/06-createdmgroup.spec.js
#	e2e/tests/room/07-markasunread.spec.js
#	e2e/tests/room/08-roominfo.spec.js
#	e2e/tests/team/01-createteam.spec.js
#	e2e/tests/team/02-team.spec.js
#	e2e/tests/team/03-moveconvert.spec.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json