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

Conflicts:
	wcfsetup/install/files/js/WCF.js

diff --cc wcfsetup/install/files/js/WCF.js
index dcf6e67ad06e94d2fae73a29b6bdd628c5bf13ca,5a991687d0e067dc6d95f3d7bdcadf941d537830..047a145b9f2bc45a21e1b157e2deeeb81d840cec
--- 1/wcfsetup/install/files/js/WCF.js
--- 2/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@@ -4221,11 -4221,9 +4221,11 @@@ WCF.Sortable.List.prototype = 
                $('#' + this._containerID + ' .wcf-sortableList').sortable({
                        connectWith: '#' + this._containerID + ' .wcf-sortableList',
                        items: 'li',
-                       placeholder: 'wcf-sortablePlaceholder'
+                       placeholder: 'wcf-badgeYellow',
 -                      stop: $.proxy(this._save, this)
                });
 +              
 +              this._container.find('.wcf-formSubmit > button[data-type="submit"]').click($.proxy(this._submit, this));
 +              this._container.find('.wcf-formSubmit > button[data-type="reset"]').click($.proxy(this._reset, this));
        },
        
        /**