Add some urls to shortcuts
Merge branch 'master' into mac