Merge branch 'master' of https://github.com/OCHA-DAP/HDX-CKAN_Setup

Conflicts:
	CKANSetup/ckanSetup.sh