Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into prod
Merge pull request #450 from OCHA-DAP/hotfix-terms-of-service-346

Hotfix terms of service 346
Merge pull request #466 from OCHA-DAP/dev

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

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

Merge DEV to STAGING
Merge pull request #477 from OCHA-DAP/staging

Merge STAG to PROD
Merge pull request #512 from OCHA-DAP/dev

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

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

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

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

Merge DEV to STAGING
Merge pull request #539 from OCHA-DAP/staging

Merge STAGING to PROD
fixes #517
Merge branch 'staging' into prod
Incrementing version number
Merge branch 'staging' into prod
Quick fix for something we broke, Alex asked me to do it this way
Merge branch 'prod' of https://github.com/OCHA-DAP/hdx-ckan into prod
Quick fix for something we broke, Alex asked me to do it this way
incrementing version numberto v0.2.5