list issue
Merge branch 'master' of https://github.com/sirchuck/media_server