added youtube shortlink
Merge branch 'shortlinks' into featuremerge