Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js

diff --cc wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
index 7cd593ec6536b866e8355233f9a6127062956ed3,132d0b56028d81c65a401e3539e65125b6f86308..c24ccd3e2823e5fe78429767916957b44f1c568d
--- 1/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
--- 2/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
@@@ -86,10 -86,10 +86,10 @@@ class UserNotificationEventPackageInsta
        protected function import(array $row, array $data) {
                $result = parent::import($row, $data);
                
-               if (empty($row)) {
+               if (empty($row) && $data['preset']) {
                        $this->presetEventIDs[] = $result->eventID;
                }
 -
 +              
                return $result;
        }