Minor changes before merging

Changes for Pull request
Meetings/Courses now has a fromCursor method
timetable_colors now refer to colors