Merge remote-tracking branch 'refs/remotes/origin/master' into next

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

diff --cc com.woltlab.wcf/objectType.xml
index 631df159522be60119f437a37471c61f1d34f837,7c1905cb7206f5c5994fa34ca5d99aab7ee4c821..70db36e6771b6846fad9ab34332122dae6cf427b
--- 1/com.woltlab.wcf/objectType.xml
--- 2/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@@ -97,22 -82,11 +97,26 @@@
                        <name>com.woltlab.wcf.user.signature</name>
                        <definitionname>com.woltlab.wcf.message</definitionname>
                </type>
 +              <type>
 +                      <name>com.woltlab.wcf.comment</name>
 +                      <definitionname>com.woltlab.wcf.message</definitionname>
 +              </type>
 +              <type>
 +                      <name>com.woltlab.wcf.paidSubscription</name>
 +                      <definitionname>com.woltlab.wcf.message</definitionname>
 +              </type>
+               <type>
+                       <name>com.woltlab.wcf.user.option.generic</name>
+                       <definitionname>com.woltlab.wcf.message</definitionname>
+               </type>
                
 +              <type>
 +                      <name>com.woltlab.wcf.page</name>
 +                      <definitionname>com.woltlab.wcf.searchableObjectType</definitionname>
 +                      <classname>wcf\system\search\PageSearch</classname>
 +                      <searchindex>wcf1_page_search_index</searchindex>
 +              </type>
 +              
                <type>
                        <name>com.woltlab.wcf.bbcode.smiley</name>
                        <definitionname>com.woltlab.wcf.category</definitionname>

diff --cc com.woltlab.wcf/templates/articleList.tpl
index 52a2fa22c2604238a62d206e8ec5871f6aadc2e3,f3d30427cd5ae6471ace126a31469025614ed183..820f4f6b9f8c9313983711e707831381df369444
--- 1/com.woltlab.wcf/templates/articleList.tpl
--- 2/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@@ -15,12 -15,9 +15,12 @@@
  
  {capture assign='headerNavigation'}
        <li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed'}{/link}{/if}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
 +      {if ARTICLE_ENABLE_VISIT_TRACKING}
 +              <li class="jsOnly"><a href="#" title="{lang}wcf.article.markAllAsRead{/lang}" class="markAllAsReadButton jsTooltip"><span class="icon icon16 fa-check"></span> <span class="invisible">{lang}wcf.article.markAllAsRead{/lang}</span></a></li>
 +      {/if}
  {/capture}
  
- {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}
+ {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle') || $__wcf->getSession()->getPermission('admin.content.article.canContributeArticle')}
        {capture assign='contentHeaderNavigation'}
                <li><a href="{link controller='ArticleAdd' isACP=true}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
        {/capture}

diff --cc com.woltlab.wcf/templates/headIncludeJavaScript.tpl
Simple merge

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

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

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

diff --cc wcfsetup/install/files/js/WCF.Message.js
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php
Simple merge