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

diff --cc CodeSniff/WCF/ruleset.xml
index ba7183f8c18ce12678eca66478c4a1d96d807fd4,2a12e2247aa1d44accd17ae27e479981b24b3690..f3cc911fe7bdd2916f1de81e4229b16431793545
--- 1/CodeSniff/WCF/ruleset.xml
--- 2/CodeSniff/WCF/ruleset.xml
+++ b/CodeSniff/WCF/ruleset.xml
@@@ -43,10 -43,9 +43,9 @@@
        <rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing" />
        <rule ref="WCF.Classes.ClassFileName" />
        <rule ref="WCF.ControlStructures.ControlSignature" />
 -      <rule ref="WCF.Functions.OpeningFunctionBraceKernighanRitchie" />
 +      <!--TODO:<rule ref="WCF.Functions.OpeningFunctionBraceKernighanRitchie" />-->
        <rule ref="WCF.Methods.MethodDeclaration" />
        <rule ref="WCF.Namespaces.ClassMustBeImported" />
-       <rule ref="WCF.Namespaces.SortedUseDeclaration" />
        <rule ref="WCF.Namespaces.UseDeclaration" />
        <rule ref="WCF.WhiteSpace.SuperfluousWhitespace" />
        <rule ref="Zend.Files.ClosingTag" />

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

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

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