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

Conflicts:
	xiast.sql
Fixed bug in API routes
API: available-blocks-in-timespan
Fixed incorrect definitions
Removed db ID's from rooms, removed type from schedule blocks
Merge branch 'nilsbranch'
Merge remote-tracking branch 'origin/master' into schedule-activity-dialog

Conflicts:
	src/xiast/query.clj
Fixed dissoc bug
API: check that arguments are ints
Merge branch 'nilsbranch'
- tested add and delete -> succeed
- moved tested -> bugs fixed
- other tests ans bugs fixed
Merge branch 'master' into schedule-activity-dialog