closes #976 closes #993
closes #963 although needs to be revisited after js/css organization is re-evaluated
closes #933
closes #972
Merge pull request #1013 from OCHA-DAP/marianne-dev

Marianne dev