SAM-2151 Allow the instructor to include extra calculations within the calculated question
Also includes some cleanup and improvements to the calculated question (reduced duplicate code, etc.)



git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@124154 66ffb92e-73f9-0310-93c1-f5514f145a0a