Merge branch 'hotfix/BVV-636'
Merge branch 'develop'
Added a filter on the timeline
Merge branch 'master' of github.com:cultuurnet/culturefeed
Add type to composer.json.
Needed for installer-paths support.
Merge branch 'develop'
Merge branch 'develop'
WKS-212. activity summaries for production, events (and actors) available on a page.
MSS-16
MSS-16 bootstrap fixes
MSS-16 fixes
MSS-16 time format period permanent
MSS-22 thumbnail
MSS-22 thumbnail
MSS-16 time autocomplete
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
Merge branch 'develop' into feature/MSS-22

Conflicts:
	jenkins/mss-17-bartik.sh
	jenkins/mss-17-culturefeed-bootstrap.sh
MSS-22 photo protocol
MSS-17 remove jenkins
MSS-18 jenkins folder verwijderen