#661 - Working on pre-populating the assessment drop down menus.
Merge remote-tracking branch 'origin/t660' into t660