Merge branch 'next' of github.com:WoltLab/WCF into next

Conflicts:
	com.woltlab.wcf/templates/headIncludeJavaScript.tpl
	wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js

diff --cc com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index e63e9235dbd6c3e67afb86e7c919d635e0a3b71a,814f75286f332d7c881100372c15d4d6266ca5cb..c310324ff999079c94ce5b6f35e13f4947e7d02f
--- 1/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
--- 2/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@@ -138,7 -145,13 +138,7 @@@
                baseUrl: '{@$__wcf->getPath()}js'
        });
        
-       define('jQuery', [], function() { return window.jQuery; });
 -      /*require(function(require) {
 -              var ui = require('WCF/UI');
 -              
 -              console.debug(ui);
 -      });*/
 -      
+       define('jquery', [], function() { return window.jQuery; });
        
        $.holdReady(true);
        require(['WoltLab/WCF/Bootstrap'], function(bootstrap) {

diff --cc wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
index 9ceafe0b3394165e9967e2fb01e7dc9c1fc6e4ba,d7cd4cee9e12e4585536befc03de0b44f613c526..01f91db5dcb9a6b350541765230da30b575e9b41
--- 1/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
--- 2/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
@@@ -9,11 -9,9 +9,11 @@@
   * @module    WoltLab/WCF/Bootstrap
   */
  define(
-       [       'favico', 'enquire', 'WoltLab/WCF/Date/Time/Relative', 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu', 'WoltLab/WCF/UI/FlexibleMenu'], 
-       function(favico,   enquire,   relativeTime,                     simpleDropdown,      uiMobile,                TabMenu,                  FlexibleMenu)
 -      [       'jquery', 'favico', 'enquire', 'WoltLab/WCF/Date/Time/Relative', 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu'], 
 -      function($,        favico,   enquire,   relativeTime,                     simpleDropdown,      uiMobile,                TabMenu)
++      [       'jquery', 'favico', 'enquire', 'WoltLab/WCF/Date/Time/Relative', 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu', 'WoltLab/WCF/UI/FlexibleMenu'], 
++      function($,        favico,   enquire,   relativeTime,                     simpleDropdown,      uiMobile,                TabMenu,                  UIFlexibleMenu)
  {
 +      "use strict";
 +      
        window.Favico = favico;
        window.enquire = enquire;