test
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into develop
Merge https://github.com/CenterForOpenScience/osf into develop
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into develop
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into develop

Conflicts:
	tasks.py
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into develop
OSF reupload
Fixed url inconsistencies for the Wiki Edit page
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into develop
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into develop
Treebeard and Fangorn initial implementation on the OSF
Rewrote columns
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into feature/backend_development
Fixed issues to allow treebeard to extend
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into develop
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf into feature/treebeard
Merge branch 'feature/backend_development' of https://github.com/fayetality/osf into feature/treebeard
Added treebeard as dependency in bower and added files to assets.py
Initial setup working
Initial fangorn options working