Merge branch 'develop' of github.com:Rudloff/alltube into develop

Conflicts:
	composer.json
	composer.lock

composer.json

@@ -8,10 +8,13 @@
         "smarty/smarty": "~3.1",
         "rg3/youtube-dl": "2015.12.06",
         "slim/slim": "~2.6.2",
-        "slim/views": "~0.1.3"
+        "slim/views": "~0.1.3",
+        "rudloff/smarty-plugin-noscheme": "~0.1.0",
+        "symfony/yaml": "~3.0.0",
+        "ffmpeg/ffmpeg": "~2.8.2"
     },
     "require-dev": {
-        "symfony/var-dumper": "~2.7.6"
+        "symfony/var-dumper": "~3.0.0"
     },
     "extra": {
         "paas": {
@@ -32,6 +35,20 @@
                     "reference": "2015.12.06"
                 }
             }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "ffmpeg/ffmpeg",
+                "version": "2.8.2",
+                "dist": {
+                    "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
+                    "type": "xz"
+                },
+                "bin": [
+                    "ffmpeg"
+                ]
+            }
         }
     ],
     "authors": [