Updated CourseOutcomeMapping to work with the new OutcomePrototypes
Fixed merge conflicts