closes #1610
will close #1637 when the language files are recompiled
closes #1609
Merge pull request #1680 from OCHA-DAP/marianne-dev

Marianne dev