update with latest changes from Dropbox
Merge branch 'master' of https://github.com/aaronbeekay/Component-libraries