merge
this is master
Merge branch 'master' of https://github.com/cszwdy/EMNetworking

Conflicts:

EMNetworking/EMNetworking.xcodeproj/project.xcworkspace/xcuserdata/hoshi
sakaichen.xcuserdatad/UserInterfaceState.xcuserstate