Merge remote-tracking branch 'origin/next' into next

# Conflicts:
#	com.woltlab.wcf/objectType.xml

diff --cc com.woltlab.wcf/objectType.xml
index 27a33f2368e19fa7e4e7200e95e059b05a1f386c,434855c36162e60fc40bcb0ae86f6de4f79d6494..d1b6f8fe4bc77adf98649081aae291d3988a4159
--- 1/com.woltlab.wcf/objectType.xml
--- 2/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@@ -1024,15 -1024,21 +1024,28 @@@
                        <definitionname>com.woltlab.wcf.boxController</definitionname>
                        <classname>wcf\system\box\ArticleCategoriesBoxController</classname>
                </type>
+               <type>
+                       <name>com.woltlab.wcf.articleList</name>
+                       <definitionname>com.woltlab.wcf.boxController</definitionname>
+                       <classname>wcf\system\box\ArticleListBoxController</classname>
+               </type>
                <!-- /box controllers -->
                
 -              <!-- /thread list box condition -->
 +              <!-- pages -->
 +              <type>
 +                      <name>com.woltlab.wcf.page</name>
 +                      <definitionname>com.woltlab.wcf.acl.simple</definitionname>
 +              </type>
 +              <!-- /pages -->
 +              
+               <!-- article list box condition -->
+               <type>
+                       <name>com.woltlab.wcf.articleCategory</name>
+                       <definitionname>com.woltlab.wcf.box.articleList.condition</definitionname>
+                       <classname>wcf\system\condition\article\ArticleCategoryCondition</classname>
+               </type>
++              <!-- /article list box condition -->
+               
                <!-- deprecated -->
                <type>
                        <name>com.woltlab.wcf.page.controller</name>

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

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

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