Revert changes to default_base.html and site_header.html
Merge branch 'master' into issues/734-people-list-pages