Modify the logging messages to cut down slightly on the logging spam.
Warning cleanup.
Added in an explicit nil check to the response from the JSON parser.
Merge branch 'master' of git://github.com/dropbox-sdk-mirror/dropbox-sdk-ios

Conflicts:
	DropboxSDK/Classes/DBKeychain-iOS.m
	DropboxSDK/Classes/DBRequest.m
	DropboxSDK/Classes/DBRestClient.m
Updated git ignore.
Only show the last path component when logging an error.
Added DBDeltaEntry to the DropboxSDK header.
Merge branch 'master' of github.com:nothirst/dropbox-sdk-ios
Add DBDeltaEntry to the DropboxOSX header
Merge branch 'master' of github.com:nothirst/dropbox-sdk-ios
Use an AppleEvent to catch when Dropbox.com has rerouted us back to our application instead of relying on the applicationDidBecomeActive notification.
Merge branch 'master' of git://github.com/dropbox-sdk-mirror/dropbox-sdk-ios
Revert "Use an AppleEvent to catch when Dropbox.com has rerouted us back to our application instead of relying on the applicationDidBecomeActive notification."

This reverts commit ee617b6a64a7dcfe4b164043a1afc307794d1e63.
Fix a #define to declare a super class.
Merge branch 'master' of github.com:nothirst/dropbox-sdk-ios
Merge branch 'master' of github.com:dropbox-sdk-mirror/dropbox-sdk-ios
Fix an issue where the navigation bar overlapped the content in the authorization controller on iOS 7.
Merge https://github.com/nothirst/dropbox-sdk-ios