closes #349
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into dev