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 #477 from OCHA-DAP/staging

Merge STAG to PROD
Merge pull request #539 from OCHA-DAP/staging

Merge STAGING to PROD
Merge branch 'staging' into prod
Merge branch 'staging' into prod
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
Merge remote-tracking branch 'origin/staging' into prod
Merge pull request #566 from OCHA-DAP/staging

Merge STAGING to PROD
Merge pull request #923 from OCHA-DAP/staging

Merge STAGING to PROD
Merge pull request #926 from OCHA-DAP/staging

Merge STAGING to PROD
Merge pull request #953 from OCHA-DAP/staging

Merge STAGING to PROD
Merge pull request #959 from OCHA-DAP/staging

Merge STAGING to PROD
Merge pull request #967 from OCHA-DAP/staging

Merge STAGING to PROD
Merge pull request #983 from OCHA-DAP/staging

Staging into Prod
Merge pull request #1030 from OCHA-DAP/staging

Pull req for production version 0.3.1
Merge pull request #1033 from OCHA-DAP/staging

Pull req for prod: #1016 small change to jquery lib url
Merge pull request #1080 from OCHA-DAP/staging

Pull request for merging staging into production for Sprint 25
#1056 - Organization Page: broken "More info {ORGANISATION NAME} website" links