刘任驰‘7-31

增加了视频录制功能
8-1修改

增加本地视频播放，但是有个小bug，需要通过下拉刷新解决
更新

更新
Merge branch '刘任驰“分支'

Conflicts:

IStone.xcworkspace/xcuserdata/lrcray.xcuserdatad/UserInterfaceState.xcus
erstate
	IStone/MenuViewController.m
	IStone/MyVideoViewController.h
	IStone/MyVideoViewController.m
	Main.storyboard