Added test files
This was causing "extra" content api calls.

(not loads of them, just annoying new test files)
Don't really want that checked in :)
None of our cron or run once scheduled jobs will now run during tests.

 They are impossible to test (that way) and only result in random new data files.
Show DFP video preroll ads
Configure DFP host
Merge pull request #3723 from guardian/kc-dfp-video

Show DFP video preroll ads
Fix bug with video ad switch state
Merge pull request #3721 from guardian/test-schedules

Cron (and run once) schedules cannot now run in Test mode
Use the complete contentApiQuery value
Merge pull request #3728 from guardian/push-contentapi-query

Include queryStr when pushing collection backfill to CAPI
Merge branch 'master' of github.com:guardian/frontend into memcached

Conflicts:
	common/app/common/akka.scala
Merge branch 'master' of github.com:guardian/frontend into memcached

Conflicts:
	common/app/common/akka.scala