Conflicts: AFNetworking/AFNetworkActivityIndicatorManager.m iOS Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
Restructuring project files, directories, etc.