Merge branch 'url-upon-play'

Tried this on Windows  8  PC . The channels show up but I get the 404 error.Is there anything I may need o edit. Thanks.