Merge branch 'master' into feature/152-submission-page-fe

opentech/apply/categories/blocks.py

opentech/apply/dashboard/tables.py

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

.../apply/dashboard/templates/dashboard/includes/search.html

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

...ech/apply/dashboard/templates/dashboard/tables/table.html

opentech/apply/dashboard/urls.py

opentech/apply/dashboard/views.py

opentech/apply/funds/blocks.py

...unds/migrations/0024_applicationsubmission_search_data.py

...ch/apply/funds/migrations/0025_update_with_file_blocks.py

opentech/apply/funds/models.py

opentech/apply/funds/templates/funds/demo_workflow.html

opentech/apply/funds/templates/funds/fund_type.html

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

...pply/funds/templates/funds/includes/submission_field.html

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

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

opentech/apply/funds/tests/test_models.py

...tech/apply/home/templates/apply_home/apply_home_page.html