Merge branches 'local' and 'master'
Course Settings Page added

The course settings page allows for settings to be changed by the
instructor or TA's
merged master into local