Merge branch '3.0'

diff --cc wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php
index c6b6bc4feb56d4e693dd8c8d0b3eeafaa1b0c5df,7ddab70d038b0210007f6767880cf607124f90f8..5d0594a09549e84c1870583a23ac05027de2abbf
--- 1/wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php
--- 2/wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php
+++ b/wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php
@@@ -18,11 -18,11 +18,11 @@@ use wcf\system\WCF
   * @property-read     integer         $baseObjectID           id of a generic base object of object that triggered the user notification or 0 if there is no such base object
   * @property-read     string          $eventHash              hash of the event the user notification represents, is used to stack notifications
   * @property-read     integer|null    $authorID               id of the user that triggered the user notification or null if there is no such user or the user was a guest
-  * @property-read     integer         $timesTriggered         number of times a stacked notification has been triggered by registered users
+  * @property-read     integer         $timesTriggered         total number of times a stacked notification has been triggered by registered users and guests
   * @property-read     integer         $guestTimesTriggered    number of times a stacked notification has been triggered by guests
 - * @property-read     integer         $userID                 id of the user who recieves the user notification
 + * @property-read     integer         $userID                 id of the user who receives the user notification
   * @property-read     integer         $time                   timestamp at which the user notification has been created
 - * @property-read     integer         $mailNotified           is 0 has not be notified by mail about the user notifiction, otherwise 1
 + * @property-read     integer         $mailNotified           is 0 has not be notified by mail about the user notification, otherwise 1
   * @property-read     integer         $confirmTime            timestamp at which the user notification has been marked as confirmed/read
   * @property-read     array           $additionalData         array with additional data of the user notification event
   */