Replace copyrighted content with links
Merge branch 'master' into milestone1