Merge remote-tracking branch 'origin/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
Merge branch 'master' into api-query-tests