Merge branch 'master' into feature/972-add-meta-categories-submissions

opentech/apply/activity/messaging.py

...ply/activity/templates/messages/email/applicant_base.html

opentech/apply/funds/api_views.py

opentech/apply/funds/differ.py

opentech/apply/funds/templates/funds/application_base.html

...apply/funds/templates/funds/applicationrevision_list.html

opentech/apply/funds/views.py

opentech/apply/funds/workflow.py

opentech/apply/users/models.py

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

opentech/apply/users/templates/users/change_password.html

opentech/apply/users/templates/wagtailusers/users/list.html

opentech/apply/users/views.py

opentech/apply/users/wagtail_hooks.py

opentech/apply/utils/notifications.py

opentech/static_src/src/images/usagm.png

opentech/static_src/src/sass/public/layout/_footer.scss

opentech/templates/base.html

requirements.txt