Merge branch 'develop' into feature/stream

Conflicts:
	composer.json
	composer.lock
	controllers/FrontController.php

composer.json

@@ -6,21 +6,23 @@
   "type": "project",
   "require": {
     "smarty/smarty": "~3.1.29",
-    "rg3/youtube-dl": "~2016.09.08",
-    "slim/slim": "~3.5.0",
+    "slim/slim": "~3.6.0",
     "mathmarques/smarty-view": "~1.1.0",
-    "symfony/yaml": "~3.1.0",
-    "symfony/process": "~3.1.0",
+    "symfony/yaml": "~3.2.0",
+    "symfony/process": "~3.2.0",
     "ptachoire/process-builder-chain": "~1.2.0",
-    "ffmpeg/ffmpeg": "dev-release",
     "rudloff/smarty-plugin-noscheme": "~0.1.0",
     "guzzlehttp/guzzle": "~6.2.0",
-    "rudloff/rtmpdump-bin": "~2.3"
+    "rudloff/rtmpdump-bin": "~2.3",
+    "aura/session": "~2.1.0"
   },
   "require-dev": {
-    "symfony/var-dumper": "~3.1.0",
+    "symfony/var-dumper": "~3.2.0",
     "squizlabs/php_codesniffer": "~2.7.0",
-    "phpunit/phpunit": "~5.5.2"
+    "phpunit/phpunit": "~5.7.2",
+    "ffmpeg/ffmpeg": "dev-release",
+    "rg3/youtube-dl": "~2016.12.20",
+    "rudloff/rtmpdump-bin": "~2.3"
   },
   "extra": {
     "paas": {
@@ -34,11 +36,10 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2016.09.08",
-        "source": {
-          "url": "https://github.com/rg3/youtube-dl.git",
-          "type": "git",
-          "reference": "2016.09.08"
+        "version": "2016.12.20",
+        "dist": {
+          "type": "zip",
+          "url": "https://github.com/rg3/youtube-dl/archive/2016.12.20.zip"
         }
       }
     },
@@ -79,5 +80,8 @@
   },
   "config": {
     "secure-http": false
+  },
+  "scripts": {
+    "compile": "composer install --dev"
   }
 }