Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/cleanup

diff --cc com.woltlab.wcf/acpMenu.xml
Simple merge

diff --cc wcfsetup/install/files/acp/templates/applicationEdit.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/cacheList.tpl
index 2466036eccdb32b01821bd233c8a5f5deae4e8e4,60247c98ebd351c15b65feb6df22fefe3a8b1da9..15364bf43c086de664d474c195239cc5bef942c3
--- 1/wcfsetup/install/files/acp/templates/cacheList.tpl
--- 2/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@@ -15,10 -15,10 +15,10 @@@
  </header>
  
  {if $cleared}
 -      <p class="success">{lang}wcf.acp.cache.clear.success{/lang}</p> 
 +      <p class="success">{lang}wcf.acp.cache.clear.success{/lang}</p>
  {/if}
  
- <div class="container containerPadding marginTop shadow">
+ <div class="container containerPadding marginTop">
        <fieldset>
                <legend>{lang}wcf.acp.cache.data{/lang}</legend>
                

diff --cc wcfsetup/install/files/acp/templates/cronjobAdd.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/masterPassword.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/option.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/optionImport.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/packageStartInstall.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/updateServerAdd.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/userAdd.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/userGroupAdd.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/userMail.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/userSearch.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/data/DatabaseObject.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
index 5eb8d36df6fd80346b6c6c5a50ac414f57efe606,07d456e53e427fbc81800f9554b9bbfccf0ae4f3..0ac6fa03a6bb97f1bf9bbde0eb67283b0bd9046e
--- 1/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
--- 2/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
@@@ -90,9 -90,9 +90,9 @@@ class Cronjob extends DatabaseObject 
        /**
         * Returns true if current user may enable or disable this cronjob.
         * 
 -       * @return      true
 +       * @return      boolean
         */
        public function canBeDisabled() {
-               return (WCF::getSession()->getPermission('admin.system.cronjob.canEnableDisableCronjob') && $this->canBeDisabled);
+               return $this->canBeDisabled;
        }
  }

diff --cc wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/cronjob/log/CronjobLogEditor.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
index b6e0656a60c50ff4a53487001cfc2928f1b473f7,6fe55c81f30c461c4d7fc2e7c7146c61d1bdbbd8..856c793df9ee6e11a2239f4e706ab76abc2becc0
--- 1/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
--- 2/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
@@@ -31,13 -31,12 +31,9 @@@ class UserOptionPackageInstallationPlug
        public static $reservedTags = array('name', 'optiontype', 'defaultvalue', 'validationpattern', 'required', 'editable', 'visible', 'searchable', 'showorder', 'outputclass', 'selectoptions', 'enableoptions', 'disabled', 'categoryname', 'permissions', 'options', 'attrs', 'cdata');
        
        /**
 -       * Installs user option categories.
 -       * 
 -       * @param       array           $category
 -       * @param       array           $categoryXML
 +       * @see wcf\system\package\plugin\AbstractOptionPackageInstallationPlugin::saveCategory()
         */
        protected function saveCategory($category, $categoryXML = null) {
-               $icon = $menuIcon = '';
-               if (isset($categoryXML['icon'])) $icon = $categoryXML['icon'];
-               if (isset($categoryXML['menuicon'])) $menuIcon = $categoryXML['menuicon'];
-               
                // use for create and update
                $data = array(
                        'parentCategoryName' => $category['parentCategoryName'],

diff --cc wcfsetup/setup/db/install.sql
Simple merge