Merged in some code from MOST. Changes made...

partly to make it easier to compare mostSandbox with MOST in ExamDiff
software. There were many places where a blank line or the exact same
line were highlighted as different, probably due to invisible
characters. By copying code from one branch to the other, many of these
differences are no longer present.