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

FAQ.md

@@ -45,3 +45,13 @@ Create a dyno with the following buildpacks:
 * `https://github.com/heroku/heroku-buildpack-nodejs`
 
 Then push the code to Heroku and it should work out of the box.
+
+## Why can't I download videos from some websites (e.g. Dailymotion)
+
+Some websites generate an unique video URL for each IP address. When using Alltube, the URL is generated for our server's IP address and your computer is not allowed to use it.
+
+There are two known workarounds:
+
+* You can run Alltube locally on your computer.
+* You can use the experimental `feature/stream` branch which streams the video through the server in order to bypass IP restrictions.
+  Please note that this can use a lot of resources on the server (which is why we won't enable it on alltubedownload.net).

README.md

@@ -119,7 +119,7 @@ Please __use a different name and logo__ if you run it on a public server.
 ## Other dependencies
 
 You need [avconv](https://libav.org/avconv.html), [rtmpdump](http://rtmpdump.mplayerhq.hu/) and [curl](https://curl.haxx.se/) in order to enable conversions.
-If you don't want to enable conversions, you can disable it in *config.yml*.
+If you don't want to enable conversions, you can disable it in `config.yml`.
 
 On Debian-based systems:
 
@@ -127,4 +127,8 @@ On Debian-based systems:
 sudo apt-get install libav-tools rtmpdump curl
 ```
 
-You also probably need to edit the *avconv* variable in *config.yml* so that it points to your ffmpeg/avconv binary (*/usr/bin/avconv* on Debian/Ubuntu).
+You also probably need to edit the `avconv` variable in `config.yml` so that it points to your ffmpeg/avconv binary (`/usr/bin/avconv` on Debian/Ubuntu).
+
+## FAQ
+
+Please read the [FAQ](FAQ.md) before reporting any issue.