quick fix for grooteoorlog module_exist to culturefeed_pages
UPS-1177 changing var to textarea
Merge branch 'develop' of https://github.com/cultuurnet/culturefeed into develop
CF-306 update labels & translations
Merge branch 'feature/CF-306' into develop
Merge branch 'develop' of github.com:cultuurnet/culturefeed into develop
MSS-18 thema's onder wat-opties tonen
MSS-18 jenkins scripts toevoegen
MSS-18 aanpassen voor meertaligheid
MSS-19 HTML editor lange beschrijving verwijderen
MSS-19 markup korte beschrijvingen controleren
MSS-17
MSS-20 jenkins
MSS-22 instance setup
Merge branch 'feature/MSS-18' into develop
Merge branch 'feature/MSS-19' into develop

Conflicts:
	culturefeed_entry_ui/culturefeed_entry_ui.module
Merge branch 'feature/MSS-20' into develop
Merge branch 'feature/MSS-22' into develop
Merge branch 'develop' into feature/MSS-16

Conflicts:
	culturefeed_entry_ui/culturefeed_entry_ui.module
	culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
	culturefeed_entry_ui/theme/theme.inc