Merge branch 'master' into release/v4.2.52+1652

* master:
  Release/v4.2.47+1647 (#2866)
  Update version number in SECURITY.md

# Conflicts:
#	CHANGELOG.md
#	SECURITY.md
#	android/app/src/main/java/edu/illinois/rokwire/Utils.java
#	assets/extra/appointments.json
#	assets/strings.en.json
#	assets/strings.es.json
#	assets/strings.zh.json
#	ios/Podfile.lock
#	ios/Runner/UIUC/NSDictionary+UIUCExplore.m
#	lib/ext/Favorite.dart
#	lib/model/Auth2.dart
#	lib/model/Questionnaire.dart
#	lib/service/Analytics.dart
#	lib/service/Appointments.dart
#	lib/service/Auth2.dart
#	lib/service/DeviceCalendar.dart
#	lib/service/FirebaseMessaging.dart
#	lib/service/NativeCommunicator.dart
#	lib/ui/RootPanel.dart
#	lib/ui/SavedPanel.dart
#	lib/ui/academics/SkillsSelfEvaluationInfoPanel.dart
#	lib/ui/academics/SkillsSelfEvaluationResultsDetailPanel.dart
#	lib/ui/academics/SkillsSelfEvaluationResultsPanel.dart
#	lib/ui/explore/ExplorePanel.dart
#	lib/ui/groups/GroupDetailPanel.dart
#	lib/ui/groups/GroupMembersPanel.dart
#	lib/ui/home/HomeFavoritesWidget.dart
#	lib/ui/home/HomeVideoTutorialsWidget.dart
#	lib/ui/home/HomeWalletWidget.dart
#	lib/ui/home/HomeWelcomeWidget.dart
#	lib/ui/mtd/MTDStopsHomePanel.dart
#	lib/ui/onboarding2/Onboarding2ResearchQuestionnaireAcknowledgementPanel.dart
#	lib/ui/onboarding2/Onboarding2ResearchQuestionnairePanel.dart
#	lib/ui/onboarding2/Onboarding2ResearchQuestionnairePromptPanel.dart
#	lib/ui/research/ResearchProjectsHomePanel.dart
#	lib/ui/settings/SettingsInboxHomeContentWidget.dart
#	lib/ui/settings/SettingsNotificationPreferencesContentWidget.dart
#	lib/ui/settings/SettingsPrivacyPanel.dart
#	lib/ui/settings/SettingsSectionsContentWidget.dart
#	lib/ui/wallet/IDCardPanel.dart
#	lib/ui/wellness/WellnessHomePanel.dart
#	lib/ui/wellness/appointments/AppointmentDetailPanel.dart
#	lib/ui/wellness/appointments/WellnessAppointmentsHomeContentWidget.dart
#	lib/ui/wellness/todo/WellnessToDoHomeContentWidget.dart
#	lib/ui/widgets/HeaderBar.dart
#	lib/ui/widgets/VideoPlayButton.dart
#	plugin
#	pubspec.lock
#	pubspec.yaml

Author: Mihail Varbanov