Changed some links
Merge branch 'master' into playlist