Merge branch 'master' of github.com:Carl-XPG/iFind
merge new code
modify photoManager
Merge branch 'ui-module' of github.com:Carl-XPG/iFind
delete conflict file`
Conflicts:
	iFind.xcodeproj/project.xcworkspace/xcuserdata/Carl.xcuserdatad/UserInterfaceState.xcuserstate
拍照保存本地实现
异步保存照片
conflict sloved