Merge branch 'Content-deactivation'
Bug fix for missing video object in response
Bug fix & tests - missing video attribute
Merge branch 'bug-fix-video'
Merge branch 'dev'

Conflicts:
	web/app/Apiv1/Repositories/Articles/ArticleRepository.php
	web/tests/_data/dump.sql
	web/tests/api/ApiTester.php
Data check for missing show time
Merge branch 'bug-fix-listings' into dev