closes #1393
adding more nosetests and closing #1301
Merge pull request #1406 from OCHA-DAP/search_controller

closes #1393
Merge remote-tracking branch 'origin/dev' into indicator-action-menu

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/helpers/helpers.py
	ckanext-hdx_theme/ckanext/hdx_theme/plugin.py