Merge branch '3.1' into 5.2

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

diff --cc wcfsetup/install/files/acp/templates/menuList.tpl
index e40114bb8bf29adf9986cc9b67f531c0f3f78f0d,55d0dd0e529400d1fe717f85b1c66fa5f04c061b..002601bb284e05de9c76419a30932796cd14d18f
--- 1/wcfsetup/install/files/acp/templates/menuList.tpl
--- 2/wcfsetup/install/files/acp/templates/menuList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuList.tpl
@@@ -55,8 -55,8 +55,8 @@@
                                                        
                                                        {event name='rowButtons'}
                                                </td>
-                                               <td class="columnID columnPageID">{@$menu->menuID}</td>
+                                               <td class="columnID columnMenuID">{@$menu->menuID}</td>
 -                                              <td class="columnTitle"><a href="{link controller='MenuEdit' id=$menu->menuID}{/link}">{lang}{$menu->title}{/lang}</a></td>
 +                                              <td class="columnTitle"><a href="{link controller='MenuEdit' id=$menu->menuID}{/link}">{$menu->getTitle()}</a></td>
                                                <td class="columnDigits columnItems"><a href="{link controller='MenuItemList' id=$menu->menuID}{/link}">{#$menu->items}</a></td>
                                                <td class="columnText columnPosition">{lang}wcf.acp.box.position.{@$menu->position}{/lang}</td>
                                                <td class="columnDigits columnShowOrder">{#$menu->showOrder}</td>