working on permissions
Merge branch 'staging' into dev
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
#182 - Align homepage with final wireframes
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