changed desktop urls and all related links
Merge branch 'master' of github.com:Freshmen/freshman-orienteering
Merge branch 'master' of github.com:Freshmen/freshman-orienteering
changed urls in desktop site