5/17code
Merge branch 'master' of https://github.com/mojingtao891011/BedsideTreasure

Conflicts:

iSpace.xcodeproj/project.xcworkspace/xcuserdata/yf.xcuserdatad/UserInter
faceState.xcuserstate
	iSpace/Home/SetColckViewController.xib