测试：视频与截图
Merge branch 'master' into dev

Conflicts:
	video_canvas_demo.html