Added a filter on the timeline
Merge branch 'develop' into feature/WKS-125

Conflicts:
	lib/CultureFeed/CultureFeed/Pages.php
	lib/CultureFeed/CultureFeed/Pages/Default.php
	lib/Drupal/DrupalCultureFeedPages_Cache.php
Merge branch 'feature/WKS-125' into develop