Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
#	com.woltlab.wcf/templates/wysiwyg.tpl
#	wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
#	wcfsetup/install/files/js/WoltLabSuite.Core.min.js

diff --cc com.woltlab.wcf/templates/wysiwyg.tpl
index c4293b7bc200f36692a8ff32d2716e812575130b,34aa4ae85c246ce6a0dac878b678610ae0049ac7..7c5e77fa0530ae14ff6ed052dff1399c3cf4274d
--- 1/com.woltlab.wcf/templates/wysiwyg.tpl
--- 2/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@@ -205,8 -202,7 +205,8 @@@
                                        'WoltLabDropdown',
                                        {if $__wcf->getBBCodeHandler()->isAvailableBBCode('font')}'WoltLabFont',{/if}
                                        'WoltLabFullscreen',
-                                       {if $__wcf->getBBCodeHandler()->isAvailableBBCode('img')}'WoltLabImage',{/if}
 +                                      {if $__wcf->getBBCodeHandler()->isAvailableBBCode('html')}'WoltLabHtml',{/if}
+                                       'WoltLabImage',
                                        'WoltLabInlineCode',
                                        'WoltLabInsert',
                                        'WoltLabLine',

diff --cc wcfsetup/install/files/acp/templates/userGroupOption.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/wysiwyg.tpl
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Environment.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
Simple merge

diff --cc wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
Simple merge