bug fixed
merge

Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb