API+Query: get titular and p-manager's courses
Schedule blocks in database dump
Merge remote-tracking branch 'origin/master' into nilsbranch
Splitted query into multiple files
Update course-activity names
Cleaned course names
Cleaned course names
Modal added to myschedule
Merge remote-tracking branch 'origin/master' into nilsbranch

Conflicts:
	xiast.sql
Fixed bug in API routes
API: available-blocks-in-timespan
Merge remote-tracking branch 'origin/master' into schedule-editor
Fixed incorrect definitions
Merge remote-tracking branch 'origin/master' into schedule-editor
Removed db ID's from rooms, removed type from schedule blocks
Merge branch 'nilsbranch'
Send proposal with dummy data
Fixed dissoc bug
API: check that arguments are ints
Merge branch 'nilsbranch'