#1204
Merge remote-tracking branch 'origin/dev' into dev-indicator-detail-dan
Merge remote-tracking branch 'origin/dev' into dev-indicator-detail-dan 
#1204

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/public/header.css
Merge remote-tracking branch 'origin/dev' into dev-indicator-detail-dan
#1204
Merge pull request #1219 from OCHA-DAP/dev-indicator-detail-dan

Dev indicator detail dan