closes #1153
#1153
Merge pull request #1154 from OCHA-DAP/fix-nosetests

Fix nosetests
Merge pull request #1155 from OCHA-DAP/dev

Merge DEV to STAGING