8-1daytim

初步屏幕截屏
Merge branch '刘任驰“分支'

Conflicts:

IStone.xcworkspace/xcuserdata/lrcray.xcuserdatad/UserInterfaceState.xcus
erstate
	IStone/MenuViewController.m