Merge pull request #220 from wangbailin/master

jwplayer no water mark
share live
Merge remote branch 'upstream/master'