Merge branch 'master' into feature/124-login-frontend

opentech/apply/dashboard/tables.py

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

opentech/apply/funds/admin.py

opentech/apply/funds/blocks.py

opentech/apply/funds/migrations/0012_create_lab_models.py

...nds/migrations/0013_allow_nullable_round_on_submission.py

opentech/apply/funds/migrations/0014_add_meta_names.py

...h/apply/funds/migrations/0015_link_user_to_application.py

opentech/apply/funds/models.py

opentech/apply/funds/templates/funds/email/confirmation.txt

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

opentech/apply/funds/templates/funds/fund_type_landing.html

opentech/apply/funds/templates/funds/lab_type.html

opentech/apply/funds/templates/funds/lab_type_landing.html

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

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

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

opentech/apply/funds/tests/test_models.py

opentech/apply/home/models.py

opentech/apply/stream_forms/blocks.py