closes #1298 closes #1261
Merge remote-tracking branch 'origin/search_controller' into dev

Conflicts:
	ckanext-hdx_search/ckanext/hdx_search/controllers/search_controller.py
Merge pull request #1392 from OCHA-DAP/dev-merges

Dev merges