Added video agent to async load video ads
Merge branch 'video-ads' of github.com:guardian/frontend into video-ads
Changed video ad js to use new in-page ad object
Differentiate tracking between content and adverts in Omniture
Apply Omniture tracking to videos
Adding temporary advert/content tracking code to Omniture - needs verification
Starting VideoAdAgent in dev-build
Prevent different sized ads from causing page jumps
Merge branch 'master' into video-ads

Conflicts:
	video/app/controllers/VideoController.scala
Fix Scala errors
Merge branch 'master' into video-ads
Reverting line to re-use 'context'
Merge branch 'master' into video-ads

Conflicts:
	common/app/assets/javascripts/bootstraps/common.js
Merge pull request #843 from guardian/video-ads

Pre-roll video ads