#661 - Working on pre-populating the assessment drop down menus.  Put back the TemplateVariableContent.setType() method in the AssessmentVariableService because the TemplateVariableContent.setType() method never gets called when we mix in the methods from the TemplateVariableContent.