Merge branch 'master' into feature/exercise-crowdsourcing

# Conflicts:
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart

.github/pull_request_template.md

@@ -12,4 +12,4 @@ Related Issues (if applicable)
 
 - [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
 - [ ] Tests for the changes have been added (for bug fixes / features)
-- [ ] Added yourself to AUTHORS.rst
+- [ ] Added yourself to AUTHORS.md

.github/workflows/android-release.yml

@@ -32,7 +32,7 @@ jobs:
         uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
-          flutter-version: '2.2.x'
+          flutter-version: '2.5.x'
 
       - run: dart --version
       - run: flutter --version