Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock

composer.json

@@ -6,7 +6,7 @@
 	"type": "project",
 	"require": {
 		"smarty/smarty": "~3.1.29",
-		"rg3/youtube-dl": "~2016.07.26.2",
+		"rg3/youtube-dl": "~2016.08.12",
 		"slim/slim": "~3.5.0",
 		"mathmarques/smarty-view": "~1.1.0",
 		"symfony/yaml": "~3.1.0",
@@ -18,7 +18,9 @@
 		"rudloff/rtmpdump-bin": "~2.3"
 	},
 	"require-dev": {
-		"symfony/var-dumper": "~3.1.0"
+		"symfony/var-dumper": "~3.1.0",
+		"squizlabs/php_codesniffer": "~2.6.2",
+		"phpunit/phpunit": "~5.4.8"
 	},
 	"extra": {
 		"paas": {
@@ -31,11 +33,11 @@
 		"type": "package",
 		"package": {
 			"name": "rg3/youtube-dl",
-			"version": "2016.07.26.2",
+			"version": "2016.08.12",
 			"source": {
 				"url": "https://github.com/rg3/youtube-dl.git",
 				"type": "git",
-				"reference": "2016.07.26.2"
+				"reference": "2016.08.12"
 			}
 		}
 	}, {