First commit from Hello Dropbox Example.
Merge remote-tracking branch 'origin/master' into develop