Added AFNetworking
additional changes
conflicts again