add jasmine test for DepartmentCollection
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/collections/courses/CoursesCollection.js