Merge pull request #1867 from OCHA-DAP/dev

Pull request for merging dev into staging - sprint 41
Merge pull request #1870 from OCHA-DAP/dev

Pull request for merging dev into staging ( #1721, #1291 ) - sprint 41
Merge pull request #1875 from OCHA-DAP/dev

Pull request for merging dev into staging ( #1721 bug fixes, nose test, perma_link in resource extras ) - sprint 41
Merge pull request #1877 from OCHA-DAP/staging

Pull request for merging staging into prod for Sprint 41
Hotfix for adding more checks on the ebola page

- checking that sparkline data is not empty
- checking items have a date set
changing version to 0.5.7
Merge pull request #1881 from OCHA-DAP/hotfix-sparkline-checks

Hotfix sparkline checks
Merge pull request #1882 from OCHA-DAP/prod

Pull request for merging hotfix from prod in staging ( Sprint 41 )
Merge remote-tracking branch 'origin/staging' into dev

Conflicts:
	ckanext-hdx_crisis/ckanext/hdx_crisis/controllers/crisis_controller.py