Merge remote-tracking branch 'upstream/master'

Merging user preferences to Jasmine's changes to model
Merge pull request #4 from jwoo12/master

Changed UserPref to add xml and commented buggy code in CourseDataSource
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
modified xml's of course and task
Merge pull request #6 from jivedesign/master

modified xml's of course and task
Bug fixes for courses