Moving stuff, merged courses in course search, links, fixing filters
Merge pull request #1514 from UniversityOfHelsinkiCS/trunk Merged mapped course search results to one result
Merge pull request #1514 from UniversityOfHelsinkiCS/trunk Merged mapped course search results to one result