Added support for short Youtube and Flickr URLs
Merge pull request #3827 from nicolaasmatthijs/shortUrls

Added support for short Youtube and Flickr URLs