responsive dashboard.mako
Merge branch 'develop' of github.com:CenterForOpenScience/osf.io into feature/responsive-dashboard
update faq page to reference Rackspace for file storage and backup
Fixes #1072. Again. :(
hotfix/ add meta tag for google webmaster tools

for osf (already on cos)
Fix load order of CSS files in webassets bundle

site.css must be loaded after commentpane.css
Run npm install in assets task

[skip ci]
Merge branch 'hotfix/0.22.1'
Merge branch 'hotfix/0.22.1' into develop
Don't hardcode Google Analytics and Pingdom IDs
Merge branch 'hotfix/0.22.2'
Merge branch 'hotfix/0.22.2' into develop
Fix mako import
Merge branch 'hotfix/0.22.3' into develop
Merge branch 'hotfix/0.22.4' into develop
Restore html comments
Merge branch 'feature/responsive-dashboard' into develop
Merge branch 'feature/issue1072' into develop

Conflicts:
	website/static/js/profile.js
Merge branch 'develop' of github.com:CenterForOpenScience/osf.io into feature/comment-pane
Collect users