ignore Podfile.lock and Pods
Merge remote-tracking branch 'upstream/master'
int --> NSInteger
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
update iOS SDK changelog
Merge pull request #45 from debugger87/master

更新 iOS ChangeLog