Merge branch 'hotfix/0.21.9'
Merge branch 'hotfix/0.21.10'
Merge branch 'hotfix/0.21.11'
Update changelog
Default SENTRY_DSN to None

...to avoid instantiating a Sentry client in local environments

[skip ci]
Updates Google Analytics code snippet to implement Universal Analytics as well as allow for cross-tracking between OSF and COS domains.
Merge branch 'hotfix/0.21.12' into develop
Merge branch 'release/0.21.12' into develop
New Treebeard
Merge branch 'feature/treebeard' of github.com:fayetality/osf.io into fayetality-feature/treebeard

Conflicts:
	bower.json
	website/static/js/projectorganizer.js
	website/templates/dashboard.mako
Merge branch 'fayetality-feature/treebeard' into feature/treebeard

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.