closes #349
fixes #381 - Add Colombia to the focus countries list drop down on the home page
fixes #271 - Search page: facets display the wrong numbers
fixes #381 - Add Colombia to the focus countries list drop down on the home page
Merge pull request #396 from OCHA-DAP/developmentArti

#381, #271
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into dev
#386 #389 #390
#310, #312, #347, #335

All kinds of different changes related to the datepicker functionality
and dateformat
#392
sample tests #296
changes to config and sample test #296
adding deleted&draft badges #356
Merge pull request #398 from OCHA-DAP/dev-org-edit-386-389-390

#386 #389 #390
#356 #296

testing delete badge
#400

adding test-core.ini.sample to GIT and modifying other config files
Merge pull request #400 from OCHA-DAP/delete-badge-and-tests

Pull request: Delete badge and tests
Merge remote-tracking branch 'origin/dev-datepicker-changes' into dev

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/helpers.py
Merge pull request #399 from OCHA-DAP/dev-datepicker-add-dataset

Dev datepicker add dataset
Merge pull request #402 from OCHA-DAP/dev

Dev merged in Staging