Merge bugs fixed
Macro to make testing a bit nicer
Room query checks now use mockdata
commented courseroutes
Better code, maybe
API/Query: update course-activities
Tests
api-docs complete
api-docs complete
Merge branch 'master' into api-docs

Conflicts:
	src/xiast/api.clj
Fixes to mockprograms
Merge remote-tracking branch 'origin/master' into api-query-tests
Merge branch 'master' into api-query-tests
added departments
API/Query: program manager's programs listing
Merge remote-tracking branch 'origin/mockprograms' into api-query-tests
Indentation fix
Fixes 'n tests
API/Query: add courses to a program
API/Query: add courses to a program