Merge pull request #1307 from OCHA-DAP/dev

Merge DEV to STAGING
Merge pull request #1312 from OCHA-DAP/dev

Merge DEV to STAGING
Merge pull request #1314 from OCHA-DAP/dev

trying to fix dev
Merge pull request #1316 from OCHA-DAP/dev

#1260 - fix font icons so that they don't get bundled
Merge pull request #1355 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1360 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1362 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1401 from OCHA-DAP/prod-local

hotfix closes #1385
Merge pull request #1415 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1417 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1421 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1425 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1488 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1492 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1500 from OCHA-DAP/dev

Merging DEV into STAG
Merge pull request #1506 from OCHA-DAP/dev

Merge DEV into STAG
Merge pull request #1512 from OCHA-DAP/dev

Dev into stag
better faster maps
Merge pull request #1515 from OCHA-DAP/dev

Merge DEV into STAG
closes #1456