Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/models/rapla-middleware/icalgenerator/icalgenerator.service.ts

src/models/rapla-middleware/icalgenerator/icalgenerator.service.ts

@@ -153,7 +153,11 @@ export const removeElective = function (ical: iCalFile, chosenElective: string):
         {name: 'Kryptographische Verfahren'},
         {name: 'Robotik'},
         {name: 'Web-Services'},
-        {name: 'High Performance Computing'}
+        {name: 'High Performance Computing'},
+        {name: 'Digitale Audiosignalverarbeitung'},
+        {name: 'Psychologische Grundlagen für Informatiker'},
+        {name: 'Erklärbare Künstliche Intelligenz'},
+        {name: 'Innovation Management'}
     ];
     electiveToRemove.splice(parseInt(chosenElective), 1);