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

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

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

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

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

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

diff --cc wcfsetup/install/files/acp/templates/cronjobLogList.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/optionImport.tpl
Simple merge

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

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

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

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

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

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

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

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

diff --cc wcfsetup/install/files/acp/templates/packageView.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/userAssignToGroup.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/userGroupList.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/userList.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/js/WCF.js
Simple merge

diff --cc wcfsetup/install/files/lib/acp/page/UserListPage.class.php
Simple merge

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

diff --cc wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCFACP.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/clipboard/action/IClipboardAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/session/SessionHandler.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge