bug fixes
merged
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
Merge branch 'master' of https://github.com/AnbangZhao/liveStreamingWeb
bug fixed