Merge branch 'master' into feature/133-add-address-field

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

...h/apply/users/templates/users/password_reset/confirm.html

...tech/apply/users/templates/users/password_reset/done.html

...tech/apply/users/templates/users/password_reset/form.html

opentech/apply/users/urls.py

...ch/public/funds/migrations/0006_fundindex_introduction.py

opentech/public/funds/models.py

opentech/public/funds/templates/public_funds/fund_index.html

opentech/public/funds/templates/public_funds/lab_index.html

...h/public/navigation/templates/navigation/breadcrumbs.html

opentech/public/news/templates/news/news_index.html

...blic/people/templates/people/includes/person_listing.html

...ech/public/people/templates/people/person_index_page.html

opentech/public/people/templates/people/person_page.html

...ublic/projects/templates/projects/project_index_page.html

...tech/public/projects/templates/projects/project_page.html

opentech/public/utils/templates/utils/listing_index.html

opentech/settings/base.py

opentech/static_src/src/sass/components/_form.scss

opentech/static_src/src/sass/components/_heading.scss