wuyue 4-9 preference need to change
Merge branch 'master' of https://github.com/hengjiaqi/sanbox

Conflicts:
	sandbox.xcodeproj/project.pbxproj

sandbox.xcodeproj/project.xcworkspace/xcuserdata/jake.xcuserdatad/UserIn
terfaceState.xcuserstate