Added user titular as titular to some courses
API: better errors thrown by coercer
Merge remote-tracking branch 'origin/master' into nilsbranch
Merge pull request #159 from se1-1314/nilsbranch

Added user titular as titular to some courses
Schedule block suggestions work
Merge branch 'master' of github.com:se1-1314/xiast
Fixed schedule tests
Added schedule for titular to schedule-get
Merge remote-tracking branch 'origin/master' into nilsbranch
Merge pull request #160 from se1-1314/nilsbranch

Added schedule for titular to schedule-get
Added schedule check result support functions

- Underscore.js is now a dependency
- Erroneous blocks can now be marked and unmarked in the calendar view
Merge branch 'master' of github.com:se1-1314/xiast
load_schedule_check_result marks erratic blocks
Use underscore's flatten instead of homegrown
Merge remote-tracking branch 'origin/master' into my-schedule-reset-delete

Conflicts:
	resources/public/js/generic_calendar.js

Conflicts manually resolved