user2 commit
Merge branch 'master' of https://github.com/iSerg/testttt

Conflicts:
	test/test.xcodeproj/project.xcworkspace/xcuserdata/iSerg.xcuserdatad/UserInterfaceState.xcuserstate
	test/test/AppDelegate.m