okok
拍照
okok
Merge branch 'Jacky' into develope

Conflicts:
	ActionYo.xcodeproj/project.pbxproj