CF-199
Merge branch 'develop' of https://github.com/cultuurnet/culturefeed into develop