11
Merge branch 'branch1'

Conflicts:
	iCloudTest.xcodeproj/project.xcworkspace/xcuserdata/chenzufa.xcuserdatad/UserInterfaceState.xcuserstate