Merge branch 'develop' into develop-widgets

# Conflicts:
#	lib/view/pages/timetable/timetable.dart
#	pubspec.yaml

lib/view/settings/defaultSettings.dart

@@ -32,7 +32,7 @@ class DefaultSettings {
         hiddenModules: [],
       ),
       timetableSettings: TimetableSettings(
-        connectDoubleLessons: false,
+        connectDoubleLessons: true,
         timetableNameMode: TimetableNameMode.name
       ),
       talkSettings: TalkSettings(

lib/view/settings/settings.dart

@@ -246,7 +246,7 @@ class _SettingsState extends State<Settings> {
                       ListTile(
                         leading: const CenteredLeading(Icon(Icons.date_range_outlined)),
                         title: const Text('Infos zu Web-/ Untis'),
-                        subtitle: const Text('Für den Vertretungsplan'),
+                        subtitle: const Text('Für den Stundenplan'),
                         trailing: const Icon(Icons.arrow_right),
                         onTap: () => PrivacyInfo(providerText: 'Untis', imprintUrl: 'https://www.untis.at/impressum', privacyUrl: 'https://www.untis.at/datenschutz-wu-apps').showPopup(context)
                       ),