Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into marianne-dev
close #1845
test merge
Merge pull request #1965 from OCHA-DAP/merge-marianne-dev

Merge marianne dev