Merge branch 'master' into VID-1500
Video (VID-1500): added tests to verify embed code for ooyala videos
Video (VID-1500): added tests to verify embed code for anyclip videos
Video (VID-1500): added test for ign videos
Video (VID-1500): added test for inline video
Video (VID-1500): updated VideoComponentObject
Merge branch 'master' into VID-1500
Merge pull request #216 from Wikia/VID-1500

Video (VID-1500): added tests to verify embed code