Merge pull request #219 from wangbailin/master

live
jwplayer no logo
Merge remote branch 'upstream/master'