action segue
Merge branch 'master' of https://github.com/yixin-org/yixin-client-ios-doctor

Conflicts:
	yinxin-doctor/yinxin-doctor/Base.lproj/Main_iPhone.storyboard