good
storyboard link搞定

ok
Merge branch 'Jacky' into develope

Conflicts:
	ActionYo.xcodeproj/project.pbxproj 修复