addresses #728 provided the database is updated
closes #748 but needs to be tested
resolves #861 and also a quick patch to fully close #728 without touching the db
tweaking branch for bugs
Merge pull request #861 from OCHA-DAP/marianne-dev

Marianne dev