closes #883 and closes #834
Merge pull request #920 from OCHA-DAP/marianne-dev

closes #883 and closes #834
#916
#905
Merge pull request #921 from OCHA-DAP/dev-dan-sprint22

Dev dan sprint22
Merge pull request #922 from OCHA-DAP/dev

Merge DEV to STAGING