fix video player
Merge branch 'chatPage' into phase1
Merge branch 'phase1' into gh-pages