tang

添加补救视频的动画效果
Merge branch 'master' of https://github.com/RongShu/ios_v

Conflicts:
	VPS/Classes/Main/MainViewController.m