Splitted query into multiple files
Update course-activity names
Cleaned course names
Merge remote-tracking branch 'origin/master' into nilsbranch

Conflicts:
	xiast.sql
Fixed bug in API routes