Merge branch 'master' into next

diff --cc com.woltlab.wcf/templates/login.tpl
index f9e3a837d33eb011a88072d79f030dd59b4aaef5,53c6057f1aa0c3f172f56ed7297da693c42fe0ad..e3c3ce8bf8ab8d7d5493f0610f4486d6be1e1a97
--- 1/com.woltlab.wcf/templates/login.tpl
--- 2/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@@ -85,31 -85,31 +85,31 @@@
                                <dl>
                                        <dt></dt>
                                        <dd>
-                                               <ul class="buttonList smallButtons">
+                                               <ul class="buttonList">
                                                        {content}
 -                                                              {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
 -                                                                      <li id="githubAuth" class="thirdPartyLogin">
 -                                                                              <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon24 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
 -                                                                      </li>
 -                                                              {/if}
 -                                                              
 -                                                              {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
 -                                                                      <li id="twitterAuth" class="thirdPartyLogin">
 -                                                                              <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon24 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
 -                                                                      </li>
 -                                                              {/if}
 -                                                              
                                                                {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
                                                                        <li id="facebookAuth" class="thirdPartyLogin">
-                                                                               <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
+                                                                               <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton"><span class="icon icon24 fa-facebook-official"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
                                                                        </li>
                                                                {/if}
                                                                
                                                                {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
                                                                        <li id="googleAuth" class="thirdPartyLogin">
-                                                                               <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
+                                                                               <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon24 fa-google"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
                                                                        </li>
                                                                {/if}
-                                                                               <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
 +                                                      
 +                                                              {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
 +                                                                      <li id="twitterAuth" class="thirdPartyLogin">
-                                                                               <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
++                                                                              <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon24 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
 +                                                                      </li>
 +                                                              {/if}
 +                                                              
 +                                                              {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
 +                                                                      <li id="githubAuth" class="thirdPartyLogin">
++                                                                              <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon24 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
 +                                                                      </li>
 +                                                              {/if}
                                                                
                                                                {event name='3rdpartyButtons'}
                                                        {/content}

diff --cc com.woltlab.wcf/templates/pageHeaderUser.tpl
index 276f1007071320c58e981d2f90131256f88dbfef,37284d03851b2ed576377f8fea79c83f38d46777..17732d83e3708a785309076bfed607b759045ba3
--- 1/com.woltlab.wcf/templates/pageHeaderUser.tpl
--- 2/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@@ -199,31 -200,31 +199,31 @@@
                                                                        <dl>
                                                                                <dt></dt>
                                                                                <dd>
-                                                                                       <ul class="buttonList smallButtons">
+                                                                                       <ul class="buttonList">
                                                                                                {content}
 -                                                                                                      {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
 -                                                                                                              <li id="githubAuth" class="thirdPartyLogin">
 -                                                                                                                      <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon24 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
 -                                                                                                              </li>
 -                                                                                                      {/if}
 -                                                                                                      
 -                                                                                                      {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
 -                                                                                                              <li id="twitterAuth" class="thirdPartyLogin">
 -                                                                                                                      <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon24 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
 -                                                                                                              </li>
 -                                                                                                      {/if}
 -                                                                                                      
                                                                                                        {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
                                                                                                                <li id="facebookAuth" class="thirdPartyLogin">
-                                                                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
+                                                                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton"><span class="icon icon24 fa-facebook-official"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
                                                                                                                </li>
                                                                                                        {/if}
                                                                                                        
                                                                                                        {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
                                                                                                                <li id="googleAuth" class="thirdPartyLogin">
-                                                                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
+                                                                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon24 fa-google"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
                                                                                                                </li>
                                                                                                        {/if}
-                                                                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
 +                                                                                              
 +                                                                                                      {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
 +                                                                                                              <li id="twitterAuth" class="thirdPartyLogin">
-                                                                                                                       <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
++                                                                                                                      <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon24 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
 +                                                                                                              </li>
 +                                                                                                      {/if}
 +                                                                                                      
 +                                                                                                      {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
 +                                                                                                              <li id="githubAuth" class="thirdPartyLogin">
++                                                                                                                      <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon24 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
 +                                                                                                              </li>
 +                                                                                                      {/if}
                                                                                                        
                                                                                                        {event name='3rdpartyButtons'}
                                                                                                {/content}

diff --cc wcfsetup/install/files/lib/data/tag/TagCloudTag.class.php
Simple merge

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

diff --cc wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
Simple merge

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

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

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