Fixed small typo in query
Partially re-indented core.clj
Adapted mockshedules to schema changes
- 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
Merge remote-tracking branch 'origin/master' into my-schedule-reset-delete

Conflicts:
	resources/public/js/generic_calendar.js

Conflicts manually resolved
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
Fixed typo
Merge branch 'origin-my-schedule'

Conflicts:
	resources/public/js/generic_calendar.js
Merge branch 'master' of github.com:se1-1314/xiast