fix for CFK-123
Merge branch 'feature/culturefeed_entry_ui' of https://github.com/cultuurnet/culturefeed into feature/culturefeed_entry_ui
CFK-81
final fix CFK-123
Adding copyright check
Merge branch 'feature/culturefeed_entry_ui' of https://github.com/cultuurnet/culturefeed into feature/culturefeed_entry_ui
Merge branch 'feature/culturefeed_entry_ui' of https://github.com/cultuurnet/culturefeed into feature/culturefeed_entry_ui
fix for CFK-124
Merge branch 'feature/culturefeed_entry_ui' of https://github.com/cultuurnet/culturefeed into feature/culturefeed_entry_ui
fix for CFK-133
CFK-133
CFK-118
Merge branch 'feature/culturefeed_entry_ui' of https://github.com/cultuurnet/culturefeed into feature/culturefeed_entry_ui
Merge branch 'feature/CFK-104' into feature/culturefeed_entry_ui

Conflicts:
	culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc