the beginning of features
forgot about the tab
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into search_controller
tags not q
Merge remote-tracking branch 'origin/search_controller' into dev-merges

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

Dev merges