added new permissions plugin
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into dev
merge conflict
#174
The number of datasets in the front page seems to be slightly off
Merge pull request #189 from OCHA-DAP/wrong-number-datasets-174

#174
Merge pull request #194 from OCHA-DAP/homepageChanges

#182 - Align homepage with final wireframes
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into dev
untracked changes
merge conflict
fixing authorization bug
Merge branch 'dev' into staging
#180
partial commit
changes to the login #179 #178
Merge pull request #199 from OCHA-DAP/login-changes

Pull request for: changes to the login #179 #178
Merge pull request #201 from OCHA-DAP/result-facet-displays-180

#180
Merge pull request #202 from OCHA-DAP/homepageChanges

#186 - Implement new header menu design
Merge branch 'dev' into staging
error with facets
#180
fix the search issue
#180
fix the search bug and links from facets