Merge branch 'dev' into arti-sprint-40
Merge branch 'dev' into arti-sprint-40
fixes #1785 - Menu changes to ckan and blog
Merge pull request #1826 from OCHA-DAP/arti-sprint-40

Arti sprint 40