Merge pull request #160 from se1-1314/nilsbranch

Added schedule for titular to schedule-get
Fixed small typo in query
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
Request list (with mock data)
Partially re-indented core.clj
Adapted mockshedules to schema changes
Show message of request
Use underscore's flatten instead of homegrown
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-my-schedule

Conflicts:
	resources/templates/layout.html
Merge conflict resolved
- Timetables: fixed so it can be used again for testing
- Added generic function to highlight events when clicking them
- Added delete functionality when an event has been selected
Solved merge conflict
Merge remote-tracking branch 'origin/master' into my-schedule-reset-delete

Conflicts:
	resources/public/js/generic_calendar.js

Conflicts manually resolved
Functionality for loading schedule check results
Merge pull request #161 from se1-1314/my-schedule-reset-delete

My schedule reset delete
Merge remote-tracking branch 'refs/remotes/origin/my-schedule'

Conflicts:
	resources/templates/my-schedule.html
Adapted all current query tests. They all pass.
Merge remote-tracking branch 'origin/master' into nilsbranch