Merge branch 'dev' into 'master'

Rechtschreibfehler behoben in der Datei UploadWindow.js

See merge request !1

bin/backend/controls/UploadWindow.js

@@ -57,7 +57,7 @@ define('package/quiqqer/ckeditor4/bin/backend/controls/UploadWindow', [
             var Content = this.getContent();
 
             this.$Upload = new UploadForm({
-                multible    : false,
+                multiple    : false,
                 sendbutton  : false,
                 cancelbutton: false,
                 events      : {

composer.json

@@ -16,7 +16,7 @@
     },
     "require": {
         "quiqqer\/quiqqer": "*",
-        "quiqqer\/qui": ">=1|dev-master|dev-dev",
+        "quiqqer\/qui": ">=1|*@dev",
         "ckeditor\/ckeditor": "4.10.*"
     },
     "autoload": {
@@ -25,4 +25,4 @@
             "QUI\\Ckeditor\\Plugins\\": "src\/QUI\/Ckeditor\/Plugins\/"
         }
     }
-}
\ No newline at end of file
+}