Added CourseManager classes: Course.java and CourseClass.java
Merge remote-tracking branch 'upstream/working' into working