Merge branch 'master' into feature/129-account-activation-fe

opentech/apply/dashboard/tables.py

opentech/apply/funds/blocks.py

opentech/apply/funds/migrations/0014_add_meta_names.py

...h/apply/funds/migrations/0015_link_user_to_application.py

opentech/apply/funds/models.py

opentech/apply/funds/templates/funds/email/confirmation.txt

opentech/apply/funds/tests/factories/__init__.py

opentech/apply/funds/tests/factories/blocks.py

opentech/apply/funds/tests/factories/models.py

opentech/apply/funds/tests/test_models.py

opentech/apply/users/migrations/0003_make_email_username.py

opentech/apply/users/models.py

opentech/apply/users/templates/users/activation/email.txt

.../apply/users/templates/users/activation/email_subject.txt

opentech/apply/users/templates/users/activation/invalid.html

opentech/apply/users/tests/test_oauth_access.py

opentech/apply/users/urls.py

opentech/apply/users/utils.py

opentech/apply/users/views.py

opentech/settings/base.py