Add SubjectVisit/Visit column for alignment getData call
Merge branch 'addvisitmeasure' into fb_plots