Merge branch 'stat' into stat2

Conflicts:
	GitDemo/GitDemo.xcodeproj/project.xcworkspace/xcuserdata/yao.xcuserdatad/UserInterfaceState.xcuserstate