Merge branch 'master' into cacheListPageCompiledTemplatesPlusLanguage

Conflicts:
	wcfsetup/install/files/acp/templates/cacheList.tpl

diff --cc wcfsetup/install/files/acp/templates/cacheList.tpl
index 4daf5766e07de1b29ce39ec918504acf69925d98,ad921ce53a7b398a42eb6e42597e6f565e5f9c67..420999ab367acb2c9b7be07724cd7d6df530e83f
--- 1/wcfsetup/install/files/acp/templates/cacheList.tpl
--- 2/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@@ -62,12 -62,12 +62,12 @@@
        {counter name=cacheIndex assign=cacheIndex print=false start=0}
        {if $files|count}
                <div class="wcf-border wcf-boxTitle">
-                       <a class="collapsible" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/closed2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
 -                      <a class="collapsible" data-is-open="1" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip" /></a>
++                      <a class="collapsible" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/closed2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip" /></a>
                        <hgroup>
-                               <h1>{$cache} <span class="badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
+                               <h1>{$cache} <span class="wcf-badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
                        </hgroup>
                        
-                       <table id="cache{@$cacheIndex}" style="display: none;">
 -                      <table id="cache{@$cacheIndex}" class="wcf-table">
++                      <table id="cache{@$cacheIndex}" style="display: none;" class="wcf-table">
                                <thead>
                                        <tr>
                                                <th class="columnTitle">{lang}wcf.acp.cache.list.name{/lang}</th>

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