Merge branch 'chilloutzone'
Merge branch 'chilloutzone'
Merge remote-tracking branch 'upstream/master'
[chilloutzone] fixes bug with youtube extraction

the id used for extracting the video from youtube is stored in
native_video_id not video_id. This id is only used on chilloutzone.net
Merge pull request #2340 from Fnordlab/master

[chilloutzone] Fixes refactoring bug