Fixed conflict

fixed conflict in pause method
Merge branch 'master' of https://github.com/kyungkoo/AFNetworking