Merge branch 'next' into formBuilder

diff --cc CodeSniff/WCF/ruleset.xml
index 2f4b4b24f5e0fbba9a33ce715343cb25d4deab73,10f875bddeb84d77392395fdb125eba5f0585051..f469a6bece1ea1270c0516c56f34190976aa4a7d
--- 1/CodeSniff/WCF/ruleset.xml
--- 2/CodeSniff/WCF/ruleset.xml
+++ b/CodeSniff/WCF/ruleset.xml
@@@ -40,13 -40,12 +40,12 @@@
        <rule ref="Squiz.Scope.MethodScope" />
        <rule ref="Squiz.Strings.EchoedStrings" />
        <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace" />
 -      <rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing" />
 +      <!--<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 wcfsetup/install/lang/de.xml
Simple merge

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