Upgrade ScalaTest from 1.9.1 to 2.0.RC1
Merge branch 'upgrade-scalatest'

Conflicts:
	commercial/test/model/commercial/travel/OffersApiTest.scala
Change new tests from using ShouldMatchers to Matchers
Merge remote-tracking branch 'origin/master'
Add database files
Video player aligns on layout with new grid outer margins
Merge branch 'master' of github.com:guardian/frontend into video-fallback

Conflicts:
	applications/test/VideoTemplateTest.scala
	common/app/assets/stylesheets/module/_video.scss