Merge branch 'master' into feature/155-filters

...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

opentech/apply/stream_forms/blocks.py

opentech/apply/stream_forms/fields.py

...eam_forms/templates/stream_forms/includes/file_field.html

...tream_forms/templates/stream_forms/render_file_field.html

...forms/templates/stream_forms/render_multi_file_field.html

opentech/public/home/blocks.py

...ic/home/migrations/0004_add_related_models_to_homepage.py

opentech/public/home/migrations/0005_homepage_our_work.py

opentech/public/home/migrations/0006_add_our_work_fields.py

...ublic/home/migrations/0007_add_labs_and_funds_homepage.py

...public/home/migrations/0008_add_intro_to_lab_and_funds.py

opentech/public/home/models.py

opentech/public/home/templates/home/blocks/our_work.html

opentech/public/home/templates/home/home_page.html

opentech/public/home/templates/home/includes/list_block.html