Added some more threading for our API calls.
Merge remote-tracking branch 'origin/master'
Fixed conflicts in xcode.