fix big
Merge branch 'hotfix/replase1' into develop

Conflicts:
	my-oschina.xcodeproj/project.xcworkspace/xcuserdata/jjx.xcuserdatad/UserInterfaceState.xcuserstate
	my-oschina/Base.lproj/Main.storyboard