Merge branch 'master' into feature/258-seperate-buckets

opentech/apply/dashboard/templates/dashboard/dashboard.html

opentech/apply/dashboard/wagtail_hooks.py

opentech/apply/determinations/tests/test_views.py

opentech/apply/funds/templates/funds/includes/field.html

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

opentech/apply/funds/tests/test_models.py

opentech/apply/funds/tests/test_views.py

opentech/apply/funds/views.py

opentech/apply/home/factories.py

opentech/apply/middleware.py

opentech/apply/urls.py

opentech/apply/users/forms.py

opentech/apply/users/groups.py

opentech/apply/users/management/commands/migrate_users.py

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

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

.../apply/users/templates/users/password_reset/complete.html

opentech/apply/users/tests/test_forms.py

opentech/apply/users/tests/test_oauth_access.py

opentech/apply/users/tests/test_utils.py