closes #391
closes #384
Merge pull request #464 from OCHA-DAP/marianne-dev

Licenses and issue fixes