Merge remote-tracking branch 'origin/david/prez-identifier-homepage-m…

…ediatypes' into david/prez-identifier-homepage-mediatypes

# Conflicts:
#	prez/routers/management.py
#	prez/services/link_generation.py