Merge branch 'hotfix/BVV-308'
provide keywords to agenda detail & summary
redelete culturefeed.lib.inc - error while merging to master
Merge branch 'master' of https://github.com/cultuurnet/culturefeed
Merge branch 'master' into develop