更新
导入个人，系统信息
更新个人信息1.1

加入本地视频至个人信息界面
Merge branch '谢航‘分支'

Conflicts:
	IStone_911.xcodeproj/project.pbxproj

IStone_911.xcworkspace/xcuserdata/Scofield.xcuserdatad/UserInterfaceStat
e.xcuserstate
	MenuViewController.h

Pods/Pods.xcodeproj/xcuserdata/Scofield.xcuserdatad/xcschemes/Pods-AFNet
working.xcscheme

Pods/Pods.xcodeproj/xcuserdata/Scofield.xcuserdatad/xcschemes/Pods-FHSeg
mentedViewController.xcscheme

Pods/Pods.xcodeproj/xcuserdata/Scofield.xcuserdatad/xcschemes/Pods-REFro
stedViewController.xcscheme

Pods/Pods.xcodeproj/xcuserdata/Scofield.xcuserdatad/xcschemes/Pods-SVPul
lToRefresh.xcscheme

Pods/Pods.xcodeproj/xcuserdata/Scofield.xcuserdatad/xcschemes/Pods.xcsch
eme

Pods/Pods.xcodeproj/xcuserdata/Scofield.xcuserdatad/xcschemes/xcschemema
nagement.plist