Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock

classes/Config.php

@@ -31,7 +31,7 @@ class Config
 
     public $youtubedl = 'vendor/rg3/youtube-dl/youtube_dl/__main__.py';
     public $python = '/usr/bin/python';
-    public $params = array('--no-playlist', '--no-warnings', '-f best');
+    public $params = array('--no-playlist', '--no-warnings', '-f best', '--playlist-end', 1);
     public $convert = false;
     public $avconv = 'vendor/bin/ffmpeg';
     public $curl_params = '';

composer.json

@@ -6,7 +6,7 @@
 	"type": "project",
 	"require": {
 		"smarty/smarty": "~3.1.29",
-		"rg3/youtube-dl": "2016.04.05",
+		"rg3/youtube-dl": "2016.04.06",
 		"slim/slim": "~3.3.0",
 		"mathmarques/smarty-view": "~1.1.0",
 		"symfony/yaml": "~3.0.0",
@@ -29,11 +29,11 @@
 		"type": "package",
 		"package": {
 			"name": "rg3/youtube-dl",
-			"version": "2016.04.05",
+			"version": "2016.04.06",
 			"source": {
 				"url": "https://github.com/rg3/youtube-dl.git",
 				"type": "git",
-				"reference": "2016.04.05"
+				"reference": "2016.04.06"
 			}
 		}
 	}, {

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "6ef0d5dc0640824fef3033cba540c6fb",
-    "content-hash": "dd3d8be96114267b553f77632c326e2c",
+    "hash": "347d65d546b37e0a0f459d98687906ad",
+    "content-hash": "e4325cba5a550465b162ab31dd37ecf3",
     "packages": [
         {
             "name": "container-interop/container-interop",
@@ -535,11 +535,11 @@
         },
         {
             "name": "rg3/youtube-dl",
-            "version": "2016.04.05",
+            "version": "2016.04.06",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rg3/youtube-dl.git",
-                "reference": "2016.04.05"
+                "reference": "2016.04.06"
             },
             "type": "library"
         },

config.example.yml

@@ -4,6 +4,8 @@ params:
     - --no-playlist
     - --no-warnings
     - -f best[protocol^=http]
+    - --playlist-end
+    - 1
 curl_params:
 convert: false
 avconv: vendor/bin/ffmpeg