Merge remote-tracking branch 'origin/arti-sprint-38' into dev
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan.git into dev

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
Merge branch 'dev' into arti-sprint-38

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css