Merged updates from adaptlearning mcq and alternate scoring systems