Trying to get pelican devserver to work again
Merge branch 'master' into staging
Don't mask missing markdown package errors
Merge branch 'master' into staging
updated styles for new location of team page
Merge branch 'staging' of https://github.com/databrary/www into staging

Conflicts:
	databrary/input/pages/about/team.md
Merge remote-tracking branch 'origin/staging' into lina

Conflicts:
	databrary/input/pages/about/team.md
Change of phone numbers
ICIS Berlin post
Merge remote-tracking branch 'origin/master' into staging
Change of phone number
Merge remote-tracking branch 'origin/lina' into staging
Change in text
Change in text
change to about
updates to user guide
add dmp template mdi to policies
update user guide intro page
update mdi for data management plan template
add empty page for dmp resources info, to finish later