closes #318 for good one hopes
resolves lingering issues with #384
Merge pull request #479 from OCHA-DAP/marianne-dev

closes #318 for good one hopes
fixes #475 - Remove the tooltip on the logo
#491
Merge pull request #492 from OCHA-DAP/dev-org-admin-491

#491
fixes #426 - Strange behaviour
fixes #488 - Default sort on datasets should be Most Recent - groups
fixes #488 - Default sort on datasets should be Most Recent - orgs
Merge pull request #494 from OCHA-DAP/arti-sprint-17

Arti sprint 17
#481
Merge pull request #496 from OCHA-DAP/dev-org-wireframe-481

#481
#483
Merge remote-tracking branch 'origin/dev' into org-member-changes

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/plugin.py
#320 tips appear on hover
#320 tips appear on hover
Merge branch 'entity-creation-tips' of
https://github.com/OCHA-DAP/hdx-ckan.git into entity-creation-tips

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/public/hdx_theme.css
closes #473
closes #262
closes #248