merge nan's PR
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf-ui-tests into develop

Conflicts:
	project_registration_tests.py
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf-ui-tests into develop