Merge branch 'qa' into development
more tweaks for absentee report