#749 - about page :)
#749 - update links to point to the about page
#749 - small fix
fixes #749 - updated current links - that's about it
addresses #728 provided the database is updated
closes #748 but needs to be tested
resolves #861 and also a quick patch to fully close #728 without touching the db
tweaking branch for bugs
Merge pull request #861 from OCHA-DAP/marianne-dev

Marianne dev
Merge remote-tracking branch 'origin/arti-layout-changes' into dev

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/public/header.css
Merge pull request #862 from OCHA-DAP/dev-merge-artys

Dev merge artys
Merge pull request #863 from OCHA-DAP/dev

Merge DEV to STAGING