Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	com.woltlab.wcf/templates/headIncludeJavaScript.tpl

diff --cc com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index a5c5de62b53d87c0203237368fe2df5a97274cb9,c474d61a6febfa6d0d1ba1b473cdc44cfb81697e..e3fd9e2385d816d290ab0e8dabda526ae00a4a0d
--- 1/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
--- 2/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@@ -112,10 -112,7 +112,12 @@@
                'wcf.page.pagePosition': '{lang __literal=true}wcf.page.pagePosition{/lang}',
                'wcf.page.sitemap': '{lang}wcf.page.sitemap{/lang}',
                'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}',
 -              'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}'
++              'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}',
++              'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}',
 +              'wcf.user.panel.markAllAsRead': '{lang}wcf.user.panel.markAllAsRead{/lang}',
 +              'wcf.user.panel.markAsRead': '{lang}wcf.user.panel.markAsRead{/lang}',
 +              'wcf.user.panel.settings': '{lang}wcf.user.panel.settings{/lang}',
 +              'wcf.user.panel.showAll': '{lang}wcf.user.panel.showAll{/lang}'
                {if MODULE_LIKE}
                        ,'wcf.like.button.like': '{lang}wcf.like.button.like{/lang}',
                        'wcf.like.button.dislike': '{lang}wcf.like.button.dislike{/lang}',

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