t646 & t687 -- adding formulae to assessment_variable table
Merge branch 't646' into resolved