Merge remote-tracking branch 'ssh/depend-update'

# Conflicts:
#	composer.json

composer.json

@@ -28,15 +28,15 @@
         "php": ">=5.6.0",
         "yiisoft/yii2": "2.0.13.1",
         "yiisoft/yii2-jui": "2.0.6",
-        "yiisoft/yii2-bootstrap": "~2.0.7 || dev-master || 2.1.x-dev",
-        "skeeks/cms-backend": "~1.1.1 || dev-master",
-        "skeeks/cms-backend-admin": "~1.1.0 || dev-master",
-        "skeeks/cms-admin": "~2.0.2 || dev-master",
-        "skeeks/cms-rbac": "~2.2.0 || dev-master",
-        "skeeks/cms-marketplace": "~2.0.0 || dev-master",
-        "skeeks/cms-composer": "~1.0.0 || dev-master",
-        "skeeks/cms-toolbar": "~1.0.0 || dev-master",
-        "skeeks/cms-agent": "~2.0.0 || dev-master",
+        "yiisoft/yii2-bootstrap": "~2.0.7 || dev-master@dev || 2.1.x-dev",
+        "skeeks/cms-backend": "~1.1.1 || dev-master@dev",
+        "skeeks/cms-backend-admin": "~1.1.0 || dev-master@dev",
+        "skeeks/cms-admin": "~2.0.2 || dev-master@dev",
+        "skeeks/cms-rbac": "~2.2.0 || dev-master@dev",
+        "skeeks/cms-marketplace": "~2.0.0 || dev-master@dev",
+        "skeeks/cms-composer": "~1.0.0 || dev-master@dev",
+        "skeeks/cms-toolbar": "~1.0.0 || dev-master@dev",
+        "skeeks/cms-agent": "~2.0.0 || dev-master@dev",
         "skeeks/yii2-ajax-file-upload": "~1.0.0",
         "skeeks/yii2-imagine": "~2.0.1",
         "skeeks/yii2-sx": "~1.3.0",
@@ -47,8 +47,8 @@
         "skeeks/yii2-widget-codemirror": "~1.0.3",
         "skeeks/yii2-slug-behavior": "~1.0.0",
         "skeeks/yii2-ya-slug": "~1.0.0",
-        "skeeks/yii2-form": "dev-master",
-        "skeeks/yii2-config": "dev-master",
+        "skeeks/yii2-form": "dev-master@dev",
+        "skeeks/yii2-config": "dev-master@dev",
         "skeeks/cms-user-personal-area": "dev-master@dev",
         "kartik-v/yii2-datecontrol": "~1.9.6",
         "kartik-v/yii2-widget-datepicker": "~1.4.3",