Merge branch 'master' into sprint-4-winter-2019

opentech/apply/activity/messaging.py

...ech/apply/activity/migrations/0015_partner_field_event.py

opentech/apply/activity/options.py

opentech/apply/categories/admin.py

opentech/apply/categories/admin_helpers.py

opentech/apply/categories/admin_views.py

opentech/apply/categories/migrations/0002_metacategory.py

opentech/apply/categories/models.py

.../categories/admin/includes/meta_category_list_header.html

opentech/apply/dashboard/views.py

opentech/apply/funds/admin.py

opentech/apply/funds/forms.py

...y/funds/migrations/0051_applicationsubmission_partners.py

opentech/apply/funds/models/mixins.py

opentech/apply/funds/models/submissions.py

opentech/apply/funds/models/utils.py

...s/templates/funds/applicationsubmission_admin_detail.html

...y/funds/templates/funds/applicationsubmission_detail.html

...emplates/funds/applicationsubmission_reviewer_detail.html

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