Changes to schema
Added org.clojure/math.combinatorics dependency
Unused schedule block functions deleted
Basic schedule proposal sanity checks implemented
Schedule checks emit schedule check errors
Merge branch 'origin-database-api-refactor' into origin-scheduling

Conflicts:
	project.clj
	src/xiast/query.clj
Fixed mockdata, should be removed though
Scheduling checks and some query updates
Implemented check-proposal
Merge branch 'scheduling' of github.com:se1-1314/xiast into origin-scheduling
Old code removed
Schedule block ids are back!
Moved query.clj maps
Merge branch 'database-api-refactor' into scheduling
Some query stubs for schedules
Added Midje dependency
Added scheduling tests, fixes to scheduling & schema
Merge branch 'scheduling' of github.com:se1-1314/xiast into origin-scheduling
Merge branch 'origin-api-query-tests' into origin-scheduling

Conflicts:
	project.clj
	src/xiast/api.clj
	src/xiast/query.clj
	src/xiast/schema.clj
Merge bugs fixed