1.添加视屏播放页面
2.增加collection瀑布流
3.增加图片引擎，所有获取图片的地方全改为用图片引擎
Merge branch 'master' of https://github.com/andrew020/MarineBrothers

Conflicts:

MarineBrothers.xcodeproj/project.xcworkspace/xcuserdata/langyi.xcuserdat
ad/UserInterfaceState.xcuserstate