Merge remote-tracking branch 'upstream/master'

Merging user preferences to Jasmine's changes to model
Overriding josh's local changes with Master
Merge remote-tracking branch 'upstream/master'
fixed issue referencing 4th column in Course
Merge pull request #5 from jivedesign/master

Fixed issue referencing 4th column in CourseDataSource