Merge remote-tracking branch 'refs/remotes/origin/Thesis_hannes_merge_ready_versuch1'

Conflicts:
	enzevalos_iphone/StudySettings.swift

enzevalos_iphone/StudySettings.swift

@@ -53,6 +53,7 @@ class StudySettings {
     static var securityIndicator: SecurityIndicator = SecurityIndicator.load() as! SecurityIndicator
     static var invitationsmode: Inviation = Inviation.load() as! Inviation
     
+    /// whether to show a normal inbox (false) or a (currently slightly buggy) categorized interface (true)
     static var showCategorizedInterface = false
     static var useAvatars = true