improved video markup
Merge branch 'bug/video-markup' into dev

Conflicts:
	public/includes/components/component-video.php