too much markdown #1649
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into marianne-dev
moves tags to close #1292
Merge pull request #1841 from OCHA-DAP/marianne-dev

Marianne dev