Added youtube and vimeo embed option
Merge branch 'beta'