Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into search_controller
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into search_controller
some fixes, updating tags dict to fit Arti's specs
Merge pull request #1336 from OCHA-DAP/search_controller

Search controller