fix for cf-154
CF-156
CF-153
Merge branch 'feature/culturefeed_entry_ui' of https://github.com/cultuurnet/culturefeed into feature/culturefeed_entry_ui