branch
Merge branch 'branch1'

Conflicts:

TestGit.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserI
nterfaceState.xcuserstate
	TestGit/AppDelegate.m