oops fixes #1828
Merge pull request #1829 from OCHA-DAP/marianne-dev

oops fixes #1828
Merge pull request #1830 from OCHA-DAP/dev

Pull request for merging dev into staging ( org view page problem ) - sprint 40