closes #1610
will close #1637 when the language files are recompiled
closes #1609
Merge pull request #1681 from OCHA-DAP/arti-sprint-38

crisis page layout + map
Merge pull request #1680 from OCHA-DAP/marianne-dev

Marianne dev
#1656 Changing background of search results title
Merge pull request #1683 from OCHA-DAP/crisis-search-result

Pull request: #1656 Changing background of search results title
#1656 small fix
Merge pull request #1684 from OCHA-DAP/crisis-search-result

Pull request: #1656 small fix
#1658 - small changes
Merge branch 'dev' into arti-sprint-38

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/crisis-page.css
#1658 - remove Nigeria from the map