Squashed 'projects/dkan/' changes from b9e3f6f..200302f

200302f Merge pull request #255 from NuCivic/release_updates
6818716 Updating CHANGELOG with version 7.x-1.4 notes

git-subtree-dir: projects/dkan
git-subtree-split: 200302f4becb37231a33e0512378557eb7320047
dkan subtree from git@github.com:NuCivic/dkan.git
Squashed 'projects/data_workflow/' changes from 8e96d14..0ec14d4

0ec14d4 Merge pull request #3 from NuCivic/nucivic_internal_138_portal_admin_to_administer_all_roles
af4d824 NuCivic/nucivic-internal#138: Adding permission to manage storyteller role

git-subtree-dir: projects/data_workflow
git-subtree-split: 0ec14d41e560d44742426b8f8917e2ef926b60e4
data_workflow subtree from git@github.com:nucivic/data_workflow.git
Rebuild with drush buildmanager.
Merge pull request #12 from NuCivic/new-build-1413000356

BUILD 1413000356: Rebuild with buildmanager from qa branch