Merge branch 'master' into feature/125-dashboard-header-footer

fabfile.py

opentech/apply/dashboard/tables.py

opentech/apply/funds/blocks.py

...apply/funds/migrations/0010_update_for_rich_text_block.py

...migrations/0011_update_encoder_add_round_to_submission.py

opentech/apply/funds/models.py

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

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

opentech/apply/funds/templates/funds/round.html

opentech/apply/funds/tests/test_models.py

opentech/apply/stream_forms/blocks.py

opentech/apply/stream_forms/forms.py

opentech/apply/users/middleware.py

opentech/apply/users/templates/users/account.html

opentech/apply/users/templates/users/login.html

opentech/apply/users/tests/test_oauth_access.py

opentech/public/forms/templates/public_forms/form_page.html

...lic/standardpages/templates/standardpages/index_page.html

opentech/public/utils/templates/utils/includes/funding.html

opentech/public/utils/wagtail_hooks.py