Merge branch 'feature/MSS-26' into develop

Conflicts:
	culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc