fixing template bug #1975
Merge pull request #1976 from OCHA-DAP/marianne-dev

fixing template bug #1975
Merge pull request #1977 from OCHA-DAP/dev

Merging DEV into STAG