Removed file that should't be tracked
Merge branch 'master' into dev-ipad-compatibility

Conflicts:
	agent.xcodeproj/project.xcworkspace/xcuserdata/p.korolev.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'dev-ipad-compatibility'